diff options
Diffstat (limited to 'multimedia/xbmc/patches/0002-Revert-linux-link-ffmpeg-statically.patch')
| -rw-r--r-- | multimedia/xbmc/patches/0002-Revert-linux-link-ffmpeg-statically.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/multimedia/xbmc/patches/0002-Revert-linux-link-ffmpeg-statically.patch b/multimedia/xbmc/patches/0002-Revert-linux-link-ffmpeg-statically.patch index a610aa9f4c..a3f8a2cea2 100644 --- a/multimedia/xbmc/patches/0002-Revert-linux-link-ffmpeg-statically.patch +++ b/multimedia/xbmc/patches/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 -@@ -874,14 +874,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 -@@ -2619,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,11 +74,12 @@ index c389b76..0c6fc47 100644 AC_SUBST(USE_LIBAV_HACKS) AC_SUBST(PYTHON_VERSION) AC_SUBST(OUTPUT_FILES) -@@ -2666,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 @@ -290,4 +292,3 @@ index ca18a4a..906219c 100644 $(MAKE) -C $@ -- 1.8.5.3 - |