Merge pull request #1 from phunkyfish/enable-platforms

Support Android and Linux

Author: phunkyfish

.travis.yml

@@ -0,0 +1,42 @@
+language: cpp
+
+#
+# Define the build matrix
+#
+# Travis defaults to building on Ubuntu Trusty when building on
+# Linux. We need Xenial in order to get up to date versions of
+# cmake and g++.
+#
+env:
+  global:
+    - app_id=inputstream.ffmpegdirect
+
+matrix:
+  include:
+    - os: linux
+      dist: xenial
+      sudo: required
+      compiler: gcc
+    - os: linux
+      dist: xenial
+      sudo: required
+      compiler: clang
+    - os: osx
+      osx_image: xcode10.2
+
+before_install:
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get update -qq; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get install -y yasm; 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
+
+script: make

CMakeLists.txt

@@ -94,6 +94,8 @@ add_definitions(-DCATCHUP_VERSION=${CATCHUP_VERSION})
 
 build_addon(inputstream.ffmpegdirect CATCHUP DEPLIBS)
 
+set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS "${FFMPEG_LDFLAGS}")
+
 if(CORE_SYSTEM_NAME STREQUAL windowsstore)
     # fix linking
     set_target_properties(inputstream.ffmpegdirect PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/LTCG /defaultlib:vccorlib.lib /defaultlib:msvcrt.lib")

FindFFMPEG.cmake

@@ -179,22 +179,25 @@ if(NOT ENABLE_INTERNAL_FFMPEG OR KODI_DEPENDSBUILD)
   if(FFMPEG_FOUND)
     set(FFMPEG_LDFLAGS ${PC_FFMPEG_LDFLAGS} CACHE STRING "ffmpeg linker flags")
 
+    set(FFMPEG_LIBRARIES ${FFMPEG_LIBAVCODEC} ${FFMPEG_LIBAVFILTER}
+                         ${FFMPEG_LIBAVFORMAT} ${FFMPEG_LIBAVUTIL}
+                         ${FFMPEG_LIBSWSCALE} ${FFMPEG_LIBSWRESAMPLE}
+                         ${FFMPEG_LIBPOSTPROC} ${FFMPEG_LDFLAGS})
+    list(APPEND FFMPEG_DEFINITIONS -DFFMPEG_VER_SHA=\"${FFMPEG_VERSION}\")
+
     # check if ffmpeg libs are statically linked
     set(FFMPEG_LIB_TYPE SHARED)
     foreach(_fflib IN LISTS FFMPEG_LIBRARIES)
       if(${_fflib} MATCHES ".+\.a$" AND PC_FFMPEG_STATIC_LDFLAGS)
         set(FFMPEG_LDFLAGS ${PC_FFMPEG_STATIC_LDFLAGS} CACHE STRING "ffmpeg linker flags" FORCE)
         set(FFMPEG_LIB_TYPE STATIC)
+        if(NOT APPLE AND NOT WIN32)
+          set(FFMPEG_LDFLAGS "-Wl,-Bsymbolic ${FFMPEG_LDFLAGS}")
+        endif()
         break()
       endif()
     endforeach()
 
-    set(FFMPEG_LIBRARIES ${FFMPEG_LIBAVCODEC} ${FFMPEG_LIBAVFILTER}
-                         ${FFMPEG_LIBAVFORMAT} ${FFMPEG_LIBAVUTIL}
-                         ${FFMPEG_LIBSWSCALE} ${FFMPEG_LIBSWRESAMPLE}
-                         ${FFMPEG_LIBPOSTPROC} ${FFMPEG_LDFLAGS})
-    list(APPEND FFMPEG_DEFINITIONS -DFFMPEG_VER_SHA=\"${FFMPEG_VERSION}\")
-
     if(NOT TARGET ffmpeg)
       add_library(ffmpeg ${FFMPEG_LIB_TYPE} IMPORTED)
       set_target_properties(ffmpeg PROPERTIES

Jenkinsfile

@@ -1 +1 @@
-buildPlugin(version: "Matrix", deploy: ['osx-x86_64'])
+buildPlugin(version: "Matrix", deploy: ['android-aarch64', 'android-arm7', 'ios-aarch64', 'ios-arm7', 'osx-x86_64', 'ubuntu-ppa'])

depends/android/gmp/CMakeLists.txt

@@ -0,0 +1,17 @@
+project(gmp)
+
+cmake_minimum_required(VERSION 3.5)
+
+list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
+
+include(ExternalProject)
+externalproject_add(gmp
+                    SOURCE_DIR ${CMAKE_SOURCE_DIR}
+                    CONFIGURE_COMMAND <SOURCE_DIR>/configure
+                      ${COMPILER_WITH_LIBTOOL_SYSROOT_APPLE}
+                      --prefix=${CMAKE_INSTALL_PREFIX}
+                      --disable-shared
+                      --with-pic
+                      ${gmp_conf})
+
+install(CODE "Message(Done)")

depends/android/gmp/deps.txt

@@ -0,0 +1 @@
+iconv

depends/android/gmp/gmp.sha256

@@ -0,0 +1 @@
+5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2

depends/android/gmp/gmp.txt

@@ -0,0 +1 @@
+gmp http://mirrors.kodi.tv/build-deps/sources/gmp-6.1.2.tar.bz2

depends/android/iconv/CMakeLists.txt

@@ -0,0 +1,12 @@
+cmake_minimum_required(VERSION 3.5)
+project(iconv)
+
+include(ExternalProject)
+externalproject_add(iconv
+                    SOURCE_DIR ${CMAKE_SOURCE_DIR}
+                    CONFIGURE_COMMAND ./configure --disable-shared --prefix=${OUTPUT_DIR} --enable-extra-encodings --with-pic
+                    BUILD_COMMAND make
+                    INSTALL_COMMAND ""
+                    BUILD_IN_SOURCE 1)
+
+install(CODE "execute_process(COMMAND make install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")

depends/android/iconv/iconv.sha256

@@ -0,0 +1 @@
+e6a1b1b589654277ee790cce3734f07876ac4ccfaecbee8afa0b649cf529cc04