From 8d112aac70994e2cc0e9a5320547cf4c3222eead Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 29 Sep 2009 14:38:28 +0200
Subject: [PATCH] libdrm: update to 2.4.14.

--HG--
extra : convert_revision : 62a1748aaac692e1077d6e99e9b9eb6232785c05
---
 templates/libdrm/build.diff | 55 +++++++++++--------------------------
 templates/libdrm/template   |  4 +--
 2 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/templates/libdrm/build.diff b/templates/libdrm/build.diff
index 40c13f13803..2f95c528f66 100644
--- a/templates/libdrm/build.diff
+++ b/templates/libdrm/build.diff
@@ -1,10 +1,10 @@
---- 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; }
+--- 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; }
  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 "$PKG_CONFIG"; then
@@ -12,11 +12,11 @@
 -        pkg_cv_PTHREADSTUBS_CFLAGS="$PTHREADSTUBS_CFLAGS"
 -    else
 -        if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\"") >&5
+-    { { $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
@@ -30,11 +30,11 @@
 -        pkg_cv_PTHREADSTUBS_LIBS="$PTHREADSTUBS_LIBS"
 -    else
 -        if test -n "$PKG_CONFIG" && \
--    { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pthread-stubs\"") >&5
+-    { { $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
@@ -61,7 +61,7 @@
 -	# 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
 -
@@ -71,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.
 -
@@ -96,22 +84,11 @@
 -See the pkg-config man page for more details.
 -
 -To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--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 <http://pkg-config.freedesktop.org/>.
--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/templates/libdrm/template b/templates/libdrm/template
index 02ace1bc059..005afc3077a 100644
--- a/templates/libdrm/template
+++ b/templates/libdrm/template
@@ -1,12 +1,12 @@
 # Template build file for 'libdrm'.
 pkgname=libdrm
-version=2.4.12
+version=2.4.14
 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 <xtraeme@gmail.com>"
-checksum=89e3b16aff13c5219d13b08f9143793f74777b752d87c760ec6e52fb8676bd31
+checksum=a3f5cc114cff3122e58b33740d5f80d589dc7811ac24d196d0678ba9f3676287
 long_desc="
  This package provides a library which offers a userspace interface
  to kernel DRM (Direct Rendering Manager) services for access to