Test changes without upgrading nettle and gnutls

Author: phunkyfish

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

depends/common/ffmpeg/0001-hack-fix.patch

@@ -0,0 +1,25 @@
+From 7ea3c3037d1c385001eccd850059bfa137288979 Mon Sep 17 00:00:00 2001
+From: Alwin Esch <alwin.esch@web.de>
+Date: Wed, 15 Jan 2020 03:46:11 +0100
+Subject: [PATCH] hack fix
+
+---
+ configure | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure b/configure
+index 34c2adb..957e502 100755
+--- a/configure
++++ b/configure
+@@ -1569,7 +1569,7 @@ require_cpp_condition(){
+ require_pkg_config(){
+     log require_pkg_config "$@"
+     pkg_version="$2"
+-    check_pkg_config "$@" || die "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message"
++    check_pkg_config "$@" || echo "ERROR: $pkg_version not found using pkg-config$pkg_config_fail_message"
+ }
+ 
+ test_host_cc(){
+-- 
+2.20.1
+

depends/common/ffmpeg/01-fix-build-test-with-this-as-static-on-ffmpeg.patch

@@ -0,0 +1,25 @@
+From e70f8aad605e17795d9bc351850ca0a37ad0071d Mon Sep 17 00:00:00 2001
+From: Alwin Esch <alwin.esch@web.de>
+Date: Wed, 15 Jan 2020 10:04:53 +0100
+Subject: [PATCH] fix build test with this as static on ffmpeg
+
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index 957e502..f108564 100755
+--- a/configure
++++ b/configure
+@@ -7,6 +7,8 @@
+ # Copyright (c) 2005-2008 Mans Rullgard
+ #
+ 
++export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$(pkg-config --variable pc_path pkg-config)"
++
+ # Prevent locale nonsense from breaking basic text processing.
+ LC_ALL=C
+ export LC_ALL
+-- 
+2.20.1
+

depends/common/ffmpeg/CMakeLists.txt

@@ -92,7 +92,7 @@ message(STATUS "FFMPEG_CONF: ${ffmpeg_conf}")
 include(ExternalProject)
 externalproject_add(ffmpeg
                     SOURCE_DIR ${CMAKE_SOURCE_DIR}
-                    CONFIGURE_COMMAND ${CMAKE_SOURCE_DIR}/configure
+                    CONFIGURE_COMMAND PKG_CONFIG_PATH=${CMAKE_INSTALL_PREFIX}/lib/pkgconfig ${CMAKE_SOURCE_DIR}/configure
                       --prefix=${CMAKE_INSTALL_PREFIX}
                       --extra-version="kodi-${FFMPEG_VER}"
                       --disable-devices

depends/common/gnutls/size-max.patch depends/common/gnutls/01-size-max.patchdepends/common/gnutls/size-max.patch renamed to depends/common/gnutls/01-size-max.patch

@@ -16,13 +16,16 @@ externalproject_add(gnutls
                       --prefix=${CMAKE_INSTALL_PREFIX}
                       --disable-shared
                       --without-p11-kit
+                      --without-idn
                       --disable-nls
                       --with-included-unistring
                       --with-included-libtasn1
                       --enable-local-libopts
+                      --without-nettle-mini
                       --disable-doc
                       --disable-tests
                       --disable-guile
+                      --with-pic
                       ${gnutls_conf})
 
 install(CODE "Message(Done)")

depends/common/gnutls/CMakeLists.txt

@@ -1,2 +1,3 @@
 nettle
 gmp
+xz-utils

depends/common/gnutls/Makefile

@@ -15,11 +15,17 @@ list(APPEND nettle_conf LIBS=-lgmp)
 include(ExternalProject)
 externalproject_add(nettle
                     SOURCE_DIR ${CMAKE_SOURCE_DIR}
+                    UPDATE_COMMAND <SOURCE_DIR>/.bootstrap
                     CONFIGURE_COMMAND <SOURCE_DIR>/configure
                       --prefix=${CMAKE_INSTALL_PREFIX}
+                      --libdir=${CMAKE_INSTALL_PREFIX}/lib
                       --disable-shared
                       --disable-openssl
+                      --disable-documentation
+                      --enable-pic
                       CCPIC=
-                      ${nettle_conf})
+                      ${nettle_conf}
+                    INSTALL_COMMAND ""
+                    BUILD_IN_SOURCE 1)
 
-install(CODE "Message(Done)")
+install(CODE "execute_process(COMMAND make install WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})")