Merge pull request #1071 from Gujs/openelec-next-updates

xbmc-frodo: update to xbmc-pvr--334f9c6 version

packages/mediacenter/xbmc-frodo-theme-Confluence/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="xbmc-frodo-theme-Confluence"
 if [ "$PVR" = yes ]; then
-  PKG_VERSION="pvr-8f0c91b"
+  PKG_VERSION="pvr-334f9c6"
 else
   PKG_VERSION="58abd46"
 fi

packages/mediacenter/xbmc-frodo/meta

@@ -20,7 +20,7 @@
 
 PKG_NAME="xbmc-frodo"
 if [ "$PVR" = yes ]; then
-  PKG_VERSION="pvr-8f0c91b"
+  PKG_VERSION="pvr-334f9c6"
 else
   PKG_VERSION="58abd46"
 fi

packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-334f9c6-321-texturepacker-hostflags-and-rework.patch

@@ -1,7 +1,7 @@
 diff -Naur xbmc-frodo-433f681/configure.in xbmc-frodo-433f681.patch/configure.in
 --- xbmc-frodo-433f681/configure.in	2012-06-15 02:52:26.000000000 +0200
 +++ xbmc-frodo-433f681.patch/configure.in	2012-06-19 05:26:41.472596903 +0200
-@@ -405,6 +405,12 @@
+@@ -430,6 +430,12 @@
    [use_texturepacker=$enableval],
    [use_texturepacker=auto])
  
@@ -14,7 +14,7 @@ diff -Naur xbmc-frodo-433f681/configure.in xbmc-frodo-433f681.patch/configure.in
  AC_ARG_WITH([lirc-device],
    [AS_HELP_STRING([--with-lirc-device=file],
    [specify the default LIRC device (default is /dev/lircd)])],
-@@ -516,8 +522,7 @@
+@@ -563,8 +569,7 @@
       use_cpu=cortex-a8
       check_sdl_arch=[`file /opt/local/lib/libSDL_image.dylib | awk '{V=7; print $V}'`]
       if test "x$check_sdl_arch" = "xi386"; then
@@ -24,16 +24,7 @@ diff -Naur xbmc-frodo-433f681/configure.in xbmc-frodo-433f681.patch/configure.in
       else
         use_texturepacker=no
       fi
-@@ -533,8 +538,6 @@
+@@ -1869,13 +1874,13 @@
-   *86*-apple-darwin*)
-      use_joystick=no
-      use_vtbdecoder=no
--     use_texturepacker_native=yes
--     USE_TEXTUREPACKER_NATIVE_ROOT="$prefix"
-      ARCH="x86-osx"
-      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX")
-      ;;
-@@ -1756,13 +1759,13 @@
  
  USE_TEXTUREPACKER_NATIVE=0
  if test "x$use_texturepacker" != "xno"; then
@@ -84,8 +75,8 @@ diff -Naur xbmc-frodo-433f681/lib/libsquish/Makefile.in xbmc-frodo-433f681.patch
 -NATIVE_LIB=libsquish-native.so
 -CLEAN_FILES+=$(NATIVE_LIB)
 -
- ifeq ($(findstring osx,$(ARCH)),osx)
+ ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
--NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
+-NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
 +  HOST_CXXFLAGS += $(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
  endif
  
@@ -94,7 +85,7 @@ diff -Naur xbmc-frodo-433f681/lib/libsquish/Makefile.in xbmc-frodo-433f681.patch
 +
  # TexturePacker links to libsquish and needs to run on build system, so make a native flavor.
  $(NATIVE_LIB): $(SRCS)
- ifeq ($(findstring osx,$(ARCH)),osx)
+ ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
 -	g++ $(NATIVE_ARCH) -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
 +	$(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
  else
@@ -107,7 +98,7 @@ diff -Naur xbmc-frodo-433f681/lib/libsquish/Makefile.in xbmc-frodo-433f681.patch
 diff -Naur xbmc-frodo-433f681/tools/TexturePacker/Makefile.in xbmc-frodo-433f681.patch/tools/TexturePacker/Makefile.in
 --- xbmc-frodo-433f681/tools/TexturePacker/Makefile.in	2012-06-15 02:52:20.000000000 +0200
 +++ xbmc-frodo-433f681.patch/tools/TexturePacker/Makefile.in	2012-06-19 05:35:15.349564918 +0200
-@@ -1,48 +1,51 @@
+@@ -1,56 +1,52 @@
 -DEFINES += -D_LINUX -DUSE_LZO_PACKING
 +DEFINES       += -D_LINUX -DUSE_LZO_PACKING
  ifneq ($(or $(findstring powerpc,@ARCH@),$(findstring ppc, @ARCH@)),)
@@ -142,24 +133,31 @@ diff -Naur xbmc-frodo-433f681/tools/TexturePacker/Makefile.in xbmc-frodo-433f681
    -I@abs_top_srcdir@/xbmc \
    -I@abs_top_srcdir@/xbmc/linux
  
--ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
+-RPATH=-Wl,-rpath=$(NATIVE_ROOT_PATH)/lib
--NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
--ifdef NATIVE_ROOT_PATH
 +HOST_CXXFLAGS += \
 +  -I. \
 +  -I@abs_top_srcdir@/lib \
 +  -I@abs_top_srcdir@/xbmc \
 +  -I@abs_top_srcdir@/xbmc/linux \
 +  -I$(HOST_ROOT_PATH)/include
-+
+ 
- ifeq ($(findstring osx,@ARCH@),osx)
+-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=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
+ NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
+ RPATH=
  endif
--CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include
+-NATIVE_CXXFLAGS+= -I. \
--LIBS    += -L$(NATIVE_ROOT_PATH)/lib
+-                  -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
--LIBS    += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
+-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
@@ -182,7 +180,7 @@ diff -Naur xbmc-frodo-433f681/tools/TexturePacker/Makefile.in xbmc-frodo-433f681
  ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
  # TexturePacker run native on build system, build it with native tools
  $(TARGET): $(SRCS)
--	g++ $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET)
+-	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) -o $(TARGET)
  clean:

packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-334f9c6-402-enable_yasm_in_ffmpeg-0.1.patch

@@ -1,7 +1,7 @@
-diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
+diff -Naur xbmc-pvr-334f9c6/configure.in xbmc-pvr-334f9c6.patch/configure.in
---- xbmc-pvr-3513480/configure.in	2011-04-25 02:36:33.000000000 +0200
+--- xbmc-pvr-334f9c6/configure.in	2011-04-25 02:36:33.000000000 +0200
-+++ xbmc-pvr-3513480.patch/configure.in	2011-04-25 05:14:49.220848143 +0200
++++ xbmc-pvr-334f9c6.patch/configure.in	2011-04-25 05:14:49.220848143 +0200
-@@ -885,6 +885,9 @@
+@@ -1493,6 +1493,9 @@
    AC_MSG_NOTICE($external_ffmpeg_disabled)
    USE_EXTERNAL_FFMPEG=0
    AC_DEFINE([PIX_FMT_VDPAU_MPEG4_IN_AVUTIL], [1], [Whether AVUtil defines PIX_FMT_VDPAU_MPEG4.])
@@ -10,11 +10,11 @@ diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
 +  AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",)
  fi
  
- # Python
+ # VDPAU
-@@ -1547,6 +1550,7 @@
+@@ -2378,6 +2381,7 @@
-       `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
        `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
-       --target-os=$(tolower $(uname -s)) \
+       `if test "$use_neon" = "yes"; then echo --enable-neon; else echo --disable-neon; fi`\
+       --target-os=$ffmpeg_target_os \
 +      `if test "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \
        --disable-muxers \
        --enable-muxer=spdif \

packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-334f9c6-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch

@@ -1,10 +1,10 @@
-diff -Naur xbmc-a3c804b/xbmc/interfaces/python/XBPython.cpp xbmc-a3c804b.patch/xbmc/interfaces/python/XBPython.cpp
+diff -Naur xbmc-334f9c6/xbmc/interfaces/python/XBPython.cpp xbmc-334f9c6.patch/xbmc/interfaces/python/XBPython.cpp
---- xbmc-a3c804b/xbmc/interfaces/python/XBPython.cpp	2011-08-17 23:40:00.000000000 +0200
+--- xbmc-334f9c6/xbmc/interfaces/python/XBPython.cpp	2011-08-17 23:40:00.000000000 +0200
-+++ xbmc-a3c804b.patch/xbmc/interfaces/python/XBPython.cpp	2011-08-18 03:50:49.652475572 +0200
++++ xbmc-334f9c6.patch/xbmc/interfaces/python/XBPython.cpp	2011-08-18 03:50:49.652475572 +0200
-@@ -335,11 +335,9 @@
+@@ -523,11 +523,9 @@
        // at http://docs.python.org/using/cmdline.html#environment-variables
  
- #if !defined(_WIN32)
+ #if !defined(_WIN32) && !defined(TARGET_ANDROID)
 -      /* PYTHONOPTIMIZE is set off intentionally when using external Python.
 -         Reason for this is because we cannot be sure what version of Python
 -         was used to compile the various Python object files (i.e. .pyo,

packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-8f0c91b-999-crosscompile.patch

@@ -1,23 +0,0 @@
-diff --git a/Makefile.include.in b/Makefile.include.in
-index b70245d..0537b86 100644
---- a/Makefile.include.in
-+++ b/Makefile.include.in
-@@ -1,4 +1,4 @@
--AR=ar
-+AR=@AR@
- ARFLAGS=crus
- RM=rm -rf
- SHELL=@SHELL@
-diff --git a/configure.in b/configure.in
-index 7348529..baea8e0 100755
---- a/configure.in
-+++ b/configure.in
-@@ -22,7 +22,7 @@ AC_DEFUN([XB_FIND_SONAME],
-     AC_MSG_CHECKING([for lib$2 soname])
-     $1_FILENAME=$($CC -nostdlib -o /dev/null $LDFLAGS -l$2 -Wl,-M 2>/dev/null | grep "^LOAD.*$2" | awk '{V=2; print $V}')
-     if [[ ! -z $$1_FILENAME ]]; then
--      $1_SONAME=$(objdump -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
-+      $1_SONAME=$($OBJDUMP -p $$1_FILENAME | grep "SONAME.*$2" | awk '{V=2; print $V}')
-     fi
-   else
-     AC_MSG_CHECKING([for lib$2 dylib])