diff --git a/srcpkgs/libdrm/libdrm-devel.template b/srcpkgs/libdrm/libdrm-devel.template index c365cb1c9c2..a9184478e0b 100644 --- a/srcpkgs/libdrm/libdrm-devel.template +++ b/srcpkgs/libdrm/libdrm-devel.template @@ -5,8 +5,6 @@ long_desc="${long_desc} This package contains files for development, headers, static libs, etc." -revision=1 - Add_dependency run glibc-devel Add_dependency run libudev-devel Add_dependency run libdrm diff --git a/srcpkgs/libdrm/patches/configure_no_pthread_stubs.diff b/srcpkgs/libdrm/patches/configure_no_pthread_stubs.diff index 5eb7848f9c9..23f023b9fce 100644 --- a/srcpkgs/libdrm/patches/configure_no_pthread_stubs.diff +++ b/srcpkgs/libdrm/patches/configure_no_pthread_stubs.diff @@ -1,43 +1,47 @@ ---- 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; } +--- configure.orig 2010-02-17 18:27:30.100106540 +0100 ++++ configure 2010-02-17 18:28:13.604978268 +0100 +@@ -11700,97 +11700,6 @@ $as_echo "no" >&6; } fi pkg_failed=no --{ $as_echo "$as_me:$LINENO: checking for PTHREADSTUBS" >&5 +-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREADSTUBS" >&5 -$as_echo_n "checking for PTHREADSTUBS... " >&6; } - --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 +-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 - ($PKG_CONFIG --exists --print-errors "pthread-stubs") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then - pkg_cv_PTHREADSTUBS_CFLAGS=`$PKG_CONFIG --cflags "pthread-stubs" 2>/dev/null` -else - pkg_failed=yes -fi -- else -- pkg_failed=untried +- fi +-else +- pkg_failed=untried -fi --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 +-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 - ($PKG_CONFIG --exists --print-errors "pthread-stubs") 2>&5 - ac_status=$? -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then +- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 +- test $ac_status = 0; }; then - pkg_cv_PTHREADSTUBS_LIBS=`$PKG_CONFIG --libs "pthread-stubs" 2>/dev/null` -else - pkg_failed=yes -fi -- else -- pkg_failed=untried +- fi +-else +- pkg_failed=untried -fi - - @@ -50,14 +54,14 @@ - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then -- PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pthread-stubs" 2>&1` +- PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "pthread-stubs"` - else -- PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --print-errors "pthread-stubs" 2>&1` +- PTHREADSTUBS_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pthread-stubs"` - fi - # Put the nasty error message in config.log where it belongs - echo "$PTHREADSTUBS_PKG_ERRORS" >&5 - -- { { $as_echo "$as_me:$LINENO: error: Package requirements (pthread-stubs) were not met: +- as_fn_error "Package requirements (pthread-stubs) were not met: - -$PTHREADSTUBS_PKG_ERRORS - @@ -67,23 +71,11 @@ -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. --" >&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; }; } +-" "$LINENO" 5 -elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 +- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} --{ { $as_echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +-as_fn_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. - @@ -92,22 +84,11 @@ -See the pkg-config man page for more details. - -To get pkg-config, see . --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; }; }; } +-See \`config.log' for more details." "$LINENO" 5; } -else - PTHREADSTUBS_CFLAGS=$pkg_cv_PTHREADSTUBS_CFLAGS - PTHREADSTUBS_LIBS=$pkg_cv_PTHREADSTUBS_LIBS -- { $as_echo "$as_me:$LINENO: result: yes" >&5 +- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi diff --git a/srcpkgs/libdrm/template b/srcpkgs/libdrm/template index 2fda93ba6d4..4d239d4f970 100644 --- a/srcpkgs/libdrm/template +++ b/srcpkgs/libdrm/template @@ -1,14 +1,13 @@ # Template build file for 'libdrm'. pkgname=libdrm -version=2.4.17 -revision=1 +version=2.4.18 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-intel" +configure_args="--enable-udev --enable-vmwgfx-experimental-api +--enable-nouveau-experimental-api" short_desc="Userspace interface to kernel DRM services" maintainer="Juan RP " -checksum=b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a +checksum=f6c5b44fff5cb602096cc48a1bced426496bc8060463c577a7d86f2e56eeb604 long_desc=" This package provides a library which offers a userspace interface to kernel DRM (Direct Rendering Manager) services for access to