[MPlayer-dev-eng] [PATCH] FreeBSD DVD Fix

[jb13 at gomerbud.com]

On Wed, Aug 11, 2004 at 10:27:59AM +0200, Diego Biurrun wrote:
> Shachar Raindel writes:
> > 
> > After messing around with netBSD's site (I am a l4m3 l1nux3r, no
> > relation to any *bsd....), I found their patchset. It is hidden in:
> > ftp://ftp.netbsd.org/pub/NetBSD/packages/pkgsrc/multimedia/mplayer-share/patches/
> 
> All of these patches need some explanation IMHO, so NetBSD people,
> please stand up.

$NetBSD: patch-aa,v 1.8 2004/07/20 22:04:44 salo Exp $

--- configure.orig      2004-07-15 00:04:42.000000000 +0200
+++ configure
@@ -380,8 +380,8 @@ for ac_option do
     _inc_extra=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
     ;;
  --with-extralibdir=*)
-    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
-#    _ld_extra="${_ld_extra} -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'`
+#    _ld_extra=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
+    _ld_extra="${_ld_extra} -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'`

this is for proper linking on netbsd, for an explanation why see

http://www.NetBSD.org/Documentation/elf.html

-  cc_version=`( $_cc -dumpversion ) 2>&1`
+  cc_version=`( $_cc -dumpversion | sed -e 's/-nb[0-9]//' ) 2>&1`

netbsd appends a patch level to gcc's version string, this just strips it out
i don't think its needed.

-  pfamily=`$_cpuinfo | grep 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2 | 
head -1`
+  pfamily=`$_cpuinfo | grep -i 'cpu family' | cut -d ':' -f 2 | cut -d ' ' -f 2
 | head -1`

from grep(1)
  -i, --ignore-case
     Ignore case distinctions in  both  the  PATTERN  and  the  input files.

-  x86_64)
+  x86_64|amd64)

just a diferent name.

-    _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'`

same as the first.

hope this helps

jb13