summaryrefslogtreecommitdiff
path: root/multimedia/mplayer-share/patches
diff options
context:
space:
mode:
authorgrant <grant@pkgsrc.org>2004-05-14 09:27:32 +0000
committergrant <grant@pkgsrc.org>2004-05-14 09:27:32 +0000
commit513c9dffdf3705620ff24c3556061b24d1d0dce6 (patch)
treef87aaaff695ba6d93fc9e905beba8d7025d615f5 /multimedia/mplayer-share/patches
parent8a0a29d926727c34f552ef0377508e790419d296 (diff)
downloadpkgsrc-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/mplayer-share/patches')
-rw-r--r--multimedia/mplayer-share/patches/patch-aa12
1 files changed, 11 insertions, 1 deletions
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; }