Author: ranger
Date: Thu Jun 29 16:03:39 2006
New Revision: 154
URL:
<http://svn.finkproject.org/websvn/listing.php?sc=1&rev=154&repname=user%3a+ranger>
Log:
some minor tweaks; wip of libxine1 update
Modified:
trunk/experimental/10.4/main/finkinfo/libs/libxine1.info
trunk/experimental/10.4/main/finkinfo/libs/libxine1.patch
trunk/experimental/common/main/finkinfo/libs/commons-validator.info
trunk/experimental/common/main/finkinfo/x11-system/libx11.info
Modified: trunk/experimental/10.4/main/finkinfo/libs/libxine1.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/libxine1.info&rev=154&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/libxine1.info (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/libxine1.info Thu Jun 29
16:03:39 2006
@@ -1,6 +1,6 @@
Package: libxine1
Version: 1.1.1
-Revision: 1021
+Revision: 1022
Description: Xine video/media player library
License: GPL
Maintainer: Justin F. Hallett <[EMAIL PROTECTED]>
@@ -14,30 +14,38 @@
BuildDependsOnly: true
Source: mirror:sourceforge:xine/xine-lib-%v.tar.gz
-Source2: http://ranger.befunk.com/fink/libavcodec-20060216.tar.bz2
-Source2ExtractDir: xine-lib-%v/src/libffmpeg
+#Source2: http://ranger.befunk.com/fink/libavcodec-20060627.tar.bz2
+#Source2ExtractDir: xine-lib-%v/src/libffmpeg
Source-MD5: b1f42602c776bb93e3cbf127e220cbfd
-Source2-MD5: a65547b0003f89bb653c7767c1120ab0
+#Source2-MD5: add13ae2a6644b01486a3af0c809e89b
Patch: %n.patch
PatchScript: <<
### Altivec enhancement
perl -pi -e 's,-faltivec,-faltivec -maltivec,g' configure
<<
-SetCPPFLAGS: -no-cpp-precomp -I%p/lib/freetype219/include/freetype2
-I%p/lib/freetype219/include -I%p/include
+SetCPPFLAGS: -fno-common -no-cpp-precomp
-I%p/lib/freetype219/include/freetype2 -I%p/lib/freetype219/include -I%p/include
SetLDFLAGS: -L%p/lib/freetype219/lib
SetLIBS: -L%p/lib
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
-ConfigureParams: --with-pic --enable-static --enable-shared --disable-alsa
--disable-alsatest --disable-dxr3 --enable-macosx-video --enable-coreaudio
--disable-fb --disable-directfb --disable-vis --disable-mlib
--libexecdir=%p/lib/libxine --mandir=%p/share/man --disable-sdltest
+NoSetMAKEFLAGS: true
+SetMAKEFLAGS: -j1
+ConfigureParams: --enable-fpic --with-pic --enable-static --enable-shared
--disable-alsa --disable-alsatest --disable-dxr3 --enable-macosx-video
--enable-coreaudio --disable-fb --disable-directfb --disable-vis --disable-mlib
--libexecdir=%p/lib/libxine --mandir=%p/share/man --disable-sdltest
CompileScript: <<
#!/bin/sh -e
export X_LIBS="-L/usr/X11R6/include -lX11"
export PATH="%p/lib/freetype219/bin:$PATH"
export
PKG_CONFIG_PATH="%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
+ if [ "%m" = "i386" ]; then
+ export CPPFLAGS="$CPPFLAGS -UHAVE_MMX -UHAVE_MMX2"
+ fi
./configure %c
- make
+ make OBJC=gcc
+<<
+InstallScript: <<
+ make install DESTDIR=%d OBJC=gcc
<<
DocFiles: AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO
Modified: trunk/experimental/10.4/main/finkinfo/libs/libxine1.patch
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/10.4/main/finkinfo/libs/libxine1.patch&rev=154&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/10.4/main/finkinfo/libs/libxine1.patch (original)
+++ trunk/experimental/10.4/main/finkinfo/libs/libxine1.patch Thu Jun 29
16:03:39 2006
@@ -1,5 +1,29 @@
+diff -uNr xine-lib-1.1.1/configure xine-lib-1.1.1-new/configure
+--- xine-lib-1.1.1/configure 2005-11-15 06:40:27.000000000 -0500
++++ xine-lib-1.1.1-new/configure 2006-06-27 01:23:43.000000000 -0400
+@@ -46268,7 +46268,7 @@
+ DEBUG_CFLAGS="-O3 -mieee $DEBUG_CFLAGS"
+ ;;
+ *darwin*)
+- CFLAGS="-O3 -pipe -fomit-frame-pointer $m_wm $m_psb
-fexpensive-optimizations $f_si $f_nsa -ffast-math $INLINE_FUNCTIONS
-no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
++ CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math $INLINE_FUNCTIONS
-no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
+ DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS"
+ ;;
+ ppc-*-linux* | powerpc-*)
+@@ -46354,6 +46354,10 @@
+ enable_w32dll="yes"
+
+ case "$host_or_hostalias" in
++ *-*-darwin)
++ enable_ffmmx="no"
++ enable_w32dll="no"
++ ;;
+ *-*-mingw*)
+ enable_w32dll="no"
+ ;;
+diff -uNr xine-lib-1.1.1/misc/cdda_server.c
xine-lib-1.1.1-new/misc/cdda_server.c
--- xine-lib-1.1.1/misc/cdda_server.c 2004-12-12 17:00:50.000000000 -0500
-+++ xine-lib-1.1.1-new/misc/cdda_server.c 2006-02-13 14:58:22.000000000
-0500
++++ xine-lib-1.1.1-new/misc/cdda_server.c 2006-06-27 00:17:37.000000000
-0400
@@ -335,7 +335,9 @@
/* dlopening libdvdcss */
@@ -20,8 +44,9 @@
"this shouldn't happen !\n");
dlclose(dvdcss_library);
}
+diff -uNr xine-lib-1.1.1/src/input/input_dvd.c
xine-lib-1.1.1-new/src/input/input_dvd.c
--- xine-lib-1.1.1/src/input/input_dvd.c 2005-10-14 17:02:16.000000000
-0400
-+++ xine-lib-1.1.1-new/src/input/input_dvd.c 2006-02-13 14:58:29.000000000
-0500
++++ xine-lib-1.1.1-new/src/input/input_dvd.c 2006-06-27 00:17:37.000000000
-0400
@@ -1784,7 +1784,11 @@
"DVD drive, which you intend to
use for playing DVDs."),
10, device_change_cb, (void
*)this);
@@ -34,8 +59,25 @@
/* we have found libdvdcss, enable the specific config options */
char *raw_device;
static char *decrypt_modes[] = { "key", "disc", "title", NULL };
+diff -uNr xine-lib-1.1.1/src/input/libdvdnav/bswap.h
xine-lib-1.1.1-new/src/input/libdvdnav/bswap.h
+--- xine-lib-1.1.1/src/input/libdvdnav/bswap.h 2003-05-26 19:11:44.000000000
-0400
++++ xine-lib-1.1.1-new/src/input/libdvdnav/bswap.h 2006-06-27
00:27:12.000000000 -0400
+@@ -41,6 +41,12 @@
+ #define B2N_32(x) x = bswap_32(x)
+ #define B2N_64(x) x = bswap_64(x)
+
++#elif defined(__APPLE__)
++#include <libkern/OSByteOrder.h>
++#define B2N_16(x) x = OSSwapBigToHostInt16(x)
++#define B2N_32(x) x = OSSwapBigToHostInt32(x)
++#define B2N_64(x) x = OSSwapBigToHostInt64(x)
++
+ #elif defined(__NetBSD__)
+ #include <sys/endian.h>
+ #define B2N_16(x) BE16TOH(x)
+diff -uNr xine-lib-1.1.1/src/input/libdvdnav/dvd_input.c
xine-lib-1.1.1-new/src/input/libdvdnav/dvd_input.c
--- xine-lib-1.1.1/src/input/libdvdnav/dvd_input.c 2004-04-05
14:01:09.000000000 -0400
-+++ xine-lib-1.1.1-new/src/input/libdvdnav/dvd_input.c 2006-02-13
14:57:36.000000000 -0500
++++ xine-lib-1.1.1-new/src/input/libdvdnav/dvd_input.c 2006-06-27
00:17:37.000000000 -0400
@@ -287,7 +287,9 @@
#else
/* dlopening libdvdcss */
@@ -56,8 +98,53 @@
"this shouldn't happen !\n");
dlclose(dvdcss_library);
}
+diff -uNr xine-lib-1.1.1/src/libffmpeg/libavcodec/Makefile.in
xine-lib-1.1.1-new/src/libffmpeg/libavcodec/Makefile.in
+--- xine-lib-1.1.1/src/libffmpeg/libavcodec/Makefile.in 2005-11-15
06:39:54.000000000 -0500
++++ xine-lib-1.1.1-new/src/libffmpeg/libavcodec/Makefile.in 2006-06-27
00:50:24.000000000 -0400
+@@ -530,7 +530,7 @@
+ target_vendor = @target_vendor@
+ w32_path = @w32_path@
+ XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
+-SUBDIRS = armv4l i386 mlib alpha ppc sparc libpostproc
++SUBDIRS = armv4l mlib alpha ppc sparc libpostproc
+
+ # some of ffmpeg's decoders are not used by xine yet
+ EXTRA_DIST = motion_est_template.c imgresample.c \
+@@ -628,7 +628,6 @@
+
+ libavcodec_la_LDFLAGS = \
+ $(top_builddir)/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l.la \
+- $(top_builddir)/src/libffmpeg/libavcodec/i386/libavcodec_mmx.la \
+ $(top_builddir)/src/libffmpeg/libavcodec/mlib/libavcodec_mlib.la \
+ $(top_builddir)/src/libffmpeg/libavcodec/ppc/libavcodec_ppc.la \
+ $(top_builddir)/src/libffmpeg/libavcodec/sparc/libavcodec_sparc.la \
+diff -uNr xine-lib-1.1.1/src/video_out/Makefile.in
xine-lib-1.1.1-new/src/video_out/Makefile.in
+--- xine-lib-1.1.1/src/video_out/Makefile.in 2005-11-15 06:40:17.000000000
-0500
++++ xine-lib-1.1.1-new/src/video_out/Makefile.in 2006-06-27
00:20:14.000000000 -0400
+@@ -338,7 +338,7 @@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
++DEFS = @DEFS@ -DXINE_COMPILE
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+diff -uNr xine-lib-1.1.1/src/video_out/macosx/Makefile.in
xine-lib-1.1.1-new/src/video_out/macosx/Makefile.in
+--- xine-lib-1.1.1/src/video_out/macosx/Makefile.in 2005-11-15
06:40:20.000000000 -0500
++++ xine-lib-1.1.1-new/src/video_out/macosx/Makefile.in 2006-06-27
00:20:07.000000000 -0400
+@@ -153,7 +153,7 @@
+ CYGPATH_W = @CYGPATH_W@
+ DATADIRNAME = @DATADIRNAME@
+ DEBUG_CFLAGS = @DEBUG_CFLAGS@
+-DEFS = @DEFS@
++DEFS = @DEFS@ -DXINE_COMPILE
+ DEPCOMP = @DEPCOMP@
+ DEPDIR = @DEPDIR@
+ DEPMOD = @DEPMOD@
+diff -uNr xine-lib-1.1.1/src/xine-utils/xine_check.c
xine-lib-1.1.1-new/src/xine-utils/xine_check.c
--- xine-lib-1.1.1/src/xine-utils/xine_check.c 2005-03-08 21:05:16.000000000
-0500
-+++ xine-lib-1.1.1-new/src/xine-utils/xine_check.c 2006-02-13
16:26:12.000000000 -0500
++++ xine-lib-1.1.1-new/src/xine-utils/xine_check.c 2006-06-27
00:17:37.000000000 -0400
@@ -369,7 +369,11 @@
/* Majority of thi code was taken from or inspired by the xvinfo.c file of
XFree86 */
@@ -82,14 +169,3 @@
if(!xv_handle) {
hc->msg = dlerror();
/* Xv might still work when linked statically into the output plugin,
---- xine-lib-1.1.1/configure Tue Nov 15 06:40:27 2005
-+++ xine-lib-1.1.1-new/configure Wed Feb 15 16:54:31 2006
-@@ -46268,7 +46268,7 @@
- DEBUG_CFLAGS="-O3 -mieee $DEBUG_CFLAGS"
- ;;
- *darwin*)
-- CFLAGS="-O3 -pipe -fomit-frame-pointer $m_wm $m_psb
-fexpensive-optimizations $f_si $f_nsa -ffast-math $INLINE_FUNCTIONS
-no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
-+ CFLAGS="-Os -pipe -fno-strict-aliasing -ffast-math $INLINE_FUNCTIONS
-no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS"
- DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS"
- ;;
- ppc-*-linux* | powerpc-*)
Modified: trunk/experimental/common/main/finkinfo/libs/commons-validator.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/libs/commons-validator.info&rev=154&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/libs/commons-validator.info
(original)
+++ trunk/experimental/common/main/finkinfo/libs/commons-validator.info Thu Jun
29 16:03:39 2006
@@ -8,7 +8,7 @@
PatchScript: perl -pi -e 's,<javac,<javac target="1.4" source="1.4",g'
build.xml
BuildDepends: ant-base (>= 1.6.5-1), ant-junit (>= 1.6.5-1), commons-beanutils
(>= 1.7.0-1), commons-collections (>= 3.1-1), commons-digester (>= 1.6-1),
commons-logging (>= 1.0.4-1), dojo-compressor, fink (>= 0.22.2-1), fink-mirrors
(>= 0.22.1.1-1), jakarta-oro (>= 2.0.8-1), system-java-dev (>= 1.4-1)
Depends: commons-beanutils (>= 1.7.0-1), commons-collections (>= 3.1-1),
commons-digester (>= 1.6-1), commons-logging (>= 1.0.4-1), dojo-compressor,
jakarta-oro (>= 2.0.8-1), system-java (>= 1.4-1)
-CompileScript: ant dist -Dnoget=true
+CompileScript: ant dist -Dskip.download=true
InstallScript: <<
mkdir -p %i/share/doc/%n
(cd dist/docs; gnutar -cf - .) | (cd %i/share/doc/%n; gnutar -xf -)
Modified: trunk/experimental/common/main/finkinfo/x11-system/libx11.info
URL:
<http://svn.finkproject.org/websvn/diff.php?path=/trunk/experimental/common/main/finkinfo/x11-system/libx11.info&rev=154&repname=user%3a+ranger>
==============================================================================
--- trunk/experimental/common/main/finkinfo/x11-system/libx11.info (original)
+++ trunk/experimental/common/main/finkinfo/x11-system/libx11.info Thu Jun 29
16:03:39 2006
@@ -9,7 +9,7 @@
<<
BuildDependsOnly: true
Source: http://xorg.freedesktop.org/releases/individual/lib/libX11-%v.tar.bz2
-Source-MD5: 1b0c617e3e9c1dcf13e632fe15d013c5
+Source-MD5: 86a16bdc09b42b2e018dd665c23ca21c
SetLDFLAGS: -Wl,-multiply_defined,suppress
CompileScript: <<
#!/bin/sh -ex
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
