diff options
Diffstat (limited to 'tools')
43 files changed, 216 insertions, 376 deletions
diff --git a/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm b/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm index a5d2b3363f..e265142215 100644 --- a/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm +++ b/tools/EventClients/Clients/OSXRemote/xbmcclientwrapper.mm @@ -89,9 +89,9 @@ private: std::string m_address; int m_port; XBMCClientEventSequence m_sequence; - CFRunLoopTimerRef m_timer; - double m_sequence_timeout; - int m_device_id; + CFRunLoopTimerRef m_timer = 0; + double m_sequence_timeout = 0.5; + int m_device_id = 150; bool m_verbose_mode; void populateEventMap(); void populateSequenceMap(); @@ -149,15 +149,12 @@ void XBMCClientWrapperImpl::restartTimer(){ CFRunLoopAddTimer(CFRunLoopGetCurrent(), m_timer, kCFRunLoopCommonModes); } -XBMCClientWrapperImpl::XBMCClientWrapperImpl(eRemoteMode f_mode, const std::string& fcr_address, int f_port, bool f_verbose_mode): - m_mode(f_mode), - m_address(fcr_address), - m_port(f_port), - m_timer(0), - m_sequence_timeout(0.5), - m_device_id(150), - m_verbose_mode(f_verbose_mode) - { +XBMCClientWrapperImpl::XBMCClientWrapperImpl(eRemoteMode f_mode, + const std::string& fcr_address, + int f_port, + bool f_verbose_mode) + : m_mode(f_mode), m_address(fcr_address), m_port(f_port), m_verbose_mode(f_verbose_mode) +{ if(m_mode == MULTIREMOTE_MODE){ if(m_verbose_mode) NSLog(@"XBMCClientWrapperImpl started in multiremote mode sending to address %s, port %i", fcr_address.c_str(), f_port); diff --git a/tools/Linux/kodi.metainfo.xml.in b/tools/Linux/kodi.metainfo.xml.in index 61898e8daf..6c354a39d6 100644 --- a/tools/Linux/kodi.metainfo.xml.in +++ b/tools/Linux/kodi.metainfo.xml.in @@ -78,6 +78,7 @@ </screenshot> </screenshots> <releases> + <release date="2023-06-17" version="21.0~a2-Omega" type="development"><url>https://kodi.tv/article/kodi-omega-alpha-2/</url></release> <release date="2023-04-16" version="21.0~a1-Omega" type="development"><url>https://kodi.tv/article/kodi-omega-alpha-1/</url></release> <release date="2023-01-15" version="20.0-Nexus" type="stable"><url>https://kodi.tv/article/kodi-20-0-nexus-release/</url></release> <release date="2022-12-21" version="20.0~rc2-Nexus" type="development"><url>https://kodi.tv/article/kodi-nexus-rc-2/</url></release> diff --git a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in index 11cace29a5..5dc1dd5260 100644 --- a/tools/Linux/kodi.sh.in +++ b/tools/Linux/kodi.sh.in @@ -171,12 +171,30 @@ if command_exists gdb; then fi fi +if [ -n "${KODI_AE_SINK}" ]; then + + echo "KODI_AE_SINK env variable is deprecated and will be removed in the future." + echo "Use the --audio-backend command line switch instead." + + if [ "${KODI_AE_SINK}" = "PIPEWIRE" ]; then + ENV_ARGS="--audio-backend=pipewire" + elif [ "${KODI_AE_SINK}" = "PULSE" ]; then + ENV_ARGS="--audio-backend=pulseaudio" + elif [ "${KODI_AE_SINK}" = "ALSA" ]; then + ENV_ARGS="--audio-backend=alsa" + elif [ "${KODI_AE_SINK}" = "SNDIO" ]; then + ENV_ARGS="--audio-backend=sndio" + elif [ "${KODI_AE_SINK}" = "ALSA+PULSE" ]; then + ENV_ARGS="--audio-backend=alsa+pulseaudio" + fi +fi + LOOP=1 while [ $(( $LOOP )) = "1" ] do [ -f "${APPORT_CORE}" ] && rm -f "${APPORT_CORE}" LOOP=0 - ${KODI_BINARY} $SAVED_ARGS & + ${KODI_BINARY} ${ENV_ARGS} $SAVED_ARGS & CHILD=$! wait "${CHILD}" RET=$? diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index e571e83578..b4013ac349 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -28,31 +28,31 @@ JENKINS_BUILD_STRING="${JENKINS_BUILD_TIMESTAMP}-${JENKINS_BUILD_COMMIT}-${JENKI #$XBMC_PLATFORM_DIR matches the platform subdirs! case $XBMC_PLATFORM_DIR in ios) - DEFAULT_SDK_VERSION=14.4 + DEFAULT_SDK_VERSION=16.2 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" - DEFAULT_XCODE_APP="Xcode12.4.app" + DEFAULT_XCODE_APP="Xcode_14.2.app" ;; tvos) - DEFAULT_SDK_VERSION=14.3 + DEFAULT_SDK_VERSION=16.1 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" - DEFAULT_XCODE_APP="Xcode12.4.app" + DEFAULT_XCODE_APP="Xcode_14.2.app" ;; osx64) - DEFAULT_SDK_VERSION=11.1 + DEFAULT_SDK_VERSION=13.1 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" - DEFAULT_XCODE_APP="Xcode12.4.app" + DEFAULT_XCODE_APP="Xcode_14.2.app" ;; osx-arm64) - DEFAULT_SDK_VERSION=11.1 + DEFAULT_SDK_VERSION=13.1 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" - DEFAULT_XCODE_APP="Xcode12.4.app" + DEFAULT_XCODE_APP="Xcode_14.2.app" ;; android) diff --git a/tools/buildsteps/osx-arm64/run-tests b/tools/buildsteps/osx-arm64/run-tests new file mode 100755 index 0000000000..67c8a0ea1f --- /dev/null +++ b/tools/buildsteps/osx-arm64/run-tests @@ -0,0 +1,10 @@ +WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} +XBMC_PLATFORM_DIR=osx-arm64 +. $WORKSPACE/tools/buildsteps/defaultenv + +cd $WORKSPACE/build;make -j$BUILDTHREADS kodi-test +cd $WORKSPACE;build/kodi-test --gtest_output=xml:gtestresults.xml + +awk '{ if ($1 == "<testcase" && match($0, "notrun")) print substr($0,0,length($0)-2) "><skipped/></testcase>"; else print $0;}' gtestresults.xml > gtestresults-skipped.xml +rm gtestresults.xml +mv gtestresults-skipped.xml gtestresults.xml diff --git a/tools/buildsteps/windows/download-dependencies.bat b/tools/buildsteps/windows/download-dependencies.bat index f6c4386cd7..697c616751 100644 --- a/tools/buildsteps/windows/download-dependencies.bat +++ b/tools/buildsteps/windows/download-dependencies.bat @@ -22,6 +22,7 @@ echo Downloading from mirror %KODI_MIRROR% REM Locate the BuildDependencies directory, based on the path of this script SET BUILD_DEPS_PATH=%WORKSPACE%\project\BuildDependencies SET APP_PATH=%WORKSPACE%\project\BuildDependencies\%TARGETPLATFORM% +SET NATIVE_PATH=%WORKSPACE%\project\BuildDependencies\%NATIVEPLATFORM% SET TMP_PATH=%BUILD_DEPS_PATH%\scripts\tmp REM Change to the BuildDependencies directory, if we're not there already diff --git a/tools/buildsteps/windows/vswhere.bat b/tools/buildsteps/windows/vswhere.bat index 1959c20722..a682f7c256 100644 --- a/tools/buildsteps/windows/vswhere.bat +++ b/tools/buildsteps/windows/vswhere.bat @@ -27,21 +27,15 @@ SET vcvars=no SET sdkver= SET vsver= -SET toolsdir=%arch% +REM Current tools are only using x86/win32 +REM ToDo: allow to set NATIVEPLATFORM to allow native tools based on actual native arch (eg x86/x86_64/arm/arm64) +SET toolsdir=win32 IF "%arch%" NEQ "x64" ( SET vcarch=%vcarch%_%arch% ) -IF "%arch%"=="x86" ( - SET toolsdir=win32 -) - -IF "%vcstore%"=="store" ( - SET toolsdir="win10-%toolsdir%" -) - -SET vswhere="%builddeps%\%toolsdir%\tools\vswhere\vswhere.exe" +SET vswhere="%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" FOR /f "usebackq tokens=1* delims=" %%i in (`%vswhere% -latest -property installationPath`) do ( IF EXIST "%%i\VC\Auxiliary\Build\vcvarsall.bat" ( diff --git a/tools/darwin/Support/CopyRootFiles-darwin_embedded.command b/tools/darwin/Support/CopyRootFiles-darwin_embedded.command index 34f6e7684c..31d7e57898 100755 --- a/tools/darwin/Support/CopyRootFiles-darwin_embedded.command +++ b/tools/darwin/Support/CopyRootFiles-darwin_embedded.command @@ -27,34 +27,34 @@ mkdir -p "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/userdata" mkdir -p "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/media" mkdir -p "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/tools/darwin/runtime" -${SYNC} "$BUILD_ROOT/LICENSE.md" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/" -${SYNC} "$BUILD_ROOT/privacy-policy.txt" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome" -${SYNC} "$BUILD_ROOT/xbmc/platform/darwin/Credits.html" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/" -${ADDONSYNC} "$BUILD_ROOT/addons" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome" -${SYNC} "$BUILD_ROOT/media" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome" +${SYNC} "$SRCROOT/LICENSE.md" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/" +${SYNC} "$SRCROOT/privacy-policy.txt" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome" +${SYNC} "$SRCROOT/xbmc/platform/darwin/Credits.html" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/" +${ADDONSYNC} "$SRCROOT/addons" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome" +${SYNC} "$SRCROOT/media" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome" # extracted eggs ${SYNC} "$XBMC_DEPENDS/share/$APP_NAME/addons" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome" # sync skin.estouchy SYNCSKIN_A=${SKINSYNC} -if [ -f "$BUILD_ROOT/addons/skin.estouchy/media/Textures.xbt" ]; then +if [ -f "$SRCROOT/addons/skin.estouchy/media/Textures.xbt" ]; then SYNCSKIN_A="${SKINSYNC} --exclude *.png --exclude *.jpg" fi -${SYNCSKIN_A} "$BUILD_ROOT/addons/skin.estouchy" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons" -${SYNC} "$BUILD_ROOT/addons/skin.estouchy/background" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons/skin.estouchy" -${SYNC} "$BUILD_ROOT/addons/skin.estouchy/resources" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons/skin.estouchy" +${SYNCSKIN_A} "$SRCROOT/addons/skin.estouchy" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons" +${SYNC} "$SRCROOT/addons/skin.estouchy/background" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons/skin.estouchy" +${SYNC} "$SRCROOT/addons/skin.estouchy/resources" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons/skin.estouchy" # sync skin.estuary SYNCSKIN_B=${SKINSYNC} -if [ -f "$BUILD_ROOT/addons/skin.estuary/media/Textures.xbt" ]; then +if [ -f "$SRCROOT/addons/skin.estuary/media/Textures.xbt" ]; then SYNCSKIN_B="${SKINSYNC} --exclude *.png --exclude *.jpg" fi -${SYNCSKIN_B} "$BUILD_ROOT/addons/skin.estuary" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons" -${SYNC} "$BUILD_ROOT/addons/skin.estuary/extras" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons/skin.estuary" -${SYNC} "$BUILD_ROOT/addons/skin.estuary/resources" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons/skin.estuary" +${SYNCSKIN_B} "$SRCROOT/addons/skin.estuary" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons" +${SYNC} "$SRCROOT/addons/skin.estuary/extras" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons/skin.estuary" +${SYNC} "$SRCROOT/addons/skin.estuary/resources" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome/addons/skin.estuary" -${SYNC} "$BUILD_ROOT/system" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome" -${SYNC} "$BUILD_ROOT/userdata" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome" +${SYNC} "$SRCROOT/system" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome" +${SYNC} "$SRCROOT/userdata" "$TARGET_BUILD_DIR/$EXECUTABLE_FOLDER_PATH/AppData/AppHome" fi diff --git a/tools/depends/Makefile.include.in b/tools/depends/Makefile.include.in index 691cc253e9..e91bf152f4 100644 --- a/tools/depends/Makefile.include.in +++ b/tools/depends/Makefile.include.in @@ -98,6 +98,7 @@ NM_FOR_BUILD=@NM_FOR_BUILD@ STRIP_FOR_BUILD=@STRIP_FOR_BUILD@ READELF_FOR_BUILD=@READELF_FOR_BUILD@ OBJDUMP_FOR_BUILD=@OBJDUMP_FOR_BUILD@ +CMAKE_FOR_BUILD=@prefix@/@tool_dir@/bin/cmake -DCMAKE_TOOLCHAIN_FILE=$(NATIVEPREFIX)/share/Toolchain-Native.cmake -DCMAKE_INSTALL_PREFIX=$(NATIVEPREFIX) NATIVE_CFLAGS=@host_includes@ -I@prefix@/@tool_dir@/include NATIVE_LDFLAGS=@host_includes@ -L@prefix@/@tool_dir@/lib diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac index cac10736b2..b1bd2f5e56 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac @@ -187,7 +187,7 @@ case $build in *darwin*) build_os="osx" if test "x$build_cpu" = "xx86_64"; then - host_includes="-arch x86_64 -mmacosx-version-min=10.13" + host_includes="-arch x86_64 -mmacosx-version-min=10.14" else host_includes="-arch arm64 -mmacosx-version-min=11.0" fi @@ -461,16 +461,16 @@ case $host in AC_MSG_ERROR(invalid architecture (--with-cpu=$use_cpu)) fi - target_minver="10.13" + target_minver="10.14" # check provided window system is valid_sdk - # if no window system supplied, default to SDL for now. + # 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=sdl + app_winsystem=native fi ;; aarch64-apple-darwin*) diff --git a/tools/depends/native/JsonSchemaBuilder/Makefile b/tools/depends/native/JsonSchemaBuilder/Makefile index e01a035616..e0d0dd4877 100644 --- a/tools/depends/native/JsonSchemaBuilder/Makefile +++ b/tools/depends/native/JsonSchemaBuilder/Makefile @@ -1,37 +1,28 @@ -ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) include ../../Makefile.include PREFIX=$(NATIVEPREFIX) PLATFORM=$(NATIVEPLATFORM) DEPS =../../Makefile.include Makefile -SOURCE=$(ROOT_DIR)/src - -CONFIGURE=./configure --prefix=$(PREFIX) -APP=$(PLATFORM)/JsonSchemaBuilder -APPBIN=$(PREFIX)/bin/JsonSchemaBuilder +APP=$(PLATFORM)/build/JsonSchemaBuilder all: .installed-$(PLATFORM) download: $(PLATFORM): $(DEPS) - -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) - cd $(PLATFORM); cp -a $(SOURCE)/* . - cd $(PLATFORM); ./autogen.sh - cd $(PLATFORM); $(CONFIGURE) - + -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)/build + cd $(PLATFORM); cp -a ../src/* . + cd $(PLATFORM)/build; $(CMAKE_FOR_BUILD) .. $(APP): $(PLATFORM) - $(MAKE) -C $(PLATFORM) - + $(MAKE) -C $(PLATFORM)/build .installed-$(PLATFORM): $(APP) - $(MAKE) -C $(PLATFORM) install + $(MAKE) -C $(PLATFORM)/build install touch $@ clean: - $(MAKE) -C $(PLATFORM) clean + $(MAKE) -C $(PLATFORM)/build clean distclean:: rm -rf $(PLATFORM) .installed-$(PLATFORM) - -rm -rf bin diff --git a/tools/depends/native/JsonSchemaBuilder/CMakeLists.txt b/tools/depends/native/JsonSchemaBuilder/src/CMakeLists.txt index e1c6c210bb..e298d91c34 100644 --- a/tools/depends/native/JsonSchemaBuilder/CMakeLists.txt +++ b/tools/depends/native/JsonSchemaBuilder/src/CMakeLists.txt @@ -1,8 +1,9 @@ +cmake_minimum_required(VERSION 3.15) project(JsonSchemaBuilder) -set(SOURCES src/JsonSchemaBuilder.cpp) +set(SOURCES JsonSchemaBuilder.cpp) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) add_executable(JsonSchemaBuilder ${SOURCES}) diff --git a/tools/depends/native/JsonSchemaBuilder/LICENSE.GPL b/tools/depends/native/JsonSchemaBuilder/src/LICENSE.GPL index c7e8863573..c7e8863573 100644 --- a/tools/depends/native/JsonSchemaBuilder/LICENSE.GPL +++ b/tools/depends/native/JsonSchemaBuilder/src/LICENSE.GPL diff --git a/tools/depends/native/JsonSchemaBuilder/README b/tools/depends/native/JsonSchemaBuilder/src/README index f6fcb8ef4d..f6fcb8ef4d 100644 --- a/tools/depends/native/JsonSchemaBuilder/README +++ b/tools/depends/native/JsonSchemaBuilder/src/README diff --git a/tools/depends/native/JsonSchemaBuilder/win32/JsonSchemaBuilder.sln b/tools/depends/native/JsonSchemaBuilder/win32/JsonSchemaBuilder.sln deleted file mode 100644 index 33a71954de..0000000000 --- a/tools/depends/native/JsonSchemaBuilder/win32/JsonSchemaBuilder.sln +++ /dev/null @@ -1,20 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JsonSchemaBuilder", "JsonSchemaBuilder.vcxproj", "{6D4C9949-FF2B-4B14-83BB-D86AB27B855A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6D4C9949-FF2B-4B14-83BB-D86AB27B855A}.Debug|Win32.ActiveCfg = Debug|Win32 - {6D4C9949-FF2B-4B14-83BB-D86AB27B855A}.Debug|Win32.Build.0 = Debug|Win32 - {6D4C9949-FF2B-4B14-83BB-D86AB27B855A}.Release|Win32.ActiveCfg = Release|Win32 - {6D4C9949-FF2B-4B14-83BB-D86AB27B855A}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/tools/depends/native/JsonSchemaBuilder/win32/JsonSchemaBuilder.vcxproj b/tools/depends/native/JsonSchemaBuilder/win32/JsonSchemaBuilder.vcxproj deleted file mode 100644 index ab84c5cf9f..0000000000 --- a/tools/depends/native/JsonSchemaBuilder/win32/JsonSchemaBuilder.vcxproj +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup Label="ProjectConfigurations"> - <ProjectConfiguration Include="Debug|Win32"> - <Configuration>Debug</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - <ProjectConfiguration Include="Release|Win32"> - <Configuration>Release</Configuration> - <Platform>Win32</Platform> - </ProjectConfiguration> - </ItemGroup> - <PropertyGroup Label="Globals"> - <ProjectGuid>{6D4C9949-FF2B-4B14-83BB-D86AB27B855A}</ProjectGuid> - <Keyword>Win32Proj</Keyword> - <RootNamespace>JsonSchemaBuilder</RootNamespace> - <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>true</UseDebugLibraries> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v141</PlatformToolset> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> - <ConfigurationType>Application</ConfigurationType> - <UseDebugLibraries>false</UseDebugLibraries> - <WholeProgramOptimization>true</WholeProgramOptimization> - <CharacterSet>Unicode</CharacterSet> - <PlatformToolset>v141</PlatformToolset> - </PropertyGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> - <ImportGroup Label="ExtensionSettings"> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> - </ImportGroup> - <PropertyGroup Label="UserMacros" /> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <LinkIncremental>true</LinkIncremental> - </PropertyGroup> - <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <LinkIncremental>false</LinkIncremental> - </PropertyGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> - <ClCompile> - <PrecompiledHeader> - </PrecompiledHeader> - <WarningLevel>Level3</WarningLevel> - <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - </Link> - </ItemDefinitionGroup> - <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> - <ClCompile> - <WarningLevel>Level3</WarningLevel> - <PrecompiledHeader> - </PrecompiledHeader> - <Optimization>MaxSpeed</Optimization> - <FunctionLevelLinking>true</FunctionLevelLinking> - <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> - </ClCompile> - <Link> - <SubSystem>Console</SubSystem> - <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> - <OptimizeReferences>true</OptimizeReferences> - </Link> - </ItemDefinitionGroup> - <ItemGroup> - <ClCompile Include="..\src\JsonSchemaBuilder.cpp" /> - </ItemGroup> - <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <ImportGroup Label="ExtensionTargets"> - </ImportGroup> -</Project>
\ No newline at end of file diff --git a/tools/depends/native/JsonSchemaBuilder/win32/JsonSchemaBuilder.vcxproj.filters b/tools/depends/native/JsonSchemaBuilder/win32/JsonSchemaBuilder.vcxproj.filters deleted file mode 100644 index 3c090a861f..0000000000 --- a/tools/depends/native/JsonSchemaBuilder/win32/JsonSchemaBuilder.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> - <ItemGroup> - <Filter Include="src"> - <UniqueIdentifier>{7ce1989c-783c-4e53-bb32-8511e3adab08}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClCompile Include="..\src\JsonSchemaBuilder.cpp"> - <Filter>src</Filter> - </ClCompile> - </ItemGroup> -</Project>
\ No newline at end of file diff --git a/tools/depends/native/Makefile b/tools/depends/native/Makefile index 28ce21e84e..f7a66a30b1 100644 --- a/tools/depends/native/Makefile +++ b/tools/depends/native/Makefile @@ -14,7 +14,6 @@ NATIVE= \ gettext \ giflib \ heimdal \ - JsonSchemaBuilder \ libjpeg-turbo \ liblzo2 \ libpng \ @@ -68,7 +67,7 @@ autoconf: m4 automake: autoconf dpkg: automake gettext libtool pkg-config tar heimdal: libtool -JsonSchemaBuilder: automake +JsonSchemaBuilder: cmake libjpeg-turbo: cmake nasm libpng: zlib automake libtool: automake @@ -80,7 +79,7 @@ pugixml: cmake python3: $(EXPAT) $(LIBFFI) pkg-config zlib openssl autoconf-archive swig: pcre tar: xz automake -TexturePacker: automake pkg-config libpng liblzo2 giflib libjpeg-turbo +TexturePacker: cmake libpng liblzo2 giflib libjpeg-turbo wayland-scanner: expat pkg-config waylandpp-scanner: cmake pugixml diff --git a/tools/depends/native/TexturePacker/CMakeLists.txt b/tools/depends/native/TexturePacker/CMakeLists.txt deleted file mode 100644 index 97dc1d3244..0000000000 --- a/tools/depends/native/TexturePacker/CMakeLists.txt +++ /dev/null @@ -1,54 +0,0 @@ -list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) - -if(APPLE) - set(CMAKE_FIND_ROOT_PATH ${NATIVEPREFIX}) -endif() - -find_package(Lzo2 REQUIRED) -find_package(PNG REQUIRED) -find_package(GIF REQUIRED) -find_package(JPEG REQUIRED) - -if(GIF_VERSION LESS 4) - message(FATAL_ERROR "giflib < 4 not supported") -else() - file(STRINGS ${GIF_INCLUDE_DIR}/gif_lib.h GIFSTRINGS) - string(REGEX MATCH "GIFLIB_MAJOR ([0-9])" GIFLIB_MAJOR ${GIFSTRINGS}) - if(GIFLIB_MAJOR) - string(REPLACE " " ";" GIFLIB_MAJOR ${GIFLIB_MAJOR}) - list(GET GIFLIB_MAJOR 1 GIFLIB_MAJOR) - else() - set(GIFLIB_MAJOR ${GIF_VERSION}) - endif() - if(NOT GIFLIB_MAJOR OR GIFLIB_MAJOR LESS 5) - message(WARNING "giflib${GIFLIB_MAJOR} support is experimental. Consider updating to giflib5") - endif() -endif() - -set(SOURCES src/md5.cpp - src/DecoderManager.cpp - src/TexturePacker.cpp - src/XBTFWriter.cpp - src/decoder/GIFDecoder.cpp - src/decoder/GifHelper.cpp - src/decoder/JPGDecoder.cpp - src/decoder/PNGDecoder.cpp - ${CMAKE_SOURCE_DIR}/xbmc/guilib/XBTF.cpp) - -set(CMAKE_POSITITION_INDEPENDENT_CODE 1) - -add_executable(TexturePacker ${SOURCES}) -target_include_directories(TexturePacker - PRIVATE ${PNG_INCLUDE_DIRS} - ${JPEG_INCLUDE_DIR} - ${GIF_INCLUDE_DIR} - ${CMAKE_SOURCE_DIR}/xbmc - ${CMAKE_CURRENT_SOURCE_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}/src/decoder) -target_link_libraries(TexturePacker - PRIVATE ${SYSTEM_LDFLAGS} - ${GIF_LIBRARIES} - ${PNG_LIBRARIES} - ${JPEG_LIBRARIES} - ${LZO2_LIBRARIES}) -target_compile_options(TexturePacker PRIVATE ${ARCH_DEFINES} ${SYSTEM_DEFINES}) diff --git a/tools/depends/native/TexturePacker/Makefile b/tools/depends/native/TexturePacker/Makefile index fb1a0b6398..4d24d60b68 100644 --- a/tools/depends/native/TexturePacker/Makefile +++ b/tools/depends/native/TexturePacker/Makefile @@ -1,51 +1,33 @@ -ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST)))) include ../../Makefile.include PREFIX=$(NATIVEPREFIX) PLATFORM=$(NATIVEPLATFORM) DEPS =../../Makefile.include Makefile -ifeq ($(NATIVE_OS), linux) - EXTRA_CONFIGURE = --enable-static -endif -ifeq ($(NATIVE_OS), android) - EXTRA_CONFIGURE = --enable-static -endif +APP=$(PLATFORM)/build/TexturePacker -ifeq ($(CMAKE_SOURCE_DIR),) - CMAKE_SOURCE_DIR = $(ROOT_DIR)/../../../.. -endif - -SOURCE=$(ROOT_DIR)/src - -APP=$(PLATFORM)/TexturePacker -APPBIN=$(PREFIX)/bin/TexturePacker +CMAKE_OPTIONS := -DNATIVEPREFIX=${NATIVEPREFIX} \ + -DKODI_SOURCE_DIR=$(CMAKE_SOURCE_DIR) \ + -DENABLE_STATIC=1 \ + -DARCH_DEFINES="$(NATIVE_ARCH_DEFINES)" all: .installed-$(PLATFORM) download: $(PLATFORM): $(DEPS) - -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)" - + -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)/build + cd $(PLATFORM); cp -a ../src/* . + cd $(PLATFORM)/build; $(CMAKE_FOR_BUILD) $(CMAKE_OPTIONS) .. $(APP): $(PLATFORM) - $(MAKE) -C $(PLATFORM) + $(MAKE) -C $(PLATFORM)/build .installed-$(PLATFORM): $(APP) - $(MAKE) -C $(PLATFORM) install + $(MAKE) -C $(PLATFORM)/build install touch $@ - #TEMP workaround for skins: create legacy link. Remove me when skins are fixed - @mkdir -p $(CMAKE_SOURCE_DIR)/tools/TexturePacker - @[ -f $(CMAKE_SOURCE_DIR)/tools/TexturePacker/TexturePacker ] && rm $(CMAKE_SOURCE_DIR)/tools/TexturePacker/TexturePacker || : - @ln -sf $(APPBIN) $(CMAKE_SOURCE_DIR)/tools/TexturePacker/TexturePacker - @echo "all:" > $(CMAKE_SOURCE_DIR)/tools/TexturePacker/Makefile - @echo "\t@echo "WARNING: use of tools/TexturePacker/TexturePacker is deprecated, please update your skins Makefile"" >> $(CMAKE_SOURCE_DIR)/tools/TexturePacker/Makefile clean: - $(MAKE) -C $(PLATFORM) clean + $(MAKE) -C $(PLATFORM)/build clean distclean:: rm -rf $(PLATFORM) .installed-$(PLATFORM) diff --git a/tools/depends/native/TexturePacker/src/CMakeLists.txt b/tools/depends/native/TexturePacker/src/CMakeLists.txt new file mode 100644 index 0000000000..c8b0f76cb9 --- /dev/null +++ b/tools/depends/native/TexturePacker/src/CMakeLists.txt @@ -0,0 +1,79 @@ +cmake_minimum_required(VERSION 3.15) +project(TexturePacker) + +list(APPEND CMAKE_MODULE_PATH ${KODI_SOURCE_DIR}/cmake/modules) + +if(NATIVEPREFIX) + set(CMAKE_FIND_ROOT_PATH ${NATIVEPREFIX}) +endif() + +if(ENABLE_STATIC) + set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX}) + # Requires cmake 3.24 for ZLIB_USE_STATIC_LIBS to actually do something + set(ZLIB_USE_STATIC_LIBS ON) +endif() + +find_package(Lzo2 REQUIRED) +find_package(PNG REQUIRED) +find_package(GIF REQUIRED) +find_package(JPEG REQUIRED) + +if(GIF_VERSION LESS 4) + message(FATAL_ERROR "giflib < 4 not supported") +else() + file(STRINGS ${GIF_INCLUDE_DIR}/gif_lib.h GIFSTRINGS) + string(REGEX MATCH "GIFLIB_MAJOR ([0-9])" GIFLIB_MAJOR ${GIFSTRINGS}) + if(GIFLIB_MAJOR) + string(REPLACE " " ";" GIFLIB_MAJOR ${GIFLIB_MAJOR}) + list(GET GIFLIB_MAJOR 1 GIFLIB_MAJOR) + else() + set(GIFLIB_MAJOR ${GIF_VERSION}) + endif() + if(NOT GIFLIB_MAJOR OR GIFLIB_MAJOR LESS 5) + message(WARNING "giflib${GIFLIB_MAJOR} support is experimental. Consider updating to giflib5") + endif() +endif() + +set(SOURCES md5.cpp + DecoderManager.cpp + TexturePacker.cpp + XBTFWriter.cpp + decoder/GIFDecoder.cpp + decoder/GifHelper.cpp + decoder/JPGDecoder.cpp + decoder/PNGDecoder.cpp + ${KODI_SOURCE_DIR}/xbmc/guilib/XBTF.cpp) + +if(WIN32) + list(APPEND SOURCES Win32/dirent.c) +endif() + +set(CMAKE_POSITITION_INDEPENDENT_CODE 1) + +add_executable(TexturePacker ${SOURCES}) +target_include_directories(TexturePacker + PRIVATE ${PNG_INCLUDE_DIRS} + ${JPEG_INCLUDE_DIR} + ${GIF_INCLUDE_DIR} + ${KODI_SOURCE_DIR}/xbmc + ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/decoder) +if(WIN32) + target_include_directories(TexturePacker SYSTEM + PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/Win32) +endif() + +target_link_libraries(TexturePacker + PRIVATE ${SYSTEM_LDFLAGS} + ${GIF_LIBRARIES} + ${PNG_LIBRARIES} + ${JPEG_LIBRARIES} + ${LZO2_LIBRARIES}) + +target_compile_definitions(TexturePacker PRIVATE ${ARCH_DEFINES} ${SYSTEM_DEFINES}) +target_compile_features(TexturePacker PUBLIC cxx_std_17) + +install(TARGETS TexturePacker EXPORT TexturePacker + RUNTIME DESTINATION bin + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib) diff --git a/tools/depends/native/TexturePacker/src/TexturePacker.cpp b/tools/depends/native/TexturePacker/src/TexturePacker.cpp index 99ceeaa96b..5c8304c5cb 100644 --- a/tools/depends/native/TexturePacker/src/TexturePacker.cpp +++ b/tools/depends/native/TexturePacker/src/TexturePacker.cpp @@ -197,7 +197,7 @@ CXBTFFrame TexturePacker::CreateXBTFFrame(DecodedFrame& decodedFrame, CXBTFWrite const unsigned int width = decodedFrame.rgbaImage.width; const unsigned int height = decodedFrame.rgbaImage.height; const unsigned int size = width * height * 4; - const unsigned int format = XB_FMT_A8R8G8B8; + const XB_FMT format = XB_FMT_A8R8G8B8; unsigned char* data = (unsigned char*)decodedFrame.rgbaImage.pixels.data(); const bool hasAlpha = HasAlpha(data, width, height); @@ -246,7 +246,7 @@ CXBTFFrame TexturePacker::CreateXBTFFrame(DecodedFrame& decodedFrame, CXBTFWrite frame.SetUnpackedSize(size); frame.SetWidth(width); frame.SetHeight(height); - frame.SetFormat(hasAlpha ? format : format | XB_FMT_OPAQUE); + frame.SetFormat(hasAlpha ? format : static_cast<XB_FMT>(format | XB_FMT_OPAQUE)); frame.SetDuration(delay); return frame; } @@ -258,11 +258,12 @@ bool TexturePacker::CheckDupe(MD5Context* ctx, MD5Final(digest,ctx); digest[16] = 0; char hex[33]; - sprintf(hex, "%02X%02X%02X%02X%02X%02X%02X%02X"\ - "%02X%02X%02X%02X%02X%02X%02X%02X", digest[0], digest[1], digest[2], - digest[3], digest[4], digest[5], digest[6], digest[7], digest[8], - digest[9], digest[10], digest[11], digest[12], digest[13], digest[14], - digest[15]); + snprintf(hex, sizeof(hex), + "%02X%02X%02X%02X%02X%02X%02X%02X" + "%02X%02X%02X%02X%02X%02X%02X%02X", + digest[0], digest[1], digest[2], digest[3], digest[4], digest[5], digest[6], digest[7], + digest[8], digest[9], digest[10], digest[11], digest[12], digest[13], digest[14], + digest[15]); hex[32] = 0; std::map<std::string, unsigned int>::iterator it = m_hashes.find(hex); if (it != m_hashes.end()) diff --git a/tools/depends/native/TexturePacker/src/XBTFWriter.cpp b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp index bb7f40ea20..53add01dc9 100644 --- a/tools/depends/native/TexturePacker/src/XBTFWriter.cpp +++ b/tools/depends/native/TexturePacker/src/XBTFWriter.cpp @@ -37,7 +37,7 @@ #define WRITE_U32(i, file) { uint32_t _n = Endian_SwapLE32(i); fwrite(&_n, 4, 1, file); } #define WRITE_U64(i, file) { uint64_t _n = i; _n = Endian_SwapLE64(i); fwrite(&_n, 8, 1, file); } -CXBTFWriter::CXBTFWriter(const std::string& outputFile) : m_outputFile(outputFile), m_file(nullptr) +CXBTFWriter::CXBTFWriter(const std::string& outputFile) : m_outputFile(outputFile) { } CXBTFWriter::~CXBTFWriter() diff --git a/tools/depends/native/TexturePacker/src/XBTFWriter.h b/tools/depends/native/TexturePacker/src/XBTFWriter.h index ab639fcdf3..a17954b89c 100644 --- a/tools/depends/native/TexturePacker/src/XBTFWriter.h +++ b/tools/depends/native/TexturePacker/src/XBTFWriter.h @@ -41,7 +41,7 @@ private: void Cleanup(); std::string m_outputFile; - FILE* m_file; + FILE* m_file = nullptr; std::vector<uint8_t> m_data; }; diff --git a/tools/depends/native/Toolchain-Native.cmake.in b/tools/depends/native/Toolchain-Native.cmake.in index c5f5643ab6..cc4bd16631 100644 --- a/tools/depends/native/Toolchain-Native.cmake.in +++ b/tools/depends/native/Toolchain-Native.cmake.in @@ -5,6 +5,7 @@ set(TARBALL_DIR "@use_tarballs@") set(OS "@build_os@") set(CMAKE_SYSTEM_PROCESSOR @host_cpu@) set(CPU "@use_buildcpu@") +set(ARCH_DEFINES @NATIVE_ARCH_DEFINES@) if(OS STREQUAL linux) set(CMAKE_SYSTEM_NAME Linux) @@ -19,7 +20,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL Darwin) if(CPU STREQUAL arm64) set(CMAKE_OSX_DEPLOYMENT_TARGET 11.0) else() - set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13) + set(CMAKE_OSX_DEPLOYMENT_TARGET 10.14) endif() set(CMAKE_OSX_SYSROOT "@host_sysroot@") @@ -64,16 +65,4 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) set(CMAKE_FIND_FRAMEWORK LAST) -# common autoconf build tools -find_program(AUTOCONF autoconf HINTS "${NATIVEPREFIX}/bin" REQUIRED) -find_program(ACLOCAL aclocal HINTS "${NATIVEPREFIX}/bin" REQUIRED) -find_program(AUTOHEADER autoheader HINTS "${NATIVEPREFIX}/bin" REQUIRED) -find_program(AUTOMAKE automake HINTS "${NATIVEPREFIX}/bin" REQUIRED) -find_program(AUTOM4TE autom4te HINTS "${NATIVEPREFIX}/bin" REQUIRED) -find_program(AUTOPOINT autopoint HINTS "${NATIVEPREFIX}/bin" REQUIRED) -find_program(AUTORECONF autoreconf HINTS "${NATIVEPREFIX}/bin" REQUIRED) -find_program(LIBTOOL libtool HINTS "${NATIVEPREFIX}/bin" REQUIRED) -find_program(LIBTOOLIZE libtoolize HINTS "${NATIVEPREFIX}/bin" REQUIRED) - -set(ENV{ACLOCAL_PATH} "${NATIVEPREFIX}/share/aclocal") set(ENV{PATH} "${NATIVEPREFIX}/bin:$ENV{PATH}") diff --git a/tools/depends/native/cmake/Makefile b/tools/depends/native/cmake/Makefile index 1a4dc3ef4d..e6f37b12a0 100644 --- a/tools/depends/native/cmake/Makefile +++ b/tools/depends/native/cmake/Makefile @@ -3,10 +3,10 @@ PLATFORM=$(NATIVEPLATFORM) DEPS = ../../Makefile.include Makefile ../../download-files.include APPNAME=cmake -VERSION=3.21.3 +VERSION=3.26.4 SOURCE=$(APPNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz -SHA512=0571b78443906c5ad51fb0fafbd32d565caf628cc150b1190802cb819e8497c108ea6b7ecaa03133df2dbbceb730696d24b4df38468c92088c769ce4076d9e9f +SHA512=fe817c8d5e247db3f0a9a58ee37c466a47220100d9e90711cd5d06c223cef87e41d1a756e75d1537e5f8cd010dcb8971cbeab4684b1ac12bcecf84bf7b720167 include ../../download-files.include # configuration settings diff --git a/tools/depends/native/flatbuffers/FLATBUFFERS-VERSION b/tools/depends/native/flatbuffers/FLATBUFFERS-VERSION new file mode 100644 index 0000000000..5ccaa80c2d --- /dev/null +++ b/tools/depends/native/flatbuffers/FLATBUFFERS-VERSION @@ -0,0 +1,4 @@ +LIBNAME=flatbuffers +VERSION=23.3.3 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0 diff --git a/tools/depends/native/flatbuffers/Makefile b/tools/depends/native/flatbuffers/Makefile index 6911d4c786..4d2f8cec31 100644 --- a/tools/depends/native/flatbuffers/Makefile +++ b/tools/depends/native/flatbuffers/Makefile @@ -1,15 +1,7 @@ -include ../../Makefile.include +include ../../Makefile.include FLATBUFFERS-VERSION ../../download-files.include PREFIX=$(NATIVEPREFIX) PLATFORM=$(NATIVEPLATFORM) -DEPS =../../Makefile.include Makefile ../../download-files.include - -# lib name, version -LIBNAME=flatbuffers -VERSION=2.0.0 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.gz -SHA512=26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89 -include ../../download-files.include +DEPS =../../Makefile.include Makefile FLATBUFFERS-VERSION ../../download-files.include APP=$(PLATFORM)/build-cmake/flatc @@ -17,16 +9,7 @@ APP=$(PLATFORM)/build-cmake/flatc # When we go c++17, flatbuffers has FLATBUFFERS_BUILD_CPP17 to enable # If we bump cmake min req to 3.16, enable FLATBUFFERS_ENABLE_PCH -ifeq ($(USE_CCACHE), yes) - LAUNCHER=-DCMAKE_CXX_COMPILER_LAUNCHER=$(CCACHE) -endif - -# Only this package uses CMake for build on native at the moment, -# so there is no separate toolchain file. Still we have to unset -# the CMAKE_TOOLCHAIN_FILE, which is part of $(CMAKE) and set to -# the target toolchain file. -CMAKE_OPTIONS := -DCMAKE_TOOLCHAIN_FILE= \ - -DCMAKE_BUILD_TYPE=Release \ +CMAKE_OPTIONS := -DCMAKE_BUILD_TYPE=Release \ -DFLATBUFFERS_CODE_COVERAGE=OFF \ -DFLATBUFFERS_BUILD_TESTS=OFF \ -DFLATBUFFERS_INSTALL=ON \ @@ -35,12 +18,6 @@ CMAKE_OPTIONS := -DCMAKE_TOOLCHAIN_FILE= \ -DFLATBUFFERS_BUILD_FLATHASH=OFF \ -DFLATBUFFERS_BUILD_GRPCTEST=OFF \ -DFLATBUFFERS_BUILD_SHAREDLIB=OFF \ - -DCMAKE_C_COMPILER="$(CC_BINARY_FOR_BUILD)" \ - -DCMAKE_CXX_COMPILER="$(CXX_BINARY_FOR_BUILD)" \ - $(LAUNCHER) \ - -DCMAKE_C_FLAGS="$(NATIVE_CFLAGS)" \ - -DCMAKE_CXX_FLAGS="$(NATIVE_CXXFLAGS)" \ - -DCMAKE_EXE_LINKER_FLAGS="$(NATIVE_LDFLAGS)" \ $(CMAKE_OPTIONS) BUILDDIR = $(PLATFORM)/build-cmake # 'build' conflicts with file BUILD on case-insensitive FS @@ -51,7 +28,7 @@ $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) mkdir -p $(BUILDDIR) - cd $(BUILDDIR); $(CMAKE) $(CMAKE_OPTIONS) .. + cd $(BUILDDIR); $(CMAKE_FOR_BUILD) $(CMAKE_OPTIONS) .. $(APP): $(PLATFORM) $(MAKE) -C $(BUILDDIR) diff --git a/tools/depends/target/cmakebuildsys/Makefile b/tools/depends/target/cmakebuildsys/Makefile index 8101fc18a2..446d25218d 100644 --- a/tools/depends/target/cmakebuildsys/Makefile +++ b/tools/depends/target/cmakebuildsys/Makefile @@ -29,10 +29,10 @@ else endif ifeq ($(OS),osx) - ifeq ($(APP_WINDOW_SYSTEM),native) - WINDOWSYSTEM=-DAPP_WINDOW_SYSTEM=native - else + ifeq ($(APP_WINDOW_SYSTEM),sdl) WINDOWSYSTEM=-DAPP_WINDOW_SYSTEM=sdl + else + WINDOWSYSTEM=-DAPP_WINDOW_SYSTEM=native endif endif diff --git a/tools/depends/target/config.site.in b/tools/depends/target/config.site.in index 5d7dc42678..68589b6355 100644 --- a/tools/depends/target/config.site.in +++ b/tools/depends/target/config.site.in @@ -34,7 +34,6 @@ LIBGCRYPT_CONFIG=@prefix@/@deps_dir@/bin/libgcrypt-config PATH=@prefix@/@tool_dir@/bin:@use_toolchain@/usr/bin:@use_toolchain@/bin:$PATH LD_LIBRARY_PATH=@prefix@/@tool_dir@/lib:$LD_LIBRARY_PATH -PYTHON_VERSION=3.9 NATIVE_ROOT=@prefix@/@tool_dir@ #curl diff --git a/tools/depends/target/curl/01-patch-autoconf-GH-5130.patch b/tools/depends/target/curl/01-patch-autoconf-GH-5130.patch deleted file mode 100644 index 119cd81199..0000000000 --- a/tools/depends/target/curl/01-patch-autoconf-GH-5130.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/m4/curl-functions.m4 -+++ b/m4/curl-functions.m4 -@@ -7289,8 +7289,6 @@ - dnl changes contained within this macro. - - AC_DEFUN([CURL_RUN_IFELSE], [ -- AC_REQUIRE([AC_RUN_IFELSE])dnl -- - old=$LD_LIBRARY_PATH - LD_LIBRARY_PATH=$CURL_LIBRARY_PATH:$old - export LD_LIBRARY_PATH diff --git a/tools/depends/target/curl/CURL-VERSION b/tools/depends/target/curl/CURL-VERSION new file mode 100644 index 0000000000..10caf28174 --- /dev/null +++ b/tools/depends/target/curl/CURL-VERSION @@ -0,0 +1,5 @@ +LIBNAME=curl +VERSION=8.1.2 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz +SHA512=532ab96eba6dea66d272f3be56f5af5c5da922480f9a10e203de98037c311f12f8145ba6bf813831e42815e068874ccfd108f84f7650743f5dbb3ebc3bc9c4f4 +BYPRODUCT=libcurl.a diff --git a/tools/depends/target/curl/Makefile b/tools/depends/target/curl/Makefile index 81c3130caf..76ddb64e97 100644 --- a/tools/depends/target/curl/Makefile +++ b/tools/depends/target/curl/Makefile @@ -1,28 +1,19 @@ -include ../../Makefile.include -DEPS = ../../Makefile.include Makefile 01-patch-autoconf-GH-5130.patch ../../download-files.include - -# lib name, version -LIBNAME=curl -VERSION=7.68.0 -SOURCE=$(LIBNAME)-$(VERSION) -ARCHIVE=$(SOURCE).tar.bz2 -SHA512=ad7390fd700cb74db356a39e842dab011823b87d4047687f2a8c2e0f2920a4f8c6c193ba56391489a75939cc5c39a4dccec4e4ceeac516eb7394f03e0fb7aeae -include ../../download-files.include +include ../../Makefile.include CURL-VERSION ../../download-files.include +DEPS = ../../Makefile.include Makefile CURL-VERSION ../../download-files.include + # configuration settings 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) -LIBDYLIB=$(PLATFORM)/lib/.libs/lib$(LIBNAME).a +LIBDYLIB=$(PLATFORM)/lib/.libs/$(BYPRODUCT) 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-patch-autoconf-GH-5130.patch cd $(PLATFORM); $(AUTORECONF) -vif cd $(PLATFORM); $(CONFIGURE) diff --git a/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION b/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION index 4d05761cfa..5ccaa80c2d 100644 --- a/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION +++ b/tools/depends/target/flatbuffers/FLATBUFFERS-VERSION @@ -1,4 +1,4 @@ LIBNAME=flatbuffers -VERSION=2.0.0 +VERSION=23.3.3 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz -SHA512=26a06b572c0e4c9685743bd2d2162ac7dcd74b9324624cc3f3ef5b154c0cee7c52a04b77cdc184245d2d6ae38dfdcc4fd66001c318aa8ca001d2bf1d85d66a89 +SHA512=4066c94f2473c7ea16917d29a613e16f840a329089c88e0bdbdb999aef3442ba00abfd2aa92266fa9c067e399dc88e6f0ccac40dc151378857e665638e78bbf0 diff --git a/tools/depends/target/hwdata/Makefile b/tools/depends/target/hwdata/Makefile index 8e1155e59d..e1d23755fb 100644 --- a/tools/depends/target/hwdata/Makefile +++ b/tools/depends/target/hwdata/Makefile @@ -9,8 +9,6 @@ include ../../download-files.include all: .installed-$(PLATFORM) -download: $(TARBALLS_LOCATION)/$(ARCHIVE) - $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) diff --git a/tools/depends/target/libbluray/LIBBLURAY-VERSION b/tools/depends/target/libbluray/LIBBLURAY-VERSION index c34fdc14f2..75601dbe5b 100644 --- a/tools/depends/target/libbluray/LIBBLURAY-VERSION +++ b/tools/depends/target/libbluray/LIBBLURAY-VERSION @@ -1,5 +1,5 @@ LIBNAME=libbluray -VERSION=1.3.2 +VERSION=1.3.4 ARCHIVE=$(LIBNAME)-$(VERSION).tar.bz2 -SHA512=6f2d3a984809db33a99d2fe3618370a3fda3ef1c417b725d3c2e1f24ff21495f95a6a5f78b30b2b26bab47865f68dd08c08e8a554809d3a5225956da712dc064 +SHA512=94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1 BYPRODUCT=libbluray.a diff --git a/tools/depends/target/libdisplay-info/Makefile b/tools/depends/target/libdisplay-info/Makefile index 561a5aeb49..ee900ce0d6 100644 --- a/tools/depends/target/libdisplay-info/Makefile +++ b/tools/depends/target/libdisplay-info/Makefile @@ -33,8 +33,6 @@ export PKG_CONFIG_LIBDIR=$(PREFIX)/share/pkgconfig all: .installed-$(PLATFORM) -download: $(TARBALLS_LOCATION)/$(ARCHIVE) - $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) diff --git a/tools/depends/target/libmicrohttpd/001-remove-assert.patch b/tools/depends/target/libmicrohttpd/001-remove-assert.patch deleted file mode 100644 index 472cc279c7..0000000000 --- a/tools/depends/target/libmicrohttpd/001-remove-assert.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/microhttpd/connection.c -+++ b/src/microhttpd/connection.c -@@ -1024,7 +1024,7 @@ - struct MHD_Response *response; - - response = connection->response; -- mhd_assert (connection->rp_props.send_reply_body); -+// mhd_assert (connection->rp_props.send_reply_body); - - if ( (0 == response->total_size) || - /* TODO: replace the next check with assert */ diff --git a/tools/depends/target/libmicrohttpd/LIBMICROHTTPD-VERSION b/tools/depends/target/libmicrohttpd/LIBMICROHTTPD-VERSION index b6c751d7ef..08f87d4806 100644 --- a/tools/depends/target/libmicrohttpd/LIBMICROHTTPD-VERSION +++ b/tools/depends/target/libmicrohttpd/LIBMICROHTTPD-VERSION @@ -1,4 +1,4 @@ LIBNAME=libmicrohttpd -VERSION=0.9.75 +VERSION=0.9.77 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz -SHA512=4dc62ed191342a61cc2767171bb1ff4050f390db14ef7100299888237b52ea0b04b939c843878fe7f5daec2b35a47b3c1b7e7c11fb32d458184fe6b19986a37c +SHA512=001025c023dd94c4a0cf017ed575e65a577b5ce595e7e450346bfb75def77eaa8a4cfbeffb9f4b912e34165c2cfca147c02c895e067a4f6c5a321a12035758a5 diff --git a/tools/depends/target/libmicrohttpd/Makefile b/tools/depends/target/libmicrohttpd/Makefile index 2d2e5f20b2..f62096ff50 100644 --- a/tools/depends/target/libmicrohttpd/Makefile +++ b/tools/depends/target/libmicrohttpd/Makefile @@ -1,6 +1,5 @@ include ../../Makefile.include LIBMICROHTTPD-VERSION ../../download-files.include -DEPS = ../../Makefile.include Makefile LIBMICROHTTPD-VERSION ../../download-files.include \ - 001-remove-assert.patch +DEPS = ../../Makefile.include Makefile LIBMICROHTTPD-VERSION ../../download-files.include # configuration settings CONFIGURE=cp -f $(CONFIG_SUB) $(CONFIG_GUESS) .; \ @@ -29,7 +28,6 @@ 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 ../001-remove-assert.patch cd $(PLATFORM); $(CONFIGURE) $(LIBDYLIB): $(PLATFORM) diff --git a/tools/webOS/packaging/appinfo.json.in b/tools/webOS/packaging/appinfo.json.in index a1673d59b4..2efda3b474 100644 --- a/tools/webOS/packaging/appinfo.json.in +++ b/tools/webOS/packaging/appinfo.json.in @@ -7,6 +7,6 @@ "title": "@APP_NAME@", "icon": "icon.png", "largeIcon": "largeIcon.png", - "splashBackground": "media/splash.jpg", + "splashBackground": "media/splash_webOS.png", "spinnerOnLaunch": false } diff --git a/tools/webOS/packaging/icon.png b/tools/webOS/packaging/icon.png Binary files differindex 247a9505f6..e8fe85a316 100755..100644 --- a/tools/webOS/packaging/icon.png +++ b/tools/webOS/packaging/icon.png diff --git a/tools/webOS/packaging/largeIcon.png b/tools/webOS/packaging/largeIcon.png Binary files differindex 42bdf286a8..d3959c87ba 100644 --- a/tools/webOS/packaging/largeIcon.png +++ b/tools/webOS/packaging/largeIcon.png |
