rpms/xbmc/F-16 xbmc.spec,1.30,1.31

[Alex Lancaster]

Author: alexlan

Update of /cvs/free/rpms/xbmc/F-16
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7089

Modified Files:
	xbmc.spec 
Log Message:
Sync with devel branch, F-16 was out of sync with the build package
because CVS branch happened before the repo target was switched from
f16 to f17



Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/F-16/xbmc.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- xbmc.spec	26 Sep 2011 21:34:47 -0000	1.30
+++ xbmc.spec	14 Dec 2011 23:52:17 -0000	1.31
@@ -5,7 +5,7 @@
 
 Name: xbmc
 Version: 10.1
-Release: 5%{?dist}
+Release: 7%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -111,7 +111,7 @@
 BuildRequires: libtiff-devel
 BuildRequires: libvdpau-devel
 BuildRequires: libdvdread-devel
-BuildRequires: ffmpeg-devel
+#BuildRequires: ffmpeg-devel
 BuildRequires: faad2-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: libdca-devel
@@ -174,12 +174,16 @@
 ./bootstrap
 # Can't use export nor %%configure (implies using export), because
 # the Makefile pile up *FLAGS in this case.
+
+# FIXME: disable using external ffmpeg for the moment, until such time
+# as either we backport a fix for 0.8 ffmpeg or we build XBMC Eden (11.x)
+# --enable-external-ffmpeg
 ./configure \
 --prefix=%{_prefix} --bindir=%{_bindir} --includedir=%{_includedir} \
 --libdir=%{_libdir} --datadir=%{_datadir} \
 --with-lirc-device=/var/run/lirc/lircd \
 --enable-goom \
---enable-external-ffmpeg --enable-external-python \
+--enable-external-python \
 --disable-libdts --disable-liba52 \
 --disable-dvdcss \
 --disable-optimizations --disable-debug \
@@ -230,6 +234,14 @@
 %{_datadir}/icons/hicolor/*/*/*.png
 
 %changelog
+* Wed Nov 23 2011 Nicolas Chauvet <kwizart at gmail.com> - 10.1-7
+- Rebuilt for libcdio
+
+* Sat Nov  5 2011 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.1-6
+- Disable using external ffmpeg for the moment, until such time as
+  either we backport a fix for 0.8 ffmpeg or we build XBMC Eden (11.x)
+  (see #1962)
+
 * Mon Sep 26 2011 Nicolas Chauvet <kwizart at gmail.com> - 10.1-5
 - Rebuilt for FFmpeg-0.8