diff --git a/templates/libdrm/build.diff b/templates/libdrm/build.diff index 234f57cb00d..40c13f13803 100644 --- a/templates/libdrm/build.diff +++ b/templates/libdrm/build.diff @@ -1,21 +1,21 @@ ---- configure.orig 2009-03-19 05:36:13.939762633 +0100 -+++ configure 2009-03-19 05:36:54.883713332 +0100 -@@ -21220,118 +21220,6 @@ echo "${ECHO_T}no" >&6; } +--- configure.orig 2009-04-16 16:04:24.373045106 +0200 ++++ configure 2009-04-16 16:05:39.403146621 +0200 +@@ -12505,119 +12505,6 @@ $as_echo "no" >&6; } fi pkg_failed=no --{ echo "$as_me:$LINENO: checking for PTHREADSTUBS" >&5 --echo $ECHO_N "checking for PTHREADSTUBS... $ECHO_C" >&6; } +-{ $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" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\"") >&5 +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\"") >&5 - ($PKG_CONFIG --exists --print-errors "pthread-stubs") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- $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 @@ -30,10 +30,10 @@ - pkg_cv_PTHREADSTUBS_LIBS="$PTHREADSTUBS_LIBS" - else - if test -n "$PKG_CONFIG" && \ -- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\"") >&5 +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\"") >&5 - ($PKG_CONFIG --exists --print-errors "pthread-stubs") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- $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 @@ -61,7 +61,7 @@ - # Put the nasty error message in config.log where it belongs - echo "$PTHREADSTUBS_PKG_ERRORS" >&5 - -- { { echo "$as_me:$LINENO: error: Package requirements (pthread-stubs) were not met: +- { { $as_echo "$as_me:$LINENO: error: Package requirements (pthread-stubs) were not met: - -$PTHREADSTUBS_PKG_ERRORS - @@ -72,7 +72,7 @@ -and PTHREADSTUBS_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. -" >&5 --echo "$as_me: error: Package requirements (pthread-stubs) were not met: +-$as_echo "$as_me: error: Package requirements (pthread-stubs) were not met: - -$PTHREADSTUBS_PKG_ERRORS - @@ -85,7 +85,9 @@ -" >&2;} - { (exit 1); exit 1; }; } -elif test $pkg_failed = untried; then -- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it +- { { $as_echo "$as_me:$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 -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - @@ -95,7 +97,7 @@ - -To get pkg-config, see . -See \`config.log' for more details." >&5 --echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it +-$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. - @@ -105,17 +107,16 @@ - -To get pkg-config, see . -See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } +- { (exit 1); exit 1; }; }; } -else - PTHREADSTUBS_CFLAGS=$pkg_cv_PTHREADSTUBS_CFLAGS - PTHREADSTUBS_LIBS=$pkg_cv_PTHREADSTUBS_LIBS -- { echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6; } +- { $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/templates/libdrm/depends b/templates/libdrm/depends index 977112ac373..7fbf23ef48a 100644 --- a/templates/libdrm/depends +++ b/templates/libdrm/depends @@ -1,2 +1,2 @@ -abi_depends=2.4.5 +abi_depends=2.4.6 api_depends=${abi_depends} diff --git a/templates/libdrm/template b/templates/libdrm/template index 375225e1da5..eca76461d1b 100644 --- a/templates/libdrm/template +++ b/templates/libdrm/template @@ -1,13 +1,13 @@ # Template build file for 'libdrm'. pkgname=libdrm sourcepkg=$pkgname -version=2.4.5 +version=2.4.9 distfiles="http://dri.freedesktop.org/libdrm/$pkgname-$version.tar.bz2" build_style=gnu_configure configure_args="--enable-udev" short_desc="Userspace interface to kernel DRM services" maintainer="Juan RP " -checksum=95daf23bce3fc7fc644e68ac17f1415a85c671511eb227183834204fec43a094 +checksum=ed9b21ec2440387e6e5e15aa1d67bc6d8ba3c3eb3e44aaa812ab09cf2e6121a2 long_desc=" This package provides a library which offers a userspace interface to kernel DRM (Direct Rendering Manager) services for access to