diff options
Diffstat (limited to '0002-Revert-linux-link-ffmpeg-statically.patch')
| -rw-r--r-- | 0002-Revert-linux-link-ffmpeg-statically.patch | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/0002-Revert-linux-link-ffmpeg-statically.patch b/0002-Revert-linux-link-ffmpeg-statically.patch index ba49693..c237b33 100644 --- a/0002-Revert-linux-link-ffmpeg-statically.patch +++ b/0002-Revert-linux-link-ffmpeg-statically.patch @@ -38,7 +38,7 @@ index 6f689cf..bfadbe6 100644 - lib/ffmpeg/libpostproc/libpostproc.a \ - lib/ffmpeg/libswscale/libswscale.a -DYNOBJSXBMC+= $(FFMPEGOBJS) --LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ +-LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @HOGWEED_ALL_LIBS@ - -$(FFMPEGOBJS): dvdpcodecs -endif @@ -50,7 +50,7 @@ diff --git a/configure.in b/configure.in index c389b76..0c6fc47 100644 --- a/configure.in +++ b/configure.in -@@ -880,14 +880,6 @@ elif test "$use_arch" = "arm"; then +@@ -874,15 +874,6 @@ elif test "$use_arch" = "arm"; then fi fi fi @@ -60,12 +60,13 @@ index c389b76..0c6fc47 100644 - # ffmpeg may depend on gnutls and vorbisenc, we add those libs at the end of linker - # command in order to resolve any missing symbols - GNUTLS_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors gnutls` +- HOGWEED_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors hogweed nettle` - VORBISENC_ALL_LIBS=`${PKG_CONFIG} --static --libs-only-l --silence-errors vorbisenc` -fi # Checks for library functions. AC_FUNC_ALLOCA -@@ -2626,7 +2618,6 @@ AC_SUBST(DISABLE_FISHBMC) +@@ -2627,7 +2618,6 @@ AC_SUBST(DISABLE_FISHBMC) AC_SUBST(DISABLE_PROJECTM) AC_SUBST(USE_SKIN_TOUCHED) AC_SUBST(USE_EXTERNAL_FFMPEG) @@ -73,16 +74,17 @@ index c389b76..0c6fc47 100644 AC_SUBST(USE_LIBAV_HACKS) AC_SUBST(PYTHON_VERSION) AC_SUBST(OUTPUT_FILES) -@@ -2672,8 +2663,6 @@ AC_SUBST(USE_ANDROID) +@@ -2673,9 +2663,6 @@ AC_SUBST(USE_ANDROID) AC_SUBST(GTEST_CONFIGURED) AC_SUBST(USE_DOXYGEN) AC_SUBST(USE_PVR_ADDONS) -AC_SUBST(GNUTLS_ALL_LIBS) +-AC_SUBST(HOGWEED_ALL_LIBS) -AC_SUBST(VORBISENC_ALL_LIBS) # pushd and popd are not available in other shells besides bash, so implement # our own pushd/popd functions -@@ -2830,7 +2819,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [ +@@ -2832,7 +2819,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [ --disable-ffserver \ --disable-ffmpeg \ --disable-crystalhd \ |