xbmc: update to xbmc-12.2-71eb528

Signed-off-by: Stephan Raue <stephan@openelec.tv>

packages/mediacenter/xbmc-theme-Confluence/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-theme-Confluence"
-PKG_VERSION="12.2-18397e1"
+PKG_VERSION="12.2-71eb528"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="13.alpha-2435cf3"
 elif [ "$XBMC" = "xbmc-aml" ]; then

packages/mediacenter/xbmc/package.mk

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc"
-PKG_VERSION="12.2-18397e1"
+PKG_VERSION="12.2-71eb528"
 if [ "$XBMC" = "master" ]; then
   PKG_VERSION="13.alpha-2435cf3"
 elif [ "$XBMC" = "xbmc-aml" ]; then

packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-321-texturepacker-hostflags-and-rework.patch

@@ -1,169 +0,0 @@
-diff -Naur xbmc-frodo-0ff0d2e/configure.in xbmc-frodo-0ff0d2e.patch/configure.in
---- xbmc-frodo-0ff0d2e/configure.in	2012-10-11 15:45:44.000000000 +0200
-+++ xbmc-frodo-0ff0d2e.patch/configure.in	2012-10-11 16:49:08.872850880 +0200
-@@ -452,6 +452,12 @@
-   [use_texturepacker=$enableval],
-   [use_texturepacker=auto])
- 
-+AC_ARG_WITH([texturepacker-root],
-+  [AS_HELP_STRING([--with-texturepacker-root],
-+  [root dir to search for librarys and includes if building native TexturePacker (default is \$prefix)])],
-+  [use_texturepacker_root=$withval],
-+  [use_texturepacker_root=$prefix])
-+
- AC_ARG_WITH([lirc-device],
-   [AS_HELP_STRING([--with-lirc-device=file],
-   [specify the default LIRC device (default is /dev/lircd)])],
-@@ -2000,13 +2006,13 @@
- 
- USE_TEXTUREPACKER_NATIVE=0
- if test "x$use_texturepacker" != "xno"; then
--  final_message="$final_message\n  TexturePacker:Yes"
-   USE_TEXTUREPACKER=1
--  if test "x$use_texturepacker_native" = "xyes"; then
-+  if test "x$cross_compiling" = "xyes"; then
-     USE_TEXTUREPACKER_NATIVE=1
--    if [[ ! -d "$USE_TEXTUREPACKER_NATIVE_ROOT" ]]; then 
--      USE_TEXTUREPACKER_NATIVE_ROOT= 
--    fi
-+    USE_TEXTUREPACKER_NATIVE_ROOT="$use_texturepacker_root"
-+    final_message="$final_message\n  TexturePacker:Native ($USE_TEXTUREPACKER_NATIVE_ROOT)"
-+  else
-+    final_message="$final_message\n  TexturePacker:Yes"
-   fi
- else
-   final_message="$final_message\n  TexturePacker:No"
-diff -Naur xbmc-frodo-0ff0d2e/lib/libsquish/Makefile.in xbmc-frodo-0ff0d2e.patch/lib/libsquish/Makefile.in
---- xbmc-frodo-0ff0d2e/lib/libsquish/Makefile.in	2012-10-11 15:47:26.000000000 +0200
-+++ xbmc-frodo-0ff0d2e.patch/lib/libsquish/Makefile.in	2012-10-11 16:49:08.873850900 +0200
-@@ -11,26 +11,25 @@
-   singlecolourfit.cpp \
-   squish.cpp
- 
--CXXFLAGS+=-I.
--
--LIB=libsquish.a
--
--ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
--NATIVE_LIB=libsquish-native.so
--CLEAN_FILES+=$(NATIVE_LIB)
-+LIB              = libsquish.a
-+NATIVE_LIB       = libsquish-native.so
-+CLEAN_FILES     += $(NATIVE_LIB)
-+
-+HOST_CXX        ?= g++
-+CXXFLAGS        += -I.
-+HOST_CXXFLAGS   += -I.
- 
- ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
--NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
-+  HOST_CXXFLAGS += @DARWIN_NATIVE_ARCH@
- endif
- 
--all: $(LIB) $(NATIVE_LIB)
-+$(LIB): $(SRCS)
- # TexturePacker links to libsquish and needs to run on build system, so make a native flavor.
- $(NATIVE_LIB): $(SRCS)
- ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
--	g++ $(NATIVE_ARCH) -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
-+	$(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
- else
--	g++ -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
--endif
-+	$(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
- endif
- 
- include ../../Makefile.include
-diff -Naur xbmc-frodo-0ff0d2e/tools/TexturePacker/Makefile.in xbmc-frodo-0ff0d2e.patch/tools/TexturePacker/Makefile.in
---- xbmc-frodo-0ff0d2e/tools/TexturePacker/Makefile.in	2012-10-11 15:47:05.000000000 +0200
-+++ xbmc-frodo-0ff0d2e.patch/tools/TexturePacker/Makefile.in	2012-10-11 16:49:08.874850920 +0200
-@@ -1,56 +1,54 @@
--DEFINES += -D_LINUX -DUSE_LZO_PACKING
-+DEFINES       += -D_LINUX -DUSE_LZO_PACKING
- ifneq ($(or $(findstring powerpc,@ARCH@),$(findstring ppc, @ARCH@)),)
--DEFINES += -DHOST_BIGENDIAN
-+DEFINES       += -DHOST_BIGENDIAN
- endif
- 
--CXXFLAGS+= \
-+SRCS           = \
-+  md5.cpp \
-+  SDL_anigif.cpp \
-+  XBTFWriter.cpp \
-+  XBMCTex.cpp \
-+  @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
-+
-+TARGET         = TexturePacker
-+CLEAN_FILES    = $(TARGET)
-+
-+all: $(TARGET)
-+
-+HOST_CXX      ?= g++
-+HOST_ROOT_PATH = @USE_TEXTUREPACKER_NATIVE_ROOT@
-+
-+LIBS          += -lSDL_image -lSDL -llzo2
-+LIBS          += -L@abs_top_srcdir@/lib/libsquish -lsquish
-+HOST_LIBS     += -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2
-+HOST_LIBS     += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
-+
-+CXXFLAGS      += \
-   -I. \
-   -I@abs_top_srcdir@/lib \
-   -I@abs_top_srcdir@/xbmc \
-   -I@abs_top_srcdir@/xbmc/linux
- 
--RPATH=-Wl,-rpath=$(NATIVE_ROOT_PATH)/lib
-+HOST_CXXFLAGS += \
-+  -I. \
-+  -I@abs_top_srcdir@/lib \
-+  -I@abs_top_srcdir@/xbmc \
-+  -I@abs_top_srcdir@/xbmc/linux \
-+  -I$(HOST_ROOT_PATH)/include
-+
-+RPATH=-Wl,-rpath=$(HOST_ROOT_PATH)/lib
- 
--ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
--NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
--ifdef NATIVE_ROOT_PATH
- ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
- DEFINES += -DTARGET_DARWIN
- NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
- RPATH=
- endif
--NATIVE_CXXFLAGS+= -I. \
--                  -I$(NATIVE_ROOT_PATH)/include \
--                  -I@abs_top_srcdir@/lib \
--                  -I@abs_top_srcdir@/xbmc \
--                  -I@abs_top_srcdir@/xbmc/linux
--NATIVE_LIBS    += -L$(NATIVE_ROOT_PATH)/lib
--endif
--NATIVE_LIBS    += -lSDL_image -lSDL -llzo2
--NATIVE_LIBS    += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
--else
--LIBS    += -L@abs_top_srcdir@/lib/libsquish -lsquish
--endif
--
--LIBS    += -lSDL_image -lSDL -llzo2
--
--SRCS = \
--  md5.cpp \
--  SDL_anigif.cpp \
--  XBTFWriter.cpp \
--  XBMCTex.cpp \
--  @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
--
--
--TARGET = TexturePacker
--CLEAN_FILES=$(TARGET)
--
--all: $(TARGET)
- 
- ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
- # TexturePacker run native on build system, build it with native tools
- $(TARGET): $(SRCS) @abs_top_srcdir@/xbmc/guilib/XBTF.h
--	g++ $(DEFINES) $(NATIVE_ARCH) $(NATIVE_CXXFLAGS) $(SRCS) $(NATIVE_LIBS) $(RPATH) -o $(TARGET)
-+	make -C @abs_top_srcdir@/lib/libsquish libsquish-native.so
-+	$(HOST_CXX) $(DEFINES) $(NATIVE_ARCH) $(HOST_CXXFLAGS) $(SRCS) $(HOST_LIBS) $(RPATH) -o $(TARGET)
- clean:
- 	rm -f $(TARGET)
- else

packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-995.12-enable-vpp-fix-audio-out-of-sync.patch

@@ -1,34 +0,0 @@
-commit 7205cbc5abda0a8571170a132bd30fc54a4aa6b6
-Author: fritsch <peter.fruehberger@gmail.com>
-Date:   Tue Jun 18 18:59:05 2013 +0200
-
-    VPP: SkipDeint was not only meant for interlaced content (fixes Audio out of sync after pause, ffwd)
-
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-index fbe3fd5..0f138aa 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-@@ -771,8 +771,8 @@ void CVPPThread::Process()
-     if(currentFrame.valid)
-     {
-       bool isInterlaced = currentFrame.DVDPic.iFlags & DVP_FLAG_INTERLACED;
--      if(currentFrame.DVDPic.iFlags & DVP_FLAG_DROPDEINT)
--        isInterlaced = false;
-+      //if(currentFrame.DVDPic.iFlags & DVP_FLAG_DROPDEINT)
-+      //  isInterlaced = false;
- 
-       EDEINTERLACEMODE   mode = g_settings.m_currentVideoSettings.m_DeinterlaceMode;
-       EINTERLACEMETHOD method = g_settings.m_currentVideoSettings.m_InterlaceMethod;
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-index 6ccef59..b7b82c9 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-@@ -181,7 +181,7 @@ public:
-   virtual void Close();
-   virtual const std::string Name() { return "vaapi"; }
-   virtual CCriticalSection* Section() { if(m_display) return m_display.get(); else return NULL; }
--  virtual bool CanSkipDeint() { return true; }
-+  virtual bool CanSkipDeint() { return false; }
- 
-   int   GetBuffer(AVCodecContext *avctx, AVFrame *pic);
-   void  RelBuffer(AVCodecContext *avctx, AVFrame *pic);

packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-995.13-vpp-fix-skipping.patch

@@ -1,95 +0,0 @@
-commit 6f1d11cf3e44a37b5d90689bda9fc7df11ae8a52
-Author: fritsch <peter.fruehberger@gmail.com>
-Date:   Wed Jun 19 20:30:44 2013 +0200
-
-    VPP: Implement proper deinterlace skipping
-
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-index 0f138aa..fcc9ec9 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp
-@@ -569,10 +569,15 @@ int CDecoder::Check(AVCodecContext* avctx)
-   return 0;
- }
- 
-+bool CDecoder::CanSkipDeint()
-+{
-+  return m_vppth->CanSkipDeint();
-+}
- 
- CVPPThread::CVPPThread(CDisplayPtr& display, int width, int height)
-   :CThread("VAAPI VPP Thread")
-   ,m_stop(false)
-+  ,m_skipDeinterlace(false)
- {
-   m_vpp = new CVPP(display, width, height);
- }
-@@ -720,6 +725,11 @@ int CVPPThread::GetOutputQueueSize()
-   return m_output_queue.size();
- }
- 
-+bool CVPPThread::CanSkipDeint()
-+{
-+  return m_skipDeinterlace;
-+}
-+
- void CVPPThread::Flush()
- {
-   CSingleLock lock(m_work_lock);
-@@ -771,22 +781,22 @@ void CVPPThread::Process()
-     if(currentFrame.valid)
-     {
-       bool isInterlaced = currentFrame.DVDPic.iFlags & DVP_FLAG_INTERLACED;
--      //if(currentFrame.DVDPic.iFlags & DVP_FLAG_DROPDEINT)
--      //  isInterlaced = false;
- 
-       EDEINTERLACEMODE   mode = g_settings.m_currentVideoSettings.m_DeinterlaceMode;
-       EINTERLACEMETHOD method = g_settings.m_currentVideoSettings.m_InterlaceMethod;
- 
--      if (m_vpp->DeintBobReady() && (method == VS_INTERLACEMETHOD_VAAPI_AUTO || method == VS_INTERLACEMETHOD_AUTO)
--       && (mode == VS_DEINTERLACEMODE_FORCE || (mode == VS_DEINTERLACEMODE_AUTO && isInterlaced)))
-+      if (m_vpp->DeintBobReady() && !(currentFrame.DVDPic.iFlags & DVP_FLAG_DROPDEINT)
-+        && (method == VS_INTERLACEMETHOD_VAAPI_AUTO || method == VS_INTERLACEMETHOD_AUTO)
-+        && (mode == VS_DEINTERLACEMODE_FORCE || (mode == VS_DEINTERLACEMODE_AUTO && isInterlaced)))
-       {
-         bool topField = currentFrame.DVDPic.iFlags & DVP_FLAG_TOP_FIELD_FIRST;
--
-+        m_skipDeinterlace = true;
-         DoDeinterlacing(currentFrame, topField);
-         DoDeinterlacing(currentFrame, !topField);
-       }
-       else
-       {
-+        m_skipDeinterlace = false;
-         CVPPRenderPicture res;
-         res.valid = true;
-         res.DVDPic = currentFrame.DVDPic;
-diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-index b7b82c9..8361ff0 100644
---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h
-@@ -134,6 +134,7 @@ public:
- 
-   void InsertNewFrame(CVPPDecodedPicture &new_frame);
-   void WaitForOutput(unsigned long msec = 0);
-+  virtual bool CanSkipDeint();
-   CVPPRenderPicture GetOutputPicture();
- 
-   int GetInputQueueSize();
-@@ -153,6 +154,7 @@ protected:
-   CVPP *m_vpp;
- 
-   bool m_stop;
-+  bool m_skipDeinterlace;
- 
-   CCriticalSection m_work_lock;
- 
-@@ -181,7 +183,7 @@ public:
-   virtual void Close();
-   virtual const std::string Name() { return "vaapi"; }
-   virtual CCriticalSection* Section() { if(m_display) return m_display.get(); else return NULL; }
--  virtual bool CanSkipDeint() { return false; }
-+  virtual bool CanSkipDeint();
- 
-   int   GetBuffer(AVCodecContext *avctx, AVFrame *pic);
-   void  RelBuffer(AVCodecContext *avctx, AVFrame *pic);

packages/mediacenter/xbmc/patches/12.2-18397e1/xbmc-999-dualaudiofix.patch

@@ -1,13 +0,0 @@
-diff -Naur xbmc-12.2-83bda98/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp xbmc-12.2-83bda98.patch/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp
---- xbmc-12.2-83bda98/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp	2013-08-25 21:45:30.000000000 +0200
-+++ xbmc-12.2-83bda98.patch/xbmc/video/dialogs/GUIDialogAudioSubtitleSettings.cpp	2013-08-26 01:26:41.950633846 +0200
-@@ -277,7 +277,9 @@
-       case 0: g_guiSettings.SetInt("audiooutput.mode", AUDIO_ANALOG ); break;
-       case 1: g_guiSettings.SetInt("audiooutput.mode", AUDIO_IEC958 ); bitstream = true; break;
-       case 2: g_guiSettings.SetInt("audiooutput.mode", AUDIO_HDMI   ); bitstream = true; break;
-+#ifdef TARGET_RASPBERRY_PI
-       case 3: g_guiSettings.SetInt("audiooutput.mode", AUDIO_BOTH   ); break;
-+#endif
-     }
- 
-     EnableSettings(AUDIO_SETTINGS_OUTPUT_TO_ALL_SPEAKERS, bitstream);