- Rebase to Dharma beta 4 (SVN r35068)

- Enable libbluray (currently only available for f15+)
- Drop patch disabling SNES (fixed in nasm)

1 files changed, 5 insertions, 8 deletions

diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index 2d4c2f9..47b3ba4 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -9,17 +9,17 @@ SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma
 #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 @@ cd xbmc-$VERSION
 # 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 @@ done
 # 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 @@ find \( -type f -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib'
 # 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