diff options
| author | tron <tron@pkgsrc.org> | 2007-12-21 16:07:48 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2007-12-21 16:07:48 +0000 |
| commit | 065bec24043ee8cf3a1f1ab9eb07a1dc66f6c74f (patch) | |
| tree | 01784f32601412a41a69dfb6acf30ade13227c96 /multimedia/mplayer-share | |
| parent | 9ce8e066fe40cc1e67b3696287d939ea67c1d2e0 (diff) | |
| download | pkgsrc-065bec24043ee8cf3a1f1ab9eb07a1dc66f6c74f.tar.gz | |
Fix NetBSD-specific bug in "configure" script which broke the detection
of a lot of X11 libraries. Problem noted by Matthias Drochner in
private e-mail.
Bump package revision because of this fix.
Diffstat (limited to 'multimedia/mplayer-share')
| -rw-r--r-- | multimedia/mplayer-share/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-aa | 19 |
2 files changed, 18 insertions, 5 deletions
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index f846ca580df..f483cd0edda 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.44 2007/12/21 11:31:14 tron Exp $ +$NetBSD: distinfo,v 1.45 2007/12/21 16:07:48 tron Exp $ SHA1 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = e9b496f3527c552004ec6d01d6b43f196b43ce2d RMD160 (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 3b5cba1529856a177a5191e22f8dcc00b5a83c52 Size (mplayer-1.0rc10/MPlayer-1.0rc2.tar.bz2) = 9338201 bytes -SHA1 (patch-aa) = 446167de0440017c9d746361771d568a8673751c +SHA1 (patch-aa) = 44e185164de7dbeb26cf51892e62a32517b9b7c4 SHA1 (patch-ab) = 29bf59ecb3d283708ae1c5002d1fa71cac627cc9 SHA1 (patch-ac) = 6d0de4bd41d9842ea1bf46e9fbe60bf6a943b913 SHA1 (patch-ad) = d0b72eaa5e63d2cfd7828ea1a9973f1728c607b5 diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa index ae360cd4659..b5c1c8d1492 100644 --- a/multimedia/mplayer-share/patches/patch-aa +++ b/multimedia/mplayer-share/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.18 2007/12/21 11:31:15 tron Exp $ +$NetBSD: patch-aa,v 1.19 2007/12/21 16:07:48 tron Exp $ --- configure.orig 2007-10-07 20:49:33.000000000 +0100 -+++ configure 2007-12-19 13:38:13.000000000 +0000 ++++ configure 2007-12-21 15:21:48.000000000 +0000 @@ -718,7 +718,7 @@ _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` ;; @@ -42,7 +42,20 @@ $NetBSD: patch-aa,v 1.18 2007/12/21 11:31:15 tron Exp $ if test "$_rpath" = yes ; then for I in `echo $_ld_extra | sed 's/-L//g'` ; do tmp="$tmp ` echo $I | sed 's/.*/ -L& -Wl,-R&/'`" -@@ -4368,7 +4367,7 @@ +@@ -3884,7 +3883,11 @@ + for I in "" -L/usr/X11R6/lib -L/usr/lib/X11R6 -L/usr/X11/lib \ + -L/usr/lib32 -L/usr/openwin/lib -L/usr/X11R6/lib64 -L/usr/lib ; do + if netbsd; then +- _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R`echo $I | sed s/^-L//`" ++ if test -n "$I" ; then ++ _ld_tmp="$I -lXext -lX11 $_ld_pthread -Wl,-R`echo $I | sed s/^-L//`" ++ else ++ _ld_tmp="-lXext -lX11 $_ld_pthread" ++ fi + else + _ld_tmp="$I -lXext -lX11 $_ld_pthread" + fi +@@ -4368,7 +4371,7 @@ if test "$_aa" = yes ; then _def_aa='#define HAVE_AA 1' if cygwin ; then |