diff options
| -rw-r--r-- | package/xbmc/Makefile | 41 | ||||
| -rw-r--r-- | package/xbmc/patches/patch-Makefile_in | 47 | ||||
| -rw-r--r-- | package/xbmc/patches/patch-Makefile_include_in | 4 | ||||
| -rw-r--r-- | package/xbmc/patches/patch-configure_in | 43 | ||||
| -rw-r--r-- | package/xbmc/patches/patch-language_English_langinfo_xml | 13 | ||||
| -rw-r--r-- | package/xbmc/patches/patch-language_German_langinfo_xml | 13 | ||||
| -rw-r--r-- | package/xbmc/patches/patch-tools_buildsteps_rbpi_configure-depends | 31 | ||||
| -rw-r--r-- | package/xbmc/patches/patch-xbmc_Application_cpp | 4 |
8 files changed, 99 insertions, 97 deletions
diff --git a/package/xbmc/Makefile b/package/xbmc/Makefile index d396f0534..18e38a0a5 100644 --- a/package/xbmc/Makefile +++ b/package/xbmc/Makefile @@ -4,12 +4,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:= xbmc -PKG_VERSION:= 13.1rc1 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 1eb727c04cdc8282e9c2cb1f45ceeaae +PKG_VERSION:= 13.1 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 9ce6b6ac89b6aa0b111a1acdf3606e06 PKG_DESCR:= software media player PKG_SECTION:= mm/video -PKG_DEPENDS:= boost libffmpeg python2 libstdcxx +PKG_DEPENDS:= boost libffmpeg python2 libstdcxx glibc-gconv PKG_DEPENDS+= libglew mesalib libass libmpeg2 libmad libdbus PKG_DEPENDS+= libjpeg-turbo libogg libvorbis libmodplug libcurl PKG_DEPENDS+= libflac libopenssl libbz2 libtiff liblzo @@ -35,10 +35,10 @@ PKG_SITES:= http://openadk.org/distfiles/ PKG_DEPENDS_RASPBERRY_PI:= bcm2835-vc PKG_BUILDDEP_RASPBERRY_PI:= bcm2835-vc PKG_DEPENDS_IBM_X40:= libsdl libsdl-image libxshmfence libx11 libxext libxt libsm libice -PKG_DEPENDS_QEMU_X86:= libsdl libsdl-image libxshmfence libx11 libxext libxt libsm libice +PKG_DEPENDS_VBOX_X86:= libsdl libsdl-image libxshmfence libx11 libxext libxt libsm libice PKG_BUILDDEP_IBM_X40:= nasm-host sdl sdl-image -PKG_BUILDDEP_QEMU_X86:= nasm-host sdl sdl-image -PKG_SYSTEM_DEPENDS:= raspberry-pi ibm-x40 qemu-x86 +PKG_BUILDDEP_VBOX_X86:= nasm-host sdl sdl-image +PKG_SYSTEM_DEPENDS:= raspberry-pi ibm-x40 vbox-x86 PKG_LIBC_DEPENDS:= glibc DIFF_IGNOREFILES:= configure missing depcomp install-sh INSTALL \ @@ -49,9 +49,8 @@ include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,XBMC,xbmc,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CXXFLAGS_FOR_BUILD+= $(CPPFLAGS_FOR_BUILD) -XAKE_FLAGS+= V=1 TIXML_USE_STL=1 -XAKE_FLAGS+= GCC_HONOUR_COPTS=s -TARGET_CPPFLAGS+= -I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \ +XAKE_FLAGS+= V=1 TIXML_USE_STL=1 GCC_HONOUR_COPTS=s +TARGET_CPPFLAGS+= -I. -I./utils -I$(STAGING_TARGET_DIR)/usr/include/boost-1_55 \ -DTIXML_USE_STL=1 -DHAS_SIMPLEPM=1 -DUSE_EXTERNAL_FFMPEG=1 ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) @@ -65,12 +64,25 @@ AUTOTOOL_STYLE:= autoreconf CONFIGURE_ENV+= DESTDIR='${WRKINST}' \ TEXTUREPACKER_NATIVE_ROOT='$(STAGING_HOST_DIR)/usr' CONFIGURE_ARGS+= --disable-optical-drive \ + --disable-optmizations \ --disable-mysql \ --disable-avahi \ --disable-rsxs \ --disable-projectm \ + --disable-crystalhd \ + --disable-mdnsembedded \ + --disable-libusb \ + --disable-libcap \ + --disable-joystick \ + --disable-dvdcss \ + --disable-debug \ + --disable-gtest \ + --disable-ccache \ + --disable-wayland \ + --disable-pulse \ + --disable-mid \ + --with-ffmpeg \ --enable-alsa \ - --enable-mid \ --enable-libmp3lame \ --enable-libvorbisenc \ --enable-samba \ @@ -80,12 +92,7 @@ CONFIGURE_ARGS+= --disable-optical-drive \ --enable-libbluray \ --enable-external-libraries \ --enable-rtmp \ - --enable-libcec \ - --disable-libusb \ - --disable-libcap \ - --disable-joystick \ - --disable-dvdcss \ - --disable-debug + --enable-libcec ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIGURE_ARGS+= --with-platform=raspberry-pi \ diff --git a/package/xbmc/patches/patch-Makefile_in b/package/xbmc/patches/patch-Makefile_in index 3ec03bfaf..581ff950b 100644 --- a/package/xbmc/patches/patch-Makefile_in +++ b/package/xbmc/patches/patch-Makefile_in @@ -1,6 +1,43 @@ ---- xbmc-13.1rc1.orig/Makefile.in 2014-05-28 15:30:25.000000000 +0200 -+++ xbmc-13.1rc1/Makefile.in 2014-05-28 16:05:22.772629085 +0200 -@@ -586,25 +586,7 @@ install-arch: +--- xbmc-13.1.orig/Makefile.in 2014-06-08 08:40:24.000000000 +0200 ++++ xbmc-13.1/Makefile.in 2014-06-09 11:14:17.917685925 +0200 +@@ -191,13 +191,7 @@ ifeq (@USE_LIBAV_HACKS@,1) + DIRECTORY_ARCHIVES += lib/xbmc-libav-hacks/dll-libavhacks.a + endif + +-PAPCODECS_DIRS= \ +- lib/nosefart \ +- lib/timidity \ +- lib/libsidplay2 \ +- lib/stsound/StSoundLibrary \ +- lib/snesapu/SNES/SNESAPU \ +- lib/vgmstream ++PAPCODECS_DIRS= + + ifeq (@USE_ASAP_CODEC@,1) + PAPCODECS_DIRS+= \ +@@ -419,21 +413,11 @@ libhdhomerun: dllloader + $(MAKE) -C lib/libhdhomerun + papcodecs: dllloader dvdpcodecs + test -d system/players/paplayer || mkdir system/players/paplayer +- $(MAKE) -C lib/vgmstream +- $(MAKE) -C lib/timidity +- $(MAKE) -C lib/nosefart +-ifneq ($(findstring arm-osx,@ARCH@), arm-osx) +- $(MAKE) -C lib/libsidplay2 +-endif + ifeq (@USE_ASAP_CODEC@,1) + ifneq ($(findstring osx,@ARCH@), osx) + $(MAKE) -C lib/asap asap-xbmc + endif + endif +- $(MAKE) -C lib/stsound/StSoundLibrary +-ifeq ($(or $(findstring powerpc,@ARCH@),$(findstring x86_64-linux,@ARCH@),$(findstring arm, @ARCH@),$(findstring freebsd,@ARCH@)),) +- $(MAKE) -C lib/snesapu/SNES/SNESAPU +-endif + imagelib: dllloader + $(MAKE) -C lib/cximage-6.0 + +@@ -586,25 +570,7 @@ install-arch: ifeq (@USE_PVR_ADDONS@,1) $(MAKE) -C pvr-addons install endif @@ -26,7 +63,7 @@ install-scripts: @install -d $(DESTDIR)$(bindir) -@@ -624,26 +606,7 @@ install-datas: install-scripts +@@ -624,26 +590,7 @@ install-datas: install-scripts @echo "Done!" @echo "Copying system files to $(DESTDIR)$(datarootdir)/xbmc" @install -d $(DESTDIR)$(datarootdir)/xbmc @@ -52,4 +89,4 @@ -endif @# Icons and links @install -d $(DESTDIR)$(datarootdir)/applications - @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop + @install -m 0644 tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop diff --git a/package/xbmc/patches/patch-Makefile_include_in b/package/xbmc/patches/patch-Makefile_include_in index 6e3e10640..d73f62de2 100644 --- a/package/xbmc/patches/patch-Makefile_include_in +++ b/package/xbmc/patches/patch-Makefile_include_in @@ -1,5 +1,5 @@ ---- xbmc-24032014.orig/Makefile.include.in 2014-03-24 15:52:26.000000000 +0100 -+++ xbmc-24032014/Makefile.include.in 2014-03-25 10:05:01.625705714 +0100 +--- xbmc-13.1.orig/Makefile.include.in 2014-06-08 08:40:24.000000000 +0200 ++++ xbmc-13.1/Makefile.include.in 2014-06-11 13:17:49.354722974 +0200 @@ -37,6 +37,7 @@ CFLAGS+=@CFLAGS@ CFLAGS_FOR_BUILD+=@CFLAGS_FOR_BUILD@ LDFLAGS+=@LDFLAGS@ diff --git a/package/xbmc/patches/patch-configure_in b/package/xbmc/patches/patch-configure_in index c8e47aaf2..a2598b211 100644 --- a/package/xbmc/patches/patch-configure_in +++ b/package/xbmc/patches/patch-configure_in @@ -1,20 +1,15 @@ ---- xbmc-13.0.orig/configure.in 2014-05-07 15:29:25.000000000 +0200 -+++ xbmc-13.0/configure.in 2014-05-08 20:43:08.000000000 +0200 -@@ -600,7 +600,12 @@ PKG_PROG_PKG_CONFIG +--- xbmc-13.1.orig/configure.in 2014-06-08 08:40:24.000000000 +0200 ++++ xbmc-13.1/configure.in 2014-06-08 11:12:35.190431752 +0200 +@@ -600,7 +600,7 @@ PKG_PROG_PKG_CONFIG MAKE="${MAKE:-make}" OBJDUMP="${OBJDUMP:-objdump}" -use_external_ffmpeg=no -+if test "x$use_external_libraries" != no;then -+ use_external_ffmpeg=yes -+else -+ use_external_ffmpeg=no -+fi -+ ++use_external_ffmpeg=yes use_static_ffmpeg=no # ffmpeg needs the output of uname -s (e.x. linux, darwin) for the target_os -@@ -626,21 +631,21 @@ case $host in +@@ -626,21 +626,21 @@ case $host in use_x11=no build_shared_lib=yes ;; @@ -40,8 +35,16 @@ ;; i386-*-freebsd*) ARCH="x86-freebsd" -@@ -686,7 +691,7 @@ case $host in - powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) +@@ -680,13 +680,13 @@ case $host in + ARCH="powerpc-osx" + use_arch="ppc" + ;; +- powerpc-*-linux-gnu*|powerpc-*-linux-uclibc*) ++ powerpc-*-linux-*) + ARCH="powerpc-linux" + ;; +- powerpc64-*-linux-gnu*|powerpc64-*-linux-uclibc*) ++ powerpc64-*-linux-*) ARCH="powerpc64-linux" ;; - arm*-*-linux-gnu*|arm*-*-linux-uclibc*) @@ -49,7 +52,7 @@ ARCH="arm" use_arch="arm" ffmpeg_target_os=linux -@@ -696,7 +701,7 @@ case $host in +@@ -696,7 +696,7 @@ case $host in use_sdl=no use_x11=no use_wayland=no @@ -58,7 +61,7 @@ ;; arm*-*linux-android*) target_platform=target_android -@@ -1048,7 +1053,7 @@ if test "$use_gles" = "yes"; then +@@ -1048,7 +1048,7 @@ if test "$use_gles" = "yes"; then AC_DEFINE([HAVE_LIBEGL],[1],["Define to 1 if you have the `EGL' library (-lEGL)."]) AC_DEFINE([HAVE_LIBGLESV2],[1],["Define to 1 if you have the `GLESv2' library (-lGLESv2)."]) AC_MSG_RESULT(== WARNING: OpenGLES support is assumed.) @@ -67,3 +70,15 @@ else AC_CHECK_LIB([EGL], [main],, AC_MSG_ERROR($missing_library)) AC_CHECK_LIB([GLESv2],[main],, AC_MSG_ERROR($missing_library)) +@@ -2532,11 +2532,8 @@ OUTPUT_FILES="Makefile \ + xbmc/cores/AudioEngine/Makefile \ + xbmc/cores/paplayer/Makefile \ + xbmc/cores/omxplayer/Makefile \ +- lib/timidity/Makefile \ + lib/asap/Makefile \ +- lib/nosefart/Makefile \ + lib/libsidplay2/Makefile \ +- lib/vgmstream/Makefile \ + lib/snesapu/SNES/SNESAPU/Makefile \ + lib/stsound/StSoundLibrary/Makefile \ + xbmc/cores/playercorefactory/Makefile \ diff --git a/package/xbmc/patches/patch-language_English_langinfo_xml b/package/xbmc/patches/patch-language_English_langinfo_xml deleted file mode 100644 index 9e88d77c4..000000000 --- a/package/xbmc/patches/patch-language_English_langinfo_xml +++ /dev/null @@ -1,13 +0,0 @@ ---- xbmc-12.3-Frodo.orig/language/English/langinfo.xml 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/language/English/langinfo.xml 2014-01-29 07:59:05.000000000 +0100 -@@ -48,8 +48,8 @@ - - <language locale="en"> - <charsets> -- <gui>CP1252</gui> -- <subtitle>CP1252</subtitle> -+ <gui>UTF-8</gui> -+ <subtitle>UTF-8</subtitle> - </charsets> - - <dvd> diff --git a/package/xbmc/patches/patch-language_German_langinfo_xml b/package/xbmc/patches/patch-language_German_langinfo_xml deleted file mode 100644 index 4c97f914b..000000000 --- a/package/xbmc/patches/patch-language_German_langinfo_xml +++ /dev/null @@ -1,13 +0,0 @@ ---- xbmc-12.3-Frodo.orig/language/German/langinfo.xml 2013-12-12 22:47:49.000000000 +0100 -+++ xbmc-12.3-Frodo/language/German/langinfo.xml 2014-01-29 07:59:05.000000000 +0100 -@@ -2,8 +2,8 @@ - <language locale="de"> - - <charsets> -- <gui unicodefont="false">CP1252</gui> -- <subtitle>CP1252</subtitle> -+ <gui unicodefont="false">UTF-8</gui> -+ <subtitle>UTF-8</subtitle> - </charsets> - - <dvd> diff --git a/package/xbmc/patches/patch-tools_buildsteps_rbpi_configure-depends b/package/xbmc/patches/patch-tools_buildsteps_rbpi_configure-depends deleted file mode 100644 index db1aa7aab..000000000 --- a/package/xbmc/patches/patch-tools_buildsteps_rbpi_configure-depends +++ /dev/null @@ -1,31 +0,0 @@ ---- xbmc-24032014.orig/tools/buildsteps/rbpi/configure-depends 2014-03-24 15:52:53.000000000 +0100 -+++ xbmc-24032014/tools/buildsteps/rbpi/configure-depends 2014-03-26 17:01:29.544260826 +0100 -@@ -7,13 +7,13 @@ then - cd $WORKSPACE/tools/depends; - - PATH="$PATH:$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin" \ -- CFLAGS="-pipe -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard \ -- -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \ -+ CFLAGS="\ -+ -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \ - -Wno-deprecated-declarations -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include \ - -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vcos/pthreads \ - -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vmcs_host/linux" \ -- CXXFLAGS="-pipe -mcpu=arm1176jzf-s -mtune=arm1176jzf-s \ -- -mfloat-abi=hard -mfpu=vfp -mabi=aapcs-linux -Wno-psabi \ -+ CXXFLAGS="\ -+ -mabi=aapcs-linux -Wno-psabi \ - -Wa,-mno-warn-deprecated -Wno-deprecated-declarations \ - -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include \ - -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vcos/pthreads \ -@@ -23,8 +23,8 @@ then - ./configure --host=arm-linux-gnueabihf --prefix=$XBMC_DEPENDS_ROOT --with-tarballs=$TARBALLS \ - --with-toolchain=$JENKINS_RBPI_DEVENV/tools/arm-bcm2708/arm-bcm2708hardfp-linux-gnueabi/arm-bcm2708hardfp-linux-gnueabi/sysroot \ - --build=i686-linux \ -- CFLAGS="-pipe -mcpu=arm1176jzf-s -mtune=arm1176jzf-s -mfloat-abi=hard \ -- -mfpu=vfp -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \ -+ CFLAGS="\ -+ -mabi=aapcs-linux -Wno-psabi -Wa,-mno-warn-deprecated \ - -Wno-deprecated-declarations -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include \ - -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vcos/pthreads \ - -isystem$JENKINS_RBPI_DEVENV/firmware/opt/vc/include/interface/vmcs_host/linux" diff --git a/package/xbmc/patches/patch-xbmc_Application_cpp b/package/xbmc/patches/patch-xbmc_Application_cpp index 3ecf6cb25..906ba1222 100644 --- a/package/xbmc/patches/patch-xbmc_Application_cpp +++ b/package/xbmc/patches/patch-xbmc_Application_cpp @@ -1,5 +1,5 @@ ---- xbmc-20140401.orig/xbmc/Application.cpp 2014-03-24 15:52:54.000000000 +0100 -+++ xbmc-20140401/xbmc/Application.cpp 2014-04-01 21:05:39.113975490 +0200 +--- xbmc-13.1.orig/xbmc/Application.cpp 2014-06-08 08:40:26.000000000 +0200 ++++ xbmc-13.1/xbmc/Application.cpp 2014-06-08 09:42:40.232780377 +0200 @@ -682,7 +682,7 @@ bool CApplication::Create() if (!CLog::Init(CSpecialProtocol::TranslatePath(g_advancedSettings.m_logFolder).c_str())) |