Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32416
Modified Files:
libdvdnav.info libdvdread4.info libfame1.info libfame1.patch
Added Files:
libdvdnav.patch libdvdread4.patch
Log Message:
Allow building on Intel. Doesn't affect ppc building so no rev-up.
--- NEW FILE: libdvdread4.patch ---
diff -ru libdvdread-0.9.4.orig/dvdread/bswap.h libdvdread-0.9.4/dvdread/bswap.h
--- libdvdread-0.9.4.orig/dvdread/bswap.h 2002-12-14 19:09:12.000000000
-0500
+++ libdvdread-0.9.4/dvdread/bswap.h 2006-03-02 20:27:12.000000000 -0500
@@ -84,6 +84,12 @@
(((x) & 0x000000000000ff00) << 40) | \
(((x) & 0x00000000000000ff) << 56))
+#elif defined(__APPLE__)
+#include <libkern/OSByteOrder.h>
+#define B2N_16(x) x = OSSwapInt16(x)
+#define B2N_32(x) x = OSSwapInt32(x)
+#define B2N_64(x) x = OSSwapInt64(x)
+
#else
/* If there isn't a header provided with your system with this functionality
Index: libdvdnav.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libdvdnav.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libdvdnav.info 20 Jan 2006 20:21:18 -0000 1.1
+++ libdvdnav.info 3 Mar 2006 14:12:25 -0000 1.2
@@ -10,6 +10,8 @@
###
Source: mirror:sourceforge:dvd/libdvdnav-%v.tar.gz
Source-MD5: c8ddee96ba1182d73447eaf0bb6fde81
+# Patch enables building on Intel
+Patch: %n.patch
###
ConfigureParams: --with-pic --enable-shared --enable-static
--mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
###
Index: libfame1.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libfame1.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libfame1.info 20 Jan 2006 20:21:18 -0000 1.1
+++ libfame1.info 3 Mar 2006 14:12:25 -0000 1.2
@@ -15,7 +15,7 @@
UpdateLibTool: true
UpdateConfigGuess: true
###
-ConfigureParams: --with-pic --enable-shared --enable-static
--mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib
+ConfigureParams: --with-pic --enable-shared --enable-static
--mandir=%i/share/man --infodir=%p/share/info --libexecdir=%p/lib --disable-mmx
###
SplitOff: <<
Package: %N-shlibs
Index: libfame1.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libfame1.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libfame1.patch 20 Jan 2006 20:21:18 -0000 1.1
+++ libfame1.patch 3 Mar 2006 14:12:25 -0000 1.2
@@ -1,6 +1,25 @@
+diff -ruN libfame-0.9.0.orig/configure libfame-0.9.0/configure
+--- libfame-0.9.0.orig/configure 2002-05-26 13:15:19.000000000 -0400
++++ libfame-0.9.0/configure 2006-03-02 22:03:01.000000000 -0500
+@@ -2243,7 +2243,14 @@
+
+
+ if test x$ac_cv_prog_gcc = xyes; then
+- CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops
-ffast-math"
++ case "$target" in
++ i386-*-*)
++ CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops"
++ ;;
++ *)
++ CFLAGS="$CFLAGS -Wall -fexpensive-optimizations -funroll-loops
-ffast-math"
++ ;;
++ esac
+
+ gcc_major_version=`$CC --version | \
+ sed -e 's,[^0-9.],,g' -e 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
diff -ruN libfame-0.9.0.orig/src/Makefile.in libfame-0.9.0/src/Makefile.in
---- libfame-0.9.0.orig/src/Makefile.in Thu May 30 13:26:15 2002
-+++ libfame-0.9.0/src/Makefile.in Wed Feb 26 20:53:16 2003
+--- libfame-0.9.0.orig/src/Makefile.in 2002-05-30 15:26:15.000000000 -0400
++++ libfame-0.9.0/src/Makefile.in 2006-03-02 21:55:53.000000000 -0500
@@ -89,7 +89,7 @@
libfame_la_include_HEADERS = fame.h
fame_version.h fame_bitbuffer.h
fame_profile.h
fame_profile_mpeg.h fame_profile_mpeg1.h
fame_profile_mpeg4_simple.h
fame_profile_mpeg4_shape.h fame_profile_stats.h
fame_encoder.h
fame_encoder_mpeg.h fame_decoder.h
fame_decoder_mpeg.h fame_syntax.h
fame_syntax_mpeg1.h
fame_syntax_mpeg4.h fame_shape.h
fame_rate_simple.h
fame_rate_1param.h fame_rate.h
fame_monitor.h fame_motion.h
fame_motion_none.h
fame_motion_fourstep.h fame_motion_pmvfast.h
fame_malloc.h
Index: libdvdread4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/libs/libdvdread4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- libdvdread4.info 20 Jan 2006 20:21:18 -0000 1.1
+++ libdvdread4.info 3 Mar 2006 14:12:25 -0000 1.2
@@ -16,6 +16,8 @@
perl -pi.bak -e 's,-flat_namespace -undefined suppress,,g' configure
### dlopen fix
perl -pi.bak -e 's,libdvdcss.so.2,libdvdcss.2.dylib,g' dvdread/dvd_input.c
+ ### Fix building on Intel Macs
+ patch -p1 <%a/%n.patch
<<
###
NoSetLDFLAGS: true
--- NEW FILE: libdvdnav.patch ---
diff -ru libdvdnav-0.1.10.orig/src/dvdread/bswap.h
libdvdnav-0.1.10/src/dvdread/bswap.h
--- libdvdnav-0.1.10.orig/src/dvdread/bswap.h 2004-01-11 16:43:13.000000000
-0500
+++ libdvdnav-0.1.10/src/dvdread/bswap.h 2006-03-02 20:38:09.000000000
-0500
@@ -84,6 +84,12 @@
(((x) & 0x000000000000ff00) << 40) | \
(((x) & 0x00000000000000ff) << 56))
+#elif defined(__APPLE__)
+#include <libkern/OSByteOrder.h>
+#define B2N_16(x) x = OSSwapInt16(x)
+#define B2N_32(x) x = OSSwapInt32(x)
+#define B2N_64(x) x = OSSwapInt64(x)
+
#else
/* If there isn't a header provided with your system with this functionality
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
