104 lines
3.5 KiB
Diff
104 lines
3.5 KiB
Diff
|
diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
|
||
|
|
--- libdrm-2.4.34.orig/configure.ac 2012-05-12 14:54:06.375335490 +0000
|
||
|
|
+++ libdrm-2.4.34/configure.ac 2012-05-12 14:54:32.075142065 +0000
|
||
|
|
@@ -47,10 +47,6 @@
|
||
|
|
LT_INIT([disable-static])
|
||
|
|
|
||
|
|
|
||
|
|
-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
|
||
|
|
-AC_SUBST(PTHREADSTUBS_CFLAGS)
|
||
|
|
-AC_SUBST(PTHREADSTUBS_LIBS)
|
||
|
|
-
|
||
|
|
pkgconfigdir=${libdir}/pkgconfig
|
||
|
|
AC_SUBST(pkgconfigdir)
|
||
|
|
AC_ARG_ENABLE([udev],
|
||
|
|
diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
|
||
|
|
--- libdrm-2.4.34.orig/intel/Makefile.am 2012-05-12 14:54:06.372001955 +0000
|
||
|
|
+++ libdrm-2.4.34/intel/Makefile.am 2012-05-12 14:55:24.164745055 +0000
|
||
|
|
@@ -26,7 +26,6 @@
|
||
|
|
$(WARN_CFLAGS) \
|
||
|
|
-I$(top_srcdir) \
|
||
|
|
-I$(top_srcdir)/intel \
|
||
|
|
- $(PTHREADSTUBS_CFLAGS) \
|
||
|
|
$(PCIACCESS_CFLAGS) \
|
||
|
|
$(VALGRIND_CFLAGS) \
|
||
|
|
-I$(top_srcdir)/include/drm
|
||
|
|
@@ -35,7 +34,6 @@
|
||
|
|
libdrm_intel_ladir = $(libdir)
|
||
|
|
libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
||
|
|
libdrm_intel_la_LIBADD = ../libdrm.la \
|
||
|
|
- @PTHREADSTUBS_LIBS@ \
|
||
|
|
@PCIACCESS_LIBS@ \
|
||
|
|
@CLOCK_LIB@
|
||
|
|
|
||
|
|
diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
|
||
|
|
--- libdrm-2.4.34.orig/nouveau/Makefile.am 2012-05-12 14:54:06.331998148 +0000
|
||
|
|
+++ libdrm-2.4.34/nouveau/Makefile.am 2012-05-12 14:56:00.941132085 +0000
|
||
|
|
@@ -2,14 +2,13 @@
|
||
|
|
$(WARN_CFLAGS) \
|
||
|
|
-I$(top_srcdir) \
|
||
|
|
-I$(top_srcdir)/nouveau \
|
||
|
|
- $(PTHREADSTUBS_CFLAGS) \
|
||
|
|
-I$(top_srcdir)/include/drm \
|
||
|
|
-DDEBUG
|
||
|
|
|
||
|
|
libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
|
||
|
|
libdrm_nouveau_ladir = $(libdir)
|
||
|
|
libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
|
||
|
|
-libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
|
||
|
|
+libdrm_nouveau_la_LIBADD = ../libdrm.la
|
||
|
|
|
||
|
|
libdrm_nouveau_la_SOURCES = nouveau.c \
|
||
|
|
pushbuf.c \
|
||
|
|
diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
|
||
|
|
--- libdrm-2.4.34.orig/radeon/Makefile.am 2012-05-12 14:54:06.365334765 +0000
|
||
|
|
+++ libdrm-2.4.34/radeon/Makefile.am 2012-05-12 14:55:48.084557437 +0000
|
||
|
|
@@ -26,13 +26,12 @@
|
||
|
|
$(WARN_CFLAGS) \
|
||
|
|
-I$(top_srcdir) \
|
||
|
|
-I$(top_srcdir)/radeon \
|
||
|
|
- $(PTHREADSTUBS_CFLAGS) \
|
||
|
|
-I$(top_srcdir)/include/drm
|
||
|
|
|
||
|
|
libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
|
||
|
|
libdrm_radeon_ladir = $(libdir)
|
||
|
|
libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined
|
||
|
|
-libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
|
||
|
|
+libdrm_radeon_la_LIBADD = ../libdrm.la
|
||
|
|
|
||
|
|
libdrm_radeon_la_SOURCES = \
|
||
|
|
radeon_bo_gem.c \
|
||
|
|
--- libdrm-2.4.40/omap/Makefile.am 2012-06-14 23:32:50.000000000 +0200
|
||
|
|
+++ libdrm-2.4.40/omap/Makefile.am 2012-11-06 19:24:44.183224706 +0100
|
||
|
|
@@ -2,13 +2,12 @@
|
||
|
|
$(WARN_CFLAGS) \
|
||
|
|
-I$(top_srcdir) \
|
||
|
|
-I$(top_srcdir)/omap \
|
||
|
|
- $(PTHREADSTUBS_CFLAGS) \
|
||
|
|
-I$(top_srcdir)/include/drm
|
||
|
|
|
||
|
|
libdrm_omap_la_LTLIBRARIES = libdrm_omap.la
|
||
|
|
libdrm_omap_ladir = $(libdir)
|
||
|
|
libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
||
|
|
-libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
|
||
|
|
+libdrm_omap_la_LIBADD = ../libdrm.la
|
||
|
|
|
||
|
|
libdrm_omap_la_SOURCES = omap_drm.c
|
||
|
|
|
||
|
|
--- libdrm-2.4.40/exynos/Makefile.am 2012-06-14 23:32:50.000000000 +0200
|
||
|
|
+++ libdrm-2.4.40/exynos/Makefile.am 2012-11-06 19:26:01.975323106 +0100
|
||
|
|
@@ -2,13 +2,12 @@
|
||
|
|
$(WARN_CFLAGS) \
|
||
|
|
-I$(top_srcdir) \
|
||
|
|
-I$(top_srcdir)/exynos \
|
||
|
|
- $(PTHREADSTUBS_CFLAGS) \
|
||
|
|
-I$(top_srcdir)/include/drm
|
||
|
|
|
||
|
|
libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la
|
||
|
|
libdrm_exynos_ladir = $(libdir)
|
||
|
|
libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined
|
||
|
|
-libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
|
||
|
|
+libdrm_exynos_la_LIBADD = ../libdrm.la
|
||
|
|
|
||
|
|
libdrm_exynos_la_SOURCES = exynos_drm.c
|