jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc: revert PR4642

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2014-05-05 14:21:04 +02:00
parent 7834402efc
commit 0a356b087b
1 changed files with 89 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
packages/mediacenter/xbmc/patches/xbmc-999.80.02-revert-PR4642.patch Normal file
View File

@ -0,0 +1,89 @@
From b237030e1ed5d6a983aa17b1c0bf35a42ccc77f4 Mon Sep 17 00:00:00 2001
From: Jonathan Marshall <jmarshall@xbmc.org>
Date: Mon, 5 May 2014 08:45:49 +1200
Subject: [PATCH] Revert "Merge pull request #4642 from wsnipex/linking-fix"
This reverts commit 0d1d80373801c330e2a5dc938cc50d0d6d3ccc6d, reversing
changes made to 60bd97bdd8d662807076e9838ad7632b8c92d4fa.
---
Makefile.in | 2 +-
configure.in | 36 ++++++++++++++----------------------
2 files changed, 15 insertions(+), 23 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 754f153..1db6ee2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -481,7 +481,7 @@ FFMPEGOBJS = lib/ffmpeg/libavcodec/libavcodec.a \
lib/ffmpeg/libpostproc/libpostproc.a \
lib/ffmpeg/libswscale/libswscale.a
DYNOBJSXBMC+= $(FFMPEGOBJS)
-LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@ @HOGWEED_ALL_LIBS@
+LIBS+= @GNUTLS_ALL_LIBS@ @VORBISENC_ALL_LIBS@
$(FFMPEGOBJS): dvdpcodecs
endif
diff --git a/configure.in b/configure.in
index f3e142f..d8d06df 100644
--- a/configure.in
+++ b/configure.in
@@ -880,7 +880,6 @@ if test "$use_static_ffmpeg" = "yes"; then
# 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
@@ -1529,26 +1528,20 @@ fi
# libRTMP
if test "$use_librtmp" != "no"; then
- PKG_CHECK_MODULES([LIBRTMP], [librtmp],
- [INCLUDES="$INCLUDES $LIBRTMP_CFLAGS"; LIBS="$LIBS $LIBRTMP_LIBS";
- AC_DEFINE([HAS_LIBRTMP], [1], [Whether to use libRTMP library.])
- RTMP_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors librtmp)
- test "$use_static_ffmpeg" = "yes" && LIBS="$LIBS $RTMP_ALL_LIBS"],
- [AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
- [if test "$use_librtmp" = "yes"; then
- AC_MSG_ERROR($librtmp_not_found)
- elif test "$use_librtmp" != "no"; then
- AC_MSG_NOTICE($librtmp_not_found)
- use_librtmp="no"
- fi
- ])
- if test "$use_librtmp" != "no"; then
- XB_FIND_SONAME([RTMP], [rtmp], [use_librtmp])
- fi
- if test "$use_librtmp" != "no"; then
- AC_DEFINE([HAS_LIBRTMP], [1], [Whether to use libRTMP library.])
- fi
- ])
+ AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
+ [if test "$use_librtmp" = "yes"; then
+ AC_MSG_ERROR($librtmp_not_found)
+ elif test "$use_librtmp" != "no"; then
+ AC_MSG_NOTICE($librtmp_not_found)
+ use_librtmp="no"
+ fi
+ ])
+ if test "$use_librtmp" != "no"; then
+ XB_FIND_SONAME([RTMP], [rtmp], [use_librtmp])
+ fi
+ if test "$use_librtmp" != "no"; then
+ AC_DEFINE([HAS_LIBRTMP], [1], [Whether to use libRTMP library.])
+ fi
else
AC_MSG_NOTICE($librtmp_disabled)
fi
@@ -2674,7 +2667,6 @@ 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
--
1.9.1