diff options
| author | grant <grant@pkgsrc.org> | 2004-05-14 09:27:32 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-05-14 09:27:32 +0000 |
| commit | 513c9dffdf3705620ff24c3556061b24d1d0dce6 (patch) | |
| tree | f87aaaff695ba6d93fc9e905beba8d7025d615f5 /multimedia | |
| parent | 8a0a29d926727c34f552ef0377508e790419d296 (diff) | |
| download | pkgsrc-513c9dffdf3705620ff24c3556061b24d1d0dce6.tar.gz | |
apply patch from Jukka Salmi (thanks!). applies the same option
parsing logic for X libraries as non-X libraries to ensure mplayer is
linked with the right rpath to the X libraries.
fixes my PR pkg/25268.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mplayer-share/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/mplayer-share/patches/patch-aa | 12 |
2 files changed, 13 insertions, 3 deletions
diff --git a/multimedia/mplayer-share/distinfo b/multimedia/mplayer-share/distinfo index 98fc436b408..786928c7e6c 100644 --- a/multimedia/mplayer-share/distinfo +++ b/multimedia/mplayer-share/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2004/04/28 15:54:46 wiz Exp $ +$NetBSD: distinfo,v 1.5 2004/05/14 09:27:32 grant Exp $ SHA1 (mplayer-1.0rc4/MPlayer-1.0pre4.tar.bz2) = 1e9f181589d6bf36e4c59ad013f8b5976447e702 Size (mplayer-1.0rc4/MPlayer-1.0pre4.tar.bz2) = 4913390 bytes @@ -8,5 +8,5 @@ SHA1 (mplayer-1.0rc4/font-arial-iso-8859-2.tar.bz2) = 7b99bbe0e9ba89a57eccbea8f9 Size (mplayer-1.0rc4/font-arial-iso-8859-2.tar.bz2) = 222208 bytes SHA1 (mplayer-1.0rc4/font-arial-cp1250.tar.bz2) = ccf11dce5d0fb72fd3af97f788b7471cd0cd0b68 Size (mplayer-1.0rc4/font-arial-cp1250.tar.bz2) = 249705 bytes -SHA1 (patch-aa) = 1b09896da6e37512abb1306df4b1674d96b11c4b +SHA1 (patch-aa) = 93b13909bd489599b3f9a6c4ec1fc3e53411fc17 SHA1 (patch-ad) = e01b08da4c46c57a50b5306353391b8f9ba7bf6e diff --git a/multimedia/mplayer-share/patches/patch-aa b/multimedia/mplayer-share/patches/patch-aa index f2c9f6072d4..3832af501d2 100644 --- a/multimedia/mplayer-share/patches/patch-aa +++ b/multimedia/mplayer-share/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2004/04/28 15:54:46 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2004/05/14 09:27:32 grant Exp $ --- configure.orig Mon Apr 26 11:44:06 2004 +++ configure @@ -40,6 +40,16 @@ $NetBSD: patch-aa,v 1.4 2004/04/28 15:54:46 wiz Exp $ _def_arch='#define ARCH_X86_64 1' _target_arch='TARGET_ARCH_X86_64 = yes' iproc='x86_64' +@@ -1587,7 +1587,8 @@ + _inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` + ;; + --with-x11libdir=*) +- _ld_x11=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` ++# _ld_x11=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` ++ _ld_x11="${_ld_x11} -Wl,-R"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -Wl\,-R,g'`" -L"`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` + ;; + --with-dxr2incdir=*) + _inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'` @@ -4653,11 +4653,11 @@ if test "$_matroska_external" != no ; th int main(void) { return 0; } |