From 9663e6c2c48b34448378f5c995546491590913c2 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 7 Dec 2009 10:46:34 +0100 Subject: [PATCH] libdrm: update to 2.4.16. --HG-- extra : convert_revision : 90ecebe12c32a13fe278b0df5b7ab5e60cb0c1e1 --- srcpkgs/libdrm/libdrm-devel.template | 1 + .../patches/configure_no_pthread_stubs.diff | 90 +++++++++++-------- srcpkgs/libdrm/template | 12 +-- 3 files changed, 63 insertions(+), 40 deletions(-) diff --git a/srcpkgs/libdrm/libdrm-devel.template b/srcpkgs/libdrm/libdrm-devel.template index 5c7d2b511dd..9e32a21bba2 100644 --- a/srcpkgs/libdrm/libdrm-devel.template +++ b/srcpkgs/libdrm/libdrm-devel.template @@ -5,6 +5,7 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." +Add_dependency run glibc-devel Add_dependency run libdrm do_install() diff --git a/srcpkgs/libdrm/patches/configure_no_pthread_stubs.diff b/srcpkgs/libdrm/patches/configure_no_pthread_stubs.diff index 2f95c528f66..5eb7848f9c9 100644 --- a/srcpkgs/libdrm/patches/configure_no_pthread_stubs.diff +++ b/srcpkgs/libdrm/patches/configure_no_pthread_stubs.diff @@ -1,47 +1,43 @@ ---- configure.orig 2009-09-29 14:24:16.702191110 +0200 -+++ configure 2009-09-29 14:25:06.772061229 +0200 -@@ -11416,96 +11416,6 @@ $as_echo "no" >&6; } +--- configure.orig 2009-12-07 10:44:18.755546340 +0100 ++++ configure 2009-12-07 10:44:50.409234114 +0100 +@@ -12686,116 +12686,6 @@ $as_echo "no" >&6; } fi pkg_failed=no --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREADSTUBS" >&5 +-{ $as_echo "$as_me:$LINENO: checking for PTHREADSTUBS" >&5 -$as_echo_n "checking for PTHREADSTUBS... " >&6; } - --if test -n "$PKG_CONFIG"; then -- if test -n "$PTHREADSTUBS_CFLAGS"; then -- pkg_cv_PTHREADSTUBS_CFLAGS="$PTHREADSTUBS_CFLAGS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\""; } >&5 +-if test -n "$PTHREADSTUBS_CFLAGS"; then +- pkg_cv_PTHREADSTUBS_CFLAGS="$PTHREADSTUBS_CFLAGS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\"") >&5 - ($PKG_CONFIG --exists --print-errors "pthread-stubs") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then - pkg_cv_PTHREADSTUBS_CFLAGS=`$PKG_CONFIG --cflags "pthread-stubs" 2>/dev/null` -else - pkg_failed=yes -fi -- fi --else -- pkg_failed=untried +- else +- pkg_failed=untried -fi --if test -n "$PKG_CONFIG"; then -- if test -n "$PTHREADSTUBS_LIBS"; then -- pkg_cv_PTHREADSTUBS_LIBS="$PTHREADSTUBS_LIBS" -- else -- if test -n "$PKG_CONFIG" && \ -- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\""; } >&5 +-if test -n "$PTHREADSTUBS_LIBS"; then +- pkg_cv_PTHREADSTUBS_LIBS="$PTHREADSTUBS_LIBS" +- elif test -n "$PKG_CONFIG"; then +- if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\"") >&5 - ($PKG_CONFIG --exists --print-errors "pthread-stubs") 2>&5 - ac_status=$? -- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -- test $ac_status = 0; }; then +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; then - pkg_cv_PTHREADSTUBS_LIBS=`$PKG_CONFIG --libs "pthread-stubs" 2>/dev/null` -else - pkg_failed=yes -fi -- fi --else -- pkg_failed=untried +- else +- pkg_failed=untried -fi - - @@ -54,14 +50,14 @@ - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then -- PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pthread-stubs"` +- PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pthread-stubs" 2>&1` - else -- PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pthread-stubs"` +- PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --print-errors "pthread-stubs" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$PTHREADSTUBS_PKG_ERRORS" >&5 - -- as_fn_error "Package requirements (pthread-stubs) were not met: +- { { $as_echo "$as_me:$LINENO: error: Package requirements (pthread-stubs) were not met: - -$PTHREADSTUBS_PKG_ERRORS - @@ -71,11 +67,23 @@ -Alternatively, you may set the environment variables PTHREADSTUBS_CFLAGS -and PTHREADSTUBS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. --" "$LINENO" 5 +-" >&5 +-$as_echo "$as_me: error: Package requirements (pthread-stubs) were not met: +- +-$PTHREADSTUBS_PKG_ERRORS +- +-Consider adjusting the PKG_CONFIG_PATH environment variable if you +-installed software in a non-standard prefix. +- +-Alternatively, you may set the environment variables PTHREADSTUBS_CFLAGS +-and PTHREADSTUBS_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +-" >&2;} +- { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --as_fn_error "The pkg-config script could not be found or is too old. Make sure it +-{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - @@ -84,16 +92,28 @@ -See the pkg-config man page for more details. - -To get pkg-config, see . --See \`config.log' for more details." "$LINENO" 5; } +-See \`config.log' for more details." >&5 +-$as_echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +-is in your PATH or set the PKG_CONFIG environment variable to the full +-path to pkg-config. +- +-Alternatively, you may set the environment variables PTHREADSTUBS_CFLAGS +-and PTHREADSTUBS_LIBS to avoid the need to call pkg-config. +-See the pkg-config man page for more details. +- +-To get pkg-config, see . +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; }; } -else - PTHREADSTUBS_CFLAGS=$pkg_cv_PTHREADSTUBS_CFLAGS - PTHREADSTUBS_LIBS=$pkg_cv_PTHREADSTUBS_LIBS -- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +- { $as_echo "$as_me:$LINENO: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi - - - +- pkgconfigdir=${libdir}/pkgconfig + # Check whether --enable-udev was given. diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 3330a64cc21..6c3a5bb4c64 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -1,18 +1,20 @@ # Template build file for 'libdrm'. pkgname=libdrm -version=2.4.15 +version=2.4.16 distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-udev --enable-nouveau-experimental-api - --enable-radeon-experimental-api" + --enable-radeon-experimental-api --enable-intel" short_desc="Userspace interface to kernel DRM services" maintainer="Juan RP " -checksum=bcff899a93adce47fabb787380bf636ed6554a4db2b6452bde5cfab15b8ba7de +checksum=ca8e95d1c93c302b25cd2899040ea8eb0987f7d1d02eb658274243d9ada933ca long_desc=" This package provides a library which offers a userspace interface to kernel DRM (Direct Rendering Manager) services for access to graphics hardware." subpackages="$pkgname-devel" -Add_dependency full glibc -Add_dependency full udev +Add_dependency run glibc +Add_dependency run udev +Add_dependency build glibc-devel +Add_dependency build udev-devel