Merge pull request #100 from phunkyfish/remove-p8platform

Remove p8platform

.travis.yml

@@ -14,26 +14,46 @@ env:
 matrix:
   include:
     - os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       compiler: gcc
     - os: linux
-      dist: xenial
+      dist: bionic
       sudo: required
       compiler: clang
+    - os: linux
+      dist: bionic
+      sudo: required
+      compiler: gcc
+      env: DEBIAN_BUILD=true
+    - os: linux
+      dist: focal
+      sudo: required
+      compiler: gcc
+      env: DEBIAN_BUILD=true
     - os: osx
       osx_image: xcode10.2
 
+before_install:
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo add-apt-repository -y ppa:team-xbmc/xbmc-nightly; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get update; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get install fakeroot; fi
+
 #
 # The addon source is automatically checked out in $TRAVIS_BUILD_DIR,
 # we'll put the Kodi source on the same level
 #
 before_script:
-  - cd $TRAVIS_BUILD_DIR/..
-  - git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git
-  - cd ${app_id} && mkdir build && cd build
-  - mkdir -p definition/${app_id}
-  - echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt
-  - cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons
+  - if [[ $DEBIAN_BUILD != true ]]; then cd $TRAVIS_BUILD_DIR/..; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then git clone --branch master --depth=1 https://github.com/xbmc/xbmc.git; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then cd ${app_id} && mkdir build && cd build; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then mkdir -p definition/${app_id}; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then echo ${app_id} $TRAVIS_BUILD_DIR $TRAVIS_COMMIT > definition/${app_id}/${app_id}.txt; fi
+  - if [[ $DEBIAN_BUILD != true ]]; then cmake -DADDONS_TO_BUILD=${app_id} -DADDON_SRC_PREFIX=$TRAVIS_BUILD_DIR/.. -DADDONS_DEFINITION_DIR=$TRAVIS_BUILD_DIR/build/definition -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=$TRAVIS_BUILD_DIR/../xbmc/addons -DPACKAGE_ZIP=1 $TRAVIS_BUILD_DIR/../xbmc/cmake/addons; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then wget https://raw.githubusercontent.com/xbmc/xbmc/master/xbmc/addons/kodi-dev-kit/tools/debian-addon-package-test.sh && chmod +x ./debian-addon-package-test.sh; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then sudo apt-get build-dep $TRAVIS_BUILD_DIR; fi
 
-script: make
+script: 
+  - if [[ $DEBIAN_BUILD != true ]]; then make; fi
+  - if [[ $DEBIAN_BUILD == true ]]; then ./debian-addon-package-test.sh $TRAVIS_BUILD_DIR; fi
+

CMakeLists.txt

@@ -5,10 +5,8 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
 
 find_package(TinyXML REQUIRED)
 find_package(Kodi REQUIRED)
-find_package(p8-platform REQUIRED)
 
-include_directories(${p8-platform_INCLUDE_DIRS}
-                    ${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
+include_directories(${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Kodi cmake rework to match right include ways
                     ${TINYXML_INCLUDE_DIRS})
 
 add_definitions(-D__STDC_FORMAT_MACROS)
@@ -33,8 +31,7 @@ set(DVBVIEWER_HEADERS src/client.h
                       src/TimeshiftBuffer.h
                       src/utilities/XMLUtils.h)
 
-set(DEPLIBS ${p8-platform_LIBRARIES}
-            ${TINYXML_LIBRARIES})
+set(DEPLIBS ${TINYXML_LIBRARIES})
 
 # check if the linker supports version script or symbols list
 if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")

appveyor.yml

@@ -17,8 +17,6 @@ environment:
       PLATFORM: linux-x86_64
     - APPVEYOR_BUILD_WORKER_IMAGE: ubuntu
       PLATFORM: linux-clang-x86_64
-    - APPVEYOR_BUILD_WORKER_IMAGE: ubuntu
-      PLATFORM: rbpi-arm
 
 init:
   - ps: |
@@ -37,11 +35,6 @@ install:
           sudo apt-get install --yes --no-install-recommends --no-upgrade clang
           export CC=clang CXX=clang++
           ;;
-        "rbpi-arm")
-          git clone -q --depth=1 https://github.com/raspberrypi/tools.git $ROOT/tools
-          # we don't need the firmware. fake it
-          mkdir -p $ROOT/firmware/opt/vc/include
-          ;;
       esac
 
 before_build:
@@ -56,17 +49,6 @@ before_build:
 
       # generate toolchain file
       params=()
-      case "$PLATFORM" in
-        "rbpi-arm")
-          params+=(
-            --with-platform=raspberry-pi2
-            --host=arm-linux-gnueabihf
-            --with-toolchain="$ROOT/tools/arm-bcm2708/arm-linux-gnueabihf"
-            --with-firmware="$ROOT/firmware"
-            --build=x86_64-linux
-          )
-          ;;
-      esac
 
       cd "$KODI/tools/depends"
       sed -i 's/@platform_ldflags@//' target/Toolchain_binaddons.cmake.in

debian/control

@@ -1,8 +1,8 @@
 Source: kodi-pvr-dvbviewer
 Priority: extra
 Maintainer: Manuel Mausz <[email protected]>
-Build-Depends: debhelper (>= 9.0.0), cmake,
-               libp8-platform-dev, kodi-addon-dev
+Build-Depends: debhelper (>= 9.0.0), cmake, libtinyxml-dev,
+               kodi-addon-dev
 Standards-Version: 4.1.2
 Section: libs
 

pvr.dvbviewer/addon.xml.in

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.dvbviewer"
-  version="6.0.6"
+  version="6.0.7"
   name="DVBViewer Client"
   provider-name="Manuel Mausz">
   <requires>@ADDON_DEPENDS@</requires>

pvr.dvbviewer/changelog.txt

@@ -1,3 +1,14 @@
+6.0.7:
+[removed] Remove dependency on p8-platform and kodi-platform
+[updated] Update to use std::thread
+[updated] Update to use std::mutex and locks
+[updated] Replace SAFE_DELETE macro with SafeDelete template
+[updated] Use kodi StringUtils and update system headers
+[removed] Remove rpi platform as it's now removed from matrix
+[updated] Include windows.h for Windows for GetUTCOffset()
+[updated] While sleeping for long periods allow break on destruction
+[updated] Update travis.yml for cpp17 and debian
+
 6.0.6:
 [removed] External kodiplatform dependency
 [added] libp8-platform-dev dependency