diff options
Diffstat (limited to 'tools')
30 files changed, 97 insertions, 266 deletions
diff --git a/tools/Linux/kodi.sh.in b/tools/Linux/kodi.sh.in index 73d8c9be81..6899a47c1e 100644 --- a/tools/Linux/kodi.sh.in +++ b/tools/Linux/kodi.sh.in @@ -44,39 +44,13 @@ do LIBDIR="$2" shift; shift ;; - --windowing) - WINDOWING="$2" - echo "$SAVED_ARGS" | sed "s/--windowing[ ]*$2//g" - shift; shift - ;; *) shift ;; esac done -# Note: by default only one of those binaries exists -# To be able to select a different one, if has to be compiled specifically -# Your distribution might provide extra packages for those -if [ "$WINDOWING" = "auto" ]; then - # Wayland - if [ -n "$WAYLAND_DISPLAY" ] && [ -x $LIBDIR/${bin_name}/${bin_name}-wayland ]; then - KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-wayland - # X11 - elif echo $DISPLAY | grep -qE ":[0-9]+" && [ -x $LIBDIR/${bin_name}/${bin_name}-x11 ]; then - KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-x11 - # GBM/DRM - elif [ -z "$DISPLAY" ] && [ -z "$WAYLAND_DISPLAY" ] && [ -x $LIBDIR/${bin_name}/${bin_name}-gbm ]; then - KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-gbm - # Default kodi.bin - else - KODI_BINARY=${APP_BINARY} - fi -elif [ -n "$WINDOWING" ]; then - KODI_BINARY=$LIBDIR/${bin_name}/${bin_name}-${WINDOWING} -else - KODI_BINARY=${APP_BINARY} -fi +KODI_BINARY=${APP_BINARY} if [ ! -x ${KODI_BINARY} ]; then echo "Error: ${KODI_BINARY} not found" diff --git a/tools/Linux/packaging/package-kodi-launchpad.sh b/tools/Linux/packaging/package-kodi-launchpad.sh new file mode 100755 index 0000000000..46586c83c6 --- /dev/null +++ b/tools/Linux/packaging/package-kodi-launchpad.sh @@ -0,0 +1,75 @@ +#/bin/bash + +releaseversion=${VERSION:-"19.0"} +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" +gpgkey=${GPG_KEY:-"jenkins (jenkins build bot) <jenkins@kodi.tv>"} +ppa=${PPA:-"nightly"} +debianrepo="${DEBIAN:-"https://github.com/wsnipex/xbmc-packaging"}" + +version="${releaseversion}+git$(date '+%Y%m%d.%H%M')-${tag}" +debversion="${epoch}:${version}" +origtarball="kodi_${version}.orig.tar.gz" + +declare -A PPAS=( + ["nightly"]='ppa:team-xbmc/xbmc-nightly' + ["unstable"]='ppa:team-xbmc/unstable' + ["stable"]='ppa:team-xbmc/ppa' + ["wsnipex-nightly"]='ppa:wsnipex/kodi-git' + ["wsnipex-stable"]='ppa:wsnipex/kodi-stable' +) + +[ -d debian ] && rm -rf debian + +# set build info +date '+%Y%m%d' > BUILDDATE +echo $gitrev > VERSION + +# download packaging files +wget -O - ${debianrepo}/archive/master.tar.gz | tar xzv --strip-components=1 --exclude=".git*" -f - +[ -d debian ] || { echo "ERROR: directory debian does not exist"; exit 3; } + +# add tarballs for internal ffmpeg, libdvd +tools/depends/target/ffmpeg/autobuild.sh -d || { echo "Error downloading ffmpeg"; exit 2; } +make -C tools/depends/target/libdvdnav download GITREV="" || { echo "Error downloading libdvdnav"; exit 2; } +make -C tools/depends/target/libdvdread download GITREV="" || { echo "Error downloading libdvdread"; exit 2; } +make -C tools/depends/target/libdvdcss download GITREV="" || { echo "Error downloading libdvdcss"; exit 2; } +make -C tools/depends/target/dav1d download || { echo "Error downloading dav1d"; exit 2; } + +# create orig tarball if needed +if grep -q quilt debian/source/format; then + echo "origtarball: ${origtarball}" + git archive -o ../${origtarball} ${gitrev} +fi + + +# build source packages +for dist in ${dists//,/ }; do + echo "### Building for ${dist} ###" + sed \ + -e "s/#PACKAGEVERSION#/${debversion}/" \ + -e "s/#TAGREV#/${tagrev}/" \ + -e "s/#DIST#/${dist}/g" \ + debian/changelog.in > debian/changelog + + echo "Changelog:" + cat debian/changelog + echo + + debuild -d -S -k"${gpgkey}" + echo "### DONE ###" +done + +# upload to PPA +echo "### Uploading to PPA ${PPAS[${ppa}]} ###" +dput ${PPAS[${ppa}]} ../kodi_${version}*.changes +if [ $? -eq 0 ]; then + echo "### Successfully pushed ${version} to launchpad ###" +else + echo "### ERROR could not upload package ###" +fi + diff --git a/tools/buildsteps/defaultenv b/tools/buildsteps/defaultenv index 66f0777fb0..0108ac2fff 100644 --- a/tools/buildsteps/defaultenv +++ b/tools/buildsteps/defaultenv @@ -9,6 +9,7 @@ PATH_CHANGE_REV_FILENAME=".last_success_revision" FAILED_BUILD_FILENAME=".last_failed_revision" #TARBALLS ENV-VAR is only used by android scripts atm TARBALLS=${TARBALLS:-"/opt/xbmc-tarballs"} +RENDER_SYSTEM=${RENDER_SYSTEM:-"Default"} BINARY_ADDONS_ROOT=tools/depends/target BINARY_ADDONS="binary-addons" @@ -25,10 +26,10 @@ case $XBMC_PLATFORM_DIR in ;; tvos) - DEFAULT_SDK_VERSION=12.2 + DEFAULT_SDK_VERSION=13.2 DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" - DEFAULT_XCODE_APP="Xcode10.2.app" + DEFAULT_XCODE_APP="Xcode11.3.1.app" ;; osx64) @@ -48,6 +49,7 @@ case $XBMC_PLATFORM_DIR in linux*) DEFAULT_XBMC_DEPENDS_ROOT=$WORKSPACE/tools/depends/xbmc-depends DEFAULT_CONFIGURATION="Debug" + DEFAULT_RENDER_SYSTEM="gl" ;; freebsd) @@ -93,6 +95,11 @@ then DEBUG_SWITCH='--disable-debug' fi +if [ "$RENDER_SYSTEM" == "Default" ] +then + RENDER_SYSTEM=$DEFAULT_RENDER_SYSTEM +fi + #helper functions #hash a dir based on the git revision, Configuration, SDK_PATH, NDK_PATH, NDK_VERSION, SDK_VERSION, TOOLCHAIN and XBMC_DEPENDS_ROOT diff --git a/tools/buildsteps/freebsd/configure-xbmc b/tools/buildsteps/freebsd/configure-xbmc index 0fe6f3b986..cf5f9bcf0b 100644 --- a/tools/buildsteps/freebsd/configure-xbmc +++ b/tools/buildsteps/freebsd/configure-xbmc @@ -5,4 +5,4 @@ XBMC_PLATFORM_DIR=freebsd mkdir -p $WORKSPACE/build cd $WORKSPACE/build -cmake -DCMAKE_BUILD_TYPE=$Configuration -DENABLE_INTERNAL_SPDLOG=ON .. +cmake -DCMAKE_BUILD_TYPE=$Configuration -DENABLE_INTERNAL_SPDLOG=ON -DAPP_RENDER_SYSTEM=gl .. diff --git a/tools/buildsteps/linux-aarch64-gbm/configure-depends b/tools/buildsteps/linux-aarch64-gbm/configure-depends index 2f3532faee..846e0a6be8 100644 --- a/tools/buildsteps/linux-aarch64-gbm/configure-depends +++ b/tools/buildsteps/linux-aarch64-gbm/configure-depends @@ -5,5 +5,5 @@ XBMC_PLATFORM_DIR=linux-aarch64-gbm if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then cd $WORKSPACE/tools/depends;./configure \ - --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=aarch64-linux-gnu --with-platform=gbm --with-rendersystem=gles --with-tarballs=$TARBALLS $DEBUG_SWITCH + --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=aarch64-linux-gnu --with-rendersystem=$RENDER_SYSTEM --with-tarballs=$TARBALLS $DEBUG_SWITCH fi diff --git a/tools/buildsteps/linux-arm-gbm/configure-depends b/tools/buildsteps/linux-arm-gbm/configure-depends index 394a1fb6d6..ac6b24ec81 100644 --- a/tools/buildsteps/linux-arm-gbm/configure-depends +++ b/tools/buildsteps/linux-arm-gbm/configure-depends @@ -5,5 +5,5 @@ XBMC_PLATFORM_DIR=linux-arm-gbm if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then cd $WORKSPACE/tools/depends;./configure \ - --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=arm-linux-gnueabihf --with-platform=gbm --with-rendersystem=gles --with-tarballs=$TARBALLS $DEBUG_SWITCH + --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=arm-linux-gnueabihf --with-rendersystem=$RENDER_SYSTEM --with-tarballs=$TARBALLS $DEBUG_SWITCH fi diff --git a/tools/buildsteps/linux64-gbm/configure-depends b/tools/buildsteps/linux64-gbm/configure-depends deleted file mode 100644 index eae90fb12c..0000000000 --- a/tools/buildsteps/linux64-gbm/configure-depends +++ /dev/null @@ -1,9 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-gbm -. $WORKSPACE/tools/buildsteps/defaultenv - -if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] -then - cd $WORKSPACE/tools/depends;./configure \ - --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=x86_64-linux-gnu --with-platform=gbm --with-rendersystem=gles --with-tarballs=$TARBALLS $DEBUG_SWITCH -fi diff --git a/tools/buildsteps/linux64-gbm/configure-xbmc b/tools/buildsteps/linux64-gbm/configure-xbmc deleted file mode 100644 index b5ccaf8e8d..0000000000 --- a/tools/buildsteps/linux64-gbm/configure-xbmc +++ /dev/null @@ -1,5 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-gbm -. $WORKSPACE/tools/buildsteps/defaultenv - -make -C $WORKSPACE/tools/depends/target/cmakebuildsys diff --git a/tools/buildsteps/linux64-gbm/make-binary-addons b/tools/buildsteps/linux64-gbm/make-binary-addons deleted file mode 100644 index ea4e4e3315..0000000000 --- a/tools/buildsteps/linux64-gbm/make-binary-addons +++ /dev/null @@ -1,28 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-gbm -. $WORKSPACE/tools/buildsteps/defaultenv - -. $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends - -#clear the build failed file -rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME - -ALL_BINARY_ADDONS_BUILT="1" -#only build binary addons when requested by env/jenkins -if [ "$BUILD_BINARY_ADDONS" == "true" ] -then - for addon in $BINARY_ADDONS - do - echo "building $addon" - git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon - cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS V=99 VERBOSE=1 || ALL_BINARY_ADDONS_BUILT="0" - done -fi - -if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ] -then - tagSuccessFulBuild $WORKSPACE/cmake -else - #mark the build failure in the filesystem but leave jenkins running - tagFailedBuild $WORKSPACE/cmake -fi diff --git a/tools/buildsteps/linux64-gbm/make-depends b/tools/buildsteps/linux64-gbm/make-depends deleted file mode 100644 index ebcf446c1d..0000000000 --- a/tools/buildsteps/linux64-gbm/make-depends +++ /dev/null @@ -1,8 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-gbm -. $WORKSPACE/tools/buildsteps/defaultenv - -if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] -then - cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS || make && tagSuccessFulBuild $WORKSPACE/tools/depends -fi diff --git a/tools/buildsteps/linux64-gbm/make-native-depends b/tools/buildsteps/linux64-gbm/make-native-depends deleted file mode 100644 index 804751e293..0000000000 --- a/tools/buildsteps/linux64-gbm/make-native-depends +++ /dev/null @@ -1,9 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-gbm -. $WORKSPACE/tools/buildsteps/defaultenv - -if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] && [ "$BINARY_ADDONS_CLEAN_NATIVETOOLS" != "0" ] -then - git clean -xffd $WORKSPACE/tools/depends/native - cd $WORKSPACE/tools/depends/native;make -j $BUILDTHREADS && tagSuccessFulBuild $WORKSPACE/tools/depends -fi diff --git a/tools/buildsteps/linux64-gbm/make-xbmc b/tools/buildsteps/linux64-gbm/make-xbmc deleted file mode 100644 index 025988db1a..0000000000 --- a/tools/buildsteps/linux64-gbm/make-xbmc +++ /dev/null @@ -1,5 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-gbm -. $WORKSPACE/tools/buildsteps/defaultenv - -cd $WORKSPACE/build;make -j$BUILDTHREADS || make diff --git a/tools/buildsteps/linux64-gbm/package b/tools/buildsteps/linux64-gbm/package deleted file mode 100644 index 052caea54b..0000000000 --- a/tools/buildsteps/linux64-gbm/package +++ /dev/null @@ -1,5 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-gbm -. $WORKSPACE/tools/buildsteps/defaultenv - -#nothing for linux atm diff --git a/tools/buildsteps/linux64-gbm/prepare-depends b/tools/buildsteps/linux64-gbm/prepare-depends deleted file mode 100644 index 1f4d0d5e48..0000000000 --- a/tools/buildsteps/linux64-gbm/prepare-depends +++ /dev/null @@ -1,15 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-gbm -. $WORKSPACE/tools/buildsteps/defaultenv - -#clean without depends for skipping depends build if possible -#also skip binary addons (pvr, audioencoder) as long as they are deployed in tree -cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS} - -# if depends path has changed - cleanout everything and do a full rebuild -if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] -then - #clean up the rest too - cd $WORKSPACE;git clean -xffd - cd $WORKSPACE/tools/depends/;./bootstrap -fi diff --git a/tools/buildsteps/linux64-gbm/prepare-xbmc b/tools/buildsteps/linux64-gbm/prepare-xbmc deleted file mode 100644 index 4c17247ec3..0000000000 --- a/tools/buildsteps/linux64-gbm/prepare-xbmc +++ /dev/null @@ -1,9 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-gbm -. $WORKSPACE/tools/buildsteps/defaultenv - -#build binary addons before building xbmc... -#make sure that binary_addons don't clean the native tools -#here -BINARY_ADDONS_CLEAN_NATIVETOOLS="0" -. $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-binary-addons diff --git a/tools/buildsteps/linux64-gbm/run-tests b/tools/buildsteps/linux64-gbm/run-tests deleted file mode 100644 index bab7e75331..0000000000 --- a/tools/buildsteps/linux64-gbm/run-tests +++ /dev/null @@ -1,14 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-gbm -. $WORKSPACE/tools/buildsteps/defaultenv - -cd $WORKSPACE/build;make -j$BUILDTHREADS kodi-test -if [ "$Configuration" != "Coverage" ]; then - cd $WORKSPACE;build/kodi-test --gtest_output=xml:gtestresults.xml -else - cd $WORKSPACE/build;GTEST_OUTPUT="xml:$WORKSPACE/gtestresults.xml" make coverage -fi - -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/linux64-wayland/configure-depends b/tools/buildsteps/linux64-wayland/configure-depends deleted file mode 100755 index 0210592449..0000000000 --- a/tools/buildsteps/linux64-wayland/configure-depends +++ /dev/null @@ -1,9 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-wayland -. $WORKSPACE/tools/buildsteps/defaultenv - -if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] -then - cd $WORKSPACE/tools/depends;./configure \ - --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=x86_64-linux-gnu --with-platform=wayland --with-rendersystem=gl --with-tarballs=$TARBALLS $DEBUG_SWITCH -fi diff --git a/tools/buildsteps/linux64-wayland/configure-xbmc b/tools/buildsteps/linux64-wayland/configure-xbmc deleted file mode 100755 index 52479a2209..0000000000 --- a/tools/buildsteps/linux64-wayland/configure-xbmc +++ /dev/null @@ -1,5 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-wayland -. $WORKSPACE/tools/buildsteps/defaultenv - -make -C $WORKSPACE/tools/depends/target/cmakebuildsys diff --git a/tools/buildsteps/linux64-wayland/make-binary-addons b/tools/buildsteps/linux64-wayland/make-binary-addons deleted file mode 100755 index 0886919146..0000000000 --- a/tools/buildsteps/linux64-wayland/make-binary-addons +++ /dev/null @@ -1,28 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-wayland -. $WORKSPACE/tools/buildsteps/defaultenv - -. $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-native-depends - -#clear the build failed file -rm -f $WORKSPACE/cmake/$FAILED_BUILD_FILENAME - -ALL_BINARY_ADDONS_BUILT="1" -#only build binary addons when requested by env/jenkins -if [ "$BUILD_BINARY_ADDONS" == "true" ] -then - for addon in $BINARY_ADDONS - do - echo "building $addon" - git clean -xffd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon - cd $WORKSPACE/$BINARY_ADDONS_ROOT/$addon;make -j $BUILDTHREADS V=99 VERBOSE=1 || ALL_BINARY_ADDONS_BUILT="0" - done -fi - -if [ "$ALL_BINARY_ADDONS_BUILT" == "1" ] -then - tagSuccessFulBuild $WORKSPACE/cmake -else - #mark the build failure in the filesystem but leave jenkins running - tagFailedBuild $WORKSPACE/cmake -fi diff --git a/tools/buildsteps/linux64-wayland/make-depends b/tools/buildsteps/linux64-wayland/make-depends deleted file mode 100755 index 5953efd23f..0000000000 --- a/tools/buildsteps/linux64-wayland/make-depends +++ /dev/null @@ -1,9 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-wayland -. $WORKSPACE/tools/buildsteps/defaultenv - -if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] -then - cd $WORKSPACE/tools/depends;make -j $BUILDTHREADS || make && tagSuccessFulBuild $WORKSPACE/tools/depends -fi - diff --git a/tools/buildsteps/linux64-wayland/make-native-depends b/tools/buildsteps/linux64-wayland/make-native-depends deleted file mode 100755 index 77295b96a1..0000000000 --- a/tools/buildsteps/linux64-wayland/make-native-depends +++ /dev/null @@ -1,9 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-wayland -. $WORKSPACE/tools/buildsteps/defaultenv - -if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] && [ "$BINARY_ADDONS_CLEAN_NATIVETOOLS" != "0" ] -then - git clean -xffd $WORKSPACE/tools/depends/native - cd $WORKSPACE/tools/depends/native;make -j $BUILDTHREADS && tagSuccessFulBuild $WORKSPACE/tools/depends -fi
\ No newline at end of file diff --git a/tools/buildsteps/linux64-wayland/make-xbmc b/tools/buildsteps/linux64-wayland/make-xbmc deleted file mode 100755 index 1a5d7e087f..0000000000 --- a/tools/buildsteps/linux64-wayland/make-xbmc +++ /dev/null @@ -1,5 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-wayland -. $WORKSPACE/tools/buildsteps/defaultenv - -cd $WORKSPACE/build;make -j$BUILDTHREADS || make diff --git a/tools/buildsteps/linux64-wayland/package b/tools/buildsteps/linux64-wayland/package deleted file mode 100755 index 0f0abf8f9c..0000000000 --- a/tools/buildsteps/linux64-wayland/package +++ /dev/null @@ -1,5 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-wayland -. $WORKSPACE/tools/buildsteps/defaultenv - -#nothing for linux atm diff --git a/tools/buildsteps/linux64-wayland/prepare-depends b/tools/buildsteps/linux64-wayland/prepare-depends deleted file mode 100755 index d72507053c..0000000000 --- a/tools/buildsteps/linux64-wayland/prepare-depends +++ /dev/null @@ -1,15 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-wayland -. $WORKSPACE/tools/buildsteps/defaultenv - -#clean without depends for skipping depends build if possible -#also skip binary addons (pvr, audioencoder) as long as they are deployed in tree -cd $WORKSPACE;git clean -xfd -e "cmake/.last_success_revision" -e "tools/depends" ${DEPLOYED_BINARY_ADDONS} - -# if depends path has changed - cleanout everything and do a full rebuild -if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] -then - #clean up the rest too - cd $WORKSPACE;git clean -xffd - cd $WORKSPACE/tools/depends/;./bootstrap -fi diff --git a/tools/buildsteps/linux64-wayland/prepare-xbmc b/tools/buildsteps/linux64-wayland/prepare-xbmc deleted file mode 100755 index db0e084696..0000000000 --- a/tools/buildsteps/linux64-wayland/prepare-xbmc +++ /dev/null @@ -1,9 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-wayland -. $WORKSPACE/tools/buildsteps/defaultenv - -#build binary addons before building xbmc... -#make sure that binary_addons don't clean the native tools -#here -BINARY_ADDONS_CLEAN_NATIVETOOLS="0" -. $WORKSPACE/tools/buildsteps/$XBMC_PLATFORM_DIR/make-binary-addons diff --git a/tools/buildsteps/linux64-wayland/run-tests b/tools/buildsteps/linux64-wayland/run-tests deleted file mode 100755 index 42fa9137b7..0000000000 --- a/tools/buildsteps/linux64-wayland/run-tests +++ /dev/null @@ -1,14 +0,0 @@ -WORKSPACE=${WORKSPACE:-$( cd $(dirname $0)/../../.. ; pwd -P )} -XBMC_PLATFORM_DIR=linux64-wayland -. $WORKSPACE/tools/buildsteps/defaultenv - -cd $WORKSPACE/build;make -j$BUILDTHREADS kodi-test -if [ "$Configuration" != "Coverage" ]; then - cd $WORKSPACE;build/kodi-test --gtest_output=xml:gtestresults.xml -else - cd $WORKSPACE/build;GTEST_OUTPUT="xml:$WORKSPACE/gtestresults.xml" make coverage -fi - -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/linux64/configure-depends b/tools/buildsteps/linux64/configure-depends index 8d22408516..f6446b128b 100755 --- a/tools/buildsteps/linux64/configure-depends +++ b/tools/buildsteps/linux64/configure-depends @@ -5,5 +5,5 @@ XBMC_PLATFORM_DIR=linux64 if [ "$(pathChanged $WORKSPACE/tools/depends)" == "1" ] then cd $WORKSPACE/tools/depends;./configure \ - --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=x86_64-linux-gnu --with-platform=x11 --with-rendersystem=gl --with-tarballs=$TARBALLS $DEBUG_SWITCH + --with-toolchain=/usr --prefix=$XBMC_DEPENDS_ROOT --host=x86_64-linux-gnu --with-rendersystem=$RENDER_SYSTEM --with-tarballs=$TARBALLS $DEBUG_SWITCH fi diff --git a/tools/depends/configure.ac b/tools/depends/configure.ac index cbc57e56c7..2111632a64 100644 --- a/tools/depends/configure.ac +++ b/tools/depends/configure.ac @@ -313,6 +313,7 @@ case $host in platform_cxxflags="$platform_cflags" platform_os="linux" meson_system="linux" + target_platform="wayland gbm" ;; *i686*-linux-gnu*|i*86*-*-linux-uclibc*|x86_64*-linux-gnu*|x86_64-*-linux-uclibc*) case $host in @@ -331,6 +332,7 @@ case $host in platform_os="linux" meson_system="linux" ffmpeg_options_default="--enable-vaapi --enable-vdpau --cpu=$use_cpu" + target_platform="x11 wayland gbm" ;; *darwin*) # darwin builds are always cross @@ -432,12 +434,6 @@ case $host in esac case $use_platform in - gbm|wayland|x11) - if test "$platform_os" != "linux"; then - AC_MSG_ERROR([$use_platform is only supported on the Linux platform]) - fi - target_platform=$use_platform - ;; tvos) platform_cflags+=" -fembed-bitcode" platform_cxxflags+=" -fembed-bitcode" diff --git a/tools/depends/native/TexturePacker/src/TexturePacker.cpp b/tools/depends/native/TexturePacker/src/TexturePacker.cpp index f977e56756..94c421acb7 100644 --- a/tools/depends/native/TexturePacker/src/TexturePacker.cpp +++ b/tools/depends/native/TexturePacker/src/TexturePacker.cpp @@ -49,7 +49,7 @@ #define FLAGS_USE_LZO 1 -#define DIR_SEPARATOR "/" +#define DIR_SEPARATOR '/' const char *GetFormatString(unsigned int format) { @@ -72,7 +72,9 @@ const char *GetFormatString(unsigned int format) } } -void CreateSkeletonHeaderImpl(CXBTFWriter& xbtfWriter, std::string fullPath, std::string relativePath) +void CreateSkeletonHeaderImpl(CXBTFWriter& xbtfWriter, + const std::string& fullPath, + const std::string& relativePath) { struct dirent* dp; struct stat stat_p; @@ -129,7 +131,7 @@ void CreateSkeletonHeaderImpl(CXBTFWriter& xbtfWriter, std::string fullPath, std } } -void CreateSkeletonHeader(CXBTFWriter& xbtfWriter, std::string fullPath) +void CreateSkeletonHeader(CXBTFWriter& xbtfWriter, const std::string& fullPath) { std::string temp; CreateSkeletonHeaderImpl(xbtfWriter, fullPath, temp); diff --git a/tools/depends/target/Toolchain.cmake.in b/tools/depends/target/Toolchain.cmake.in index 8786f52f7e..d30b754f21 100644 --- a/tools/depends/target/Toolchain.cmake.in +++ b/tools/depends/target/Toolchain.cmake.in @@ -11,15 +11,7 @@ if(OS STREQUAL linux) set(CMAKE_SYSTEM_NAME Linux) set(CORE_SYSTEM_NAME linux) set(CORE_PLATFORM_NAME @target_platform@) - if(NOT "@app_rendersystem@" STREQUAL "") - set(X11_RENDER_SYSTEM @app_rendersystem@ CACHE STRING "Render system to use with X11: \"gl\" or \"gles\"") - set(WAYLAND_RENDER_SYSTEM @app_rendersystem@ CACHE STRING "Render system to use with Wayland: \"gl\" or \"gles\"") - set(GBM_RENDER_SYSTEM @app_rendersystem@ CACHE STRING "Render system to use with GBM: \"gl\" or \"gles\"") - else() - set(X11_RENDER_SYSTEM gl CACHE STRING "Render system to use with X11: \"gl\" or \"gles\"") - set(WAYLAND_RENDER_SYSTEM gl CACHE STRING "Render system to use with Wayland: \"gl\" or \"gles\"") - set(GBM_RENDER_SYSTEM gles CACHE STRING "Render system to use with GBM: \"gl\" or \"gles\"") - endif() + set(APP_RENDER_SYSTEM @app_rendersystem@ CACHE STRING "Render system to use: \"gl\" or \"gles\"") elseif(OS STREQUAL android) set(CMAKE_SYSTEM_NAME Android) set(CORE_SYSTEM_NAME android) |