diff options
Diffstat (limited to 'tools')
19 files changed, 79 insertions, 152 deletions
diff --git a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in index a9824f07b4..52d4646db5 100644 --- a/tools/Linux/kodi.sh.in +++ b/tools/Linux/kodi.sh.in @@ -191,6 +191,20 @@ if [ -n "${KODI_AE_SINK}" ]; then fi fi +if [ -n "${KODI_GL_INTERFACE}" ]; then + + echo "KODI_GL_INTERFACE env variable is deprecated and will be removed in the future." + echo "Use the --gl-interface command line switch instead." + + if [ "${KODI_GL_INTERFACE}" = "GLX" ]; then + ENV_ARGS="--gl-interface=glx" + elif [ "${KODI_GL_INTERFACE}" = "EGL" ]; then + ENV_ARGS="--gl-interface=egl" + elif [ "${KODI_GL_INTERFACE}" = "EGL_PB" ]; then + ENV_ARGS="--gl-interface=egl-pb" + fi +fi + LOOP=1 while [ $(( $LOOP )) = "1" ] do diff --git a/tools/buildsteps/osx-arm64/configure-xbmc b/tools/buildsteps/osx-arm64/configure-xbmc index 2fed17071c..fb83a37f31 100755 --- a/tools/buildsteps/osx-arm64/configure-xbmc +++ b/tools/buildsteps/osx-arm64/configure-xbmc @@ -2,4 +2,4 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=osx-arm64 . $WORKSPACE/tools/buildsteps/defaultenv -make -C $WORKSPACE/tools/depends/target/cmakebuildsys APP_WINDOW_SYSTEM=native CMAKE_EXTRA_ARGUMENTS="-D CODE_SIGN_IDENTITY='$CODE_SIGN_IDENTITY' -D DEV_ACCOUNT='$DEV_ACCOUNT' -D DEV_ACCOUNT_PASSWORD='$DEV_ACCOUNT_PASSWORD' -D DEV_TEAM='$DEV_TEAM'" +make -C $WORKSPACE/tools/depends/target/cmakebuildsys CMAKE_EXTRA_ARGUMENTS="-D CODE_SIGN_IDENTITY='$CODE_SIGN_IDENTITY' -D DEV_ACCOUNT='$DEV_ACCOUNT' -D DEV_ACCOUNT_PASSWORD='$DEV_ACCOUNT_PASSWORD' -D DEV_TEAM='$DEV_TEAM'" diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in index e91bf152f4..1903fecd85 100644 --- a/tools/depends/Makefile.include.in +++ b/tools/depends/Makefile.include.in @@ -26,7 +26,6 @@ ARCH_DEFINES=@ARCH_DEFINES@ NATIVE_ARCH_DEFINES=@NATIVE_ARCH_DEFINES@ TARGET_PLATFORM=@target_platform@ RENDER_SYSTEM=@app_rendersystem@ -WINDOW_SYSTEM=@app_winsystem@ SHA512SUM=@SHA512SUM@ SHA256SUM=@SHA256SUM@ SHASUM=@SHASUM@ diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac index 957a9e89c9..d93e4aab5e 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac @@ -102,11 +102,6 @@ AC_ARG_WITH([rendersystem], [render system to use])], [app_rendersystem=$withval]) -AC_ARG_WITH([windowsystem], - [AS_HELP_STRING([--with-windowsystem], - [Windowing system to use])], - [app_winsystem=$withval]) - AC_ARG_WITH([target-cflags], [AS_HELP_STRING([--with-target-cflags], [C compiler flags (target)])], @@ -323,7 +318,7 @@ case $host in use_cpu="armeabi-v7a" fi if test "x$use_cpu" = "xarmeabi-v7a"; then - platform_cflags="${platform_cflags} -march=armv7-a -mtune=cortex-a9 -mfloat-abi=softfp -mfpu=neon" + platform_cflags="${platform_cflags} -mtune=cortex-a9 -mfloat-abi=softfp" fi platform_ldflags="${platform_ldflags} -Wl,--exclude-libs,libunwind.a" meson_cpu="arm" @@ -333,7 +328,7 @@ case $host in use_cpu="arm64-v8a" fi if test "x$use_cpu" = "xarm64-v8a"; then - platform_cflags="${platform_cflags} -march=armv8-a -mtune=cortex-a53" + platform_cflags="${platform_cflags} -mtune=cortex-a53" fi meson_cpu="aarch64" ;; @@ -462,16 +457,6 @@ case $host in fi target_minver="10.14" - - # check provided window system is valid_sdk - # if no window system supplied, default to native. - if test -n "$app_winsystem"; then - if test "$app_winsystem" != "native" && test "$app_winsystem" != "sdl"; then - AC_MSG_ERROR(Window system must be native or sdl) - fi - else - app_winsystem=native - fi ;; aarch64-apple-darwin*) MC_CHECK_NOT_CPU([$use_cpu], "*86") @@ -482,7 +467,6 @@ case $host in ;; osx) target_minver="11.0" - app_winsystem=native ;; *) AC_MSG_ERROR(invalid platform for architecture ($host)) @@ -734,7 +718,6 @@ AC_SUBST(host_includes) AC_SUBST(host_sysroot) AC_SUBST(host_cxxflags) AC_SUBST(app_rendersystem) -AC_SUBST(app_winsystem) AC_SUBST(ffmpeg_options) [ diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index c968d71f8d..b2ea61e733 100644 --- a/tools/depends/target/Makefile +++ b/tools/depends/target/Makefile @@ -67,11 +67,7 @@ endif ifeq ($(OS),osx) EXCLUDED_DEPENDS = libusb - ifneq ($(CPU),arm64) - ifeq ($(WINDOW_SYSTEM),sdl) - DEPENDS += libsdl - endif - endif + DEPENDS += smctemp endif ifeq ($(OS),android) diff --git a/tools/depends/target/cmakebuildsys/Makefile b/tools/depends/target/cmakebuildsys/Makefile index 446d25218d..52941fa014 100644 --- a/tools/depends/target/cmakebuildsys/Makefile +++ b/tools/depends/target/cmakebuildsys/Makefile @@ -28,21 +28,13 @@ else endif endif -ifeq ($(OS),osx) - ifeq ($(APP_WINDOW_SYSTEM),sdl) - WINDOWSYSTEM=-DAPP_WINDOW_SYSTEM=sdl - else - WINDOWSYSTEM=-DAPP_WINDOW_SYSTEM=native - endif -endif - ifeq ($(BUILD_DIR),) BUILD_DIR=$(CMAKE_SOURCE_DIR)/build endif all: mkdir -p $(BUILD_DIR) - cd $(BUILD_DIR); $(CMAKE) $(CMAKE_BUILD_ARGUMENTS) $(WINDOWSYSTEM) -DENABLE_INTERNAL_CROSSGUID=ON -DENABLE_INTERNAL_FFMPEG=OFF $(CMAKE_EXTRA_ARGUMENTS) $(CMAKE_SOURCE_DIR) + cd $(BUILD_DIR); $(CMAKE) $(CMAKE_BUILD_ARGUMENTS) -DENABLE_INTERNAL_CROSSGUID=ON -DENABLE_INTERNAL_FFMPEG=OFF $(CMAKE_EXTRA_ARGUMENTS) $(CMAKE_SOURCE_DIR) kodi: $(MAKE) -C $(BUILD_DIR) diff --git a/tools/depends/target/curl/Makefile b/tools/depends/target/curl/Makefile index 76ddb64e97..90a0cd83ca 100644 --- a/tools/depends/target/curl/Makefile +++ b/tools/depends/target/curl/Makefile @@ -5,7 +5,8 @@ DEPS = ../../Makefile.include Makefile CURL-VERSION ../../download-files.include CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ ./configure --prefix=$(PREFIX) --disable-shared --disable-ldap \ --without-libssh2 --disable-ntlm-wb --enable-ipv6 --without-librtmp \ - --without-libidn2 --with-ca-fallback --with-ssl=$(PREFIX) --with-nghttp2=$(PREFIX) + --without-libidn2 --with-ca-fallback --with-ssl=$(PREFIX) \ + --with-nghttp2=$(PREFIX) --without-libpsl LIBDYLIB=$(PLATFORM)/lib/.libs/$(BYPRODUCT) diff --git a/tools/depends/target/libsdl/01-SDL_SetWidthHeight.patch b/tools/depends/target/libsdl/01-SDL_SetWidthHeight.patch deleted file mode 100644 index 1ecb5a3973..0000000000 --- a/tools/depends/target/libsdl/01-SDL_SetWidthHeight.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/include/SDL_video.h -+++ b/include/SDL_video.h -@@ -323,6 +323,11 @@ - */ - extern DECLSPEC SDL_Rect ** SDLCALL SDL_ListModes(SDL_PixelFormat *format, Uint32 flags); - -+/** -+* Alter the width and height of the current surface to the given sizes. -+*/ -+extern DECLSPEC void SDLCALL SDL_SetWidthHeight(int width, int height); -+ - /** - * Set up a video mode with the specified width, height and bits-per-pixel. - * ---- a/src/video/SDL_video.c -+++ b/src/video/SDL_video.c -@@ -1976,3 +1976,11 @@ - return(0); - } - } -+ -+void SDL_SetWidthHeight(int width, int height) -+{ -+ if (current_video != NULL && current_video->screen != NULL) { -+ current_video->screen->w = width; -+ current_video->screen->h = height; -+ } -+} diff --git a/tools/depends/target/libsdl/02-OSX_interpretKeyEvents.patch b/tools/depends/target/libsdl/02-OSX_interpretKeyEvents.patch deleted file mode 100644 index 0a6ef088b5..0000000000 --- a/tools/depends/target/libsdl/02-OSX_interpretKeyEvents.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/video/quartz/SDL_QuartzEvents.m -+++ b/src/video/quartz/SDL_QuartzEvents.m -@@ -345,7 +345,11 @@ - the scancode/keysym. - */ - if (SDL_TranslateUNICODE && state == SDL_PRESSED) { -- [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]]; -+ NSResponder *firstResponder = [[NSApp keyWindow] firstResponder]; -+ if ([NSStringFromClass([firstResponder class]) isEqual:@"OSXTextInputResponder"]) -+ [firstResponder interpretKeyEvents:[NSArray arrayWithObject:event]]; -+ else -+ [field_edit interpretKeyEvents:[NSArray arrayWithObject:event]]; - chars = [ event characters ]; - numChars = [ chars length ]; - if (numChars > 0) diff --git a/tools/depends/target/libsdl/03-mavericks-compile.patch b/tools/depends/target/libsdl/03-mavericks-compile.patch deleted file mode 100644 index 1c00140a7f..0000000000 --- a/tools/depends/target/libsdl/03-mavericks-compile.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/src/video/quartz/SDL_QuartzVideo.h -+++ b/src/video/quartz/SDL_QuartzVideo.h -@@ -91,7 +91,9 @@ - CGDirectDisplayID display; /* 0 == main display (only support single display) */ - const void *mode; /* current mode of the display */ - const void *save_mode; /* original mode of the display */ -+#ifdef CGDirectPaletteRef - CGDirectPaletteRef palette; /* palette of an 8-bit display */ -+#endif - NSOpenGLContext *gl_context; /* OpenGL rendering context */ - NSGraphicsContext *nsgfx_context; /* Cocoa graphics context */ - Uint32 width, height, bpp; /* frequently used data about the display */ diff --git a/tools/depends/target/libsdl/04-fix_external_screen_crash.patch b/tools/depends/target/libsdl/04-fix_external_screen_crash.patch deleted file mode 100644 index 82bb364b70..0000000000 --- a/tools/depends/target/libsdl/04-fix_external_screen_crash.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/video/quartz/SDL_QuartzWindow.m -+++ b/src/video/quartz/SDL_QuartzWindow.m -@@ -87,7 +87,7 @@ - SDL_VideoDevice *this = (SDL_VideoDevice*)current_video; - - /* make sure pixels are fully opaque */ -- if (! ( SDL_VideoSurface->flags & SDL_OPENGL ) ) -+ if ( SDL_VideoSurface && ! ( SDL_VideoSurface->flags & SDL_OPENGL ) ) - QZ_SetPortAlphaOpaque (); - - /* save current visible SDL surface */ diff --git a/tools/depends/target/libsdl/Makefile b/tools/depends/target/libsdl/Makefile deleted file mode 100644 index d776b89370..0000000000 --- a/tools/depends/target/libsdl/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile 01-SDL_SetWidthHeight.patch 02-OSX_interpretKeyEvents.patch 03-mavericks-compile.patch 04-fix_external_screen_crash.patch ../../download-files.include - -# lib name, version -LIBNAME=SDL -VERSION=1.2.15 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=ac392d916e6953b0925a7cbb0f232affea33339ef69b47a0a7898492afb9784b93138986df53d6da6d3e2ad79af1e9482df565ecca30f89428be0ae6851b1adc -include ../../download-files.include - -# configuration settings -CONFIGURE=./configure --prefix=$(PREFIX) --disable-video-directfb -ifneq ($(OS),linux) -CONFIGURE += --without-x --disable-video-x11 -endif - -LIBDYLIB=$(PLATFORM)/build/.libs/lib$(LIBNAME).a - -all: .installed-$(PLATFORM) - - -$(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) - rm -rf $(PLATFORM); mkdir -p $(PLATFORM) - cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p1 -i ../01-SDL_SetWidthHeight.patch - cd $(PLATFORM); patch -p1 -i ../02-OSX_interpretKeyEvents.patch - cd $(PLATFORM); patch -p1 -i ../03-mavericks-compile.patch - cd $(PLATFORM); patch -p1 -i ../04-fix_external_screen_crash.patch - cd $(PLATFORM); ./autogen.sh - cd $(PLATFORM); $(CONFIGURE) - -$(LIBDYLIB): $(PLATFORM) - $(MAKE) -j 1 -C $(PLATFORM) - -.installed-$(PLATFORM): $(LIBDYLIB) - $(MAKE) -C $(PLATFORM) install - touch $@ - -clean: - $(MAKE) -C $(PLATFORM) clean - rm -f .installed-$(PLATFORM) - -distclean:: - rm -rf $(PLATFORM) .installed-$(PLATFORM) diff --git a/tools/depends/target/rapidjson/002-cmake-standardise_config_installpath.patch b/tools/depends/target/rapidjson/002-cmake-standardise_config_installpath.patch new file mode 100644 index 0000000000..937d19e8e3 --- /dev/null +++ b/tools/depends/target/rapidjson/002-cmake-standardise_config_installpath.patch @@ -0,0 +1,15 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -94,11 +94,7 @@ + SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Directory where lib will install") + SET(DOC_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}" CACHE PATH "Path to the documentation") + +-IF(UNIX OR CYGWIN) +- SET(_CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}") +-ELSEIF(WIN32) +- SET(_CMAKE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/cmake") +-ENDIF() ++SET(_CMAKE_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${PROJECT_NAME}") + SET(CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" CACHE PATH "The directory cmake fiels are installed in") + + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) diff --git a/tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch b/tools/depends/target/rapidjson/003-cmake-removedocs-examples.patch index 4bf06da59c..4bf06da59c 100644 --- a/tools/depends/target/rapidjson/002-cmake-removedocs-examples.patch +++ b/tools/depends/target/rapidjson/003-cmake-removedocs-examples.patch diff --git a/tools/depends/target/rapidjson/003-win-arm64.patch b/tools/depends/target/rapidjson/004-win-arm64.patch index 2d045dcaf6..2d045dcaf6 100644 --- a/tools/depends/target/rapidjson/003-win-arm64.patch +++ b/tools/depends/target/rapidjson/004-win-arm64.patch diff --git a/tools/depends/target/rapidjson/Makefile b/tools/depends/target/rapidjson/Makefile index 233d3a3571..1e0a2d2e75 100644 --- a/tools/depends/target/rapidjson/Makefile +++ b/tools/depends/target/rapidjson/Makefile @@ -1,8 +1,9 @@ -include ../../Makefile.include include RAPIDJSON-VERSION DEPS = Makefile RAPIDJSON-VERSION 001-remove_custom_cxx_flags.patch ../../download-files.include \ - 002-cmake-removedocs-examples.patch \ - 003-win-arm64.patch + 002-cmake-standardise_config_installpath.patch \ + 003-cmake-removedocs-examples.patch \ + 004-win-arm64.patch CMAKE_OPTIONS=-DRAPIDJSON_HAS_STDSTRING=ON -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF @@ -42,8 +43,9 @@ endif cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) cd $(PLATFORM); rm -rf build; mkdir -p build cd $(PLATFORM); patch -p1 -i ../001-remove_custom_cxx_flags.patch - cd $(PLATFORM); patch -p1 -i ../002-cmake-removedocs-examples.patch - cd $(PLATFORM); patch -p1 -i ../003-win-arm64.patch + cd $(PLATFORM); patch -p1 -i ../002-cmake-standardise_config_installpath.patch + cd $(PLATFORM); patch -p1 -i ../003-cmake-removedocs-examples.patch + cd $(PLATFORM); patch -p1 -i ../004-win-arm64.patch cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) .. .installed-$(PLATFORM): $(PLATFORM) diff --git a/tools/depends/target/smctemp/Makefile b/tools/depends/target/smctemp/Makefile new file mode 100644 index 0000000000..b257625403 --- /dev/null +++ b/tools/depends/target/smctemp/Makefile @@ -0,0 +1,30 @@ +include ../../Makefile.include SMCTEMP-VERSION ../../download-files.include +DEPS = ../../Makefile.include SMCTEMP-VERSION Makefile ../../download-files.include \ + +LIBDYLIB=$(PLATFORM)/$(BYPRODUCT) + +ifeq ($(CPU), arm64) + CXXFLAGS += -DARCH_TYPE_ARM64 +else + CXXFLAGS += -DARCH_TYPE_X86_64 +endif + +all: .installed-$(PLATFORM) + +$(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) + rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) + cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) + +$(LIBDYLIB): $(PLATFORM) + $(MAKE) CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" AR=$(AR) RANLIB=$(RANLIB) -C $(PLATFORM) staticlib + +.installed-$(PLATFORM): $(LIBDYLIB) + $(MAKE) DEST_PREFIX=$(PREFIX) -C $(PLATFORM) installstaticlib + touch $@ + +clean: + $(MAKE) -C $(PLATFORM) clean + rm -f .installed-$(PLATFORM) + +distclean:: + rm -rf $(PLATFORM) .installed-$(PLATFORM) diff --git a/tools/depends/target/smctemp/SMCTEMP-VERSION b/tools/depends/target/smctemp/SMCTEMP-VERSION new file mode 100644 index 0000000000..4eb38567cb --- /dev/null +++ b/tools/depends/target/smctemp/SMCTEMP-VERSION @@ -0,0 +1,5 @@ +LIBNAME=smctemp +VERSION=0.2.1 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +SHA512=8671836ed3f16122ffc84a1e91b463c8405526b1500fa9f5816a9f9eff1fd598c86958e894d2b8b25ae798da57b536766729b28dcc6b7c69fe2dc3c818f18290 +BYPRODUCT=libsmctemp.a diff --git a/tools/webOS/packaging/appinfo.json.in b/tools/webOS/packaging/appinfo.json.in index 300a52be6b..8bedf6b640 100644 --- a/tools/webOS/packaging/appinfo.json.in +++ b/tools/webOS/packaging/appinfo.json.in @@ -10,5 +10,6 @@ "splashBackground": "media/splash_webOS.png", "spinnerOnLaunch": false, "handlesRelaunch": true, - "nativeLifeCycleInterfaceVersion": 2 + "nativeLifeCycleInterfaceVersion": 2, + "requiredMemory": 500 } |