packages: xine-lib/xine-lib-ac.patch, xine-lib/xine-lib-nolibs.patch, xine-...
arekm
arekm at pld-linux.org
Wed Feb 15 09:33:51 CET 2012
Author: arekm Date: Wed Feb 15 08:33:51 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.2.1
---- Files affected:
packages/xine-lib:
xine-lib-ac.patch (1.1 -> 1.2) , xine-lib-nolibs.patch (1.1 -> 1.2) , xine-lib-sh.patch (1.2 -> 1.3) , xine-lib.spec (1.300 -> 1.301) , xine-lib-a52.patch (1.1 -> NONE) (REMOVED), xine-lib-am.patch (1.1 -> NONE) (REMOVED), xine-lib-ffmpeg-0.8.patch (1.1 -> NONE) (REMOVED), xine-lib-pvr.patch (1.1 -> NONE) (REMOVED), xine-lib-xxmc.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/xine-lib/xine-lib-ac.patch
diff -u packages/xine-lib/xine-lib-ac.patch:1.1 packages/xine-lib/xine-lib-ac.patch:1.2
--- packages/xine-lib/xine-lib-ac.patch:1.1 Tue May 27 21:13:55 2008
+++ packages/xine-lib/xine-lib-ac.patch Wed Feb 15 09:33:46 2012
@@ -1,10 +1,10 @@
---- xine-lib-1.1.12/configure.ac.orig 2008-05-27 21:04:31.000000000 +0200
-+++ xine-lib-1.1.12/configure.ac 2008-05-27 21:05:02.000000000 +0200
-@@ -119,6 +119,7 @@
+--- xine-lib-1.2.1/configure.ac~ 2012-02-15 09:07:21.000000000 +0100
++++ xine-lib-1.2.1/configure.ac 2012-02-15 09:11:13.049069705 +0100
+@@ -164,6 +164,7 @@
AC_PROG_CC
- AM_PROG_AS
+ AM_PROG_CC_C_O
+AC_PROG_CXX
+ AC_GNU_SOURCE
+ AC_ISC_POSIX
- case "$host_os" in
- *darwin*)
================================================================
Index: packages/xine-lib/xine-lib-nolibs.patch
diff -u packages/xine-lib/xine-lib-nolibs.patch:1.1 packages/xine-lib/xine-lib-nolibs.patch:1.2
--- packages/xine-lib/xine-lib-nolibs.patch:1.1 Mon Apr 12 22:59:43 2004
+++ packages/xine-lib/xine-lib-nolibs.patch Wed Feb 15 09:33:46 2012
@@ -1,13 +1,13 @@
---- xine-lib-1-rc3c/configure.ac.orig 2004-04-12 22:17:29.000000000 +0200
-+++ xine-lib-1-rc3c/configure.ac 2004-04-12 22:19:00.638295880 +0200
-@@ -343,8 +343,8 @@
+--- xine-lib-1.2.1/configure.ac~ 2012-02-04 01:41:43.000000000 +0100
++++ xine-lib-1.2.1/configure.ac 2012-02-15 09:05:03.683929323 +0100
+@@ -267,8 +267,8 @@
+ AM_CONDITIONAL([EXTERNAL_LIBXDG_BASEDIR], [test x"$have_xdg_basedir" = xyes])
dnl Test for socket and network support library
- NET_LIBS=""
--AC_CHECK_LIB(socket, socket, NET_LIBS="-lsocket $NET_LIBS",)
--AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)
-+AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket, socket, NET_LIBS="-lsocket $NET_LIBS",)])
-+AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl, gethostbyname, NET_LIBS="-lnsl $NET_LIBS",)])
+-AC_CHECK_LIB([socket], [socket], [NET_LIBS="-lsocket $NET_LIBS"])
+-AC_CHECK_LIB([nsl], [gethostbyname], [NET_LIBS="-lnsl $NET_LIBS"])
++#AC_CHECK_LIB([socket], [socket], [NET_LIBS="-lsocket $NET_LIBS"])
++#AC_CHECK_LIB([nsl], [gethostbyname], [NET_LIBS="-lnsl $NET_LIBS"])
+ AC_CHECK_LIB([resolv], [hstrerror], [NET_LIBS="-lresolv $NET_LIBS"])
AC_SUBST(NET_LIBS)
-
================================================================
Index: packages/xine-lib/xine-lib-sh.patch
diff -u packages/xine-lib/xine-lib-sh.patch:1.2 packages/xine-lib/xine-lib-sh.patch:1.3
--- packages/xine-lib/xine-lib-sh.patch:1.2 Sat May 2 02:08:56 2009
+++ packages/xine-lib/xine-lib-sh.patch Wed Feb 15 09:33:46 2012
@@ -1,17 +1,17 @@
--- xine-lib-1.1.16.3/configure.ac.orig 2009-05-02 00:04:29.569438975 +0000
+++ xine-lib-1.1.16.3/configure.ac 2009-05-02 00:06:52.962751969 +0000
-@@ -553,9 +553,9 @@
+@@ -982,9 +982,9 @@
b
:q
q"
--x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.so"* "${x_libraries:-/usr/lib}/libX11.so"* 2>/dev/null | sed -e \"${soname_script}\"`"
-+x_lib_location="$(ls -1 "${x_libraries:-/usr/local/lib}/libX11.so"* "${x_libraries:-/usr/lib}/libX11.so"* 2>/dev/null | sed -e "${soname_script}")"
- AC_DEFINE_UNQUOTED([LIBX11_SO], "${x_lib_location:-libX11.so}", [The soname of libX11, needed for dlopen()])
--x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"* "${x_libraries:-/usr/lib}/libXv.so"* 2>/dev/null | sed -e \"${soname_script}\"`"
-+x_lib_location="$(ls -1 "${x_libraries:-/usr/local/lib}/libXv.so"* "${x_libraries:-/usr/lib}/libXv.so"* 2>/dev/null | sed -e "${soname_script}")"
- AC_DEFINE_UNQUOTED([LIBXV_SO], "${x_lib_location:-libXv.so}", [The soname of libXv, needed for dlopen()])
-
+-x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libX11.$acl_cv_shlibext"* "${x_libraries:-/usr/lib}/libX11.$acl_cv_shlibext"* 2>/dev/null | sed -e \"${soname_script}\"`"
++x_lib_location=$(ls -1 "${x_libraries:-/usr/local/lib}/libX11.$acl_cv_shlibext"* "${x_libraries:-/usr/lib}/libX11.$acl_cv_shlibext"* 2>/dev/null | sed -e \"${soname_script}\")
+ AC_DEFINE_UNQUOTED([LIBX11_SO], "${x_lib_location:-libX11.$acl_cv_shlibext}", [The soname of libX11, needed for dlopen()])
+-x_lib_location="`ls -1 "${x_libraries:-/usr/local/lib}/libXv.$acl_cv_shlibext"* "${x_libraries:-/usr/lib}/libXv.$acl_cv_shlibext"* 2>/dev/null | sed -e \"${soname_script}\"`"
++x_lib_location=$(ls -1 "${x_libraries:-/usr/local/lib}/libXv.$acl_cv_shlibext"* "${x_libraries:-/usr/lib}/libXv.$acl_cv_shlibext"* 2>/dev/null | sed -e \"${soname_script}\")
+ AC_DEFINE_UNQUOTED([LIBXV_SO], "${x_lib_location:-libXv.$acl_cv_shlibext}", [The soname of libXv, needed for dlopen()])
+ dnl _FILE_OFFSET_BITS (AC_SYS_LARGEFILE; ac_cv_sys_file_offset_bits)
@@ -2512,7 +2512,7 @@
XINE_BUILD_CC="`$CC -v 2>&1 | tail -1 2>/dev/null`"
================================================================
Index: packages/xine-lib/xine-lib.spec
diff -u packages/xine-lib/xine-lib.spec:1.300 packages/xine-lib/xine-lib.spec:1.301
--- packages/xine-lib/xine-lib.spec:1.300 Sun Feb 12 09:19:10 2012
+++ packages/xine-lib/xine-lib.spec Wed Feb 15 09:33:46 2012
@@ -41,22 +41,20 @@
Summary(pl.UTF-8): Odtwarzacz filmów
Summary(pt_BR.UTF-8): Xine, um player de video
Name: xine-lib
-Version: 1.1.20
-Release: 6
+Version: 1.2.1
+Release: 1
Epoch: 2
License: GPL v2+
Group: Libraries
Source0: http://downloads.sourceforge.net/xine/%{name}-%{version}.tar.bz2
-# Source0-md5: 1213457c42e2370155eb26e1c862dab2
+# Source0-md5: fdd1cf233bfd8b7fe65bf7ef9abfed34
Source1: http://home.vrweb.de/~rnissl/vdr-xine-%{_vdr_plugin_ver}.tgz
# Source1-md5: 0374123d6991f55d91122b020361d8f6
Patch0: %{name}-nolibs.patch
Patch1: %{name}-win32-path.patch
-Patch2: %{name}-am.patch
+
Patch3: %{name}-sh.patch
Patch5: %{name}-ac.patch
-Patch6: %{name}-a52.patch
-Patch7: %{name}-pvr.patch
URL: http://xine.sourceforge.net/
%{?with_directfb:BuildRequires: DirectFB-devel >= 0.9.22}
%{?with_fusionsound:BuildRequires: FusionSound-devel >= 0.9.23}
@@ -113,12 +111,13 @@
Obsoletes: xine
Obsoletes: xine-libs
Obsoletes: xine-output-audio-arts
+Obsoletes: xine-output-video-syncfb
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLU.so.1
# based on libtool numbers
-%define xine_pluginsdir %{_libdir}/xine/plugins/1.30
+%define xine_pluginsdir %{_libdir}/xine/plugins/2.1
%define specflags -fomit-frame-pointer
@@ -653,22 +652,6 @@
Wtyczka wyjścia obrazu do XINE wyświetlająca poprzez bibliotekę
libstk.
-%package -n xine-output-video-syncfb
-Summary: XINE - SyncFB (Matrox G200/G400) support
-Summary(pl.UTF-8): XINE - obsługa SyncFB (Matrox G200/G400)
-Group: Libraries
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Provides: xine-plugin-video = %{epoch}:%{version}-%{release}
-Obsoletes: xine-lib-syncfb
-
-%description -n xine-output-video-syncfb
-XINE video output plugin using SyncFB interface (for Matrox G200/G400
-cards).
-
-%description -n xine-output-video-syncfb -l pl.UTF-8
-Wtyczka wyjścia obrazu do XINE obsługująca interfejs SyncFB (dla kart
-Matrox G200/G400).
-
%package -n xine-output-video-vidix
Summary: XINE - VIDIX video output plugin
Summary(pl.UTF-8): XINE - wtyczka wyjścia obrazu VIDIX
@@ -897,12 +880,10 @@
%setup -q -a 1
%patch0 -p1
%patch1 -p1
-%patch2 -p1
+
%patch3 -p1
%{?with_vdr:%{__patch} -p1 < xine-%{_vdr_plugin_ver}/patches/xine-lib.patch}
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%build
%{__gettextize}
@@ -921,12 +902,15 @@
%{!?with_pulseaudio:--without-pulseaudio} \
%{!?with_smb:--disable-samba} \
%{?with_aalib:--with-aalib-prefix=/usr} \
- --with-external-a52dec \
+ --enable-a52dec \
--with-external-dvdnav \
- --with-external-ffmpeg \
- --with-external-libdts \
- --with-external-libmad \
- --with-external-libmpcdec \
+ --enable-dts \
+ --enable-mad \
+ --with-speex \
+ --with-xcb \ \
+ --with-libflac \
+ --with-theora \
+ --with-vorbis \
%{?with_fusionsound:--with-fusionsound} \
--with-libflac \
%{?with_stk:--with-libstk} \
@@ -951,7 +935,7 @@
DESTDIR=$RPM_BUILD_ROOT \
m4datadir=%{_aclocaldir}
-%find_lang libxine1
+%find_lang libxine2
%clean
rm -rf $RPM_BUILD_ROOT
@@ -959,15 +943,14 @@
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
-%files -f libxine1.lang
+%files -f libxine2.lang
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog TODO
-%attr(755,root,root) %{_bindir}/xine-list-1.1
+%attr(755,root,root) %{_bindir}/xine-list-1.2
%attr(755,root,root) %{_libdir}/libxine.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxine.so.1
-%dir %{_datadir}/xine
-%dir %{_datadir}/xine/libxine1
-%{_datadir}/xine/libxine1/fonts
+%attr(755,root,root) %ghost %{_libdir}/libxine.so.2
+%dir %{_datadir}/xine-lib
+%{_datadir}/xine-lib/fonts
%dir %{_libdir}/xine
%dir %{_libdir}/xine/plugins
%dir %{xine_pluginsdir}
@@ -980,7 +963,7 @@
%attr(755,root,root) %{xine_pluginsdir}/post/xineplug_post_tvtime.so
%attr(755,root,root) %{xine_pluginsdir}/post/xineplug_post_visualizations.so
%{_docdir}/xine-lib
-%{_mandir}/man1/xine-list-1.1.1*
+%{_mandir}/man1/xine-list-1.2.1*
%{_mandir}/man5/xine.5*
# input plugins
@@ -1006,6 +989,9 @@
%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_iff.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_image.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_matroska.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_modplug.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_playlist.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_vc1_es.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_mpeg*.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_nsv.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_pva.so
@@ -1013,7 +999,6 @@
%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_rawdv.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_real.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_slave.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_sputext.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_yuv4mpeg2.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_yuv_frames.so
@@ -1023,14 +1008,17 @@
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_gsm610.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_lpcm.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_mpeg2.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_nsf.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_real.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_rgb.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_spucc.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_spucmml.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_spuhdmv.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_spudvb.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_sputext.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vdpau_h264.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vdpau_h264_alter.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vdpau_mpeg12.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vdpau_mpeg4.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vdpau_vc1.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_yuv.so
# Others
@@ -1038,6 +1026,12 @@
%attr(755,root,root) %{xine_pluginsdir}/xineplug_ao_out_none.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_vo_out_none.so
%attr(755,root,root) %{xine_pluginsdir}/xineplug_vo_out_raw.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_vo_out_vdpau.so
+
+# ?
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_nsf.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_sputext.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_vdr.so
%files devel
%defattr(644,root,root,755)
@@ -1094,10 +1088,7 @@
%files -n xine-decode-ogg
%defattr(644,root,root,755)
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_speex.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_theora.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_decode_vorbis.so
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_dmx_ogg.so
+%attr(755,root,root) %{xine_pluginsdir}/xineplug_xiph.so
%ifarch %{ix86}
%files -n xine-decode-w32dll
@@ -1229,10 +1220,6 @@
%attr(755,root,root) %{xine_pluginsdir}/xineplug_vo_out_stk.so
%endif
-%files -n xine-output-video-syncfb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{xine_pluginsdir}/xineplug_vo_out_syncfb.so
-
%ifarch %{ix86}
%files -n xine-output-video-vidix
%defattr(644,root,root,755)
@@ -1313,6 +1300,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.301 2012/02/15 08:33:46 arekm
+- up to 1.2.1
+
Revision 1.300 2012/02/12 08:19:10 arekm
- release 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xine-lib/xine-lib-ac.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xine-lib/xine-lib-nolibs.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xine-lib/xine-lib-sh.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xine-lib/xine-lib.spec?r1=1.300&r2=1.301&f=u
More information about the pld-cvs-commit
mailing list