diff options
Diffstat (limited to 'tools')
19 files changed, 85 insertions, 28 deletions
diff --git a/tools/Linux/kodi-standalone.sh.in b/tools/Linux/kodi-standalone.sh.in index e47813101b..dc902b4d7e 100644 --- a/tools/Linux/kodi-standalone.sh.in +++ b/tools/Linux/kodi-standalone.sh.in @@ -18,7 +18,6 @@ # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. # http://www.gnu.org/copyleft/gpl.html -APP=@APP_NAME@ prefix="@prefix@" exec_prefix="@exec_prefix@" bindir="@bindir@" diff --git a/tools/Linux/kodi-standalone.sh.pulse b/tools/Linux/kodi-standalone.sh.pulse index 5273094b55..e77efe8f81 100644 --- a/tools/Linux/kodi-standalone.sh.pulse +++ b/tools/Linux/kodi-standalone.sh.pulse @@ -1,9 +1,4 @@ PULSE_START="$(command -v start-pulseaudio-x11)" if [ -n "$PULSE_START" ]; then $PULSE_START -else - PULSE_SESSION="$(command -v pulse-session)" - if [ -n "$PULSE_SESSION" ]; then - XBMC="$PULSE_SESSION $XBMC" - fi fi diff --git a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in index 7a85054fc6..108c0b007b 100644 --- a/tools/Linux/kodi.sh.in +++ b/tools/Linux/kodi.sh.in @@ -28,7 +28,6 @@ LIBDIR="@libdir@" APP_BINARY=$LIBDIR/${bin_name}/@APP_BINARY@ CRASHLOG_DIR=${CRASHLOG_DIR:-$HOME} KODI_DATA=${KODI_DATA:-"${HOME}/.${bin_name}"} # mapped to special://home/ -WINDOWING=${WINDOWING:-"auto"} # Workaround for high CPU load with nvidia GFX export __GL_YIELD=USLEEP diff --git a/tools/Linux/packaging/package-kodi-launchpad.sh b/tools/Linux/packaging/package-kodi-launchpad.sh index 46586c83c6..df816e1084 100755 --- a/tools/Linux/packaging/package-kodi-launchpad.sh +++ b/tools/Linux/packaging/package-kodi-launchpad.sh @@ -1,15 +1,20 @@ -#/bin/bash +#!/bin/bash -releaseversion=${VERSION:-"19.0"} +releaseversion=${VERSION:-"AUTO"} epoch=${EPOCH:-"2"} gitrev=${GITREV:-"$(git log -1 --pretty=format:"%h")"} tag=${TAG:-${gitrev}} tagrev=${tagrev:-"0"} -dists=${DISTS:-"groovy focal bionic"} -#debuildopts="--no-lintian -d" +dists=${DISTS:-"hirsute groovy focal bionic"} gpgkey=${GPG_KEY:-"jenkins (jenkins build bot) <jenkins@kodi.tv>"} ppa=${PPA:-"nightly"} -debianrepo="${DEBIAN:-"https://github.com/wsnipex/xbmc-packaging"}" +debianrepo="${DEBIAN:-"https://github.com/xbmc/xbmc-packaging"}" + +if [ "$releaseversion" = "AUTO" ]; then + majorversion="$(awk '/VERSION_MAJOR/ {print $2}' version.txt)" + minorversion="$(awk '/VERSION_MINOR/ {print $2}' version.txt)" + releaseversion="${majorversion}.${minorversion}" +fi version="${releaseversion}+git$(date '+%Y%m%d.%H%M')-${tag}" debversion="${epoch}:${version}" diff --git a/tools/android/packaging/xbmc/src/Splash.java.in b/tools/android/packaging/xbmc/src/Splash.java.in index 66dca26f24..a5569ef579 100644 --- a/tools/android/packaging/xbmc/src/Splash.java.in +++ b/tools/android/packaging/xbmc/src/Splash.java.in @@ -91,6 +91,8 @@ public class Splash extends Activity private String sXbmcdata = ""; private File fPackagePath = null; private File fXbmcHome = null; + private String sXbmcTemp = ""; + private File fXbmcTemp = null; private BroadcastReceiver mExternalStorageReceiver = null; private boolean mExternalStorageChecked = false; @@ -595,6 +597,32 @@ public class Splash extends Activity } } + sXbmcTemp = XBMCProperties.getStringProperty("xbmc.temp", ""); + if (!sXbmcTemp.isEmpty()) + { + File fXbmcTemp = new File(sXbmcTemp); + int loop = 20; + while (!fXbmcTemp.exists() && loop > 0) + { + // Wait a while in case of non-primary sdcard + try + { + Thread.sleep(1000); + } + catch (InterruptedException e) + { + continue; + } + loop--; + } + + if (!fXbmcTemp.exists()) + { + sXbmcTemp = ""; + System.setProperty("xbmc.temp", ""); + } + } + sPackagePath = getPackageResourcePath(); fPackagePath = new File(sPackagePath); String obbfn = ""; diff --git a/tools/android/packaging/xbmc/src/channels/util/TvUtil.java.in b/tools/android/packaging/xbmc/src/channels/util/TvUtil.java.in index 5ba2fe46af..0286b8dc13 100644 --- a/tools/android/packaging/xbmc/src/channels/util/TvUtil.java.in +++ b/tools/android/packaging/xbmc/src/channels/util/TvUtil.java.in @@ -113,11 +113,21 @@ public class TvUtil .setAppLinkIntent(playlistIntent); Log.d(TAG, "Creating channel: " + subscription.getName()); - Uri channelUrl = - context.getContentResolver() - .insert( - TvContractCompat.Channels.CONTENT_URI, - builder.build().toContentValues()); + Uri channelUrl = null; + try + { + channelUrl = + context.getContentResolver() + .insert( + TvContractCompat.Channels.CONTENT_URI, + builder.build().toContentValues()); + } catch (IllegalArgumentException e) { + Log.e(TAG, "Failed to add channel to the tv provider"); + e.printStackTrace(); + } + + if (channelUrl == null) + return 0; Log.d(TAG, "channel insert at " + channelUrl); long channelId = ContentUris.parseId(channelUrl); diff --git a/tools/buildsteps/freebsd/configure-xbmc b/tools/buildsteps/freebsd/configure-xbmc index cf5f9bcf0b..b6c2260902 100644 --- a/tools/buildsteps/freebsd/configure-xbmc +++ b/tools/buildsteps/freebsd/configure-xbmc @@ -2,7 +2,6 @@ WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} XBMC_PLATFORM_DIR=freebsd . $WORKSPACE/tools/buildsteps/defaultenv - mkdir -p $WORKSPACE/build cd $WORKSPACE/build -cmake -DCMAKE_BUILD_TYPE=$Configuration -DENABLE_INTERNAL_SPDLOG=ON -DAPP_RENDER_SYSTEM=gl .. +cmake -DCMAKE_BUILD_TYPE=$Configuration -DAPP_RENDER_SYSTEM=gl .. diff --git a/tools/buildsteps/windows/BuildSetup.bat b/tools/buildsteps/windows/BuildSetup.bat index 6e1aca3e86..45ba7c0a48 100644 --- a/tools/buildsteps/windows/BuildSetup.bat +++ b/tools/buildsteps/windows/BuildSetup.bat @@ -84,7 +84,7 @@ set WORKSPACE=%base_dir%\kodi-build.%TARGET_PLATFORM% MKDIR %WORKSPACE% PUSHD %WORKSPACE% - cmake.exe -G "%cmakeGenerator%" %cmakeProps% %base_dir% + cmake.exe -G "%cmakeGenerator%" -A %cmakeArch% -T host=x64 %cmakeProps% %base_dir% IF %errorlevel%==1 ( set DIETEXT="%APP_NAME%.EXE failed to build!" goto DIE diff --git a/tools/buildsteps/windows/arm-uwp/BuildSetup.bat b/tools/buildsteps/windows/arm-uwp/BuildSetup.bat index 18b3ecf86c..8fd6e03de1 100644 --- a/tools/buildsteps/windows/arm-uwp/BuildSetup.bat +++ b/tools/buildsteps/windows/arm-uwp/BuildSetup.bat @@ -9,7 +9,8 @@ IF ERRORLEVEL 1 ( EXIT /B 1 ) -SET cmakeGenerator=Visual Studio %vsver% ARM +SET cmakeGenerator=Visual Studio %vsver% +SET cmakeArch=ARM SET TARGET_ARCHITECTURE=arm SET TARGET_PLATFORM=%TARGET_ARCHITECTURE%-uwp SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion% diff --git a/tools/buildsteps/windows/buildffmpeg.sh b/tools/buildsteps/windows/buildffmpeg.sh index 14e48c850a..f2e72cb3c7 100644 --- a/tools/buildsteps/windows/buildffmpeg.sh +++ b/tools/buildsteps/windows/buildffmpeg.sh @@ -84,6 +84,7 @@ do_addOption "--disable-gnutls" do_addOption "--enable-openssl" do_addOption "--enable-nonfree" do_addOption "--toolchain=msvc" +do_addOption "--disable-mediafoundation" if [ "$ARCH" == "x86_64" ]; then FFMPEG_TARGET_OS=win64 diff --git a/tools/buildsteps/windows/vswhere.bat b/tools/buildsteps/windows/vswhere.bat index f7b132bb37..97c2594ff4 100644 --- a/tools/buildsteps/windows/vswhere.bat +++ b/tools/buildsteps/windows/vswhere.bat @@ -47,7 +47,9 @@ SET vswhere="%builddeps%\%toolsdir%\tools\vswhere\vswhere.exe" FOR /f "usebackq tokens=1* delims=" %%i in (`%vswhere% -latest -property installationPath`) do ( IF EXIST "%%i\VC\Auxiliary\Build\vcvarsall.bat" ( SET vcvars="%%i\VC\Auxiliary\Build\vcvarsall.bat" - SET vsver=15 + SET vsver=15 2017 + ECHO %%i | findstr "2019" >NUL 2>NUL + IF NOT ERRORLEVEL 1 SET vsver=16 2019 ) ) @@ -57,7 +59,7 @@ IF %vcvars%==no ( IF NOT ERRORLEVEL 1 ( IF EXIST "%%i\VC\vcvarsall.bat" ( SET vcvars="%%i\VC\vcvarsall.bat" - SET vsver=14 + SET vsver=14 2015 ) ) ) diff --git a/tools/buildsteps/windows/win32-uwp/BuildSetup.bat b/tools/buildsteps/windows/win32-uwp/BuildSetup.bat index 3aba2378f1..5ddf234b57 100644 --- a/tools/buildsteps/windows/win32-uwp/BuildSetup.bat +++ b/tools/buildsteps/windows/win32-uwp/BuildSetup.bat @@ -9,6 +9,7 @@ IF ERRORLEVEL 1 ( ) SET cmakeGenerator=Visual Studio %vsver% +SET cmakeArch=Win32 SET TARGET_ARCHITECTURE=x86 SET TARGET_PLATFORM=win32-uwp SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion% diff --git a/tools/buildsteps/windows/win32/BuildSetup.bat b/tools/buildsteps/windows/win32/BuildSetup.bat index 70764985ba..0c10f4336c 100644 --- a/tools/buildsteps/windows/win32/BuildSetup.bat +++ b/tools/buildsteps/windows/win32/BuildSetup.bat @@ -10,6 +10,7 @@ IF ERRORLEVEL 1 ( ) SET cmakeGenerator=Visual Studio %vsver% +SET cmakeArch=Win32 SET TARGET_ARCHITECTURE=x86 SET TARGET_PLATFORM=%TARGET_ARCHITECTURE% diff --git a/tools/buildsteps/windows/x64-uwp/BuildSetup.bat b/tools/buildsteps/windows/x64-uwp/BuildSetup.bat index 037c536b80..8144248dd0 100644 --- a/tools/buildsteps/windows/x64-uwp/BuildSetup.bat +++ b/tools/buildsteps/windows/x64-uwp/BuildSetup.bat @@ -8,7 +8,8 @@ IF ERRORLEVEL 1 ( EXIT /B 1 ) -SET cmakeGenerator=Visual Studio %vsver% Win64 +SET cmakeGenerator=Visual Studio %vsver% +SET cmakeArch=x64 SET TARGET_ARCHITECTURE=x64 SET TARGET_PLATFORM=%TARGET_ARCHITECTURE%-uwp SET cmakeProps=-DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=%UCRTVersion% diff --git a/tools/buildsteps/windows/x64/BuildSetup.bat b/tools/buildsteps/windows/x64/BuildSetup.bat index 6434d3f0c0..09acf3faa1 100644 --- a/tools/buildsteps/windows/x64/BuildSetup.bat +++ b/tools/buildsteps/windows/x64/BuildSetup.bat @@ -8,7 +8,8 @@ IF ERRORLEVEL 1 ( EXIT /B 1 ) -SET cmakeGenerator=Visual Studio %vsver% Win64 +SET cmakeGenerator=Visual Studio %vsver% +SET cmakeArch=x64 SET TARGET_ARCHITECTURE=x64 SET TARGET_PLATFORM=%TARGET_ARCHITECTURE% diff --git a/tools/codegenerator/SwigTypeParser.groovy b/tools/codegenerator/SwigTypeParser.groovy index 24437f228d..8d8a644698 100644 --- a/tools/codegenerator/SwigTypeParser.groovy +++ b/tools/codegenerator/SwigTypeParser.groovy @@ -270,6 +270,20 @@ public class SwigTypeParser } /** + * SwigType_lrtype(const SwigType *ty) + * + * Create a locally assignable reference type + */ + public static String SwigType_lrtype(String s) { + String ltype = SwigType_ltype(s); + if (SwigType_ispointer(s)) { + return ltype; + } else { + return "r." + ltype; + } + } + + /** * This creates the C++ declaration for a valid ltype for the type string * given. For example, if the type is a "const char*" which is equivalent * to the type string 'p.q(const).char', the return value from this method diff --git a/tools/depends/native/flatbuffers/Makefile b/tools/depends/native/flatbuffers/Makefile index e50f61fec5..1f4196e963 100644 --- a/tools/depends/native/flatbuffers/Makefile +++ b/tools/depends/native/flatbuffers/Makefile @@ -5,7 +5,7 @@ DEPS=../../Makefile.include Makefile # lib name, version LIBNAME=flatbuffers -VERSION=1.11.0 +VERSION=1.12.0 SOURCE=$(LIBNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz diff --git a/tools/depends/target/ffmpeg/FFMPEG-VERSION b/tools/depends/target/ffmpeg/FFMPEG-VERSION index 9017251829..ba9ec50a75 100644 --- a/tools/depends/target/ffmpeg/FFMPEG-VERSION +++ b/tools/depends/target/ffmpeg/FFMPEG-VERSION @@ -1,4 +1,4 @@ LIBNAME=ffmpeg BASE_URL=https://github.com/xbmc/FFmpeg -VERSION=4.3.1-Matrix-Beta1 +VERSION=4.3.2-Matrix-19.1 ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz diff --git a/tools/depends/target/libandroidjni/Makefile b/tools/depends/target/libandroidjni/Makefile index 13f62b5493..7e86c8df76 100644 --- a/tools/depends/target/libandroidjni/Makefile +++ b/tools/depends/target/libandroidjni/Makefile @@ -3,7 +3,7 @@ DEPS= ../../Makefile.include Makefile # lib name, version LIBNAME=libandroidjni -VERSION=ee5cc102101d9cb04ab4dbfd7a65db1c52345faf +VERSION=e9517e0f4efccd07667eec163449853bea8d5e5e SOURCE=archive ARCHIVE=$(VERSION).tar.gz GIT_BASE_URL=https://github.com/xbmc |