Sync with work in rawhide for Camelot+1

1 files changed, 30 insertions, 8 deletions

diff --git a/xbmc-generate-tarball-xz.sh b/xbmc-generate-tarball-xz.sh
index d328c31..124d3a3 100755
--- a/xbmc-generate-tarball-xz.sh
+++ b/xbmc-generate-tarball-xz.sh
@@ -1,14 +1,24 @@
 #!/bin/sh
 
-VERSION=${1-9.11}
+MAJORVERSION=10.5
 
-tar -xzvf xbmc-$VERSION.tar.gz
+# get version number
+SVNVERSION=$(svn info  https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk |grep "Revision:"|cut -d' ' -f2)
+
+#VERSION=${1-9.11}
+VERSION=$MAJORVERSION-$SVNVERSION
+
+svn export -r $SVNVERSION https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk xbmc-$VERSION
+
+# don't need to extra tarball, already expanded
+#tar -xzvf xbmc-$VERSION.tar.gz
 
 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 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
 do
     rm -r xbmc/lib/$i
 done
@@ -17,16 +27,19 @@ done
 rm -r xbmc/visualizations/XBMCProjectM/win32
 
 # remove various headers 
-rm xbmc/FileSystem/zlib.h
+#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
-for i in ffmpeg liba52 libmpeg2 libdts
+# grrr, have to keep in ffmpeg for now (2010-07-019) since upstream
+# seems to require files within that subdirectory <sigh>
+for i in liba52 libmpeg2 libdts
 do
     rm -r xbmc/cores/dvdplayer/Codecs/$i
 done
 
+
 # remove DVD stuff we can't ship, or is already in external libraries
 for i in libdvdcss libdvdread includes 
 do
@@ -34,12 +47,21 @@ do
 done
 
 # remove all prebuilt binaries (e.g., .so files and Win32 DLLs)
-find \( -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) | xargs rm -f
+find \( -type f -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) | xargs rm -f
 
-# remove other packages that should be system-wide 
-rm -rf lib
+# remove all other packages that should be system-wide
+# except for libass, cpluff, jsoncpp (need to figure out how to
+# remove these too)
+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 xbmc-dll-symbols
+do
+    rm -r lib/$i
+done
 
 cd -
 
 # repack
 tar -cJvf xbmc-$VERSION-patched.tar.xz xbmc-$VERSION
+
+echo "Release:"
+echo "$(date +'%Y%m%d')svn${SVNVERSION}"
+