snailed/void-packages
2
0
Fork 0
Code Issues 1 Pull requests 3 Activity Actions

libdrm: fix build.

Browse source
This commit is contained in:
Juan RP 2013-01-16 20:48:46 +01:00
parent e1fd1564a0
commit 763cafcb06
4 changed files with 117 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
srcpkgs/libdrm/libdrm-devel.template
View file

@ -7,5 +7,5 @@ short_desc="${short_desc} -- development files"
do_install() {
vmove usr/include usr
vmove usr/lib/pkgconfig usr/lib
vmove usr/share/man/man3 usr/share/man
#vmove usr/share/man/man3 usr/share/man
}

11
srcpkgs/libdrm/patches/buildfix.diff Normal file
View file

@ -0,0 +1,11 @@
diff --git a/configure.ac b/configure.ac
index 10cc9a4..1776610 100644
--- a/configure.ac
+++ b/configure.ac
@@ -348,7 +348,6 @@ AC_CONFIG_FILES([
tests/vbltest/Makefile
include/Makefile
include/drm/Makefile
- man/Makefile
libdrm.pc])
AC_OUTPUT

103
srcpkgs/libdrm/patches/no-pthread-stubs.patch Normal file
View file

@ -0,0 +1,103 @@
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

8
srcpkgs/libdrm/template
View file

@ -2,8 +2,9 @@
pkgname=libdrm
version=2.4.41
revision=1
patch_args="-Np1"
build_style=gnu-configure
configure_args="--enable-udev --enable-vmwgfx-experimental-api"
configure_args="--enable-udev"
makedepends="automake pkg-config libudev-devel libpciaccess-devel"
subpackages="$pkgname-devel"
short_desc="Userspace interface to kernel DRM services"
@ -14,10 +15,5 @@ distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2"
checksum=52b3ca670df43fc9f5164f0f55fa40b008de297c0ceedab7c77c30bf9022f212
pre_configure() {
sed -i "/.*PTHREADSTUBS.*/d" configure.ac
sed -i -e "s/@PTHREADSTUBS_LIBS@//g" \
-e "s/\$(PTHREADSTUBS_CFLAGS)//g" \
nouveau/Makefile.am radeon/Makefile.am intel/Makefile.am
autoreconf -fi
sed -i 's/tests//g' Makefile.in
}