rpms/xbmc/devel xbmc-10-disable-snes.patch, NONE, 1.1 xbmc.spec, 1.10, 1.11

[Alex Lancaster]

Author: alexlan

Update of /cvs/free/rpms/xbmc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28021

Modified Files:
	xbmc.spec 
Added Files:
	xbmc-10-disable-snes.patch 
Log Message:
Patch to disable SNES codec (Nintendo sound files) on f14 as nasm >=2.09 has
trouble compiling with that version on f14 (rhbz#633646)


xbmc-10-disable-snes.patch:
 Makefile.in |    3 ---
 1 file changed, 3 deletions(-)

--- NEW FILE xbmc-10-disable-snes.patch ---
--- Makefile.in.orig	2010-09-14 18:08:19.973814197 -0400
+++ Makefile.in	2010-09-14 18:08:57.258416052 -0400
@@ -361,9 +361,6 @@
   endif
 endif
 	$(MAKE) -C xbmc/cores/paplayer/YMCodec/StSoundLibrary	
-ifeq ($(or $(findstring powerpc,$(ARCH)),$(findstring x86_64-linux,$(ARCH)),$(findstring arm, $(ARCH))),)
-	$(MAKE) -C xbmc/cores/paplayer/SPCCodec/SNES/SNESAPU
-endif
 imagelib: dllloader
 	$(MAKE) -C xbmc/lib/cximage-6.0
 


Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xbmc.spec	13 Sep 2010 14:49:34 -0000	1.10
+++ xbmc.spec	15 Sep 2010 00:36:39 -0000	1.11
@@ -6,7 +6,7 @@
 
 Name: xbmc
 Version: 10.0
-Release: 0.12.%{PRERELEASE}%{?dist}
+Release: 0.13.%{PRERELEASE}%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -45,6 +45,11 @@
 # to find Python 2.7 (needed for F-14+)
 Patch6: xbmc-10-python2.7.patch
 
+# disable SNES code (Nintendo sound files) as nasm >=2.09 has
+# trouble compiling with that version on f14
+# filed: https://bugzilla.redhat.com/show_bug.cgi?id=633646
+Patch7: xbmc-10-disable-snes.patch
+
 ExcludeArch: ppc64
 Buildroot: %{_tmppath}/%{name}-%{version}
 Summary: Media center
@@ -145,6 +150,9 @@
 %patch4 -p1
 %patch5 -p0
 %patch6 -p0
+%if 0%{?fedora} >= 14
+%patch7 -p0
+%endif
 
 # Prevent rerunning the autotools.
 touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \
@@ -205,6 +213,10 @@
 %{_datadir}/icons/hicolor/*/*/*.png
 
 %changelog
+* Tue Sep 14 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.13.Dharma_beta1
+- Disable SNES codec (Nintendo sound files) on f14 as nasm >=2.09 has
+  trouble compiling with that version on f14 (rhbz#633646)
+
 * Mon Sep 13 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.12.Dharma_beta1
 - Upstream is dropping month from version, using 10.0 as Dharma release version.
 - Add explicit Requires for libcrystalhd