From 82da227217f39abb69cde7c1c6b4615238f0308b Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 11 Jul 2014 19:41:20 +0300 Subject: [PATCH] xbmc-master: dont depend on flac anymore Signed-off-by: Stephan Raue --- packages/mediacenter/xbmc-master/package.mk | 2 +- .../xbmc-master-999.04-bye-bye-libflac.patch | 40 +++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 packages/mediacenter/xbmc-master/patches/xbmc-master-999.04-bye-bye-libflac.patch diff --git a/packages/mediacenter/xbmc-master/package.mk b/packages/mediacenter/xbmc-master/package.mk index 785bf30a42..f9ec013917 100644 --- a/packages/mediacenter/xbmc-master/package.mk +++ b/packages/mediacenter/xbmc-master/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.xbmc.org" PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="toolchain boost Python zlib bzip2 systemd pciutils lzo pcre swig:host libass enca curl rtmpdump fontconfig fribidi gnutls tinyxml libjpeg-turbo libpng tiff freetype jasper libogg libcdio libmodplug faad2 flac libmpeg2 taglib libxml2 libxslt yajl sqlite libvorbis ffmpeg xbmc-master:host" +PKG_DEPENDS_TARGET="toolchain boost Python zlib bzip2 systemd pciutils lzo pcre swig:host libass enca curl rtmpdump fontconfig fribidi gnutls tinyxml libjpeg-turbo libpng tiff freetype jasper libogg libcdio libmodplug faad2 libmpeg2 taglib libxml2 libxslt yajl sqlite libvorbis ffmpeg xbmc-master:host" PKG_DEPENDS_HOST="toolchain" PKG_PRIORITY="optional" PKG_SECTION="mediacenter" diff --git a/packages/mediacenter/xbmc-master/patches/xbmc-master-999.04-bye-bye-libflac.patch b/packages/mediacenter/xbmc-master/patches/xbmc-master-999.04-bye-bye-libflac.patch new file mode 100644 index 0000000000..d7c9c9a35d --- /dev/null +++ b/packages/mediacenter/xbmc-master/patches/xbmc-master-999.04-bye-bye-libflac.patch @@ -0,0 +1,40 @@ +From 4b7c1455582ccb6f8979681b4baed93d2852140c Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Fri, 11 Jul 2014 19:37:12 +0300 +Subject: [PATCH] bye bye libflac + +--- + configure.in | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/configure.in b/configure.in +index 83687bb..7562012 100644 +--- a/configure.in ++++ b/configure.in +@@ -1055,7 +1055,6 @@ AC_CHECK_HEADER([ogg/ogg.h],, AC_MSG_ERROR($missing_library)) + AC_CHECK_HEADER([vorbis/vorbisfile.h],, AC_MSG_ERROR($missing_library)) + AC_CHECK_HEADER([libmodplug/modplug.h],, AC_MSG_ERROR($missing_library)) + AC_CHECK_HEADER([curl/curl.h],, AC_MSG_ERROR($missing_library)) +-AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library)) + + # we need to check for the header because if it exists we set the openssl + # and gcrypt MT callback hooks. This is mostly so that libcurl operates +@@ -1210,7 +1209,6 @@ fi + + XB_FIND_SONAME([OGG], [ogg]) + XB_FIND_SONAME([CURL], [curl]) +-XB_FIND_SONAME([FLAC], [FLAC]) + XB_FIND_SONAME([VORBIS], [vorbis]) + XB_FIND_SONAME([VORBISFILE], [vorbisfile]) + XB_FIND_SONAME([MODPLUG], [modplug]) +@@ -2592,7 +2590,6 @@ AC_SUBST(OUTPUT_FILES) + AC_SUBST(HAVE_XBMC_NONFREE) + AC_SUBST(USE_ASAP_CODEC) + AC_SUBST(LIBCURL_BASENAME) +-AC_SUBST(LIBFLAC_BASENAME) + AC_SUBST(LIBVORBISFILE_BASENAME) + AC_SUBST(LIBMODPLUG_BASENAME) + AC_SUBST(LIBOGG_BASENAME) +-- +1.9.1 +