Update of /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv28662
Modified Files:
libxine2.info libxine2.patch
Log Message:
libxine2 1.2.4
Index: libxine2.info
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libxine2.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libxine2.info 29 May 2013 19:59:04 -0000 1.3
+++ libxine2.info 27 Sep 2013 20:51:41 -0000 1.4
@@ -1,6 +1,6 @@
Info4: <<
Package: libxine2
-Version: 1.2.3
+Version: 1.2.4
Revision: 1
Description: Xine video/media player library
License: LGPL
@@ -10,7 +10,7 @@
%N-shlibs (= %v-%r),
fontconfig2-shlibs (>= 2.8.0-6),
freetype219-shlibs (>= 2.4.4-2),
- libavutil52-1.2-shlibs,
+ libavutil52-2.0-shlibs,
libgettext8-shlibs,
libiconv
<<
@@ -31,8 +31,8 @@
gtk+2-dev (>= 2.18.0-1),
imagemagick7-dev,
jack-dev,
- libavcodec54-1.2-dev,
- libavutil52-1.2-dev,
+ libavcodec55-2.0-dev,
+ libavutil52-2.0-dev,
libbluray1-dev,
libcaca-dev (>= 0.99.beta16-1),
libdvdnav,
@@ -41,7 +41,7 @@
libflac8-dev,
libgettext8-dev,
libiconv-dev,
- libjpeg8,
+ libjpeg9,
libmad,
libmng2,
libmodplug1,
@@ -49,12 +49,13 @@
libncurses5 (>= 5.4-20041023-1006),
libncursesw5,
libogg,
- libpostproc52-1.2-dev,
+ libpostproc52-2.0-dev,
libspeex1,
libtheora0,
libvorbis0,
pkgconfig (>= 0.23-1),
sdl (>= 1.2.9-1001),
+ sed,
x11-dev
<<
Conflicts: <<
@@ -74,14 +75,14 @@
BuildDependsOnly: true
Source: mirror:sourceforge:xine/xine-lib/xine-lib-%v.tar.xz
-Source-MD5: 011def012e9db3dee06808b4580ccede
-Source-Checksum: SHA1(6f9ef4ba75688659052d21448d46527db2b77e57)
+Source-MD5: d59f737097848d4c2586b61b49b0fe2a
+Source-Checksum: SHA1(32267c5fcaa1439a5fbf7606d27dc4fafba9e504)
PatchScript: <<
%{default_script}
<<
PatchFile: %n.patch
-PatchFile-MD5: b6f2eba1c027dc3cd92997d6ea9edfd5
+PatchFile-MD5: bfbaa6663c137a62e8c40e7ba212dae4
### --NNNdir games needed to put fonts into a versioned directory
ConfigureParams: <<
@@ -134,10 +135,10 @@
--with-theora \
--with-vorbis
<<
-SetCPPFLAGS: -I%p/lib/ffmpeg-1.2/include
+SetCPPFLAGS: -I%p/lib/ffmpeg-2.0/include
CompileScript: <<
#!/bin/sh -ev
- export PKG_CONFIG_PATH=%p/lib/ffmpeg-1.2/lib/pkgconfig:$PKG_CONFIG_PATH
+ export PKG_CONFIG_PATH=%p/lib/ffmpeg-2.0/lib/pkgconfig:$PKG_CONFIG_PATH
./configure %c
make -w
fink-package-precedence --prohibit-bdep=libxine1,libxine2 .
@@ -165,8 +166,8 @@
gtk+2-shlibs (>= 2.18.0-1),
imagemagick7-shlibs,
jack-shlibs,
- libavcodec54-1.2-shlibs,
- libavutil52-1.2-shlibs,
+ libavcodec55-2.0-shlibs,
+ libavutil52-2.0-shlibs,
libbluray1-shlibs,
libcaca-shlibs (>= 0.99.beta16-1),
libdvdnav4-shlibs,
@@ -182,7 +183,7 @@
libncurses5-shlibs (>= 5.4-20041023-1006),
libncursesw5-shlibs,
libogg-shlibs,
- libpostproc52-1.2-shlibs,
+ libpostproc52-2.0-shlibs,
libspeex1-shlibs,
libtheora0-shlibs,
libvorbis0-shlibs,
Index: libxine2.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.7/stable/main/finkinfo/libs/libxine2.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libxine2.patch 29 May 2013 19:59:04 -0000 1.3
+++ libxine2.patch 27 Sep 2013 20:51:41 -0000 1.4
@@ -1,8 +1,8 @@
--- a/src/xine-engine/Makefile.in 2012-02-04 08:09:37.000000000 -0500
+++ b/src/xine-engine/Makefile.in 2012-04-20 10:23:06.000000000 -0400
@@ -606,7 +606,11 @@
- rm -f "$${dir}/so_locations"; \
- done
+ }
+
libxine-interface.la: $(libxine_interface_la_OBJECTS)
$(libxine_interface_la_DEPENDENCIES) $(EXTRA_libxine_interface_la_DEPENDENCIES)
- $(AM_V_CCLD)$(libxine_interface_la_LINK)
$(libxine_interface_la_OBJECTS) $(libxine_interface_la_LIBADD) $(LIBS)
+ if test -n "$(libxine_interface_la_OBJECTS)" ; then \
@@ -10,12 +10,12 @@
+ else \
+ touch $@; \
+ fi
+
libxine.la: $(libxine_la_OBJECTS) $(libxine_la_DEPENDENCIES)
$(EXTRA_libxine_la_DEPENDENCIES)
$(AM_V_CCLD)$(libxine_la_LINK) -rpath $(libdir) $(libxine_la_OBJECTS)
$(libxine_la_LIBADD) $(LIBS)
-
--- a/src/demuxers/demux_qt.c 2011-10-04 18:40:59.000000000 -0400
+++ b/src/demuxers/demux_qt.c 2012-04-19 19:18:44.000000000 -0400
-@@ -130,8 +130,9 @@
+@@ -131,8 +131,9 @@
#define RMVC_ATOM QT_ATOM('r', 'm', 'v', 'c')
#define QTIM_ATOM QT_ATOM('q', 't', 'i', 'm')
------------------------------------------------------------------------------
October Webinars: Code for Performance
Free Intel webinars can help you accelerate application performance.
Explore tips for MPI, OpenMP, advanced profiling, and more. Get the most from
the latest Intel processors and coprocessors. See abstracts and register >
http://pubads.g.doubleclick.net/gampad/clk?id=60133471&iu=/4140/ostg.clktrk
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
