diff --git a/packages/mediacenter/xbmc/patches/211_xmbc-let_select_HAL-0.1.diff b/packages/mediacenter/xbmc/patches/211_xmbc-let_select_HAL-0.1.diff deleted file mode 100644 index 5b87556086..0000000000 --- a/packages/mediacenter/xbmc/patches/211_xmbc-let_select_HAL-0.1.diff +++ /dev/null @@ -1,76 +0,0 @@ -diff -Naur xbmc-28910/configure.in xbmc-28910.patch/configure.in ---- xbmc-28910/configure.in 2010-03-28 19:11:12.041628640 +0200 -+++ xbmc-28910.patch/configure.in 2010-03-28 19:11:28.334628763 +0200 -@@ -33,6 +33,8 @@ - faac_disabled="== FAAC support manually disabled. ==" - dvdcss_enabled="== DVDCSS support enabled. ==" - dvdcss_disabled="== DVDCSS support disabled. ==" -+hal_not_found="== Could not find hal and hal-storage. HAL support disabled. ==" -+hal_disabled="== HAL support disabled. ==" - avahi_not_found="== Could not find libavahi-common or libavahi-client. Avahi support disabled. ==" - avahi_disabled="== Avahi support disabled. ==" - vdpau_not_found="== Could not find libvdpau. VDPAU support disabled. ==" -@@ -198,6 +200,11 @@ - [enable MID support (default is no)])], - [use_mid=$enableval], - [use_mid=no]) -+AC_ARG_ENABLE([hal], -+ [AS_HELP_STRING([--disable-hal], -+ [disable HAL support (default is enabled if hal and hal-storage is found)])], -+ [use_hal=$enableval], -+ [use_hal=yes]) - AC_ARG_ENABLE([avahi], - [AS_HELP_STRING([--disable-avahi], - [disable Avahi support (default is enabled if libavahi-common and libavahi-client is found)])], -@@ -465,15 +472,9 @@ - PKG_CHECK_MODULES([DBUS], [dbus-1], - [INCLUDES+=" $DBUS_CFLAGS"; LIBS+=" $DBUS_LIBS"], - AC_MSG_ERROR($missing_library)) -- PKG_CHECK_MODULES([HAL_STORAGE], [hal-storage], -- [INCLUDES+=" $HAL_STORAGE_CFLAGS"; LIBS+=" $HAL_STORAGE_LIBS"], -- AC_MSG_ERROR($missing_library)) - PKG_CHECK_MODULES([SDL], [sdl], - [INCLUDES+=" $SDL_CFLAGS"; LIBS+=" $SDL_LIBS"], - AC_MSG_ERROR($missing_library)) -- PKG_CHECK_MODULES([HAL], [hal], -- [INCLUDES+=" $HAL_CFLAGS"; LIBS+=" $HAL_LIBS"], -- AC_MSG_ERROR($missing_library)) - fi - - # PulseAudio -@@ -502,6 +503,24 @@ - fi - fi - -+# HAL -+if test "$host_vendor" = "apple" ; then -+ use_hal="no" -+ AC_MSG_RESULT($hal_disabled) -+else -+ if test "$use_hal" = "yes"; then -+ PKG_CHECK_MODULES([HAL], [hal], -+ [INCLUDES+=" $HAL_CFLAGS"; LIBS+=" $HAL_LIBS"], -+ use_hal=no;AC_MSG_ERROR($missing_library)) -+ PKG_CHECK_MODULES([HAL_STORAGE], [hal-storage], -+ [INCLUDES+=" $HAL_STORAGE_CFLAGS"; LIBS+=" $HAL_STORAGE_LIBS"], -+ use_hal=no;AC_MSG_ERROR($missing_library)) -+ AC_DEFINE([HAS_HAL], [1], [Define to 1 if you have HAL installed]) -+ else -+AC_MSG_RESULT($hal_disabled) -+ fi -+fi -+ - # avahi - if test "$host_vendor" = "apple" ; then - use_avahi="no" -diff -Naur xbmc-28910/guilib/system.h xbmc-28910.patch/guilib/system.h ---- xbmc-28910/guilib/system.h 2010-03-28 17:12:32.000000000 +0200 -+++ xbmc-28910.patch/guilib/system.h 2010-03-28 19:11:28.336628838 +0200 -@@ -126,7 +126,6 @@ - #define HAS_AVAHI - #endif - #define HAS_LCD --#define HAS_HAL - #define HAS_DBUS - #define HAS_DBUS_SERVER - #define HAS_GL diff --git a/packages/mediacenter/xbmc/patches/303-xbmc-use_variable_GCC_instead_hardcoded_gcc-0.1.diff b/packages/mediacenter/xbmc/patches/303-xbmc-use_variable_GCC_instead_hardcoded_gcc-0.1.diff deleted file mode 100644 index fed04421e0..0000000000 --- a/packages/mediacenter/xbmc/patches/303-xbmc-use_variable_GCC_instead_hardcoded_gcc-0.1.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur xbmc-29740/configure.in xbmc-29740.patch/configure.in ---- xbmc-29740/configure.in 2010-05-03 04:08:41.115131030 +0200 -+++ xbmc-29740.patch/configure.in 2010-05-03 04:12:20.116129219 +0200 -@@ -499,7 +499,7 @@ - AC_DEFUN([XB_FIND_SONAME], - [ - AC_MSG_CHECKING([for lib$2 soname]) -- $1_SONAME=$( gcc -print-file-name=lib$2.so | \ -+ $1_SONAME=$( $CC -print-file-name=lib$2.so | \ - while read output; do objdump -p $output | \ - grep "SONAME" | \ - sed -e 's/ \+SONAME \+//'; done 2> /dev/null ) diff --git a/packages/mediacenter/xbmc/patches/403-xbmc-add_DESTDIR_support_to_make_install-0.1.diff b/packages/mediacenter/xbmc/patches/403-xbmc-add_DESTDIR_support_to_make_install-0.1.diff deleted file mode 100644 index 509472b745..0000000000 --- a/packages/mediacenter/xbmc/patches/403-xbmc-add_DESTDIR_support_to_make_install-0.1.diff +++ /dev/null @@ -1,92 +0,0 @@ -diff -Naur xbmc-29740/Makefile.in xbmc-29740.patch/Makefile.in ---- xbmc-29740/Makefile.in 2010-05-03 04:08:41.116131093 +0200 -+++ xbmc-29740.patch/Makefile.in 2010-05-03 04:16:42.386130163 +0200 -@@ -497,7 +497,7 @@ - $(MAKE) -C tools/TexturePacker/ - - install-bin: xbmc.bin # developement convenience target -- sudo install -D xbmc.bin $(prefix)/share/xbmc -+ sudo install -D xbmc.bin $(DESTDIR)/$(prefix)/share/xbmc - - ifeq ($(findstring osx,$(ARCH)), osx) - # TODO: add osx install -@@ -505,53 +505,53 @@ - install: install-binaries install-arch install-datas install-web - - install-binaries: install-scripts -- @echo "Copying XBMC binary to $(prefix)/share/xbmc/xbmc.bin" -- @install -D xbmc.bin $(prefix)/share/xbmc/xbmc.bin -- @install -D xbmc-xrandr $(prefix)/share/xbmc/xbmc-xrandr -+ @echo "Copying XBMC binary to $(DESTDIR)/$(prefix)/share/xbmc/xbmc.bin" -+ @install -D xbmc.bin $(DESTDIR)/$(prefix)/share/xbmc/xbmc.bin -+ @install -D xbmc-xrandr $(DESTDIR)/$(prefix)/share/xbmc/xbmc-xrandr - @echo "You can run XBMC with the command 'xbmc'" - endif - - install-arch: - @# Arch dependent files -- @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" -+ @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*|.*win32(dx)?\.vis|.*osx\.vis" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs" -exec install -D "{}" $(DESTDIR)/$(prefix)/share/xbmc/"{}" \; -printf " -- %-75.75f\r" - - install-scripts: -- @install -D tools/Linux/xbmc.sh $(prefix)/bin/xbmc -- @install -D tools/Linux/xbmc-standalone.sh $(prefix)/bin/xbmc-standalone -- @install -D -m 0644 tools/Linux/FEH.py $(prefix)/share/xbmc/FEH.py -- @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(prefix)/share/xsessions/XBMC.desktop -+ @install -D tools/Linux/xbmc.sh $(DESTDIR)/$(prefix)/bin/xbmc -+ @install -D tools/Linux/xbmc-standalone.sh $(DESTDIR)/$(prefix)/bin/xbmc-standalone -+ @install -D -m 0644 tools/Linux/FEH.py $(DESTDIR)/$(prefix)/share/xbmc/FEH.py -+ @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(DESTDIR)/$(prefix)/share/xsessions/XBMC.desktop - - install-datas: install-scripts - @echo "Copying support and legal files..." - @for FILE in `ls README.linux LICENSE.GPL *.txt`; do \ -- install -D -m 0644 "$$FILE" $(prefix)/share/xbmc/; done -+ install -D -m 0644 "$$FILE" $(DESTDIR)/$(prefix)/share/xbmc/; done - @echo "Done!" -- @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 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" - @# Icons and links -- @mkdir -p $(prefix)/share/applications $(prefix)/share/pixmaps -- @cp -a tools/Linux/xbmc.png $(prefix)/share/pixmaps/ -- @cp -a tools/Linux/xbmc.desktop $(prefix)/share/applications/ -+ @mkdir -p $(DESTDIR)/$(prefix)/share/applications $(DESTDIR)/$(prefix)/share/pixmaps -+ @cp -a tools/Linux/xbmc.png $(DESTDIR)/$(prefix)/share/pixmaps/ -+ @cp -a tools/Linux/xbmc.desktop $(DESTDIR)/$(prefix)/share/applications/ - - install-livedatas: -- @echo "Install Live CD datas in $(prefix) ..." -- @mkdir -p $(prefix)/bin -- @install -D tools/XBMCLive/diskmounter $(prefix)/bin -- @install -D tools/XBMCLive/installXBMC $(prefix)/bin -- @install -D tools/XBMCLive/runXBMC $(prefix)/bin -- @install -D tools/XBMCLive/setAlsaVolumes $(prefix)/bin -+ @echo "Install Live CD datas in $(DESTDIR)/$(prefix) ..." -+ @mkdir -p $(DESTDIR)/$(prefix)/bin -+ @install -D tools/XBMCLive/diskmounter $(DESTDIR)/$(prefix)/bin -+ @install -D tools/XBMCLive/installXBMC $(DESTDIR)/$(prefix)/bin -+ @install -D tools/XBMCLive/runXBMC $(DESTDIR)/$(prefix)/bin -+ @install -D tools/XBMCLive/setAlsaVolumes $(DESTDIR)/$(prefix)/bin - - install-web: -- @mkdir -p $(prefix)/share/xbmc/web -- @cp -r web/poc_jsonrpc/* $(prefix)/share/xbmc/web -- @find $(prefix)/share/xbmc/web -depth -name .svn -exec rm -rf {} \; -+ @mkdir -p $(DESTDIR)/$(prefix)/share/xbmc/web -+ @cp -r web/poc_jsonrpc/* $(DESTDIR)/$(prefix)/share/xbmc/web -+ @find $(DESTDIR)/$(prefix)/share/xbmc/web -depth -name .svn -exec rm -rf {} \; - - uninstall: - @echo "Removing XBMC..." -- @rm -rf $(prefix)/share/xbmc $(prefix)/bin/xbmc -- @rm -rf $(prefix)/bin/xbmc-standalone -- @rm -rf $(prefix)/share/xsessions/XBMC.desktop -+ @rm -rf $(DESTDIR)/$(prefix)/share/xbmc $(DESTDIR)/$(prefix)/bin/xbmc -+ @rm -rf $(DESTDIR)/$(prefix)/bin/xbmc-standalone -+ @rm -rf $(DESTDIR)/$(prefix)/share/xsessions/XBMC.desktop - @echo "Done!" - - reallyclean: diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index cb96527626..649789e810 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-29931.tar.bz2 +http://sources.openelec.tv/svn/xbmc-29992.tar.bz2