diff --git a/packages/mediacenter/xbmc-master-theme-Confluence/package.mk b/packages/mediacenter/xbmc-master-theme-Confluence/package.mk index 7731d41513..2e6b8c2f8a 100644 --- a/packages/mediacenter/xbmc-master-theme-Confluence/package.mk +++ b/packages/mediacenter/xbmc-master-theme-Confluence/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-master-theme-Confluence" -PKG_VERSION="14-92141a9" +PKG_VERSION="14-67f025d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc-master/package.mk b/packages/mediacenter/xbmc-master/package.mk index a0dd2cf336..a2e891eac4 100644 --- a/packages/mediacenter/xbmc-master/package.mk +++ b/packages/mediacenter/xbmc-master/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-master" -PKG_VERSION="14-92141a9" +PKG_VERSION="14-67f025d" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" 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 index d7c9c9a35d..16ac4dd9c0 100644 --- 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 @@ -7,27 +7,26 @@ 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)) +diff -Naur xbmc-master-14-67f025d/configure.in xbmc-master-14-67f025d.patch/configure.in +--- xbmc-master-14-67f025d/configure.in 2014-07-25 06:45:49.000000000 +0200 ++++ xbmc-master-14-67f025d.patch/configure.in 2014-07-25 06:54:20.396754173 +0200 +@@ -1056,7 +1056,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 + AC_CHECK_HEADER([curl/curl.h],, AC_MSG_ERROR($missing_library)) + XB_FIND_SONAME([CURL], [curl]) +@@ -1219,7 +1218,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) +@@ -2596,7 +2594,6 @@ AC_SUBST(HAVE_XBMC_NONFREE) AC_SUBST(USE_ASAP_CODEC) AC_SUBST(LIBCURL_BASENAME) @@ -35,6 +34,3 @@ index 83687bb..7562012 100644 AC_SUBST(LIBVORBISFILE_BASENAME) AC_SUBST(LIBMODPLUG_BASENAME) AC_SUBST(LIBOGG_BASENAME) --- -1.9.1 -