From d8cc934beedcc9dc22fc9d0d6cde8950b3ee0c23 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@x200t.openelec.tv>
Date: Mon, 15 Mar 2010 02:08:45 +0100
Subject: [PATCH] xbmc: - update to xbmc-28584

---
 ...dd_host_and_build_to_configures-0.2.1.diff | 34 +++++++++----------
 .../011_xbmc-let_select_XBMCProjectM-0.1.diff | 26 +++++++-------
 .../patches/012_xbmc-let_select_RSXS-0.1.diff | 16 ++++-----
 ...d_DESTDIR_support_to_make_install-0.1.diff | 14 ++++----
 packages/mediacenter/xbmc/url                 |  2 +-
 5 files changed, 46 insertions(+), 46 deletions(-)

diff --git a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff
index 4149bf0129..033babe263 100644
--- a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff
+++ b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.1.diff
@@ -1,7 +1,7 @@
-diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
---- xbmc-28425/configure.in	2010-03-06 13:48:42.000000000 +0100
-+++ xbmc-28425.patch/configure.in	2010-03-06 15:45:45.758328458 +0100
-@@ -1153,7 +1153,9 @@
+diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
+--- xbmc-28584/configure.in	2010-03-14 21:06:24.000000000 +0100
++++ xbmc-28584.patch/configure.in	2010-03-15 00:50:53.680149619 +0100
+@@ -1154,7 +1154,9 @@
      cp pyconfig.h Include	
    else
      ./configure \
@@ -12,7 +12,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
        --enable-unicode=ucs4 \
        --without-cxx \
        --enable-shared \
-@@ -1218,6 +1220,7 @@
+@@ -1219,6 +1221,7 @@
        --disable-static \
        --disable-ipv6 \
        `if test "$use_debug" = "no"; then echo --disable-debug; fi` \
@@ -20,7 +20,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
        --disable-muxers \
        --enable-muxer=spdif \
        --enable-muxer=adts \
-@@ -1234,6 +1237,7 @@
+@@ -1235,6 +1238,7 @@
        --enable-postproc \
        --enable-gpl \
        `if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \
@@ -28,7 +28,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
        --enable-libfaad \
        --enable-protocol=http \
        --enable-pthreads \
-@@ -1253,6 +1257,8 @@
+@@ -1254,6 +1258,8 @@
        --disable-win
    else
      ./configure \
@@ -37,7 +37,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
        --disable-oss \
        --disable-solaris-audio \
        --disable-al-audio \
-@@ -1270,6 +1276,8 @@
+@@ -1271,6 +1277,8 @@
        --with-pic
    else
      ./configure \
@@ -46,7 +46,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
        --disable-doc \
        --enable-static \
        --with-pic
-@@ -1288,6 +1296,8 @@
+@@ -1289,6 +1297,8 @@
      cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
    else
      ./configure2 \
@@ -55,7 +55,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
        --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../libdvdcss/src" \
        --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
        --enable-static \
-@@ -1313,6 +1323,8 @@
+@@ -1314,6 +1324,8 @@
        --cc="$CC"
    else
      ./configure2 \
@@ -64,7 +64,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
        --extra-cflags="$DVDREAD_CFLAGS -fPIC -DPIC -I`pwd`/../includes" \
        --extra-ldflags="-L`pwd`/../libdvdread/obj" \
        --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \
-@@ -1345,6 +1357,8 @@
+@@ -1346,6 +1358,8 @@
        --disable-al-audio
    else
      ./configure \
@@ -73,7 +73,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
        --with-pic \
        --disable-static \
        --enable-shared \
-@@ -1380,7 +1394,9 @@
+@@ -1381,7 +1395,9 @@
      ./configure MACOSX_DEPLOYMENT_TARGET=10.4
    else
      CFLAGS="$CFLAGS -fPIC" \
@@ -84,7 +84,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
    fi
  ], [$USE_EXTERNAL_LIBASS])
  
-@@ -1394,6 +1410,8 @@
+@@ -1395,6 +1411,8 @@
        --with-pic
    else
      ./configure \
@@ -93,7 +93,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
        CPPFLAGS="$CPPFLAGS" \
        CFLAGS="$CFLAGS -fPIC" \ 
        CXXFLAGS="$CXXFLAGS -fPIC" \
-@@ -1420,6 +1438,8 @@
+@@ -1421,6 +1439,8 @@
  XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
    if test "$host_vendor" != "apple" ; then
      ./configure  \
@@ -102,7 +102,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
          CPPFLAGS="$CPPFLAGS" \
          CFLAGS="$CFLAGS -fPIC" \ 
          CXXFLAGS="$CXXFLAGS -fPIC" \
-@@ -1450,6 +1470,8 @@
+@@ -1451,6 +1471,8 @@
        --disable-skyrocket
    else
      ./configure \
@@ -111,7 +111,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
        CPPFLAGS="$CPPFLAGS" \
        CFLAGS="$CFLAGS -fPIC" \ 
        CXXFLAGS="$CXXFLAGS -fPIC" \
-@@ -1469,9 +1491,11 @@
+@@ -1470,9 +1492,11 @@
  
  XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
    if test "$host_vendor" = "apple" ; then
@@ -125,7 +125,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
    fi
  ], [0])
  
-@@ -1480,7 +1504,9 @@
+@@ -1481,7 +1505,9 @@
      CFLAGS="-isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4 -fno-common" \
      ./configure MACOSX_DEPLOYMENT_TARGET=10.4 --disable-shared
    else
diff --git a/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff b/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff
index 90379aea4f..3ebd50d15c 100644
--- a/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/011_xbmc-let_select_XBMCProjectM-0.1.diff
@@ -1,6 +1,6 @@
-diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
---- xbmc-28425/configure.in	2010-03-06 15:46:30.970324985 +0100
-+++ xbmc-28425.patch/configure.in	2010-03-06 15:46:44.355431403 +0100
+diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
+--- xbmc-28584/configure.in	2010-03-15 00:51:45.481151345 +0100
++++ xbmc-28584.patch/configure.in	2010-03-15 00:52:15.206151488 +0100
 @@ -33,6 +33,8 @@
  xrandr_disabled="== XRandR support disabled. SDL will be used for resolution support. =="
  goom_enabled="== GOOM enabled. =="
@@ -60,7 +60,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
  AC_SUBST(USE_EXTERNAL_LIBRARIES)
  AC_SUBST(USE_EXTERNAL_FFMPEG)
  AC_SUBST(USE_EXTERNAL_LIBA52)
-@@ -1433,7 +1457,7 @@
+@@ -1434,7 +1458,7 @@
        -DSYSCONF_INSTALL_DIR:PATH="${sysconfdir}" -DSHARE_INSTALL_PREFIX:PATH="${datadir}" .
  set +x
    fi
@@ -69,9 +69,9 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
  
  XB_CONFIG_MODULE([xbmc/visualizations/Goom/goom2k4-0],[
    if test "$host_vendor" != "apple" ; then
-diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
---- xbmc-28425/Makefile.in	2010-03-06 13:48:42.000000000 +0100
-+++ xbmc-28425.patch/Makefile.in	2010-03-06 15:46:44.356451434 +0100
+diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
+--- xbmc-28584/Makefile.in	2010-03-14 21:06:24.000000000 +0100
++++ xbmc-28584.patch/Makefile.in	2010-03-15 00:55:14.471274664 +0100
 @@ -104,8 +104,10 @@
  
  VIS_DIRS=\
@@ -82,16 +82,16 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
 +ifneq (@BUILD_XBMCPROJECTM@,1)
 +VIS_DIRS+=xbmc/visualizations/XBMCProjectM
 +endif
- ifneq (@BUILD_GOOM@,1)
- VIS_DIRS+=xbmc/visualizations/Goom
+ ifeq ($(findstring osx,$(ARCH)), osx)
+ VIS_DIRS+=xbmc/visualizations/iTunes
  endif
-@@ -291,7 +293,9 @@
+@@ -294,7 +296,9 @@
  visualizations: exports
  	$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
  	$(MAKE) -C xbmc/visualizations/WaveForm
 +ifneq (@BUILD_XBMCPROJECTM@,1)
  	$(MAKE) -C xbmc/visualizations/XBMCProjectM
 +endif
- ifneq (@BUILD_GOOM@,1)
- ifeq ($(or $(findstring powerpc-linux,$(ARCH)),$(findstring powerpc64-linux,$(ARCH))),)
- 	$(MAKE) -C xbmc/visualizations/Goom
+ ifeq ($(findstring osx,$(ARCH)), osx)
+ 	$(MAKE) -C xbmc/visualizations/iTunes
+ endif
diff --git a/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff b/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff
index 3f68b2fb88..641ebc938f 100644
--- a/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/012_xbmc-let_select_RSXS-0.1.diff
@@ -1,6 +1,6 @@
-diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
---- xbmc-28425/configure.in	2010-03-06 15:47:49.217295596 +0100
-+++ xbmc-28425.patch/configure.in	2010-03-06 15:48:00.615295765 +0100
+diff -Naur xbmc-28584/configure.in xbmc-28584.patch/configure.in
+--- xbmc-28584/configure.in	2010-03-15 00:58:21.345276911 +0100
++++ xbmc-28584.patch/configure.in	2010-03-15 00:58:38.170152082 +0100
 @@ -35,6 +35,8 @@
  goom_disabled="== GOOM disabled. =="
  xbmcprojectm_enabled="== XBMCProjectM enabled. =="
@@ -60,7 +60,7 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
  AC_SUBST(USE_EXTERNAL_LIBRARIES)
  AC_SUBST(USE_EXTERNAL_FFMPEG)
  AC_SUBST(USE_EXTERNAL_LIBA52)
-@@ -1511,7 +1535,7 @@
+@@ -1512,7 +1536,7 @@
        --disable-lattice \
        --disable-skyrocket
    fi
@@ -69,9 +69,9 @@ diff -Naur xbmc-28425/configure.in xbmc-28425.patch/configure.in
  
  XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libbdnav/], [
    if test "$host_vendor" = "apple" ; then
-diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
---- xbmc-28425/Makefile.in	2010-03-06 15:47:49.218295582 +0100
-+++ xbmc-28425.patch/Makefile.in	2010-03-06 15:48:45.399294520 +0100
+diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
+--- xbmc-28584/Makefile.in	2010-03-15 00:58:21.346276544 +0100
++++ xbmc-28584.patch/Makefile.in	2010-03-15 00:58:38.176152470 +0100
 @@ -99,8 +99,10 @@
  	lib/xbmc-dll-symbols \
  	lib/jsoncpp/jsoncpp/src/lib_json
@@ -85,7 +85,7 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
  
  VIS_DIRS=\
  	xbmc/visualizations/OpenGLSpectrum \
-@@ -302,7 +304,9 @@
+@@ -308,7 +310,9 @@
  endif
  endif
  screensavers: exports
diff --git a/packages/mediacenter/xbmc/patches/xbmc-add_DESTDIR_support_to_make_install-0.1.diff b/packages/mediacenter/xbmc/patches/xbmc-add_DESTDIR_support_to_make_install-0.1.diff
index 63f3ff28ca..cb767ce20e 100644
--- a/packages/mediacenter/xbmc/patches/xbmc-add_DESTDIR_support_to_make_install-0.1.diff
+++ b/packages/mediacenter/xbmc/patches/xbmc-add_DESTDIR_support_to_make_install-0.1.diff
@@ -1,7 +1,7 @@
-diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
---- xbmc-28425/Makefile.in	2010-03-06 15:49:58.203323655 +0100
-+++ xbmc-28425.patch/Makefile.in	2010-03-06 15:53:21.236294350 +0100
-@@ -480,7 +480,7 @@
+diff -Naur xbmc-28584/Makefile.in xbmc-28584.patch/Makefile.in
+--- xbmc-28584/Makefile.in	2010-03-15 01:06:53.490151727 +0100
++++ xbmc-28584.patch/Makefile.in	2010-03-15 01:06:07.685150760 +0100
+@@ -486,7 +486,7 @@
  	$(MAKE) -C tools/TexturePacker/
  
  install-bin: xbmc.bin # developement convenience target
@@ -10,7 +10,7 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
  
  ifeq ($(findstring osx,$(ARCH)), osx)
  	# TODO: add osx install
-@@ -488,55 +488,55 @@
+@@ -494,55 +494,55 @@
  install: install-binaries install-arch install-datas install-web
  
  install-binaries: install-scripts
@@ -47,8 +47,8 @@ diff -Naur xbmc-28425/Makefile.in xbmc-28425.patch/Makefile.in
 -	@echo "Copying system files to $(prefix)/share/xbmc"
 +	@echo "Copying system files to $(DESTDIR)/$(prefix)/share/xbmc"
  	@# Arch independent files
--	@find addons language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
-+	@find addons language media scripts sounds userdata visualisations system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib|.*\.vis" -exec install -D -m 0644 "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
+-	@find addons language media scripts sounds userdata system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" -exec install -D -m 0644 "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
++	@find addons language media scripts sounds userdata system -regextype posix-extended -type f -not -iregex ".*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python/.*\.zlib" -exec install -D -m 0644 "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r"
  	@# Skins
 -	@find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"
 +	@find skin -regextype posix-extended -type f -not -iregex '.*/\.svn/.*|^skin/[^/]*/media/.*[^x][^b][^t]' -exec install -D -m 0644 '{}' $(DESTDIR)/$(prefix)/share/xbmc/'{}' \; -printf " -- %-75.75f\r"
diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url
index dfbdad4b4b..734d3e3701 100644
--- a/packages/mediacenter/xbmc/url
+++ b/packages/mediacenter/xbmc/url
@@ -1 +1 @@
-http://sources.openelec.tv/svn/xbmc-28425.tar.bz2
+http://sources.openelec.tv/svn/xbmc-28584.tar.bz2