diff -Nru kodi-inputstream-rtmp-2.0.5/appveyor.yml kodi-inputstream-rtmp-2.0.6/appveyor.yml --- kodi-inputstream-rtmp-2.0.5/appveyor.yml 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/appveyor.yml 2013-05-31 22:59:22.000000000 +0000 @@ -23,7 +23,7 @@ build_script: - cd .. - - git clone --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch Leia --depth=1 https://github.com/xbmc/xbmc.git - cd %app_id% - mkdir build - cd build diff -Nru kodi-inputstream-rtmp-2.0.5/CMakeLists.txt kodi-inputstream-rtmp-2.0.6/CMakeLists.txt --- kodi-inputstream-rtmp-2.0.5/CMakeLists.txt 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,20 +1,14 @@ +cmake_minimum_required(VERSION 3.5) project(inputstream.rtmp) -cmake_minimum_required(VERSION 2.6) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}) -enable_language(CXX) - find_package(PkgConfig) find_package(Kodi REQUIRED) -find_package(p8-platform REQUIRED) find_package(OpenSSL REQUIRED) find_package(ZLIB REQUIRED) find_package(RTMP REQUIRED) -list(APPEND DEPLIBS ${p8-platform_LIBRARIES}) - set(RTMP_SOURCES src/RTMPStream.cpp) include_directories(${INCLUDES} diff -Nru kodi-inputstream-rtmp-2.0.5/debian/changelog kodi-inputstream-rtmp-2.0.6/debian/changelog --- kodi-inputstream-rtmp-2.0.5/debian/changelog 2019-02-11 08:49:17.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/debian/changelog 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -kodi-inputstream-rtmp (2.0.5-1~bionic) bionic; urgency=low +kodi-inputstream-rtmp (2.0.6-1~bionic) bionic; urgency=low [ kodi ] * autogenerated dummy changelog diff -Nru kodi-inputstream-rtmp-2.0.5/debian/control kodi-inputstream-rtmp-2.0.6/debian/control --- kodi-inputstream-rtmp-2.0.5/debian/control 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/debian/control 2013-05-31 22:59:22.000000000 +0000 @@ -1,7 +1,7 @@ Source: kodi-inputstream-rtmp Priority: extra Maintainer: Arne Morten Kvarving -Build-Depends: debhelper (>= 9.0.0), cmake, libkodiplatform-dev (>= 17.0.0), +Build-Depends: debhelper (>= 9.0.0), cmake, kodi-addon-dev, pkg-config, libssl-dev, zlib1g-dev, librtmp-dev Standards-Version: 3.9.6 Section: libs diff -Nru kodi-inputstream-rtmp-2.0.5/depends/common/librtmp/CMakeLists.txt kodi-inputstream-rtmp-2.0.6/depends/common/librtmp/CMakeLists.txt --- kodi-inputstream-rtmp-2.0.5/depends/common/librtmp/CMakeLists.txt 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/depends/common/librtmp/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,8 +1,7 @@ +cmake_minimum_required(VERSION 3.5) project(librtmp) -cmake_minimum_required(VERSION 2.8) - -if(CORE_SYSTEM_NAME STREQUAL osx OR CORE_SYSTEM_NAME STREQUAL ios) +if(CORE_SYSTEM_NAME STREQUAL osx OR CORE_SYSTEM_NAME STREQUAL ios OR CORE_SYSTEM_NAME STREQUAL darwin_embedded) set(SYS darwin) else() set(SYS posix) diff -Nru kodi-inputstream-rtmp-2.0.5/depends/common/openssl/CMakeLists.txt kodi-inputstream-rtmp-2.0.6/depends/common/openssl/CMakeLists.txt --- kodi-inputstream-rtmp-2.0.5/depends/common/openssl/CMakeLists.txt 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/depends/common/openssl/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,8 +1,9 @@ +cmake_minimum_required(VERSION 3.5) project(openssl) -cmake_minimum_required(VERSION 2.8) - -include(ExternalProject) +if(NOT CPU AND CMAKE_SYSTEM_PROCESSOR) + set(CPU ${CMAKE_SYSTEM_PROCESSOR}) +endif() if(CORE_SYSTEM_NAME MATCHES "android") if(CPU MATCHES arm64) @@ -12,63 +13,50 @@ elseif(CPU MATCHES i686) set(OPENSSL_TARGET android-x86) endif() - set(configure_command CC=${CMAKE_C_COMPILER} AR=${CMAKE_AR} RANLIB=${CMAKE_RANLIB} INSTALL_PREFIX="" ANDROID_NDK=${TOOLCHAIN} - /Configure no-shared zlib - --prefix=${OUTPUT_DIR} - --with-zlib-include=${OUTPUT_DIR}/include - --with-zlib-lib=${OUTPUT_DIR}/lib - ${OPENSSL_TARGET} ${CMAKE_C_FLAGS} -I${OUTPUT_DIR}/include - && sed -ie "s|apps test||" ${PROJECT_SOURCE_DIR}/Makefile) -endif() - -if(CORE_SYSTEM_NAME MATCHES "linux" OR CORE_SYSTEM_NAME MATCHES "rbpi") - if(CMAKE_TOOLCHAIN_FILE) - if(CPU MATCHES aarch64 OR CPU MATCHES arm64 OR CPU STREQUAL x86_64 OR ARCH MATCHES aarch64 OR ARCH STREQUAL x86_64) - set(bitness 64) - elseif(CPU MATCHES arm OR CPU MATCHES "i.86" OR ARCH MATCHES arm OR CPU MATCHES cortex-a7 OR CPU MATCHES arm1176jzf-s) - set(bitness 32) - else() - message(WARNING "Could not detect bitness for CPU ${CPU} - assuming 32bit") - set(bitness 32) - endif() - - set(configure_command CC=${CMAKE_C_COMPILER} AR=${CMAKE_AR} INSTALL_PREFIX="" - /Configure no-shared zlib - --prefix=${OUTPUT_DIR} - --with-zlib-include=${OUTPUT_DIR}/include - --with-zlib-lib=${OUTPUT_DIR}/lib - linux-generic${bitness} ${CMAKE_C_FLAGS} -I${OUTPUT_DIR}/include - && sed -ie "s|apps test||" ${PROJECT_SOURCE_DIR}/Makefile) +elseif(CORE_SYSTEM_NAME MATCHES "linux" OR CORE_SYSTEM_NAME MATCHES "rbpi") + if(CPU MATCHES aarch64 OR CPU MATCHES arm64 OR CPU STREQUAL x86_64 OR ARCH MATCHES aarch64 OR ARCH STREQUAL x86_64) + set(OPENSSL_TARGET linux-generic64) + elseif(CPU MATCHES arm OR CPU MATCHES "i.86" OR ARCH MATCHES arm OR CPU MATCHES cortex-a7 OR CPU MATCHES arm1176jzf-s) + set(OPENSSL_TARGET linux-generic32) else() - set(configure_command MACHINE=${PLATFORM} CC=${CMAKE_C_COMPILER} AR=${CMAKE_AR} /config no-shared zlib - && sed -ie "s|apps test||" ${PROJECT_SOURCE_DIR}/Makefile) + message(WARNING "Could not detect bitness for CPU ${CPU} - assuming 32bit") + set(OPENSSL_TARGET linux-generic32) endif() -endif() - -if(CORE_SYSTEM_NAME MATCHES "ios") - set(configure_command CC=${CMAKE_COMPILER} AR=${CMAKE_AR} INSTALL_PREFIX="" - /Configure iphoneos-cross no-shared zlib no-asm - --prefix=${OUTPUT_DIR} - && sed -E -ie "s|^CFLAGS=-|CFLAGS=${CMAKE_C_FLAGS} -|" ${PROJECT_SOURCE_DIR}/Makefile - && sed -ie "s|-isysroot $.CROSS_TOP./SDKs/$.CROSS_SDK. ||" ${PROJECT_SOURCE_DIR}/Makefile - && sed -ie "s|apps test||" ${PROJECT_SOURCE_DIR}/Makefile - && sed -ie "s|static volatile sig_atomic_t intr_signal|static volatile intr_signal|" ${PROJECT_SOURCE_DIR}/crypto/ui/ui_openssl.c) -endif() - -if(CORE_SYSTEM_NAME MATCHES "osx") +elseif(CORE_SYSTEM_NAME MATCHES "ios" OR CORE_SYSTEM_NAME MATCHES "darwin_embedded") + set(OPENSSL_TARGET iphoneos-cross) +elseif(CORE_SYSTEM_NAME MATCHES "osx") if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(configure_command /Configure darwin64-x86_64-cc zlib no-asm no-shared --prefix=${OUTPUT_DIR} - && sed -ie "s|CC= /usr/bin/gcc-4.2|CC= ${CMAKE_COMPILER}|" ${PROJECT_SOURCE_DIR}/Makefile - && sed -E -ie "s|^CFLAGS=-|CFLAGS=${CMAKE_C_FLAGS} -|" ${PROJECT_SOURCE_DIR}/Makefile - && sed -ie "s|apps test||" ${PROJECT_SOURCE_DIR}/Makefile) + set(OPENSSL_TARGET darwin64-x86_64-cc) else() - set(configure_command /Configure darwin-x86-cc zlib no-asm no-shared --prefix=${OUTPUT_DIR} - && sed -ie "s|CC= /usr/bin/gcc-4.2|CC= ${CMAKE_COMPILER}|" ${PROJECT_SOURCE_DIR}/Makefile - && sed -E -ie "s|^CFLAGS=-|CFLAGS=${CMAKE_C_FLAGS} -|" ${PROJECT_SOURCE_DIR}/Makefile - && sed -ie "s|apps test||" ${PROJECT_SOURCE_DIR}/Makefile) + set(OPENSSL_TARGET darwin-i386-cc) endif() endif() +list(APPEND configure_command ${CMAKE_COMMAND} -E env) +list(APPEND configure_command ANDROID_NDK=${TOOLCHAIN}) +list(APPEND configure_command AR=${CMAKE_AR}) +list(APPEND configure_command CC=${CMAKE_C_COMPILER}) +list(APPEND configure_command CFLAGS=${CMAKE_C_FLAGS}) +list(APPEND configure_command CPPFLAGS=${CMAKE_CPP_FLAGS}) +list(APPEND configure_command CXX=${CMAKE_CXX_COMPILER}) +list(APPEND configure_command CXXFLAGS=${CMAKE_CXX_FLAGS}) +list(APPEND configure_command INSTALL_PREFIX=) +list(APPEND configure_command LDFLAGS=${CMAKE_LD_FLAGS}) +list(APPEND configure_command RANLIB=${CMAKE_RANLIB}) +list(APPEND configure_command /Configure) +list(APPEND configure_command ${OPENSSL_TARGET}) +list(APPEND configure_command no-shared zlib) +if(PLATFORM MATCHES appletvos) + list(APPEND configure_command no-async) +endif() +list(APPEND configure_command --prefix=${OUTPUT_DIR}) +list(APPEND configure_command --with-zlib-include=${OUTPUT_DIR}/include) +list(APPEND configure_command --with-zlib-lib=${OUTPUT_DIR}/lib) +list(APPEND configure_command COMMAND sed -ie "s|PROGRAMS=|PROGRAMS=#|" ${PROJECT_SOURCE_DIR}/Makefile) +list(APPEND configure_command COMMAND sed -ie "s|-isysroot $.CROSS_TOP./SDKs/$.CROSS_SDK. ||" ${PROJECT_SOURCE_DIR}/Makefile) + +include(ExternalProject) + externalproject_add(openssl SOURCE_DIR ${CMAKE_SOURCE_DIR} UPDATE_COMMAND "" @@ -76,5 +64,4 @@ INSTALL_COMMAND "" BUILD_IN_SOURCE 1) -install(CODE "execute_process(COMMAND find ${CMAKE_SOURCE_DIR} -name Makefile -exec sed -ie s|INSTALL_PREFIX|stupidshit|g {} \;) - execute_process(COMMAND make install_sw WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})") +install(CODE "execute_process(COMMAND make install_sw WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})") diff -Nru kodi-inputstream-rtmp-2.0.5/depends/common/zlib/02-disable-example-binaries.patch kodi-inputstream-rtmp-2.0.6/depends/common/zlib/02-disable-example-binaries.patch --- kodi-inputstream-rtmp-2.0.5/depends/common/zlib/02-disable-example-binaries.patch 1970-01-01 00:00:00.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/depends/common/zlib/02-disable-example-binaries.patch 2013-05-31 22:59:22.000000000 +0000 @@ -0,0 +1,28 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -226,25 +226,3 @@ endif() + if(NOT SKIP_INSTALL_FILES AND NOT SKIP_INSTALL_ALL ) + install(FILES ${ZLIB_PC} DESTINATION "${INSTALL_PKGCONFIG_DIR}") + endif() +- +-#============================================================================ +-# Example binaries +-#============================================================================ +- +-add_executable(example test/example.c) +-target_link_libraries(example zlib) +-add_test(example example) +- +-add_executable(minigzip test/minigzip.c) +-target_link_libraries(minigzip zlib) +- +-if(HAVE_OFF64_T) +- add_executable(example64 test/example.c) +- target_link_libraries(example64 zlib) +- set_target_properties(example64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") +- add_test(example64 example64) +- +- add_executable(minigzip64 test/minigzip.c) +- target_link_libraries(minigzip64 zlib) +- set_target_properties(minigzip64 PROPERTIES COMPILE_FLAGS "-D_FILE_OFFSET_BITS=64") +-endif() diff -Nru kodi-inputstream-rtmp-2.0.5/depends/windows/librtmp/CMakeLists.txt kodi-inputstream-rtmp-2.0.6/depends/windows/librtmp/CMakeLists.txt --- kodi-inputstream-rtmp-2.0.5/depends/windows/librtmp/CMakeLists.txt 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/depends/windows/librtmp/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) project(librtmp C CXX) diff -Nru kodi-inputstream-rtmp-2.0.5/depends/windows/openssl/CMakeLists.txt kodi-inputstream-rtmp-2.0.6/depends/windows/openssl/CMakeLists.txt --- kodi-inputstream-rtmp-2.0.5/depends/windows/openssl/CMakeLists.txt 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/depends/windows/openssl/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(openssl VERSION 1.1.1 LANGUAGES C) diff -Nru kodi-inputstream-rtmp-2.0.5/depends/windows/strawberryperl/CMakeLists.txt kodi-inputstream-rtmp-2.0.6/depends/windows/strawberryperl/CMakeLists.txt --- kodi-inputstream-rtmp-2.0.5/depends/windows/strawberryperl/CMakeLists.txt 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/depends/windows/strawberryperl/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.5) project(strawberryperl VERSION 5.28.0.1) diff -Nru kodi-inputstream-rtmp-2.0.5/depends/windowsstore/librtmp/CMakeLists.txt kodi-inputstream-rtmp-2.0.6/depends/windowsstore/librtmp/CMakeLists.txt --- kodi-inputstream-rtmp-2.0.5/depends/windowsstore/librtmp/CMakeLists.txt 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/depends/windowsstore/librtmp/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) project(librtmp C CXX) diff -Nru kodi-inputstream-rtmp-2.0.5/depends/windowsstore/openssl/CMakeLists.txt kodi-inputstream-rtmp-2.0.6/depends/windowsstore/openssl/CMakeLists.txt --- kodi-inputstream-rtmp-2.0.5/depends/windowsstore/openssl/CMakeLists.txt 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/depends/windowsstore/openssl/CMakeLists.txt 2013-05-31 22:59:22.000000000 +0000 @@ -1,7 +1,6 @@ +cmake_minimum_required(VERSION 3.5) project(openssl) -cmake_minimum_required(VERSION 2.8) - include(CheckSymbolExists) check_symbol_exists(_X86_ "Windows.h" _X86_) check_symbol_exists(_AMD64_ "Windows.h" _X64_) diff -Nru kodi-inputstream-rtmp-2.0.5/FindRTMP.cmake kodi-inputstream-rtmp-2.0.6/FindRTMP.cmake --- kodi-inputstream-rtmp-2.0.5/FindRTMP.cmake 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/FindRTMP.cmake 2013-05-31 22:59:22.000000000 +0000 @@ -6,27 +6,23 @@ # RTMP_LIBRARIES - The librtmp libraries if(PKG_CONFIG_FOUND) - pkg_check_modules (PC_RTMP librtmp QUIET) + pkg_check_modules(PC_RTMP librtmp QUIET) endif() find_path(RTMP_INCLUDE_DIR librtmp/rtmp.h PATHS ${PC_RTMP_INCLUDEDIR}) find_library(RTMP_LIBRARY rtmp librtmp PATHS ${PC_RTMP_LIBDIR}) -if(PC_RTMP_FOUND) - if(RTMP_LIBRARY) - set(RTMP_LIBRARIES ${PC_RTMP_LIBRARIES}) - else() - unset(RTMP_LIBRARIES) - endif() - if(RTMP_INCLUDE_DIR) - set(RTMP_INCLUDE_DIRS ${RTMP_INCLUDE_DIR} ${PC_RTMP_INCLUDE_DIRS}) - endif() -else() +set(RTMP_VERSION ${PC_RTMP_VERSION}) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(RTMP + REQUIRED_VARS RTMP_INCLUDE_DIR RTMP_LIBRARY + VERSION_VAR RTMP_VERSION) + +if(RTMP_FOUND) set(RTMP_LIBRARIES ${RTMP_LIBRARY}) set(RTMP_INCLUDE_DIRS ${RTMP_INCLUDE_DIR}) endif() -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(RTMP DEFAULT_MSG RTMP_INCLUDE_DIRS RTMP_LIBRARIES) mark_as_advanced(RTMP_INCLUDE_DIRS RTMP_LIBRARIES) diff -Nru kodi-inputstream-rtmp-2.0.5/inputstream.rtmp/addon.xml.in kodi-inputstream-rtmp-2.0.6/inputstream.rtmp/addon.xml.in --- kodi-inputstream-rtmp-2.0.5/inputstream.rtmp/addon.xml.in 2019-02-11 08:37:42.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/inputstream.rtmp/addon.xml.in 2013-05-31 22:59:22.000000000 +0000 @@ -1,7 +1,7 @@ @ADDON_DEPENDS@ diff -Nru kodi-inputstream-rtmp-2.0.5/Jenkinsfile kodi-inputstream-rtmp-2.0.6/Jenkinsfile --- kodi-inputstream-rtmp-2.0.5/Jenkinsfile 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/Jenkinsfile 2013-05-31 22:59:22.000000000 +0000 @@ -1 +1 @@ -buildPlugin() +buildPlugin(version: "Leia") diff -Nru kodi-inputstream-rtmp-2.0.5/README.md kodi-inputstream-rtmp-2.0.6/README.md --- kodi-inputstream-rtmp-2.0.5/README.md 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/README.md 2013-05-31 22:59:22.000000000 +0000 @@ -16,7 +16,7 @@ The following instructions assume you will have built Kodi already in the `kodi-build` directory suggested by the README. -1. `git clone https://github.com/xbmc/xbmc.git` +1. `git clone --branch Leia https://github.com/xbmc/xbmc.git` 2. `git clone https://github.com/xbmc/inputstream.rtmp.git` 3. `cd inputstream.rtmp && mkdir build && cd build` 4. `cmake -DADDONS_TO_BUILD=inputstream.rtmp -DADDON_SRC_PREFIX=../.. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=../../xbmc/kodi-build/addons -DPACKAGE_ZIP=1 ../../xbmc/cmake/addons` diff -Nru kodi-inputstream-rtmp-2.0.5/.travis.yml kodi-inputstream-rtmp-2.0.6/.travis.yml --- kodi-inputstream-rtmp-2.0.5/.travis.yml 2018-11-04 23:51:08.000000000 +0000 +++ kodi-inputstream-rtmp-2.0.6/.travis.yml 2013-05-31 22:59:22.000000000 +0000 @@ -39,7 +39,7 @@ # before_script: - cd $TRAVIS_BUILD_DIR/.. - - git clone --depth=1 https://github.com/xbmc/xbmc.git + - git clone --branch Leia --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