From 19bbb2dd0d495bddad8d2ec599cb47754818ebe5fa53cf48ffbfc8360dfc0a36 Mon Sep 17 00:00:00 2001
From: Stefan Dirsch <sndirsch@suse.com>
Date: Tue, 29 May 2012 09:51:44 +0000
Subject: [PATCH] - back to libdrm 2.4.33, since 2.4.34 currentlz requires Mesa
 git   master changes for nouveau Mesa driver build - update to version
 2.4.34, see NEWS for detail, here follows

OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/libdrm?expand=0&rev=107
---
 libdrm-2.4.33.tar.bz2     |   3 +
 libdrm-2.4.34.tar.bz2     |   3 -
 libdrm-implicit-defs.diff | 544 +-------------------------------------
 libdrm.changes            |   8 +-
 libdrm.spec               |  28 +-
 5 files changed, 29 insertions(+), 557 deletions(-)
 create mode 100644 libdrm-2.4.33.tar.bz2
 delete mode 100644 libdrm-2.4.34.tar.bz2

diff --git a/libdrm-2.4.33.tar.bz2 b/libdrm-2.4.33.tar.bz2
new file mode 100644
index 0000000..6bb9993
--- /dev/null
+++ b/libdrm-2.4.33.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2d7b9d94ada0e3a6ede6243509883df2ded01c2983e24322759a366283898fea
+size 446817
diff --git a/libdrm-2.4.34.tar.bz2 b/libdrm-2.4.34.tar.bz2
deleted file mode 100644
index 37d3505..0000000
--- a/libdrm-2.4.34.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a468570e7c85107b7c2f8eaceeebaa8f8a0da86482618f445bb74fa0b0d0f8d0
-size 572571
diff --git a/libdrm-implicit-defs.diff b/libdrm-implicit-defs.diff
index bebbd60..cf65543 100644
--- a/libdrm-implicit-defs.diff
+++ b/libdrm-implicit-defs.diff
@@ -13,16 +13,12 @@ radeon_ttm.c: At top level:
  tests/radeon/radeon_ttm.c |    2 ++
  1 file changed, 2 insertions(+)
 
---- tests/radeon/radeon_ttm.c.orig
-+++ tests/radeon/radeon_ttm.c
-@@ -23,9 +23,15 @@
-  * Authors:
-  *    Jerome Glisse <j.glisse@gmail.com>
+Index: libdrm-2.4.31/tests/radeon/radeon_ttm.c
+===================================================================
+--- libdrm-2.4.31.orig/tests/radeon/radeon_ttm.c
++++ libdrm-2.4.31/tests/radeon/radeon_ttm.c
+@@ -25,7 +25,9 @@
   */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
  #include <stdio.h>
  #include <stdlib.h>
 +#include <unistd.h>
@@ -31,533 +27,3 @@ radeon_ttm.c: At top level:
  
  /* allocate as many single page bo to try to starve the kernel
   * memory zone (below highmem)
---- configure.ac.orig
-+++ configure.ac
-@@ -36,7 +36,7 @@ AM_MAINTAINER_MODE([enable])
- m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
- # Check for programs
--AC_PROG_CC
-+AC_PROG_CC_STDC
- 
- AC_USE_SYSTEM_EXTENSIONS
- AC_SYS_LARGEFILE
-@@ -109,9 +109,7 @@ AC_DEFUN([LIBDRM_CC_TRY_FLAG], [
- 
- dnl We use clock_gettime to check for timeouts in drmWaitVBlank
- 
--AC_CHECK_FUNCS([clock_gettime], [CLOCK_LIB=],
--               [AC_CHECK_LIB([rt], [clock_gettime], [CLOCK_LIB=-lrt],
--                             [AC_MSG_ERROR([Couldn't find clock_gettime])])])
-+AC_SEARCH_LIBS([clock_gettime], [rt])
- AC_SUBST([CLOCK_LIB])
- 
- AC_CHECK_FUNCS([open_memstream], [HAVE_OPEN_MEMSTREAM=yes])
---- intel/intel_decode.c.orig
-+++ intel/intel_decode.c
-@@ -21,6 +21,10 @@
-  * IN THE SOFTWARE.
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <assert.h>
- #include <stdint.h>
- #include <stdlib.h>
---- intel/mm.c.orig
-+++ intel/mm.c
-@@ -22,6 +22,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdlib.h>
- #include <assert.h>
- 
---- libkms/dumb.c.orig
-+++ libkms/dumb.c
-@@ -26,8 +26,9 @@
-  **************************************************************************/
- 
- 
--#define HAVE_STDINT_H
--#define _FILE_OFFSET_BITS 64
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <errno.h>
- #include <stdio.h>
---- libkms/intel.c.orig
-+++ libkms/intel.c
-@@ -26,8 +26,9 @@
-  **************************************************************************/
- 
- 
--#define HAVE_STDINT_H
--#define _FILE_OFFSET_BITS 64
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <errno.h>
- #include <stdio.h>
---- libkms/nouveau.c.orig
-+++ libkms/nouveau.c
-@@ -29,6 +29,10 @@
- #define HAVE_STDINT_H
- #define _FILE_OFFSET_BITS 64
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
---- libkms/radeon.c.orig
-+++ libkms/radeon.c
-@@ -26,8 +26,9 @@
-  **************************************************************************/
- 
- 
--#define HAVE_STDINT_H
--#define _FILE_OFFSET_BITS 64
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
- 
- #include <errno.h>
- #include <stdio.h>
---- libkms/vmwgfx.c.orig
-+++ libkms/vmwgfx.c
-@@ -29,6 +29,10 @@
- #define HAVE_STDINT_H
- #define _FILE_OFFSET_BITS 64
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
---- nouveau/abi16.c.orig
-+++ nouveau/abi16.c
-@@ -22,6 +22,10 @@
-  * Authors: Ben Skeggs
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdlib.h>
- #include <stdint.h>
- 
---- radeon/bof.c.orig
-+++ radeon/bof.c
-@@ -23,6 +23,10 @@
-  * Authors:
-  *      Jerome Glisse
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <errno.h>
- #include <stdlib.h>
- #include <string.h>
---- radeon/radeon_bo.c.orig
-+++ radeon/radeon_bo.c
-@@ -29,6 +29,10 @@
-  *      Dave Airlie
-  *      Jérôme Glisse <glisse@freedesktop.org>
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <radeon_bo.h>
- #include <radeon_bo_int.h>
- 
---- radeon/radeon_cs.c.orig
-+++ radeon/radeon_cs.c
-@@ -1,4 +1,8 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include "radeon_cs.h"
- #include "radeon_cs_int.h"
---- radeon/radeon_cs_gem.c.orig
-+++ radeon/radeon_cs_gem.c
-@@ -29,6 +29,10 @@
-  *      Nicolai Haehnle <prefect_@gmx.net>
-  *      Jérôme Glisse <glisse@freedesktop.org>
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <assert.h>
- #include <errno.h>
- #include <stdlib.h>
---- radeon/radeon_cs_space.c.orig
-+++ radeon/radeon_cs_space.c
-@@ -25,6 +25,10 @@
-  */
- /*
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <assert.h>
- #include <errno.h>
- #include <stdlib.h>
---- radeon/radeon_surface.c.orig
-+++ radeon/radeon_surface.c
-@@ -26,6 +26,10 @@
-  * Authors:
-  *      Jérôme Glisse <jglisse@redhat.com>
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
---- tests/dristat.c.orig
-+++ tests/dristat.c
-@@ -27,9 +27,14 @@
-  * 
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <sys/ioctl.h>
- #include "xf86drm.h"
- #include "xf86drmRandom.c"
- #include "xf86drmHash.c"
---- tests/drmtest.c.orig
-+++ tests/drmtest.c
-@@ -25,6 +25,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <string.h>
- #include <fcntl.h>
- #include <fnmatch.h>
---- tests/gem_basic.c.orig
-+++ tests/gem_basic.c
-@@ -25,6 +25,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -33,6 +37,7 @@
- #include <inttypes.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#include <sys/ioctl.h>
- #include "drm.h"
- #include "i915_drm.h"
- 
---- tests/gem_flink.c.orig
-+++ tests/gem_flink.c
-@@ -25,6 +25,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -33,6 +37,7 @@
- #include <inttypes.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#include <sys/ioctl.h>
- #include "drm.h"
- #include "i915_drm.h"
- 
---- tests/gem_mmap.c.orig
-+++ tests/gem_mmap.c
-@@ -25,6 +25,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -33,6 +37,7 @@
- #include <inttypes.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#include <sys/ioctl.h>
- #include "drm.h"
- #include "i915_drm.h"
- 
---- tests/gem_readwrite.c.orig
-+++ tests/gem_readwrite.c
-@@ -25,6 +25,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdlib.h>
- #include <stdio.h>
- #include <string.h>
-@@ -33,6 +37,7 @@
- #include <inttypes.h>
- #include <errno.h>
- #include <sys/stat.h>
-+#include <sys/ioctl.h>
- #include "drm.h"
- #include "i915_drm.h"
- 
---- tests/getclient.c.orig
-+++ tests/getclient.c
-@@ -25,7 +25,12 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <limits.h>
-+#include <sys/ioctl.h>
- #include "drmtest.h"
- 
- /**
---- tests/getstats.c.orig
-+++ tests/getstats.c
-@@ -25,7 +25,12 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <limits.h>
-+#include <sys/ioctl.h>
- #include "drmtest.h"
- 
- /**
---- tests/getversion.c.orig
-+++ tests/getversion.c
-@@ -25,6 +25,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "drmtest.h"
- 
- /**
---- tests/kmstest/main.c.orig
-+++ tests/kmstest/main.c
-@@ -26,6 +26,10 @@
-  **************************************************************************/
- 
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <string.h>
- #include "xf86drm.h"
---- tests/modeprint/modeprint.c.orig
-+++ tests/modeprint/modeprint.c
-@@ -30,6 +30,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <assert.h>
- #include <stdio.h>
- #include <stdlib.h>
---- tests/name_from_fd.c.orig
-+++ tests/name_from_fd.c
-@@ -25,6 +25,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <unistd.h>
- #include <fcntl.h>
- #include <limits.h>
---- tests/openclose.c.orig
-+++ tests/openclose.c
-@@ -25,6 +25,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "drmtest.h"
- 
- int main(int argc, char **argv)
---- tests/radeon/rbo.c.orig
-+++ tests/radeon/rbo.c
-@@ -24,6 +24,10 @@
-  *    Jerome Glisse <j.glisse@gmail.com>
-  */
- #define _FILE_OFFSET_BITS 64
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
---- tests/setversion.c.orig
-+++ tests/setversion.c
-@@ -25,7 +25,12 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <limits.h>
-+#include <sys/ioctl.h>
- #include "drmtest.h"
- 
- /**
---- tests/updatedraw.c.orig
-+++ tests/updatedraw.c
-@@ -25,6 +25,11 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#include <sys/ioctl.h>
- #include "drmtest.h"
- 
- static void
---- xf86drmHash.c.orig
-+++ xf86drmHash.c
-@@ -68,6 +68,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- 
---- xf86drmMode.c.orig
-+++ xf86drmMode.c
-@@ -37,6 +37,10 @@
-  * TODO the types we are after are defined in diffrent headers on diffrent
-  * platforms find which headers to include to get uint32_t
-  */
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdint.h>
- #include <sys/ioctl.h>
- #include <stdio.h>
---- xf86drmRandom.c.orig
-+++ xf86drmRandom.c
-@@ -71,6 +71,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- 
---- xf86drmSL.c.orig
-+++ xf86drmSL.c
-@@ -38,6 +38,10 @@
-  *
-  */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include <stdio.h>
- #include <stdlib.h>
- 
---- tests/modetest/modetest.c.orig
-+++ tests/modetest/modetest.c
-@@ -49,7 +49,7 @@
- #include <errno.h>
- #include <sys/poll.h>
- #include <sys/time.h>
--
-+#include <sys/ioctl.h>
- #include "xf86drm.h"
- #include "xf86drmMode.h"
- #include "drm_fourcc.h"
---- intel/Makefile.am.orig
-+++ intel/Makefile.am
-@@ -49,7 +49,7 @@ libdrm_intel_la_SOURCES = \
- 	mm.c \
- 	mm.h
- 
--intel_bufmgr_gem_o_CFLAGS = $(AM_CFLAGS) -c99
-+intel_bufmgr_gem_o_CFLAGS = $(AM_CFLAGS)
- 
- libdrm_intelincludedir = ${includedir}/libdrm
- libdrm_intelinclude_HEADERS = intel_bufmgr.h \
diff --git a/libdrm.changes b/libdrm.changes
index f3a2ac2..59afd0f 100644
--- a/libdrm.changes
+++ b/libdrm.changes
@@ -1,7 +1,13 @@
+-------------------------------------------------------------------
+Tue May 29 09:47:00 UTC 2012 - sndirsch@suse.com
+
+- back to libdrm 2.4.33, since 2.4.34 currentlz requires Mesa git
+  master changes for nouveau Mesa driver build
+
 -------------------------------------------------------------------
 Sat May 26 22:25:01 UTC 2012 - crrodriguez@opensuse.org
 
-- update to version 2.4.32, see NEWS for detail, here follows 
+- update to version 2.4.34, see NEWS for detail, here follows 
   packaging changes only.
   + nouveau.h was moved out from its subdirectory (upstream change)
   + lidrm_nouveau version bumped to 2.
diff --git a/libdrm.spec b/libdrm.spec
index 435d558..e71c527 100644
--- a/libdrm.spec
+++ b/libdrm.spec
@@ -16,9 +16,10 @@
 #
 
 
+
 Name:           libdrm
 Url:            http://dri.freedesktop.org/
-Version:        2.4.34
+Version:        2.4.33
 Release:        0
 Provides:       libdrm23 = %{version}
 Obsoletes:      libdrm23 < %{version}
@@ -64,7 +65,7 @@ Provides:       libdrm = %version-%release
 Summary:        Libraries, includes and more to develop libdrm applications
 Group:          Development/Libraries/X11
 Requires:       libdrm2 = %version
-Requires:       libdrm_nouveau2 = %version
+Requires:       libdrm_nouveau1 = %version
 Requires:       libdrm_radeon1 = %version
 %ifarch %ix86 x86_64
 Requires:       libdrm_intel1 = %version
@@ -106,11 +107,11 @@ Group:          System/Libraries
 %description -n libdrm_intel1
 (Upstream has not provided a description)
 
-%package -n libdrm_nouveau2
+%package -n libdrm_nouveau1
 Summary:        Userspace interface for Kernel DRM services for NVIDIA chips
 Group:          System/Libraries
 
-%description -n libdrm_nouveau2
+%description -n libdrm_nouveau1
 (Upstream has not provided a description)
 
 %package -n libdrm_radeon1
@@ -138,12 +139,11 @@ The KMS Memory Management abstraction library.
 
 %prep
 %setup -q
-%patch -P 1
+%patch -P 1 -p1
 
 %build
-autoreconf -fiv
-#export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
-%configure --with-pic --disable-silent-rules --enable-vmwgfx-experimental-api --enable-udev
+export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
+%configure --with-pic --enable-nouveau-experimental-api --enable-vmwgfx-experimental-api --enable-udev
 make %{?_smp_mflags}
 make %{?_smp_mflags} -C tests dristat drmstat
 
@@ -170,9 +170,9 @@ rm -f "%buildroot/%_libdir"/*.la
 
 %postun -n libdrm_intel1 -p /sbin/ldconfig
 
-%post   -n libdrm_nouveau2 -p /sbin/ldconfig
+%post   -n libdrm_nouveau1 -p /sbin/ldconfig
 
-%postun -n libdrm_nouveau2 -p /sbin/ldconfig
+%postun -n libdrm_nouveau1 -p /sbin/ldconfig
 
 %post   -n libdrm_radeon1 -p /sbin/ldconfig
 
@@ -192,6 +192,7 @@ rm -f "%buildroot/%_libdir"/*.la
 %files devel
 %defattr(-,root,root)
 %_includedir/libdrm
+%_includedir/nouveau
 %_includedir/xf86drm.h
 %_includedir/xf86drmMode.h
 %_libdir/libdrm*.so
@@ -208,9 +209,9 @@ rm -f "%buildroot/%_libdir"/*.la
 %_libdir/libdrm_intel.so.1*
 %endif
 
-%files -n libdrm_nouveau2
+%files -n libdrm_nouveau1
 %defattr(-,root,root)
-%_libdir/libdrm_nouveau.so.2*
+%_libdir/libdrm_nouveau.so.1*
 
 %files -n libdrm_radeon1
 %defattr(-,root,root)
@@ -222,8 +223,7 @@ rm -f "%buildroot/%_libdir"/*.la
 
 %files -n libkms-devel
 %defattr(-,root,root)
-%dir %_includedir/libkms
-%_includedir/libkms/libkms.h
+%_includedir/libkms
 %_libdir/libkms.so
 %_libdir/pkgconfig/libkms.pc