Merge pull request #18534 from lrusak/multi-windowing

allow multiple windowing systems on linux

24 files changed, 4 insertions, 219 deletions

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..efb79762ca 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=gles --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..3c5783fd52 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=gles --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..d5d2d103e4 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=gl --with-tarballs=$TARBALLS $DEBUG_SWITCH
 fi