Author: kkofler Update of /cvs/free/rpms/xine-lib-extras-freeworld/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18297/F-15 Modified Files: .cvsignore sources xine-lib-extras-freeworld.spec Added Files: xine-lib-1.1.19-no_autopoint.patch xine-lib-1.1.20-link-libdvdread.patch xine-lib-1.1.20-system-a52dec.patch xine-lib-1.1.4-optflags.patch Removed Files: xine-lib-1.1.1-deepbind-939.patch xine-lib-1.1.3-optflags.patch Log Message: Sync from devel: * Fri Nov 25 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 1.1.20-3 - --disable-musepack, avoids building the unused bundled libmusepack (the musepack plugin (using the system lib) is included in the Fedora xine-lib) * Thu Nov 24 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 1.1.20-2 - don't check for and include a52_internal.h, fixes system a52dec support * Tue Nov 22 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 1.1.20-1 - update to 1.1.20 (matches Fedora xine-lib) - use .xz tarball - drop old conditionals - drop unused deepbind patch - use the system libdvdnav (and libdvdread) instead of the bundled one - fix system libdvdnav support to also link libdvdread - run autogen.sh in %%prep, don't patch generated files - drop ffmpeg08 patch, fixed upstream - update configure flags (drop nonexistent ones, fix renamed ones) - plugin ABI is now 1.30 * Thu Sep 29 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 1.1.19-3 - fix build with FFmpeg 0.8 (#1957) * Mon Sep 26 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.19-2 - Rebuilt for FFmpeg-0.8 xine-lib-1.1.19-no_autopoint.patch: autogen.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- NEW FILE xine-lib-1.1.19-no_autopoint.patch --- diff -up xine-lib-1.1.17/autogen.sh.no_autopoint xine-lib-1.1.17/autogen.sh --- xine-lib-1.1.17/autogen.sh.no_autopoint 2009-10-09 09:33:31.000000000 -0500 +++ xine-lib-1.1.17/autogen.sh 2009-12-02 09:15:48.534555467 -0600 @@ -229,10 +229,10 @@ run_aclocal () { echo fi - echo $_echo_n " + Running autopoint: $_echo_c" + #echo $_echo_n " + Running autopoint: $_echo_c" - autopoint - echo "done." + #autopoint + #echo "done." echo $_echo_n " + Running aclocal: $_echo_c" xine-lib-1.1.20-link-libdvdread.patch: configure.ac | 1 + 1 file changed, 1 insertion(+) --- NEW FILE xine-lib-1.1.20-link-libdvdread.patch --- diff -ur xine-lib-1.1.20/configure.ac xine-lib-1.1.20-link-libdvdread/configure.ac --- xine-lib-1.1.20/configure.ac 2011-11-13 02:36:20.000000000 +0100 +++ xine-lib-1.1.20-link-libdvdread/configure.ac 2011-11-20 05:46:16.000000000 +0100 @@ -1773,6 +1773,7 @@ AM_PATH_DVDNAV(0.1.9, AC_DEFINE(HAVE_DVDNAV,1,[Define this if you have a suitable version of libdvdnav]), [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) + AC_CHECK_LIB(dvdread, navRead_DSI, DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread",) else AC_MSG_RESULT([Use included DVDNAV support]) fi xine-lib-1.1.20-system-a52dec.patch: configure.ac | 2 +- src/liba52/xine_a52_decoder.c | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) --- NEW FILE xine-lib-1.1.20-system-a52dec.patch --- diff -ur xine-lib-1.1.20/configure.ac xine-lib-1.1.20-system-a52dec/configure.ac --- xine-lib-1.1.20/configure.ac 2011-11-13 02:36:20.000000000 +0100 +++ xine-lib-1.1.20-system-a52dec/configure.ac 2011-11-24 23:12:09.000000000 +0100 @@ -1309,7 +1309,7 @@ AC_MSG_RESULT([a52dec support disabled]) elif test "x$external_a52dec" = "xyes"; then have_a52="yes" - AC_CHECK_HEADERS([a52dec/a52.h a52dec/a52_internal.h],, have_a52="no", + AC_CHECK_HEADERS([a52dec/a52.h],, have_a52="no", [ #ifdef HAVE_SYS_TYPES_H # include <sys/types.h> diff -ur xine-lib-1.1.20/src/liba52/xine_a52_decoder.c xine-lib-1.1.20-system-a52dec/src/liba52/xine_a52_decoder.c --- xine-lib-1.1.20/src/liba52/xine_a52_decoder.c 2010-03-09 23:17:05.000000000 +0100 +++ xine-lib-1.1.20-system-a52dec/src/liba52/xine_a52_decoder.c 2011-11-24 23:12:33.000000000 +0100 @@ -53,12 +53,6 @@ # include "a52.h" #endif -#ifdef HAVE_A52DEC_A52_INTERNAL_H -# include <a52dec/a52_internal.h> -#else -# include "a52_internal.h" -#endif - #include "buffer.h" #include "xineutils.h" xine-lib-1.1.4-optflags.patch: optimizations.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE xine-lib-1.1.4-optflags.patch --- --- xine-lib-1.1.4/m4/optimizations.m4~ 2006-06-17 18:20:56.000000000 +0300 +++ xine-lib-1.1.4/m4/optimizations.m4 2007-01-30 23:03:27.000000000 +0200 @@ -107,7 +107,7 @@ DEBUG_CFLAGS="-O $DEBUG_CFLAGS" - if test x"$sarchopt" != "xno"; then + if false ; then archopt_val= case "$host_or_hostalias" in Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-15/.cvsignore,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- .cvsignore 26 Jul 2010 14:02:57 -0000 1.11 +++ .cvsignore 25 Nov 2011 21:53:25 -0000 1.12 @@ -1 +1 @@ -xine-lib-1.1.19.tar.bz2 +xine-lib-1.1.20.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-15/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 26 Jul 2010 14:02:57 -0000 1.11 +++ sources 25 Nov 2011 21:53:25 -0000 1.12 @@ -1 +1 @@ -a410a0f0617e1d6309f0cbe907f73f8a xine-lib-1.1.19.tar.bz2 +acfb6e08188fd60ad88ff83831d592d7 xine-lib-1.1.20.tar.xz Index: xine-lib-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/F-15/xine-lib-extras-freeworld.spec,v retrieving revision 1.34 retrieving revision 1.35 diff -u -r1.34 -r1.35 --- xine-lib-extras-freeworld.spec 26 Jul 2010 14:02:57 -0000 1.34 +++ xine-lib-extras-freeworld.spec 25 Nov 2011 21:53:26 -0000 1.35 @@ -1,35 +1,30 @@ -%define plugin_abi 1.29 - -%if 0%{?fedora} > 6 -%define _with_external_ffmpeg --with-external-ffmpeg -%define _with_external_libfaad --with-external-libfaad -%endif +%define plugin_abi 1.30 Name: xine-lib-extras-freeworld Summary: Extra codecs for the Xine multimedia library -Version: 1.1.19 -Release: 1%{?dist} +Version: 1.1.20 +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ -Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2 +Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch0: xine-lib-1.1.3-optflags.patch -Patch6: xine-lib-1.1.1-deepbind-939.patch - -## upstreamable patches +Patch0: xine-lib-1.1.19-no_autopoint.patch +Patch1: xine-lib-1.1.4-optflags.patch +# fix system libdvdnav support to also link libdvdread +# otherwise, we get unresolved symbols in the spudec plugin +Patch2: xine-lib-1.1.20-link-libdvdread.patch +# don't check for and include a52_internal.h, fixes system a52dec support +Patch3: xine-lib-1.1.20-system-a52dec.patch +BuildRequires: autoconf automake libtool BuildRequires: pkgconfig BuildRequires: zlib-devel BuildRequires: gawk -%if 0%{?_with_external_libfaad:1} BuildRequires: faad2-devel -%endif -%if 0%{?_with_external_ffmpeg:1} BuildRequires: ffmpeg-devel >= 0.4.9-0.22.20060804 -%endif BuildRequires: a52dec-devel BuildRequires: libmad-devel BuildRequires: libdca-devel @@ -40,6 +35,8 @@ # vcdimager reads and writes MPEG BuildRequires: vcdimager-devel >= 0.7.23 BuildRequires: sed +BuildRequires: libdvdnav-devel +BuildRequires: libdvdread-devel # Obsolete DXR3 deps, better handled by ffmpeg BuildConflicts: rte-devel BuildConflicts: libfame-devel @@ -65,14 +62,14 @@ %prep %setup -q -n xine-lib-%{version} -touch -r m4/optimizations.m4 m4/optimizations.m4.stamp -%patch0 -p1 -b .optflags -touch -r m4/optimizations.m4.stamp m4/optimizations.m4 -# when compiling with external ffmpeg and internal libfaad #939. -#patch6 -p1 -b .deepbind +%patch0 -p1 -b .no_autopoint +# extra work for to omit old libtool-related crud +rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 +%patch1 -p1 -b .optflags +%patch2 -p1 -b .link-libdvdread +%patch3 -p1 -b .system-a52dec -# Avoid standard rpaths on lib64 archs: -sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure +./autogen.sh noconfig %build @@ -83,24 +80,25 @@ --disable-opengl \ --disable-xvmc \ --disable-aalib \ - --disable-caca \ - --disable-sdl \ - --disable-rte \ - --disable-libfame \ - --disable-speex \ - --disable-flac \ + --disable-musepack \ --disable-mng \ - --disable-imagemagick \ - --disable-freetype \ - --disable-alsa \ - --disable-esd \ - --disable-arts \ --disable-gnomevfs \ --disable-gdkpixbuf \ --disable-samba \ - %{?_with_external_ffmpeg} \ + --with-external-ffmpeg \ + --without-caca \ + --without-sdl \ + --without-speex \ + --without-libflac \ --with-external-a52dec \ --with-external-libmad \ + --without-imagemagick \ + --without-freetype \ + --without-alsa \ + --without-esound \ + --without-arts \ + --with-external-dvdnav \ + --with-external-libfaad \ --with-external-libdts make %{?_smp_mflags} @@ -186,6 +184,31 @@ %changelog +* Fri Nov 25 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 1.1.20-3 +- --disable-musepack, avoids building the unused bundled libmusepack (the + musepack plugin (using the system lib) is included in the Fedora xine-lib) + +* Thu Nov 24 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 1.1.20-2 +- don't check for and include a52_internal.h, fixes system a52dec support + +* Tue Nov 22 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 1.1.20-1 +- update to 1.1.20 (matches Fedora xine-lib) +- use .xz tarball +- drop old conditionals +- drop unused deepbind patch +- use the system libdvdnav (and libdvdread) instead of the bundled one +- fix system libdvdnav support to also link libdvdread +- run autogen.sh in %%prep, don't patch generated files +- drop ffmpeg08 patch, fixed upstream +- update configure flags (drop nonexistent ones, fix renamed ones) +- plugin ABI is now 1.30 + +* Thu Sep 29 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 1.1.19-3 +- fix build with FFmpeg 0.8 (#1957) + +* Mon Sep 26 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.19-2 +- Rebuilt for FFmpeg-0.8 + * Sun Jul 25 2010 Rex Dieter <rdieter(a)fedoraproject.org&gt; - 1.1.19-1 - xine-lib-1.1.19 --- xine-lib-1.1.1-deepbind-939.patch DELETED --- --- xine-lib-1.1.3-optflags.patch DELETED ---