xbmc-frodo: update to xbmc-frodo-a642b33

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="e2c8d74"
+PKG_VERSION="a642b33"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-frodo/meta

@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo"
-PKG_VERSION="e2c8d74"
+PKG_VERSION="a642b33"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"

packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-a642b33-321-texturepacker-hostflags-and-rework.patch

@@ -1,7 +1,7 @@
-diff -Naur xbmc-frodo-5ea1d22/configure.in xbmc-frodo-5ea1d22.patch/configure.in
---- xbmc-frodo-5ea1d22/configure.in	2012-09-05 13:27:56.000000000 +0200
-+++ xbmc-frodo-5ea1d22.patch/configure.in	2012-09-05 17:55:46.727316107 +0200
-@@ -437,6 +437,12 @@
+diff -Naur xbmc-frodo-a642b33/configure.in xbmc-frodo-a642b33.patch/configure.in
+--- xbmc-frodo-a642b33/configure.in	2012-09-25 15:44:35.000000000 +0200
++++ xbmc-frodo-a642b33.patch/configure.in	2012-09-25 16:17:31.666076439 +0200
+@@ -445,6 +445,12 @@
    [use_texturepacker=$enableval],
    [use_texturepacker=auto])
  
@@ -14,7 +14,7 @@ diff -Naur xbmc-frodo-5ea1d22/configure.in xbmc-frodo-5ea1d22.patch/configure.in
  AC_ARG_WITH([lirc-device],
    [AS_HELP_STRING([--with-lirc-device=file],
    [specify the default LIRC device (default is /dev/lircd)])],
-@@ -570,8 +576,7 @@
+@@ -584,8 +590,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,7 +24,7 @@ diff -Naur xbmc-frodo-5ea1d22/configure.in xbmc-frodo-5ea1d22.patch/configure.in
       else
         use_texturepacker=no
       fi
-@@ -587,8 +592,6 @@
+@@ -601,8 +606,6 @@
    *86*-apple-darwin*)
       use_joystick=no
       use_vtbdecoder=no
@@ -33,7 +33,7 @@ diff -Naur xbmc-frodo-5ea1d22/configure.in xbmc-frodo-5ea1d22.patch/configure.in
       ARCH="x86-osx"
       AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX")
       ;;
-@@ -1938,13 +1941,13 @@
+@@ -1987,13 +1990,13 @@
  
  USE_TEXTUREPACKER_NATIVE=0
  if test "x$use_texturepacker" != "xno"; then
@@ -52,9 +52,9 @@ diff -Naur xbmc-frodo-5ea1d22/configure.in xbmc-frodo-5ea1d22.patch/configure.in
    fi
  else
    final_message="$final_message\n  TexturePacker:No"
-diff -Naur xbmc-frodo-5ea1d22/lib/libsquish/Makefile.in xbmc-frodo-5ea1d22.patch/lib/libsquish/Makefile.in
---- xbmc-frodo-5ea1d22/lib/libsquish/Makefile.in	2012-09-05 13:28:31.000000000 +0200
-+++ xbmc-frodo-5ea1d22.patch/lib/libsquish/Makefile.in	2012-09-05 17:56:05.017178267 +0200
+diff -Naur xbmc-frodo-a642b33/lib/libsquish/Makefile.in xbmc-frodo-a642b33.patch/lib/libsquish/Makefile.in
+--- xbmc-frodo-a642b33/lib/libsquish/Makefile.in	2012-09-25 15:45:45.000000000 +0200
++++ xbmc-frodo-a642b33.patch/lib/libsquish/Makefile.in	2012-09-25 16:17:31.666076439 +0200
 @@ -11,26 +11,25 @@
    singlecolourfit.cpp \
    squish.cpp
@@ -93,9 +93,9 @@ diff -Naur xbmc-frodo-5ea1d22/lib/libsquish/Makefile.in xbmc-frodo-5ea1d22.patch
  endif
  
  include ../../Makefile.include
-diff -Naur xbmc-frodo-5ea1d22/tools/TexturePacker/Makefile.in xbmc-frodo-5ea1d22.patch/tools/TexturePacker/Makefile.in
---- xbmc-frodo-5ea1d22/tools/TexturePacker/Makefile.in	2012-09-05 13:28:16.000000000 +0200
-+++ xbmc-frodo-5ea1d22.patch/tools/TexturePacker/Makefile.in	2012-09-05 17:55:49.927291649 +0200
+diff -Naur xbmc-frodo-a642b33/tools/TexturePacker/Makefile.in xbmc-frodo-a642b33.patch/tools/TexturePacker/Makefile.in
+--- xbmc-frodo-a642b33/tools/TexturePacker/Makefile.in	2012-09-25 15:44:57.000000000 +0200
++++ xbmc-frodo-a642b33.patch/tools/TexturePacker/Makefile.in	2012-09-25 16:19:08.889015705 +0200
 @@ -1,56 +1,54 @@
 -DEFINES += -D_LINUX -DUSE_LZO_PACKING
 +DEFINES       += -D_LINUX -DUSE_LZO_PACKING
@@ -179,7 +179,7 @@ diff -Naur xbmc-frodo-5ea1d22/tools/TexturePacker/Makefile.in xbmc-frodo-5ea1d22
  
  ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
  # TexturePacker run native on build system, build it with native tools
- $(TARGET): $(SRCS)
+ $(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)