[mythtv] Revert upstream commit b9c5f8b2ff983343d2545ec87022d18fcf65fe1f to fix build.

commit 2ee7c9a2ad2f1acf8cbebd1e59981c9a8da01ee7 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Oct 5 19:00:19 2018 +0100 Revert upstream commit b9c5f8b2ff983343d2545ec87022d18fcf65fe1f to fix build. b9c5f8b2ff983343d2545ec87022d18fcf65fe1f.patch | 144 +++++++++++++++++++++++++ mythtv.spec | 6 +- 2 files changed, 149 insertions(+), 1 deletion(-) --- diff --git a/b9c5f8b2ff983343d2545ec87022d18fcf65fe1f.patch b/b9c5f8b2ff983343d2545ec87022d18fcf65fe1f.patch new file mode 100644 index 0000000..8a01a1c --- /dev/null +++ b/b9c5f8b2ff983343d2545ec87022d18fcf65fe1f.patch @@ -0,0 +1,144 @@ +commit b9c5f8b2ff983343d2545ec87022d18fcf65fe1f +Author: Mark Spieth <mspieth(a)digivation.com.au&gt; +Date: Fri Mar 30 15:27:12 2018 +1100 + + Android mythplugin build updates + + refs #13252 + + Also required for minimyth builds. + + Signed-off-by: Stuart Auchterlonie <stuarta(a)mythtv.org&gt; + (cherry picked from commit 443bbeffabdfd02d334a0df47200332ecf6ee1d1) + +diff --git a/mythplugins/configure b/mythplugins/configure +index 7c07d42804..941d15de8e 100755 +--- a/mythplugins/configure ++++ b/mythplugins/configure +@@ -220,7 +220,7 @@ EOF + } + + add_ldflags(){ +- append LDFLAGS "$@" ++ append ELDFLAGS "$@" + } + + add_cxxflags(){ +@@ -307,6 +307,7 @@ disable $DEPRECATED_PLUGIN_LIST + prefix="/usr/local" + libdir_name="lib" + sysroot="" ++mythroot="" + ln_s="ln -sf" + + logfile="config.ep" +@@ -326,13 +327,16 @@ NB: all --enable-* options can be reversed with --disable-* + + Generic options: + --prefix=PREFIX MythTV install location PREFIX [$prefix] +- --sysroot=SYSROOT MythTV sysroot location SYSROOT [$sysroot] ++ --sysroot=SYSROOT General sysroot location SYSROOT [$sysroot] ++ --mythroot=SYSROOT MythTV specific sysroot location [$mythroot] + --qmake=QMAKE use specified qmake [$qmake] ++ --qmakespecs=QMAKE use specified qmakespecs [$qmakespecs] + --python=PATH Force a specific python executable to use [$python] + --libdir-name=LIBNAME install/look for libs in PREFIX/LIBNAME [$libdir_name] + --help print this message + --enable-all Enable all options + --previous use previous configure parameters if possible ++ --extra-ldflags=ELDFLAGS add ELDFLAGS to LDFLAGS [$LDFLAGS] + + MythArchive related options: + --enable-mytharchive build the mytharchive plugin [$archive] +@@ -397,8 +401,10 @@ fi + CMDLINE_SET=" + logfile + qmake ++ qmakespecs + python + sysroot ++ mythroot + " + + CONFIGURATION_OPTS="" +@@ -452,6 +458,9 @@ for opt do + die_unknown $opt + fi + ;; ++ --extra-ldflags=*) ++ add_ldflags $optval ++ ;; + *) + optname="${opt%%=*}" + optname="${optname#--}" +@@ -528,7 +537,11 @@ EOF + fi + + # bring in mythtv config +-if [ -e $prefix/include/mythtv/mythconfig.mak ] ; then ++if [ -e $mythroot$prefix/include/mythtv/mythconfig.mak ] ; then ++ rm mythconfig.mak 2> /dev/null ++ cp $mythroot$prefix/include/mythtv/mythconfig.mak mythconfig.mak ++ sed -i -e "s,^SYSROOT\=.*,SYSROOT=$mythroot,g" mythconfig.mak ++elif [ -e $prefix/include/mythtv/mythconfig.mak ] ; then + rm mythconfig.mak 2> /dev/null + ${ln_s} $prefix/include/mythtv/mythconfig.mak mythconfig.mak + else +@@ -549,7 +562,7 @@ CFLAGS=${CFLAGS#CFLAGS=} + CPPFLAGS=$(cat mythconfig.mak | grep -e "^CPPFLAGS=") + CPPFLAGS=${CPPFLAGS#CPPFLAGS=} + LDFLAGS=$(cat mythconfig.mak | grep -e "^LDFLAGS=") +-LDFLAGS=${LDFLAGS#LDFLAGS=} ++LDFLAGS="${LDFLAGS#LDFLAGS=} ${ELDFLAGS}" + CXX=$(cat mythconfig.mak | grep -e "^QMAKE_CXX=") + CXX=${CXX#QMAKE_CXX=} + ECXXFLAGS=$(cat mythconfig.mak | grep -e "^ECXXFLAGS=") +@@ -581,6 +594,9 @@ if [ x"$qmake" = "xqmake" ]; then + else + CHECK_QMAKE=`which $qmake 2>/dev/null`" "`which qmake-qt5 2>/dev/null`" /usr/lib64/qt5/bin/qmake /usr/lib/x86_64-linux-gnu/qt5/bin/qmake /usr/lib/i386-linux-gnu/qt5/bin/qmake /usr/lib/arm-linux-gnueabihf/qt5/bin/qmake /usr/local/lib/qt5/bin/qmake" + fi ++if [ -n "qmakespec" ]; then ++ qmake="$qmake -spec $qmakespec" ++fi + # try to find a qt5 qmake to use + found_qmake='' + for i in $CHECK_QMAKE; do +diff --git a/mythplugins/mythgame/mythgame/external/ioapi.c b/mythplugins/mythgame/mythgame/external/ioapi.c +index 7f5c191b2a..8db1d9f9be 100644 +--- a/mythplugins/mythgame/mythgame/external/ioapi.c ++++ b/mythplugins/mythgame/mythgame/external/ioapi.c +@@ -14,7 +14,7 @@ + #define _CRT_SECURE_NO_WARNINGS + #endif + +-#if defined(__APPLE__) || defined(IOAPI_NO_64) ++#if defined(__APPLE__) || defined(IOAPI_NO_64) || defined(ANDROID) + // In darwin and perhaps other BSD variants off_t is a 64 bit value, hence no need for specific 64 bit functions + #define FOPEN_FUNC(filename, mode) fopen(filename, mode) + #define FTELLO_FUNC(stream) ftello(stream) +diff --git a/mythplugins/programs-libs.pro b/mythplugins/programs-libs.pro +index 905b593375..c8dce9abb1 100644 +--- a/mythplugins/programs-libs.pro ++++ b/mythplugins/programs-libs.pro +@@ -5,7 +5,7 @@ INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmyth + INCLUDEPATH += $${SYSROOT}$${PREFIX}/include/mythtv/libmythservicecontracts + DEPENDPATH *= $${INCLUDEPATH} + +-LIBS += -L$${LIBDIR} $$EXTRA_LIBS -lmythbase-$$LIBVERSION ++LIBS += -L$${SYSROOT}$${LIBDIR} $$EXTRA_LIBS -lmythbase-$$LIBVERSION + LIBS += -lmyth-$$LIBVERSION -lmythui-$$LIBVERSION -lmythupnp-$$LIBVERSION + LIBS += -lmythservicecontracts-$$LIBVERSION + LIBS += -lmythavcodec +diff --git a/mythplugins/targetdep.pro b/mythplugins/targetdep.pro +index 55f714bde9..1a447f0ef0 100644 +--- a/mythplugins/targetdep.pro ++++ b/mythplugins/targetdep.pro +@@ -10,7 +10,7 @@ MYTH_SHLIB_EXT=$${LIBVERSION}.$${QMAKE_EXTENSION_SHLIB} + MYTH_LIB_EXT =$${LIBVERSION}.$${QMAKE_EXTENSION_LIB} + + +-DEPLIBS = $${LIBDIR} ++DEPLIBS = $${SYSROOT}$${LIBDIR} + + # On Windows, dlls were installed with exes: + mingw : DEPLIBS = $${PREFIX}/bin diff --git a/mythtv.spec b/mythtv.spec index b404050..644611d 100644 --- a/mythtv.spec +++ b/mythtv.spec @@ -81,6 +81,7 @@ License: GPLv2+ and LGPLv2+ and LGPLv2 and (GPLv2 or QPL) and (GPLv2+ or URL: http://www.mythtv.org/ Source0: https://github.com/MythTV/%{name}/archive/v%{version}/%{name}-%{version}.... Patch0: https://github.com/MythTV/%{name}/compare/v%{version}..%{shorthash}.patch +Patch10: b9c5f8b2ff983343d2545ec87022d18fcf65fe1f.patch ################################################################################ @@ -835,7 +836,9 @@ on demand content. ################################################################################ %prep -%autosetup -p1 -n %{name}-%{version} +%setup -q -n %{name}-%{version} +%patch0 -p1 +%patch10 -p1 -R # Remove compiled python file #find -name *.pyc -exec rm -f {} \; @@ -1406,6 +1409,7 @@ exit 0 - Update to 29.1.39.20181004git74fff5c285 from branch fixes/29 - Fixes ERROR: ambiguous python shebang in F30 - Rework sources to avoid upload a new snapshot with 100MB, for every commit. +- Revert upstream commit b9c5f8b2ff983343d2545ec87022d18fcf65fe1f to fix build. * Thu Oct 04 2018 Sérgio Basto <sergio(a)serjux.com&gt; - 29.1-24.36.20180907.gdde16d475a - Mass rebuild for x264 and/or x265