rpms/xine-lib-extras-freeworld/devel xine-lib-extras-freeworld.spec, 1.17, 1.18

[Rex Dieter]

Author: rdieter

Update of /cvs/free/rpms/xine-lib-extras-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8772

Modified Files:
	xine-lib-extras-freeworld.spec 
Log Message:
* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-3
- drop deepbind patch
- --with-external-libfaad 



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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xine-lib-extras-freeworld.spec	8 Jan 2009 19:54:13 -0000	1.17
+++ xine-lib-extras-freeworld.spec	18 Jan 2009 20:50:21 -0000	1.18
@@ -5,12 +5,13 @@
 
 %if 0%{?fedora} > 6
 %define _with_external_ffmpeg --with-external-ffmpeg
+%define _with_external_libfaad --with-external-libfaad
 %endif
 
 Name:           xine-lib-extras-freeworld
 Summary:        Extra codecs for the Xine multimedia library
 Version:        1.1.16
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://xinehq.de/
@@ -19,10 +20,15 @@
 
 Patch0: xine-lib-1.1.3-optflags.patch
 Patch6: xine-lib-1.1.1-deepbind-939.patch
+# http://hg.debian.org/hg/xine-lib/xine-lib?cmd=changeset;node=c20ec3a8802d8f71d4ad9dc26a413716efe2d71a;style=raw
+Patch100: xine-lib-1.1.16-internal_ffmpeg.patch
 
 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
 # HACKS to workaround missing deps in ffmpeg-devel
@@ -64,8 +70,10 @@
 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp
 %patch0 -p1 -b .optflags
 touch -r m4/optimizations.m4.stamp m4/optimizations.m4
-# Patch1 needed at least when compiling with external ffmpeg, #939.
-%patch6 -p1 -b .deepbind
+# when compiling with external ffmpeg and internal libfaad #939.
+#patch6 -p1 -b .deepbind
+
+%patch100 -p1 -b .internal_ffmpeg
 
 # Avoid standard rpaths on lib64 archs:
 sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
@@ -182,8 +190,13 @@
 
 
 %changelog
+* Sun Jan 18 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-3
+- drop deepbind patch
+- --with-external-libfaad 
+
 * Thu Jan 08 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-2
 - drop ffmpeg_api patch (not needed)
+- internal_ffmpeg patch
 
 * Wed Jan 07 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.1.16-1
 - xine-lib-1.1.16