diff options
author | Oliver Braun <obraun@FreeBSD.org> | 2002-09-19 16:42:33 +0000 |
---|---|---|
committer | Oliver Braun <obraun@FreeBSD.org> | 2002-09-19 16:42:33 +0000 |
commit | 439d291bdc669abea808fb6caf76189177cfa5de (patch) | |
tree | 236d8de9fb9886ab8018eae3ad66ec242d8cb291 /multimedia/mplayerxp/files/patch-ad | |
parent | Fix cfengine port now that makeinfo splits info -> html output. This broke (diff) |
Upgrade to 0.90.0.8.
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=66716
Diffstat (limited to 'multimedia/mplayerxp/files/patch-ad')
-rw-r--r-- | multimedia/mplayerxp/files/patch-ad | 47 |
1 files changed, 8 insertions, 39 deletions
diff --git a/multimedia/mplayerxp/files/patch-ad b/multimedia/mplayerxp/files/patch-ad index be62aea43499..5ebd397726a8 100644 --- a/multimedia/mplayerxp/files/patch-ad +++ b/multimedia/mplayerxp/files/patch-ad @@ -1,6 +1,6 @@ ---- configure.orig Mon Aug 5 19:23:22 2002 -+++ configure Wed Aug 7 12:47:05 2002 -@@ -480,19 +480,10 @@ +--- configure.orig Tue Sep 17 21:47:55 2002 ++++ configure Thu Sep 19 12:19:12 2002 +@@ -491,19 +491,10 @@ # Try to find the available options for the current CPU if x86 || ppc; then @@ -20,7 +20,7 @@ pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1` pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2 | cut -d ' ' -f 2 | head -1` -@@ -1246,8 +1237,8 @@ +@@ -1289,8 +1280,8 @@ ;; *) @@ -31,7 +31,7 @@ ;; esac -@@ -1588,13 +1579,7 @@ +@@ -1688,13 +1679,7 @@ echocheck "memalign()" @@ -45,7 +45,7 @@ if test "$_memalign" = yes ; then _def_memalign='#define HAVE_MEMALIGN 1' else -@@ -1671,31 +1656,7 @@ +@@ -1771,31 +1756,7 @@ echocheck "pthread" @@ -78,43 +78,12 @@ echores "yes (using $_ld_pthread)" -@@ -3413,11 +3374,7 @@ - - echocheck "iconv" - if test "$_iconv" = auto ; then -- if freebsd ; then -- _iconv_tmp='#include <giconv.h>' -- else -- _iconv_tmp='#include <iconv.h>' -- fi -+ _iconv_tmp='#include <iconv.h>' - cat > $TMPC << EOF - #include <stdio.h> - #include <unistd.h> -@@ -3451,7 +3408,7 @@ - EOF - _iconv=no - if freebsd ; then -- cc_check -lm -lgiconv && _iconv=yes -+ cc_check -lm -liconv && _iconv=yes - elif bsdos || openbsd ; then - cc_check -lm -liconv && _iconv=yes - else -@@ -3460,7 +3417,7 @@ - fi - if test "$_iconv" = yes ; then - _def_iconv='#define USE_ICONV 1' -- freebsd && _ld_iconv='-lgiconv' -+ freebsd && _ld_iconv='-liconv' - bsdos && _ld_iconv='-liconv' - openbsd && _ld_iconv='-liconv' - else -@@ -3979,7 +3936,7 @@ +@@ -4211,7 +4172,7 @@ CFLAGS="$CFLAGS -D_REENTRANT" elif bsd ; then # FIXME bsd needs this so maybe other OS'es - CFLAGS="$CFLAGS -D_THREAD_SAFE" + CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}" fi - # 64 bit file offsets? + if test "$_largefiles" = yes || freebsd ; then |