xbmc-frodo: update to xbmc-frodo-dfaed24

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

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

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo-theme-Confluence"
-PKG_VERSION="5ea1d22"
+PKG_VERSION="dfaed24"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-frodo/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo"
-PKG_VERSION="5ea1d22"
+PKG_VERSION="dfaed24"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-321-texturepacker-hostflags-and-rework.patch

@@ -1,190 +0,0 @@
-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 @@
-   [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)])],
-@@ -516,8 +522,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
--       use_texturepacker_native=yes
--       USE_TEXTUREPACKER_NATIVE_ROOT="/opt/local"
-+       use_texturepacker_root="/opt/local"
-      else
-        use_texturepacker=no
-      fi
-@@ -533,8 +538,6 @@
-   *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
--  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-433f681/lib/libsquish/Makefile.in xbmc-frodo-433f681.patch/lib/libsquish/Makefile.in
---- xbmc-frodo-433f681/lib/libsquish/Makefile.in	2012-06-15 02:51:53.000000000 +0200
-+++ xbmc-frodo-433f681.patch/lib/libsquish/Makefile.in	2012-06-19 05:42:20.313119617 +0200
-@@ -11,31 +11,34 @@
-   singlecolourfit.cpp \
-   squish.cpp
- 
--CXXFLAGS+=-I.
-+LIB              = libsquish.a
-+NATIVE_LIB       = libsquish-native.so
-+CLEAN_FILES     += $(NATIVE_LIB)
-+
-+HOST_CXX        ?= g++
-+CXXFLAGS        += -I.
-+HOST_CXXFLAGS   += -I.
-+
- ifeq ($(findstring powerpc,$(ARCH)),powerpc)
--  CXXFLAGS+=-DSQUISH_USE_ALTIVEC=1 -maltivec
-+  CXXFLAGS      += -DSQUISH_USE_ALTIVEC=1 -maltivec
-+  HOST_CXXFLAGS += -DSQUISH_USE_ALTIVEC=1 -maltivec
- else ifeq ($(findstring x86,$(ARCH)), x86)
--  CXXFLAGS+=-DSQUISH_USE_SSE=2 -msse2
-+  CXXFLAGS      += -DSQUISH_USE_SSE=2 -msse2
-+  HOST_CXXFLAGS += -DSQUISH_USE_SSE=2 -msse2
- endif
- 
--LIB=libsquish.a
--
--ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
--NATIVE_LIB=libsquish-native.so
--CLEAN_FILES+=$(NATIVE_LIB)
--
- ifeq ($(findstring osx,$(ARCH)),osx)
--NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
-+  HOST_CXXFLAGS += $(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
- 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 osx,$(ARCH)),osx)
--	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
--	g++ -DSQUISH_USE_SSE=2 -msse2 -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-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 @@
--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
- 
--ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
--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)
- DEFINES += -DTARGET_DARWIN
- NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
- endif
--CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include
--LIBS    += -L$(NATIVE_ROOT_PATH)/lib
--endif
--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)
--	g++ $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) -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:
- 	rm -f $(TARGET)
- else

packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-402-enable_yasm_in_ffmpeg-0.1.patch

@@ -1,21 +0,0 @@
-diff -Naur xbmc-pvr-3513480/configure.in xbmc-pvr-3513480.patch/configure.in
---- xbmc-pvr-3513480/configure.in	2011-04-25 02:36:33.000000000 +0200
-+++ xbmc-pvr-3513480.patch/configure.in	2011-04-25 05:14:49.220848143 +0200
-@@ -885,6 +885,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.])
-+
-+  # check for yasm
-+  AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",)
- fi
- 
- # Python
-@@ -1547,6 +1550,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 "$HAVE_YASM" = "yes"; then echo --enable-yasm; fi` \
-       --disable-muxers \
-       --enable-muxer=spdif \
-       --enable-muxer=adts \

packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch

@@ -1,18 +0,0 @@
-diff -Naur xbmc-a3c804b/xbmc/interfaces/python/XBPython.cpp xbmc-a3c804b.patch/xbmc/interfaces/python/XBPython.cpp
---- xbmc-a3c804b/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
-@@ -335,11 +335,9 @@
-       // at http://docs.python.org/using/cmdline.html#environment-variables
- 
- #if !defined(_WIN32)
--      /* 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,
--         .pyc, etc.). */
--        // check if we are running as real xbmc.app or just binary
-+      // Required for python to find optimized code (pyo) files
-+      setenv("PYTHONOPTIMIZE", "1", 1);
-+      // check if we are running as real xbmc.app or just binary
-       if (!CUtil::GetFrameworksPath(true).IsEmpty())
-       {
-         // using external python, it's build looking for xxx/lib/python2.6

packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-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])