From 7e62870b26d529a82d0e28acda9b5800f263dae9 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Fri, 25 Dec 2009 12:59:18 +0100 Subject: [PATCH] xbmc: - update to xbmc-26057 --- packages/mediacenter/xbmc/build | 4 +--- ...sscompile_add_host_and_build_to_configures-0.2.diff | 2 +- .../014_xbmc-dont_hardcode_usr_include-0.1.diff | 10 +++++----- packages/mediacenter/xbmc/url | 2 +- 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/packages/mediacenter/xbmc/build b/packages/mediacenter/xbmc/build index 90599bf3d7..6a7ab935a4 100755 --- a/packages/mediacenter/xbmc/build +++ b/packages/mediacenter/xbmc/build @@ -74,9 +74,7 @@ fi LDFLAGS="$LDFLAGS -lpython2.6" cd $PKG_BUILD -autoheader -autoconf - +./bootstrap ./configure --host=$TARGET_NAME \ --build=$HOST_NAME \ --prefix=/usr \ diff --git a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff index 79fcbbc110..6907486d71 100644 --- a/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff +++ b/packages/mediacenter/xbmc/patches/010_xbmc-crosscompile_add_host_and_build_to_configures-0.2.diff @@ -69,7 +69,7 @@ diff -Naur xbmc-25850/configure.in xbmc-25850.patch/configure.in @@ -1206,6 +1218,7 @@ --enable-postproc \ --enable-gpl \ - `if test "$use_vdpau" = "yes"; then echo --enable-vdpau; fi` \ + `if test "$use_vdpau" = "yes"; then echo --enable-vdpau; else echo --disable-vdpau; fi` \ + --disable-vaapi \ --enable-libfaad \ --enable-protocol=http \ diff --git a/packages/mediacenter/xbmc/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff b/packages/mediacenter/xbmc/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff index 91dce9a94e..a8e0af1f78 100644 --- a/packages/mediacenter/xbmc/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff +++ b/packages/mediacenter/xbmc/patches/014_xbmc-dont_hardcode_usr_include-0.1.diff @@ -1,9 +1,9 @@ -diff -Naur xbmc-24229/guilib/Makefile xbmc-24229.patch/guilib/Makefile +3diff -Naur xbmc-24229/guilib/Makefile xbmc-24229.patch/guilib/Makefile --- xbmc-24229/guilib/Makefile 2009-11-03 10:52:46.493397566 +0100 +++ xbmc-24229.patch/guilib/Makefile 2009-11-03 12:18:27.292521966 +0100 @@ -1,4 +1,4 @@ --INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish -+INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish +-INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores/dvdplayer/Codecs/ffmpeg -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish ++INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/cores/dvdplayer/Codecs/ffmpeg -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish SRCS=AnimatedGif.cpp \ AudioContext.cpp \ @@ -20,8 +20,8 @@ diff -Naur xbmc-24229/xbmc/Makefile xbmc-24229.patch/xbmc/Makefile --- xbmc-24229/xbmc/Makefile 2009-11-03 10:49:58.642519675 +0100 +++ xbmc-24229.patch/xbmc/Makefile 2009-11-03 12:18:27.295522056 +0100 @@ -1,4 +1,4 @@ --INCLUDES+=-I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/ffmpeg -+INCLUDES+=-I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer -Icores/ffmpeg +-INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg ++INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer -Icores/dvdplayer/Codecs/ffmpeg INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \ -Ilib/libUPnP/Platinum/Source/Platinum \ diff --git a/packages/mediacenter/xbmc/url b/packages/mediacenter/xbmc/url index e301807c39..86f71aaf9d 100644 --- a/packages/mediacenter/xbmc/url +++ b/packages/mediacenter/xbmc/url @@ -1 +1 @@ -http://sources.openelec.tv/svn/xbmc-25850.tar.bz2 +http://sources.openelec.tv/svn/xbmc-26057.tar.bz2