Author: kkofler Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv30730/devel Modified Files: xine-lib-extras-freeworld.spec Added Files: xine-lib-1.1.20-system-a52dec.patch Log Message: * Thu Nov 24 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 1.1.20-2 - don't check for a52dec_internal.h, fixes system a52dec support I can't find any place where the internal stuff is actually being used, so try disabling it and seeing what, if anything, breaks (hopefully nothing). 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" Index: xine-lib-extras-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/xine-lib-extras-freeworld/devel/xine-lib-extras-freeworld.spec,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- xine-lib-extras-freeworld.spec 23 Nov 2011 16:29:06 -0000 1.39 +++ xine-lib-extras-freeworld.spec 24 Nov 2011 22:18:59 -0000 1.40 @@ -4,7 +4,7 @@ Name: xine-lib-extras-freeworld Summary: Extra codecs for the Xine multimedia library Version: 1.1.20 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -16,6 +16,8 @@ # 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 a52dec_internal.h, fixes system a52dec support +Patch3: xine-lib-1.1.20-system-a52dec.patch BuildRequires: autoconf automake libtool BuildRequires: pkgconfig @@ -65,6 +67,7 @@ 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 ./autogen.sh noconfig @@ -180,6 +183,9 @@ %changelog +* Thu Nov 24 2011 Kevin Kofler <Kevin(a)tigcc.ticalc.org&gt; - 1.1.20-2 +- don't check for a52dec_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