diff --git a/packages/mediacenter/xbmc-theme-Confluence/package.mk b/packages/mediacenter/xbmc-theme-Confluence/package.mk index bffc9a3fab..2343299ea6 100644 --- a/packages/mediacenter/xbmc-theme-Confluence/package.mk +++ b/packages/mediacenter/xbmc-theme-Confluence/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc-theme-Confluence" -PKG_VERSION="13-0d1d803" +PKG_VERSION="13-16232cc" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/package.mk b/packages/mediacenter/xbmc/package.mk index 802021b52e..6e3e80c548 100644 --- a/packages/mediacenter/xbmc/package.mk +++ b/packages/mediacenter/xbmc/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="xbmc" -PKG_VERSION="13-0d1d803" +PKG_VERSION="13-16232cc" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.80.02-revert-PR4642.patch b/packages/mediacenter/xbmc/patches/xbmc-999.80.02-revert-PR4642.patch deleted file mode 100644 index f7a2d61754..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-999.80.02-revert-PR4642.patch +++ /dev/null @@ -1,89 +0,0 @@ -From b237030e1ed5d6a983aa17b1c0bf35a42ccc77f4 Mon Sep 17 00:00:00 2001 -From: Jonathan Marshall -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 - diff --git a/packages/mediacenter/xbmc/patches/xbmc-999.80.05-PR4650.patch b/packages/mediacenter/xbmc/patches/xbmc-999.80.05-PR4650.patch deleted file mode 100644 index f7a838430f..0000000000 --- a/packages/mediacenter/xbmc/patches/xbmc-999.80.05-PR4650.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d14e6a8f8d4c00e104e8f782d66e60a5a3d19376 Mon Sep 17 00:00:00 2001 -From: Rainer Hochecker -Date: Sun, 4 May 2014 17:49:52 +0200 -Subject: [PATCH] paplayer: fix accidently disabled seek by - fc2b1b2c1ad0d235b91a33e430d39bd63de71f58 - ---- - xbmc/cores/paplayer/DVDPlayerCodec.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xbmc/cores/paplayer/DVDPlayerCodec.cpp b/xbmc/cores/paplayer/DVDPlayerCodec.cpp -index 1f7287b..b960e3b 100644 ---- a/xbmc/cores/paplayer/DVDPlayerCodec.cpp -+++ b/xbmc/cores/paplayer/DVDPlayerCodec.cpp -@@ -203,6 +203,7 @@ bool DVDPlayerCodec::Init(const CStdString &strFile, unsigned int filecache) - { - // rewind stream to beginning - Seek(0); -+ m_bCanSeek = true; - } - else - { --- -1.9.1 -