rpms/xbmc/devel .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xbmc-generate-tarball-xz.sh, 1.4, 1.5 xbmc.spec, 1.17, 1.18

[Alex Lancaster]

Author: alexlan

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

Modified Files:
	.cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec 
Log Message:
- Rebase to Dharma beta 4 (SVN r35068)
- Enable libbluray (currently only available for f15+)
- Drop patch disabling SNES (fixed in nasm)



Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	15 Oct 2010 05:24:13 -0000	1.5
+++ .cvsignore	7 Nov 2010 22:38:38 -0000	1.6
@@ -1 +1 @@
-xbmc-Dharma_beta3-patched.tar.xz
+xbmc-Dharma_beta4-patched.tar.xz


Index: sources
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	15 Oct 2010 05:24:13 -0000	1.5
+++ sources	7 Nov 2010 22:38:38 -0000	1.6
@@ -1 +1 @@
-87ca5daf013a3d26abb03f2316897ae1  xbmc-Dharma_beta3-patched.tar.xz
+d31facaa46d2986877ea50929ad40667  xbmc-Dharma_beta4-patched.tar.xz


Index: xbmc-generate-tarball-xz.sh
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- xbmc-generate-tarball-xz.sh	15 Oct 2010 05:24:13 -0000	1.4
+++ xbmc-generate-tarball-xz.sh	7 Nov 2010 22:38:38 -0000	1.5
@@ -9,17 +9,17 @@
 #SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk
 
 # use SVN version number passed from script, or otherwise use default
-SVNVERSION=${1-34731}
+SVNVERSION=${1-35068}
 # uncomment following if you want to always pull from tip of branch
 # SVNVERSION=$(svn info $SVNURL  |grep "Revision:"|cut -d' ' -f2)
 
 #VERSION=$MAJORVERSION-$SVNVERSION
-VERSION=Dharma_beta3
+VERSION=Dharma_beta4
 
 # remove existing checkout
 rm -r xbmc-$VERSION
 
-svn export -r $SVNVERSION $SVNURL xbmc-$VERSION
+#svn export -r $SVNVERSION $SVNURL xbmc-$VERSION
 
 # don't need to extra tarball, already expanded
 # comment out with tarball
@@ -32,7 +32,7 @@
 # remove bundled libraries (including zlib and OSX), saves space and forces using external versions
 # also remove legally problematic libGoAhead library
 #for i in libass libcdio libCDRip libcurl libenca libfribidi liblzo libmms libpcre libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib libSDL-OSX boost libportaudio libglew libGoAhead libhdhomerun
-for i in liblzo libmms libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib boost libglew libhdhomerun
+for i in liblzo libmms libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib boost libhdhomerun
 do
     rm -r xbmc/lib/$i
 done
@@ -40,9 +40,6 @@
 # bundled win32 binaries
 rm -r xbmc/visualizations/XBMCProjectM/win32
 
-# remove various headers 
-#rm xbmc/FileSystem/zlib.h
-
 # remove more bundled codecs
 # libfaad2, libmad needs upstream patches to be able to remove from tarball
 # even though the bundled libaries aren't, I think, compiled
@@ -67,7 +64,7 @@
 # except for libass, cpluff, jsoncpp (need to figure out how to
 # remove these too)
 # xbmc-dll-symbols seems to be XBMC-specific
-for i in enca freetype fribidi libcdio libcrystalhd libcurl-mingw32 libcurl-OSX libiconv liblame libmicrohttpd libmicrohttpd_win32 libmodplug libmysql_win32 libSDL-OSX libSDL-WIN32 libssh_win32 pcre 
+for i in enca freetype fribidi libcdio libcrystalhd libcurl-OSX libiconv liblame libmicrohttpd libmicrohttpd_win32 libmodplug libmysql_win32 libSDL-OSX libssh_win32 pcre libbluray libbluray_win32 librtmp bzip2
 do
     rm -r lib/$i
 done


Index: xbmc.spec
===================================================================
RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- xbmc.spec	15 Oct 2010 05:24:13 -0000	1.17
+++ xbmc.spec	7 Nov 2010 22:38:38 -0000	1.18
@@ -1,12 +1,12 @@
-%global SVNVERSION 34731
-%global PRERELEASE Dharma_beta3
+%global SVNVERSION 35068
+%global PRERELEASE Dharma_beta4
 # use below for SVN snapshot
 #global DIRVERSION %{version}-%{SVNVERSION}
 %global DIRVERSION %{PRERELEASE}
 
 Name: xbmc
 Version: 10.0
-Release: 0.19.%{PRERELEASE}%{?dist}
+Release: 0.20.%{PRERELEASE}%{?dist}
 URL: http://www.xbmc.org/
 
 Source0: %{name}-%{DIRVERSION}-patched.tar.xz
@@ -45,11 +45,6 @@
 # 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
@@ -123,15 +118,18 @@
 BuildRequires: libmodplug-devel
 BuildRequires: libmicrohttpd-devel
 BuildRequires: expat-devel
+BuildRequires: zip
 %if 0%{?fedora} >= 14
 BuildRequires: gettext-autopoint
 %else
 BuildRequires: gettext
 %endif
-BuildRequires: zip
 %if 0%{?fedora} >= 14
 BuildRequires: librtmp-devel
 %endif
+%if 0%{?fedora} >= 15
+BuildRequires: libbluray-devel
+%endif
 # VAAPI currently not working, comment-out
 #BuildRequires: libva-freeworld-devel
 
@@ -155,9 +153,6 @@
 %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 \
@@ -218,6 +213,11 @@
 %{_datadir}/icons/hicolor/*/*/*.png
 
 %changelog
+* Sun Nov  7 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.20.Dharma_beta4
+- Rebase to Dharma beta 4 (SVN r35068)
+- Enable libbluray (currently only available for f15+)
+- Drop patch disabling SNES (fixed in nasm)
+
 * Thu Oct 14 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.19.Dharma_beta3
 - Rebase to Dharma beta3 (SVN r34731)
 - Disable VAAPI: crashes XBMC when playing back rtmp streams