summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrochner <drochner@pkgsrc.org>2008-02-08 17:33:02 +0000
committerdrochner <drochner@pkgsrc.org>2008-02-08 17:33:02 +0000
commitd8abf7369277a8801fbdb32f8afb3d09290cc285 (patch)
tree26fa71c4493f3081962624237e1e3fd60efe0ea1
parent0df0e06047cce6fe737ec7726211a898ed7ff01a (diff)
downloadpkgsrc-d8abf7369277a8801fbdb32f8afb3d09290cc285.tar.gz
fix build against xine-lib versions with a patch level (ie a.b.c.d)
-rw-r--r--multimedia/gxine/distinfo4
-rw-r--r--multimedia/gxine/patches/patch-ak19
2 files changed, 19 insertions, 4 deletions
diff --git a/multimedia/gxine/distinfo b/multimedia/gxine/distinfo
index 1509001325c..0a46dac2a36 100644
--- a/multimedia/gxine/distinfo
+++ b/multimedia/gxine/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2007/02/07 20:07:25 drochner Exp $
+$NetBSD: distinfo,v 1.21 2008/02/08 17:33:02 drochner Exp $
SHA1 (gxine-0.5.11.tar.bz2) = 74d7e46ff55261c36994b60d66e55720cdb9e165
RMD160 (gxine-0.5.11.tar.bz2) = 37593c2b926dc0ef3745744c9a9ea79fd4f4d391
@@ -11,7 +11,7 @@ SHA1 (patch-ag) = 7e7ae5e189e9d315b8993883bd1b51db484f3692
SHA1 (patch-ah) = 201f42c4043cd2c1e5302d476713080554c02b86
SHA1 (patch-ai) = 5f90f28584b9248a38f58790575524ebbd33db57
SHA1 (patch-aj) = 0a9efacd2aa90855bf990944c058028af367c24d
-SHA1 (patch-ak) = 3eb0dea3337748d35be1aaff9f610a91c8b8d97b
+SHA1 (patch-ak) = a9f46b23427f8c660295211f2a9b0bb6143e83cd
SHA1 (patch-an) = e8fd4c81fad14e907aad2bffc3962c39322ac0e5
SHA1 (patch-ao) = 97e176786b0e910913ecea018b5948401f69c379
SHA1 (patch-aq) = e9f17986a2f7387cebdbbd5ddd6e0bc97eb87d0a
diff --git a/multimedia/gxine/patches/patch-ak b/multimedia/gxine/patches/patch-ak
index 3ecb17899ca..35a167d2bfc 100644
--- a/multimedia/gxine/patches/patch-ak
+++ b/multimedia/gxine/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.7 2007/01/05 14:54:29 drochner Exp $
+$NetBSD: patch-ak,v 1.8 2008/02/08 17:33:02 drochner Exp $
---- configure.orig 2006-12-17 00:37:35.000000000 +0100
+--- configure.orig 2007-02-01 02:12:35.000000000 +0100
+++ configure
@@ -26336,6 +26336,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
} && test -s conftest$ac_exeext &&
@@ -29,3 +29,18 @@ $NetBSD: patch-ak,v 1.7 2007/01/05 14:54:29 drochner Exp $
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
+@@ -26968,11 +26969,11 @@ echo $ECHO_N "checking for XINE-LIB vers
+ XINE_LIBS=`$XINE_CONFIG $xine_config_args --libs`
+ XINE_ACFLAGS=`$XINE_CONFIG $xine_config_args --acflags`
+ xine_config_major_version=`$XINE_CONFIG $xine_config_args --version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\1/'`
+ xine_config_minor_version=`$XINE_CONFIG $xine_config_args --version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\2/'`
+ xine_config_sub_version=`$XINE_CONFIG $xine_config_args --version | \
+- sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
++ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\).*/\3/'`
+ xine_data_dir=`$XINE_CONFIG $xine_config_args --datadir`
+ xine_script_dir=`$XINE_CONFIG $xine_config_args --scriptdir`
+ xine_plugin_dir=`$XINE_CONFIG $xine_config_args --plugindir`