diff options
Diffstat (limited to 'package/kodi')
| -rw-r--r-- | package/kodi/Makefile | 69 | ||||
| -rw-r--r-- | package/kodi/files/kodi.init | 4 | ||||
| -rw-r--r-- | package/kodi/patches/patch-cmake_KodiConfig_cmake_in (renamed from package/kodi/patches/patch-project_cmake_KodiConfig_cmake_in) | 8 | ||||
| -rw-r--r-- | package/kodi/patches/patch-tools_depends_native_JsonSchemaBuilder_Makefile | 212 | ||||
| -rw-r--r-- | package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt | 20 | ||||
| -rw-r--r-- | package/kodi/patches/patch-tools_depends_native_TexturePacker_Makefile | 359 | ||||
| -rw-r--r-- | package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp | 10 |
7 files changed, 59 insertions, 623 deletions
diff --git a/package/kodi/Makefile b/package/kodi/Makefile index 0c42c52a7..4e9a57a4c 100644 --- a/package/kodi/Makefile +++ b/package/kodi/Makefile @@ -4,36 +4,34 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= kodi -PKG_VERSION:= 17.6 +PKG_VERSION:= 18.0a1 PKG_RELEASE:= 1 -PKG_HASH:= c8312fe92e5bab1cdac1da93d60baed88fa1574146c50c44e3c86d01671c2b1d +PKG_HASH:= 8892498d5248eea29c30db7c128a5910afc60d1b0b894aea472604bb879a0310 PKG_DESCR:= software media player PKG_SECTION:= mm/video -PKG_DEPENDS:= python2 libsquish libressl libxz -PKG_DEPENDS+= libass libmpeg2 libmad -PKG_DEPENDS+= libmodplug libcurl +PKG_DEPENDS:= python2 libsquish libressl libxz libfmt rapidjson +PKG_DEPENDS+= libass libmpeg2 libmad libmodplug libcurl PKG_DEPENDS+= libflac libbz2 libtiff libnettle librtmp liblzo -PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libncurses +PKG_DEPENDS+= yajl tinyxml libsqlite libpcrecpp libncurses libpng PKG_DEPENDS+= libpcre libcdio libfreetype libsamplerate libuuid -PKG_DEPENDS+= taglib libjasper libmp3lame -PKG_DEPENDS+= libgpg-error python2-mod-sqlite libffmpeg -PKG_DEPENDS+= glib libdcadec bcm28xx-vc-gl-libs +PKG_DEPENDS+= taglib libjasper libmp3lame libgpg-error python2-mod-sqlite +PKG_DEPENDS+= glib libdcadec bcm28xx-vc-gl-libs libffmpeg libxvidcore PKG_BUILDDEP:= python2 libass ffmpeg rtmpdump bcm28xx-vc -PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo +PKG_BUILDDEP+= libmpeg2 libmad libjpeg-turbo fmt rapidjson PKG_BUILDDEP+= curl flac bzip2 libtiff yajl cmake-host -PKG_BUILDDEP+= tinyxml sqlite pcre libcdio freetype +PKG_BUILDDEP+= tinyxml sqlite pcre libcdio freetype libpng PKG_BUILDDEP+= libsamplerate taglib libjasper -PKG_BUILDDEP+= glib libmodplug libgpg-error +PKG_BUILDDEP+= glib libmodplug libgpg-error xvidcore PKG_BUILDDEP+= swig-host liblzo-host libpng-host libjpeg-turbo-host PKG_BUILDDEP+= zip-host unzip-host giflib-host libsquish libdcadec PKG_BUILDDEP+= libcrossguid libressl xz bzip2 liblzo -PKG_NEEDS:= threads c++ data +PKG_NEEDS:= threads c++ data iconv PKG_URL:= http://kodi.tv/ PKG_SITES:= https://github.com/xbmc/xbmc/archive/ -DISTFILES:= $(PKG_VERSION)-Krypton.tar.gz -WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Krypton -WRKSRC= $(WRKDIR)/xbmc-$(PKG_VERSION)-Krypton/project/cmake +DISTFILES:= $(PKG_VERSION)-Leia.tar.gz +WRKDIST= ${WRKDIR}/xbmc-$(PKG_VERSION)-Leia +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj PKG_SYSTEM_DEPENDS:= raspberry-pi raspberry-pi2 raspberry-pi3 raspberry-pi3p raspberry-pi3p-64 @@ -61,13 +59,11 @@ PKGFD_WITH_SSH:= enable ssh support PKGFS_WITH_SSH:= libssh PKGFB_WITH_SSH:= libssh - include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,KODI,kodi,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -HOST_CXXFLAGS:= -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(WRKBUILD)/../../xbmc/linux - +HOST_CXXFLAGS:= -DTARGET_POSIX -DTARGET_LINUX -D_LINUX -I$(WRKSRC)/xbmc/linux CONFIG_STYLE:= cmake CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ -DCMAKE_BUILD_TYPE=Release \ @@ -79,7 +75,7 @@ CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ -DKODI_DEPENDSBUILD=OFF \ -DENABLE_OPENSSL=ON \ -DENABLE_MYSQLCLIENT=OFF \ - -DENABLE_NONFREE=OFF \ + -DENABLE_NONFREE=ON \ -DENABLE_CAP=OFF \ -DENABLE_XSLT=OFF \ -DENABLE_BLUETOOTH=OFF \ @@ -98,14 +94,13 @@ CMAKE_FLAGS+= -DENABLE_CCACHE=OFF \ -DWITH_TEXTUREPACKER=$(STAGING_HOST_DIR)/usr/bin/TexturePacker ifeq ($(ADK_TARGET_BOARD_BCM28XX),y) -CMAKE_FLAGS+= -DCORE_SYSTEM_NAME=rbpi \ +CMAKE_FLAGS+= -DCORE_PLATFORM_NAME=rbpi \ -DWITH_ARCH=arm \ -DWITH_CPU=arm \ + -DENABLE_NEON=ON \ -DENABLE_OPENGL=OFF \ -DENABLE_X11=OFF \ -DENABLE_OPENGLES=ON -else -CMAKE_FLAGS+= -DCORE_SYSTEM_NAME=linux endif ifeq ($(ADK_PACKAGE_KODI_WITH_ALSA),y) @@ -144,27 +139,21 @@ else CMAKE_FLAGS+= -DENABLE_SSH=OFF endif -ifeq ($(ADK_TARGET_LIB_UCLIBC_NG),y) -TARGET_CXXFLAGS+= -liconv -endif +XAKE_FLAGS+= VERBOSE=1 pre-configure: - (cd $(WRKBUILD)/../../tools/depends/native/JsonSchemaBuilder && PATH='$(HOST_PATH)' cmake .) - PATH='$(HOST_PATH)' make -C $(WRKBUILD)/../../tools/depends/native/JsonSchemaBuilder - cp $(WRKBUILD)/../../tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \ + (cd $(WRKSRC)/tools/depends/native/JsonSchemaBuilder && PATH='$(HOST_PATH)' cmake .) + PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/JsonSchemaBuilder + cp $(WRKSRC)/tools/depends/native/JsonSchemaBuilder/JsonSchemaBuilder \ $(STAGING_HOST_DIR)/usr/bin - (cd $(WRKBUILD)/../../tools/depends/native/TexturePacker && PATH='$(HOST_PATH)' \ - cmake -DCORE_SOURCE_DIR=$(WRKBUILD)/../.. \ - -DCMAKE_MODULE_PATH=$(WRKBUILD)/../../project/cmake/modules \ - -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .) - PATH='$(HOST_PATH)' make -C $(WRKBUILD)/../../tools/depends/native/TexturePacker - cp $(WRKBUILD)/../../tools/depends/native/TexturePacker/TexturePacker \ + (cd $(WRKSRC)/tools/depends/native/TexturePacker && PATH='$(HOST_PATH)' cmake \ + -DCORE_SOURCE_DIR=$(WRKSRC) \ + -DCMAKE_MODULE_PATH=$(WRKSRC)/cmake/modules \ + -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" .) + PATH='$(HOST_PATH)' make -C $(WRKSRC)/tools/depends/native/TexturePacker + cp $(WRKSRC)/tools/depends/native/TexturePacker/TexturePacker \ $(STAGING_HOST_DIR)/usr/bin -pre-build: - $(TARGET_CC) -shared -fPIC -o $(WRKBUILD)/kodi-shim.so \ - ./files/kodi-shim.c - kodi-install: $(INSTALL_DIR) $(STAGING_TARGET_DIR)/usr/share/kodi $(CP) $(WRKINST)/usr/share/kodi/* \ @@ -182,7 +171,5 @@ kodi-install: $(IDIR_KODI)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/kodi \ $(IDIR_KODI)/usr/bin - $(CP) $(WRKBUILD)/kodi-shim.so \ - $(IDIR_KODI)/usr/lib/kodi include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/kodi/files/kodi.init b/package/kodi/files/kodi.init index 74378f82a..04ed8ea83 100644 --- a/package/kodi/files/kodi.init +++ b/package/kodi/files/kodi.init @@ -15,10 +15,10 @@ start) if [ ! -d /data/kodi ]; then mkdir /data/kodi fi - cd / && LD_PRELOAD=/usr/lib/kodi/kodi-shim.so /usr/lib/kodi/kodi.bin & + cd / && /usr/lib/kodi/kodi-rbpi & ;; stop) - kill $(pgrep -f /usr/lib/kodi/kodi.bin) + kill $(pgrep -f /usr/lib/kodi/kodi-rbpi) ;; restart) sh $0 stop diff --git a/package/kodi/patches/patch-project_cmake_KodiConfig_cmake_in b/package/kodi/patches/patch-cmake_KodiConfig_cmake_in index 0a49fe627..3ebae759b 100644 --- a/package/kodi/patches/patch-project_cmake_KodiConfig_cmake_in +++ b/package/kodi/patches/patch-cmake_KodiConfig_cmake_in @@ -1,6 +1,6 @@ ---- xbmc-17.6-Krypton.orig/project/cmake/KodiConfig.cmake.in 2017-11-14 17:55:01.000000000 +0100 -+++ xbmc-17.6-Krypton/project/cmake/KodiConfig.cmake.in 2018-02-03 20:04:37.150894847 +0100 -@@ -7,7 +7,7 @@ if(NOT @APP_NAME_UC@_PREFIX) +--- xbmc-18.0a1-Leia.orig/cmake/KodiConfig.cmake.in 2018-03-04 10:21:28.000000000 +0100 ++++ xbmc-18.0a1-Leia/cmake/KodiConfig.cmake.in 2018-05-23 08:10:01.842094111 +0200 +@@ -8,7 +8,7 @@ if(NOT @APP_NAME_UC@_PREFIX) set(@APP_NAME_UC@_PREFIX @APP_PREFIX@) endif() if(NOT @APP_NAME_UC@_INCLUDE_DIR) @@ -9,7 +9,7 @@ endif() if(NOT @APP_NAME_UC@_LIB_DIR) set(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) -@@ -18,7 +18,7 @@ endif() +@@ -20,7 +20,7 @@ set(APP_RENDER_SYSTEM @APP_RENDER_SYSTEM if(NOT WIN32) set(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") endif() diff --git a/package/kodi/patches/patch-tools_depends_native_JsonSchemaBuilder_Makefile b/package/kodi/patches/patch-tools_depends_native_JsonSchemaBuilder_Makefile deleted file mode 100644 index 7bdacc6fa..000000000 --- a/package/kodi/patches/patch-tools_depends_native_JsonSchemaBuilder_Makefile +++ /dev/null @@ -1,212 +0,0 @@ ---- xbmc-17.6-Krypton.orig/tools/depends/native/JsonSchemaBuilder/Makefile 2017-11-14 17:55:01.000000000 +0100 -+++ xbmc-17.6-Krypton/tools/depends/native/JsonSchemaBuilder/Makefile 2018-02-01 20:40:05.280091115 +0100 -@@ -1,44 +1,178 @@ --ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) ---include ../../Makefile.include -+# CMAKE generated file: DO NOT EDIT! -+# Generated by "Unix Makefiles" Generator, CMake Version 3.8 - --ifeq ($(NATIVEPREFIX),) -- PREFIX = $(ROOT_DIR) --else -- PREFIX = $(NATIVEPREFIX) --endif -+# Default target executed when no arguments are given to make. -+default_target: all - --ifeq ($(NATIVEPLATFORM),) -- PLATFORM = native --else -- PLATFORM = $(NATIVEPLATFORM) --endif -+.PHONY : default_target - --SOURCE=$(ROOT_DIR)/src -+# Allow only one "make -f Makefile2" at a time, but pass parallelism. -+.NOTPARALLEL: - --CONFIGURE=./configure --prefix=$(PREFIX) --APP=$(SOURCE)/JsonSchemaBuilder --APPBIN=$(PREFIX)/bin/JsonSchemaBuilder - --all: .installed-$(PLATFORM) -+#============================================================================= -+# Special targets provided by cmake. - --$(PLATFORM): -- -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) -- cd $(PLATFORM); cp -a $(SOURCE)/* . -- cd $(PLATFORM); ./autogen.sh -- cd $(PLATFORM); $(CONFIGURE) -+# Disable implicit rules so canonical targets will work. -+.SUFFIXES: - - --$(APP): $(PLATFORM) -- $(MAKE) -C $(PLATFORM) -+# Remove some rules from gmake that .SUFFIXES does not remove. -+SUFFIXES = - -+.SUFFIXES: .hpux_make_needs_suffix_list - --.installed-$(PLATFORM): $(APP) -- $(MAKE) -C $(PLATFORM) install -- touch $@ - -+# Suppress display of executed commands. -+$(VERBOSE).SILENT: -+ -+ -+# A target that is always out of date. -+cmake_force: -+ -+.PHONY : cmake_force -+ -+#============================================================================= -+# Set environment variables for the build. -+ -+# The shell in which to execute make rules. -+SHELL = /bin/sh -+ -+# The CMake executable. -+CMAKE_COMMAND = /home/wbx/rpi2/host_x86_64-linux-gnu/usr/bin/cmake -+ -+# The command to remove a file. -+RM = /home/wbx/rpi2/host_x86_64-linux-gnu/usr/bin/cmake -E remove -f -+ -+# Escaping for special characters. -+EQUALS = = -+ -+# The top-level source directory on which CMake was run. -+CMAKE_SOURCE_DIR = /home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/tools/depends/native/JsonSchemaBuilder -+ -+# The top-level build directory on which CMake was run. -+CMAKE_BINARY_DIR = /home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/tools/depends/native/JsonSchemaBuilder -+ -+#============================================================================= -+# Targets provided globally by CMake. -+ -+# Special rule for the target rebuild_cache -+rebuild_cache: -+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." -+ /home/wbx/rpi2/host_x86_64-linux-gnu/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -+.PHONY : rebuild_cache -+ -+# Special rule for the target rebuild_cache -+rebuild_cache/fast: rebuild_cache -+ -+.PHONY : rebuild_cache/fast -+ -+# Special rule for the target edit_cache -+edit_cache: -+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." -+ /home/wbx/rpi2/host_x86_64-linux-gnu/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -+.PHONY : edit_cache -+ -+# Special rule for the target edit_cache -+edit_cache/fast: edit_cache -+ -+.PHONY : edit_cache/fast -+ -+# The main all target -+all: cmake_check_build_system -+ $(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/tools/depends/native/JsonSchemaBuilder/CMakeFiles /home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/tools/depends/native/JsonSchemaBuilder/CMakeFiles/progress.marks -+ $(MAKE) -f CMakeFiles/Makefile2 all -+ $(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/tools/depends/native/JsonSchemaBuilder/CMakeFiles 0 -+.PHONY : all -+ -+# The main clean target - clean: -- $(MAKE) -C $(PLATFORM) clean -+ $(MAKE) -f CMakeFiles/Makefile2 clean -+.PHONY : clean -+ -+# The main clean target -+clean/fast: clean -+ -+.PHONY : clean/fast -+ -+# Prepare targets for installation. -+preinstall: all -+ $(MAKE) -f CMakeFiles/Makefile2 preinstall -+.PHONY : preinstall -+ -+# Prepare targets for installation. -+preinstall/fast: -+ $(MAKE) -f CMakeFiles/Makefile2 preinstall -+.PHONY : preinstall/fast -+ -+# clear depends -+depend: -+ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 -+.PHONY : depend -+ -+#============================================================================= -+# Target rules for targets named JsonSchemaBuilder -+ -+# Build rule for target. -+JsonSchemaBuilder: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 JsonSchemaBuilder -+.PHONY : JsonSchemaBuilder -+ -+# fast build rule for target. -+JsonSchemaBuilder/fast: -+ $(MAKE) -f CMakeFiles/JsonSchemaBuilder.dir/build.make CMakeFiles/JsonSchemaBuilder.dir/build -+.PHONY : JsonSchemaBuilder/fast -+ -+src/JsonSchemaBuilder.o: src/JsonSchemaBuilder.cpp.o -+ -+.PHONY : src/JsonSchemaBuilder.o -+ -+# target to build an object file -+src/JsonSchemaBuilder.cpp.o: -+ $(MAKE) -f CMakeFiles/JsonSchemaBuilder.dir/build.make CMakeFiles/JsonSchemaBuilder.dir/src/JsonSchemaBuilder.cpp.o -+.PHONY : src/JsonSchemaBuilder.cpp.o -+ -+src/JsonSchemaBuilder.i: src/JsonSchemaBuilder.cpp.i -+ -+.PHONY : src/JsonSchemaBuilder.i -+ -+# target to preprocess a source file -+src/JsonSchemaBuilder.cpp.i: -+ $(MAKE) -f CMakeFiles/JsonSchemaBuilder.dir/build.make CMakeFiles/JsonSchemaBuilder.dir/src/JsonSchemaBuilder.cpp.i -+.PHONY : src/JsonSchemaBuilder.cpp.i -+ -+src/JsonSchemaBuilder.s: src/JsonSchemaBuilder.cpp.s -+ -+.PHONY : src/JsonSchemaBuilder.s -+ -+# target to generate assembly for a file -+src/JsonSchemaBuilder.cpp.s: -+ $(MAKE) -f CMakeFiles/JsonSchemaBuilder.dir/build.make CMakeFiles/JsonSchemaBuilder.dir/src/JsonSchemaBuilder.cpp.s -+.PHONY : src/JsonSchemaBuilder.cpp.s -+ -+# Help Target -+help: -+ @echo "The following are some of the valid targets for this Makefile:" -+ @echo "... all (the default if no target is provided)" -+ @echo "... clean" -+ @echo "... depend" -+ @echo "... rebuild_cache" -+ @echo "... edit_cache" -+ @echo "... JsonSchemaBuilder" -+ @echo "... src/JsonSchemaBuilder.o" -+ @echo "... src/JsonSchemaBuilder.i" -+ @echo "... src/JsonSchemaBuilder.s" -+.PHONY : help -+ -+ -+ -+#============================================================================= -+# Special targets to cleanup operation of make. -+ -+# Special rule to run CMake to check the build system integrity. -+# No rule that depends on this can have commands that come from listfiles -+# because they might be regenerated. -+cmake_check_build_system: -+ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 -+.PHONY : cmake_check_build_system - --distclean:: -- rm -rf $(PLATFORM) .installed-$(PLATFORM) -- -rm -rf bin diff --git a/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt b/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt new file mode 100644 index 000000000..2b62c1465 --- /dev/null +++ b/package/kodi/patches/patch-tools_depends_native_TexturePacker_CMakeLists_txt @@ -0,0 +1,20 @@ +--- xbmc-18.0a1-Leia.orig/tools/depends/native/TexturePacker/CMakeLists.txt 2018-03-04 10:21:28.000000000 +0100 ++++ xbmc-18.0a1-Leia/tools/depends/native/TexturePacker/CMakeLists.txt 2018-05-26 06:54:36.060611270 +0200 +@@ -33,7 +33,7 @@ set(SOURCES src/md5.cpp + src/decoder/GifHelper.cpp + src/decoder/JPGDecoder.cpp + src/decoder/PNGDecoder.cpp +- ${CMAKE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp) ++ ${CORE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp) + + set(CMAKE_POSITITION_INDEPENDENT_CODE 1) + +@@ -42,7 +42,7 @@ target_include_directories(TexturePacker + PRIVATE ${PNG_INCLUDE_DIRS} + ${JPEG_INCLUDE_DIR} + ${GIF_INCLUDE_DIR} +- ${CMAKE_SOURCE_DIR}/xbmc ++ ${CORE_SOURCE_DIR}/xbmc + ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_SOURCE_DIR}/src/decoder) + target_link_libraries(TexturePacker diff --git a/package/kodi/patches/patch-tools_depends_native_TexturePacker_Makefile b/package/kodi/patches/patch-tools_depends_native_TexturePacker_Makefile deleted file mode 100644 index e88a71542..000000000 --- a/package/kodi/patches/patch-tools_depends_native_TexturePacker_Makefile +++ /dev/null @@ -1,359 +0,0 @@ ---- xbmc-17.6-Krypton.orig/tools/depends/native/TexturePacker/Makefile 2017-11-14 17:55:01.000000000 +0100 -+++ xbmc-17.6-Krypton/tools/depends/native/TexturePacker/Makefile 2018-02-01 20:40:08.806433242 +0100 -@@ -1,60 +1,310 @@ --ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) ---include ../../Makefile.include -+# CMAKE generated file: DO NOT EDIT! -+# Generated by "Unix Makefiles" Generator, CMake Version 3.8 - --ifeq ($(NATIVEPREFIX),) -- PREFIX = $(ROOT_DIR) --else -- PREFIX = $(NATIVEPREFIX) --endif -+# Default target executed when no arguments are given to make. -+default_target: all - --ifeq ($(NATIVEPLATFORM),) -- PLATFORM = native -- EXTRA_CONFIGURE = --enable-static --else -- PLATFORM = $(NATIVEPLATFORM) --endif -+.PHONY : default_target - --ifeq ($(NATIVE_OS), linux) -- EXTRA_CONFIGURE = --enable-static --endif --ifeq ($(NATIVE_OS), android) -- EXTRA_CONFIGURE = --enable-static --endif -+# Allow only one "make -f Makefile2" at a time, but pass parallelism. -+.NOTPARALLEL: - --ifeq ($(CORE_SOURCE_DIR),) -- CORE_SOURCE_DIR = $(ROOT_DIR)/../../../.. --endif - --SOURCE=$(ROOT_DIR)/src -+#============================================================================= -+# Special targets provided by cmake. - --APP=$(PLATFORM)/TexturePacker --APPBIN=$(PREFIX)/bin/TexturePacker -+# Disable implicit rules so canonical targets will work. -+.SUFFIXES: - --all: .installed-$(PLATFORM) - --$(PLATFORM): -- -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) -- cd $(PLATFORM); cp -a $(SOURCE)/* . -- cd $(PLATFORM); ./autogen.sh -- cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)" -+# Remove some rules from gmake that .SUFFIXES does not remove. -+SUFFIXES = - -+.SUFFIXES: .hpux_make_needs_suffix_list - --$(APP): $(PLATFORM) -- $(MAKE) -C $(PLATFORM) - --.installed-$(PLATFORM): $(APP) -- $(MAKE) -C $(PLATFORM) install -- touch $@ -- #TEMP workaround for skins: create legacy link. Remove me when skins are fixed -- @mkdir -p $(CORE_SOURCE_DIR)/tools/TexturePacker -- @[ -f $(CORE_SOURCE_DIR)/tools/TexturePacker/TexturePacker ] && rm $(CORE_SOURCE_DIR)/tools/TexturePacker/TexturePacker || : -- @ln -sf $(APPBIN) $(CORE_SOURCE_DIR)/tools/TexturePacker/TexturePacker -- @echo "all:" > $(CORE_SOURCE_DIR)/tools/TexturePacker/Makefile -- @echo "\t@echo "WARNING: use of tools/TexturePacker/TexturePacker is deprecated, please update your skins Makefile"" >> $(CORE_SOURCE_DIR)/tools/TexturePacker/Makefile -+# Suppress display of executed commands. -+$(VERBOSE).SILENT: -+ - -+# A target that is always out of date. -+cmake_force: -+ -+.PHONY : cmake_force -+ -+#============================================================================= -+# Set environment variables for the build. -+ -+# The shell in which to execute make rules. -+SHELL = /bin/sh -+ -+# The CMake executable. -+CMAKE_COMMAND = /home/wbx/rpi2/host_x86_64-linux-gnu/usr/bin/cmake -+ -+# The command to remove a file. -+RM = /home/wbx/rpi2/host_x86_64-linux-gnu/usr/bin/cmake -E remove -f -+ -+# Escaping for special characters. -+EQUALS = = -+ -+# The top-level source directory on which CMake was run. -+CMAKE_SOURCE_DIR = /home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/tools/depends/native/TexturePacker -+ -+# The top-level build directory on which CMake was run. -+CMAKE_BINARY_DIR = /home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/tools/depends/native/TexturePacker -+ -+#============================================================================= -+# Targets provided globally by CMake. -+ -+# Special rule for the target rebuild_cache -+rebuild_cache: -+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." -+ /home/wbx/rpi2/host_x86_64-linux-gnu/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -+.PHONY : rebuild_cache -+ -+# Special rule for the target rebuild_cache -+rebuild_cache/fast: rebuild_cache -+ -+.PHONY : rebuild_cache/fast -+ -+# Special rule for the target edit_cache -+edit_cache: -+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." -+ /home/wbx/rpi2/host_x86_64-linux-gnu/usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -+.PHONY : edit_cache -+ -+# Special rule for the target edit_cache -+edit_cache/fast: edit_cache -+ -+.PHONY : edit_cache/fast -+ -+# The main all target -+all: cmake_check_build_system -+ $(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/tools/depends/native/TexturePacker/CMakeFiles /home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/tools/depends/native/TexturePacker/CMakeFiles/progress.marks -+ $(MAKE) -f CMakeFiles/Makefile2 all -+ $(CMAKE_COMMAND) -E cmake_progress_start /home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/tools/depends/native/TexturePacker/CMakeFiles 0 -+.PHONY : all -+ -+# The main clean target - clean: -- $(MAKE) -C $(PLATFORM) clean -+ $(MAKE) -f CMakeFiles/Makefile2 clean -+.PHONY : clean -+ -+# The main clean target -+clean/fast: clean -+ -+.PHONY : clean/fast -+ -+# Prepare targets for installation. -+preinstall: all -+ $(MAKE) -f CMakeFiles/Makefile2 preinstall -+.PHONY : preinstall -+ -+# Prepare targets for installation. -+preinstall/fast: -+ $(MAKE) -f CMakeFiles/Makefile2 preinstall -+.PHONY : preinstall/fast -+ -+# clear depends -+depend: -+ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 -+.PHONY : depend -+ -+#============================================================================= -+# Target rules for targets named TexturePacker -+ -+# Build rule for target. -+TexturePacker: cmake_check_build_system -+ $(MAKE) -f CMakeFiles/Makefile2 TexturePacker -+.PHONY : TexturePacker -+ -+# fast build rule for target. -+TexturePacker/fast: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/build -+.PHONY : TexturePacker/fast -+ -+# target to build an object file -+home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.o: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.o -+.PHONY : home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.o -+ -+# target to preprocess a source file -+home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.i: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.i -+.PHONY : home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.i -+ -+# target to generate assembly for a file -+home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.s: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.s -+.PHONY : home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.s -+ -+# target to build an object file -+src/DecoderManager.o: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/DecoderManager.o -+.PHONY : src/DecoderManager.o -+ -+# target to preprocess a source file -+src/DecoderManager.i: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/DecoderManager.i -+.PHONY : src/DecoderManager.i -+ -+# target to generate assembly for a file -+src/DecoderManager.s: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/DecoderManager.s -+.PHONY : src/DecoderManager.s -+ -+# target to build an object file -+src/TexturePacker.o: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/TexturePacker.o -+.PHONY : src/TexturePacker.o -+ -+# target to preprocess a source file -+src/TexturePacker.i: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/TexturePacker.i -+.PHONY : src/TexturePacker.i -+ -+# target to generate assembly for a file -+src/TexturePacker.s: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/TexturePacker.s -+.PHONY : src/TexturePacker.s -+ -+# target to build an object file -+src/XBTFWriter.o: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/XBTFWriter.o -+.PHONY : src/XBTFWriter.o -+ -+# target to preprocess a source file -+src/XBTFWriter.i: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/XBTFWriter.i -+.PHONY : src/XBTFWriter.i -+ -+# target to generate assembly for a file -+src/XBTFWriter.s: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/XBTFWriter.s -+.PHONY : src/XBTFWriter.s -+ -+# target to build an object file -+src/decoder/GIFDecoder.o: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/GIFDecoder.o -+.PHONY : src/decoder/GIFDecoder.o -+ -+# target to preprocess a source file -+src/decoder/GIFDecoder.i: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/GIFDecoder.i -+.PHONY : src/decoder/GIFDecoder.i -+ -+# target to generate assembly for a file -+src/decoder/GIFDecoder.s: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/GIFDecoder.s -+.PHONY : src/decoder/GIFDecoder.s -+ -+# target to build an object file -+src/decoder/GifHelper.o: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/GifHelper.o -+.PHONY : src/decoder/GifHelper.o -+ -+# target to preprocess a source file -+src/decoder/GifHelper.i: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/GifHelper.i -+.PHONY : src/decoder/GifHelper.i -+ -+# target to generate assembly for a file -+src/decoder/GifHelper.s: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/GifHelper.s -+.PHONY : src/decoder/GifHelper.s -+ -+# target to build an object file -+src/decoder/JPGDecoder.o: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/JPGDecoder.o -+.PHONY : src/decoder/JPGDecoder.o -+ -+# target to preprocess a source file -+src/decoder/JPGDecoder.i: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/JPGDecoder.i -+.PHONY : src/decoder/JPGDecoder.i -+ -+# target to generate assembly for a file -+src/decoder/JPGDecoder.s: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/JPGDecoder.s -+.PHONY : src/decoder/JPGDecoder.s -+ -+# target to build an object file -+src/decoder/PNGDecoder.o: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/PNGDecoder.o -+.PHONY : src/decoder/PNGDecoder.o -+ -+# target to preprocess a source file -+src/decoder/PNGDecoder.i: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/PNGDecoder.i -+.PHONY : src/decoder/PNGDecoder.i -+ -+# target to generate assembly for a file -+src/decoder/PNGDecoder.s: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/decoder/PNGDecoder.s -+.PHONY : src/decoder/PNGDecoder.s -+ -+# target to build an object file -+src/md5.o: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/md5.o -+.PHONY : src/md5.o -+ -+# target to preprocess a source file -+src/md5.i: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/md5.i -+.PHONY : src/md5.i -+ -+# target to generate assembly for a file -+src/md5.s: -+ $(MAKE) -f CMakeFiles/TexturePacker.dir/build.make CMakeFiles/TexturePacker.dir/src/md5.s -+.PHONY : src/md5.s -+ -+# Help Target -+help: -+ @echo "The following are some of the valid targets for this Makefile:" -+ @echo "... all (the default if no target is provided)" -+ @echo "... clean" -+ @echo "... depend" -+ @echo "... rebuild_cache" -+ @echo "... edit_cache" -+ @echo "... TexturePacker" -+ @echo "... home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.o" -+ @echo "... home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.i" -+ @echo "... home/wbx/rpi2/build_raspberry-pi2_uclibc-ng_cortex_a7_hard_eabihf/w-kodi-17.6-1/xbmc-17.6-Krypton/xbmc/guilib/XBTF.s" -+ @echo "... src/DecoderManager.o" -+ @echo "... src/DecoderManager.i" -+ @echo "... src/DecoderManager.s" -+ @echo "... src/TexturePacker.o" -+ @echo "... src/TexturePacker.i" -+ @echo "... src/TexturePacker.s" -+ @echo "... src/XBTFWriter.o" -+ @echo "... src/XBTFWriter.i" -+ @echo "... src/XBTFWriter.s" -+ @echo "... src/decoder/GIFDecoder.o" -+ @echo "... src/decoder/GIFDecoder.i" -+ @echo "... src/decoder/GIFDecoder.s" -+ @echo "... src/decoder/GifHelper.o" -+ @echo "... src/decoder/GifHelper.i" -+ @echo "... src/decoder/GifHelper.s" -+ @echo "... src/decoder/JPGDecoder.o" -+ @echo "... src/decoder/JPGDecoder.i" -+ @echo "... src/decoder/JPGDecoder.s" -+ @echo "... src/decoder/PNGDecoder.o" -+ @echo "... src/decoder/PNGDecoder.i" -+ @echo "... src/decoder/PNGDecoder.s" -+ @echo "... src/md5.o" -+ @echo "... src/md5.i" -+ @echo "... src/md5.s" -+.PHONY : help -+ -+ -+ -+#============================================================================= -+# Special targets to cleanup operation of make. -+ -+# Special rule to run CMake to check the build system integrity. -+# No rule that depends on this can have commands that come from listfiles -+# because they might be regenerated. -+cmake_check_build_system: -+ $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 -+.PHONY : cmake_check_build_system - --distclean:: -- rm -rf $(PLATFORM) .installed-$(PLATFORM) -- -rm -rf bin diff --git a/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp b/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp index 791d360c9..fa943b89a 100644 --- a/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp +++ b/package/kodi/patches/patch-xbmc_cores_AudioEngine_Sinks_AESinkALSA_cpp @@ -1,6 +1,6 @@ ---- xbmc-17.6-Krypton.orig/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2017-11-14 17:55:01.000000000 +0100 -+++ xbmc-17.6-Krypton/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2018-04-08 18:01:42.270455418 +0200 -@@ -1193,7 +1193,8 @@ void CAESinkALSA::EnumerateDevicesEx(AED +--- xbmc-18.0a1-Leia.orig/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2018-03-04 10:21:28.000000000 +0100 ++++ xbmc-18.0a1-Leia/xbmc/cores/AudioEngine/Sinks/AESinkALSA.cpp 2018-05-26 06:48:45.750618626 +0200 +@@ -1213,7 +1213,8 @@ void CAESinkALSA::EnumerateDevicesEx(AED * found by the enumeration process. Skip them as well ("hw", "dmix", * "plughw", "dsnoop"). */ @@ -10,7 +10,7 @@ && baseName != "sysdefault" && baseName != "surround40" && baseName != "surround41" -@@ -1203,7 +1204,7 @@ void CAESinkALSA::EnumerateDevicesEx(AED +@@ -1223,7 +1224,7 @@ void CAESinkALSA::EnumerateDevicesEx(AED && baseName != "hw" && baseName != "dmix" && baseName != "plughw" @@ -19,7 +19,7 @@ { EnumerateDevice(list, name, desc ? desc : name, config); } -@@ -1360,7 +1361,7 @@ void CAESinkALSA::EnumerateDevice(AEDevi +@@ -1380,7 +1381,7 @@ void CAESinkALSA::EnumerateDevice(AEDevi info.m_displayName.substr(info.m_displayName.size()-5) == " HDMI") { /* We already know this is HDMI, strip it */ |