libdrm: update to 2.4.26.

This commit is contained in:
Juan RP 2011-08-12 11:16:33 +02:00
parent 1e10409ca3
commit a20c169294
2 changed files with 21 additions and 15 deletions

View File

@ -1,34 +1,35 @@
diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac diff -ru libdrm-2.4.0/configure.ac libdrm-2.4.0-nostubs/configure.ac
--- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200 --- libdrm-2.4.0/configure.ac 2008-10-09 21:57:09.000000000 +0200
+++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200 +++ libdrm-2.4.0-nostubs/configure.ac 2008-10-21 10:48:24.000000000 +0200
@@ -32,10 +32,6 @@ @@ -47,10 +47,6 @@
AC_HEADER_STDC LT_INIT([disable-static])
AC_SYS_LARGEFILE
-PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs) -PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
-AC_SUBST(PTHREADSTUBS_CFLAGS) -AC_SUBST(PTHREADSTUBS_CFLAGS)
-AC_SUBST(PTHREADSTUBS_LIBS) -AC_SUBST(PTHREADSTUBS_LIBS)
- -
pkgconfigdir=${libdir}/pkgconfig PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
AC_SUBST(pkgconfigdir) AC_SUBST(PCIACCESS_CFLAGS)
AC_ARG_ENABLE(udev, AS_HELP_STRING([--enable-udev], AC_SUBST(PCIACCESS_LIBS)
--- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000 --- libdrm-2.4.16/intel/Makefile.am 2009-11-20 23:54:36.000000000 +0000
+++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000 +++ libdrm-2.4.16/intel/Makefile.am.new 2009-12-07 08:11:32.235748069 +0000
@@ -26,13 +26,12 @@ @@ -26,14 +26,13 @@
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/intel \ -I$(top_srcdir)/intel \
- $(PTHREADSTUBS_CFLAGS) \ - $(PTHREADSTUBS_CFLAGS) \
$(PCIACCESS_CFLAGS) \
-I$(top_srcdir)/include/drm -I$(top_srcdir)/include/drm
libdrm_intel_la_LTLIBRARIES = libdrm_intel.la libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
libdrm_intel_ladir = $(libdir) libdrm_intel_ladir = $(libdir)
libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@ -libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @PCIACCESS_LIBS@ @CLOCK_LIB@
+libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@ +libdrm_intel_la_LIBADD = ../libdrm.la @PCIACCESS_LIBS@ @CLOCK_LIB@
libdrm_intel_la_SOURCES = \ libdrm_intel_la_SOURCES = \
intel_atomic.h \ intel_bufmgr.c \
--- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000 --- libdrm-2.4.16/radeon/Makefile.am 2009-11-20 23:54:36.000000000 +0000
+++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000 +++ libdrm-2.4.16/radeon/Makefile.am.new 2009-12-07 08:12:31.889075388 +0000
@@ -26,13 +26,12 @@ @@ -26,13 +26,12 @@

View File

@ -1,13 +1,16 @@
# Template build file for 'libdrm'. # Template build file for 'libdrm'.
pkgname=libdrm pkgname=libdrm
version=2.4.25 version=2.4.26
patch_args="-Np1"
distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2" distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2"
build_style=gnu_configure build_style=gnu_configure
configure_args="--enable-udev --enable-vmwgfx-experimental-api configure_args="--enable-udev --enable-vmwgfx-experimental-api
--enable-nouveau-experimental-api" --enable-nouveau-experimental-api --enable-intel --enable-radeon"
short_desc="Userspace interface to kernel DRM services" short_desc="Userspace interface to kernel DRM services"
maintainer="Juan RP <xtraeme@gmail.com>" maintainer="Juan RP <xtraeme@gmail.com>"
checksum=51f99a815a18876977991bbc6f190607791d25a6e47a3269880ce7679dbd0e9f homepage="http://dri.freedesktop.org/"
license="MIT"
checksum=b25b06ab5a077736044cbd9a3a05a9a23b873a0887ab1aaf93aa2b3218b2d3dc
long_desc=" long_desc="
This package provides a library which offers a userspace interface This package provides a library which offers a userspace interface
to kernel DRM (Direct Rendering Manager) services for access to to kernel DRM (Direct Rendering Manager) services for access to
@ -16,13 +19,15 @@ long_desc="
subpackages="$pkgname-devel" subpackages="$pkgname-devel"
Add_dependency run glibc Add_dependency run glibc
Add_dependency run libudev Add_dependency run libudev
Add_dependency run libpciaccess
Add_dependency build automake Add_dependency build automake
Add_dependency build pkg-config Add_dependency build pkg-config
Add_dependency build glibc-devel Add_dependency build glibc-devel
Add_dependency build libudev-devel Add_dependency build libudev-devel
Add_dependency build libpciaccess-devel
pre_configure() pre_configure()
{ {
sed -i -e "s|cairo.h|cairo/cairo.h|" tests/modetest/modetest.c autoreconf -fi
cd ${wrksrc} && libtoolize -f && aclocal && autoconf && automake
} }