Accepting request 131765 from home:klausi123:X11

Update to version 2.4.39

OBS-URL: https://build.opensuse.org/request/show/131765
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=118

U_intel-add-Ivy-Bridge-GT2-server-variant.patch

@@ -1,36 +0,0 @@
-From e057a56448e2e785f74bc13dbd6ead8572ebed91 Mon Sep 17 00:00:00 2001
-From: Eugeni Dodonov <eugeni@dodonov.net>
-Date: Thu, 29 Mar 2012 21:03:29 -0300
-Subject: [PATCH] intel: add Ivy Bridge GT2 server variant
-
-We were missing this one and it is being used by Bromolow.
-
-Signed-off-by: Eugeni Dodonov <eugeni.dodonov@intel.com>
----
- intel/intel_chipset.h |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/intel/intel_chipset.h b/intel/intel_chipset.h
-index 435d01a..9c1abc8 100644
---- a/intel/intel_chipset.h
-+++ b/intel/intel_chipset.h
-@@ -44,6 +44,7 @@
- #define PCI_CHIP_IVYBRIDGE_M_GT1	0x0156 /* mobile */
- #define PCI_CHIP_IVYBRIDGE_M_GT2	0x0166
- #define PCI_CHIP_IVYBRIDGE_S		0x015a /* server */
-+#define PCI_CHIP_IVYBRIDGE_S_GT2	0x016a /* server */
- 
- #define PCI_CHIP_HASWELL_GT1            0x0402 /* Desktop */
- #define PCI_CHIP_HASWELL_GT2            0x0412
-@@ -128,7 +129,8 @@
- 				 dev == PCI_CHIP_IVYBRIDGE_GT2 || \
- 				 dev == PCI_CHIP_IVYBRIDGE_M_GT1 || \
- 				 dev == PCI_CHIP_IVYBRIDGE_M_GT2 || \
--				 dev == PCI_CHIP_IVYBRIDGE_S)
-+				 dev == PCI_CHIP_IVYBRIDGE_S || \
-+				 dev == PCI_CHIP_IVYBRIDGE_S_GT2)
- 
- #define IS_HSW_GT1(devid)       (devid == PCI_CHIP_HASWELL_GT1 || \
-                                  devid == PCI_CHIP_HASWELL_M_GT1)
--- 
-1.7.3.4

baselibs.conf

@@ -1,13 +1,13 @@
 libdrm2
 libdrm_intel1
-libdrm_nouveau1
+libdrm_nouveau2
 libdrm_omap1
 libdrm_radeon1
 libdrm-devel
 	requires -libdrm-<targettype>
 	requires "libdrm2-<targettype> = <version>"
 	requires "libdrm_intel1-<targettype> = <version>"
-	requires "libdrm_nouveau1-<targettype> = <version>"
+	requires "libdrm_nouveau2-<targettype> = <version>"
 	requires "libdrm_omap1-<targettype> = <version>"
 	requires "libdrm_radeon1-<targettype> = <version>"
 libkms1

libdrm-2.4.33.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2d7b9d94ada0e3a6ede6243509883df2ded01c2983e24322759a366283898fea
-size 446817

libdrm-2.4.39.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b2a132a65cc2fddfb4adac6fecc040bd0a065b77a928bd0d9ead8ef9c3aad16f
+size 213476

libdrm.changes

@@ -1,8 +1,46 @@
+-------------------------------------------------------------------
+Fri Aug 24 21:10:18 UTC 2012 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 2.4.39:
+  + radeon: add prime import/export support
+  + intel: Use VG_CLEAR on the context destroy ioctl as well.
+  + radeon: fix allocation of MSAA surfaces on r600-r700
+  + radeon: align r600 msaa buffers to a multiple of macrotile size
+    * num samples  
+  + tests/modetest: Add a forgotten return, needed for opensuse buildservice
+  + omap: include omap_drm.h independently
+  
+-------------------------------------------------------------------
+Mon Aug 13 16:44:20 UTC 2012 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 2.4.38:
+  + Bugfix release
+
+-------------------------------------------------------------------
+Sun Jul 22 21:59:27 UTC 2012 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 2.4.37:
+  + Put the proper context APIs in place.
+- Add a patch to build 2.4.37 successfully!
+  + Added N_0001-Add-a-forgotten-return-needed-for-opensuse-buildserv.patch
+
 -------------------------------------------------------------------
 Thu Jul  5 12:35:11 UTC 2012 - sndirsch@suse.com
 
 - build omap support only on %arm platform
 
+-------------------------------------------------------------------
+Tue Jul  3 18:36:20 UTC 2012 - tobias.johannes.klausmann@mni.thm.de
+
+- Update to version 2.4.36:
+  + packaging changes:
+    - nouveau.h was moved out from its subdirectory (upstream change)
+    - lidrm_nouveau version bumped to 2
+    - Removed --enable-nouveau-experimental-api from configure
+      it is now stable and will build without it
+  + new in this release:
+    - Context API and wait render timeout API added to libdrm for Intel
+
 -------------------------------------------------------------------
 Mon Jul  2 08:52:51 UTC 2012 - guillaume@opensuse.org
 

libdrm.spec

@@ -18,7 +18,7 @@
 
 Name:           libdrm
 Url:            http://dri.freedesktop.org/
-Version:        2.4.33
+Version:        2.4.39
 Release:        0
 Provides:       libdrm23 = %{version}
 Obsoletes:      libdrm23 < %{version}
@@ -38,9 +38,10 @@ Source:         http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
 Source2:        baselibs.conf
 # PATCH-FIX-UPSTREAM libdrm-implicit-defs.diff fdo#48599 -- Fix compiler warnings in tests/radeon/radeon_ttm.c
 Patch1:         libdrm-implicit-defs.diff
-Patch2:         U_intel-add-Ivy-Bridge-GT2-server-variant.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-#git#BuildRequires:	autoconf >= 2.63, automake >= 1.10
+BuildRequires:  autoconf >= 2.63
+BuildRequires:  automake >= 1.10
 BuildRequires:  libtool >= 2.2
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(pciaccess) >= 0.10
@@ -67,7 +68,7 @@ Provides:       libdrm = %version-%release
 Summary:        Libraries, includes and more to develop libdrm applications
 Group:          Development/Libraries/X11
 Requires:       libdrm2 = %version
-Requires:       libdrm_nouveau1 = %version
+Requires:       libdrm_nouveau2 = %version
 Requires:       libdrm_radeon1 = %version
 %ifarch %arm
 Requires:       libdrm_omap1 = %version
@@ -112,11 +113,11 @@ Group:          System/Libraries
 %description -n libdrm_intel1
 (Upstream has not provided a description)
 
-%package -n libdrm_nouveau1
+%package -n libdrm_nouveau2
 Summary:        Userspace interface for Kernel DRM services for NVIDIA chips
 Group:          System/Libraries
 
-%description -n libdrm_nouveau1
+%description -n libdrm_nouveau2
 (Upstream has not provided a description)
 
 %package -n libdrm_radeon1
@@ -153,16 +154,17 @@ Group:          System/Libraries
 
 %prep
 %setup -q
-%patch -P 1 -p1
+%patch1 -p1
-%patch2 -p1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure --with-pic --enable-nouveau-experimental-api --enable-vmwgfx-experimental-api \
+autoreconf -fi
+%configure --with-pic --enable-vmwgfx-experimental-api \
 %ifarch %arm
 	   --enable-omap-experimental-api \
 %endif
 	   --enable-udev
+
 make %{?_smp_mflags}
 make %{?_smp_mflags} -C tests dristat drmstat
 
@@ -189,9 +191,9 @@ rm -f "%buildroot/%_libdir"/*.la
 
 %postun -n libdrm_intel1 -p /sbin/ldconfig
 
-%post   -n libdrm_nouveau1 -p /sbin/ldconfig
+%post   -n libdrm_nouveau2 -p /sbin/ldconfig
 
-%postun -n libdrm_nouveau1 -p /sbin/ldconfig
+%postun -n libdrm_nouveau2 -p /sbin/ldconfig
 
 %post   -n libdrm_radeon1 -p /sbin/ldconfig
 
@@ -217,7 +219,6 @@ rm -f "%buildroot/%_libdir"/*.la
 %files devel
 %defattr(-,root,root)
 %_includedir/libdrm
-%_includedir/nouveau
 %ifarch %arm
 %_includedir/omap
 %endif
@@ -237,9 +238,9 @@ rm -f "%buildroot/%_libdir"/*.la
 %_libdir/libdrm_intel.so.1*
 %endif
 
-%files -n libdrm_nouveau1
+%files -n libdrm_nouveau2
 %defattr(-,root,root)
-%_libdir/libdrm_nouveau.so.1*
+%_libdir/libdrm_nouveau.so.2*
 
 %files -n libdrm_radeon1
 %defattr(-,root,root)