jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 21:56:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

xbmc-rpi: update texturepacker patch

Browse Source 
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-06-19 06:57:36 +02:00
parent b565c28f08
commit 2f9a6ab4ac
3 changed files with 299 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/mediacenter/xbmc-frodo/build
View File

@ -294,7 +294,7 @@ cd $PKG_BUILD
$XBMC_WEBSERVER \ $XBMC_WEBSERVER \
--enable-optical-drive \ --enable-optical-drive \
$XBMC_BLURAY \ $XBMC_BLURAY \
--enable-texturepacker TEXTUREPACKER_NATIVE_ROOT="$ROOT/$TOOLCHAIN" \ --enable-texturepacker --with-texturepacker-root="$ROOT/$TOOLCHAIN" \
--disable-external-libraries \ --disable-external-libraries \
--enable-external-ffmpeg \ --enable-external-ffmpeg \
$XBMC_PLATFORM_SUPPORT \ $XBMC_PLATFORM_SUPPORT \

207
packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-433f681-321-texturepacker-hostflags-and-rework.patch
View File

@ -1,99 +1,190 @@
diff -Naur xbmc-rpi-bffd7a7/lib/libsquish/Makefile.in xbmc-rpi-bffd7a7.patch/lib/libsquish/Makefile.in diff -Naur xbmc-frodo-433f681/configure.in xbmc-frodo-433f681.patch/configure.in
--- xbmc-rpi-bffd7a7/lib/libsquish/Makefile.in 2012-06-14 01:06:47.000000000 +0200 --- xbmc-frodo-433f681/configure.in 2012-06-15 02:52:26.000000000 +0200
+++ xbmc-rpi-bffd7a7.patch/lib/libsquish/Makefile.in 2012-06-18 04:35:28.769262149 +0200 +++ xbmc-frodo-433f681.patch/configure.in 2012-06-19 05:26:41.472596903 +0200
@@ -11,31 +11,29 @@ @@ -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 \ singlecolourfit.cpp \
squish.cpp squish.cpp
-CXXFLAGS+=-I. -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) ifeq ($(findstring powerpc,$(ARCH)),powerpc)
- CXXFLAGS+=-DSQUISH_USE_ALTIVEC=1 -maltivec - CXXFLAGS+=-DSQUISH_USE_ALTIVEC=1 -maltivec
+ OPTS = -DSQUISH_USE_ALTIVEC=1 -maltivec + CXXFLAGS += -DSQUISH_USE_ALTIVEC=1 -maltivec
+ HOST_CXXFLAGS += -DSQUISH_USE_ALTIVEC=1 -maltivec
else ifeq ($(findstring x86,$(ARCH)), x86) else ifeq ($(findstring x86,$(ARCH)), x86)
- CXXFLAGS+=-DSQUISH_USE_SSE=2 -msse2 - CXXFLAGS+=-DSQUISH_USE_SSE=2 -msse2
+ OPTS = -DSQUISH_USE_SSE=2 -msse2 + CXXFLAGS += -DSQUISH_USE_SSE=2 -msse2
+ HOST_CXXFLAGS += -DSQUISH_USE_SSE=2 -msse2
endif endif
-LIB=libsquish.a -LIB=libsquish.a
+LIB = libsquish.a -
+NATIVE_LIB = libsquish-native.so
+CXXFLAGS += -I. $(OPTS)
+HOST_CXX ?= g++
+CLEAN_FILES += $(NATIVE_LIB)
-ifeq (@USE_TEXTUREPACKER_NATIVE@,1) -ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
-NATIVE_LIB=libsquish-native.so -NATIVE_LIB=libsquish-native.so
-CLEAN_FILES+=$(NATIVE_LIB) -CLEAN_FILES+=$(NATIVE_LIB)
+$(LIB): $(SRCS)
-ifeq ($(findstring osx,$(ARCH)),osx)
-NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
-endif
- -
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) -all: $(LIB) $(NATIVE_LIB)
+$(LIB): $(SRCS)
+
# TexturePacker links to libsquish and needs to run on build system, so make a native flavor. # TexturePacker links to libsquish and needs to run on build system, so make a native flavor.
$(NATIVE_LIB): $(SRCS) $(NATIVE_LIB): $(SRCS)
ifeq ($(findstring osx,$(ARCH)),osx) ifeq ($(findstring osx,$(ARCH)),osx)
- g++ $(NATIVE_ARCH) -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@ - g++ $(NATIVE_ARCH) -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
-else + $(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 $@ - g++ -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
+ NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) -endif
endif + $(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
+ifeq ($(findstring osx,$(ARCH)),osx)
+ $(HOST_CXX) $(NATIVE_ARCH) -I. $(OPTS) $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
+else
+ $(HOST_CXX) -I.$(OPTS) $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
endif endif
include ../../Makefile.include include ../../Makefile.include
diff -Naur xbmc-rpi-bffd7a7/tools/TexturePacker/Makefile.in xbmc-rpi-bffd7a7.patch/tools/TexturePacker/Makefile.in diff -Naur xbmc-frodo-433f681/tools/TexturePacker/Makefile.in xbmc-frodo-433f681.patch/tools/TexturePacker/Makefile.in
--- xbmc-rpi-bffd7a7/tools/TexturePacker/Makefile.in 2012-06-14 01:07:10.000000000 +0200 --- xbmc-frodo-433f681/tools/TexturePacker/Makefile.in 2012-06-15 02:52:20.000000000 +0200
+++ xbmc-rpi-bffd7a7.patch/tools/TexturePacker/Makefile.in 2012-06-18 05:09:06.085353812 +0200 +++ xbmc-frodo-433f681.patch/tools/TexturePacker/Makefile.in 2012-06-19 05:35:15.349564918 +0200
@@ -3,12 +3,6 @@ @@ -1,48 +1,51 @@
DEFINES += -DHOST_BIGENDIAN -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 endif
-CXXFLAGS+= \ -CXXFLAGS+= \
- -I. \ +SRCS = \
- -I@abs_top_srcdir@/lib \ + md5.cpp \
- -I@abs_top_srcdir@/xbmc \ + SDL_anigif.cpp \
- -I@abs_top_srcdir@/xbmc/linux + XBTFWriter.cpp \
- + XBMCTex.cpp \
ifeq (@USE_TEXTUREPACKER_NATIVE@,1) + @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@ +
ifdef NATIVE_ROOT_PATH +TARGET = TexturePacker
@@ -16,8 +10,9 @@ +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 DEFINES += -DTARGET_DARWIN
NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
endif endif
-CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include -CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include
-LIBS += -L$(NATIVE_ROOT_PATH)/lib -LIBS += -L$(NATIVE_ROOT_PATH)/lib
+HOST_CXX?= g++ -endif
+CXXFLAGS = -I$(NATIVE_ROOT_PATH)/include -LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
+LIBS = -L$(NATIVE_ROOT_PATH)/lib -else
endif -LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish
LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native -endif
else -
@@ -26,6 +21,12 @@ -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)
LIBS += -lSDL_image -lSDL -llzo2
+CXXFLAGS+= \
+ -I. \
+ -I@abs_top_srcdir@/lib \
+ -I@abs_top_srcdir@/xbmc \
+ -I@abs_top_srcdir@/xbmc/linux
+
SRCS = \
md5.cpp \
SDL_anigif.cpp \
@@ -42,7 +43,8 @@
ifeq (@USE_TEXTUREPACKER_NATIVE@,1) ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
# TexturePacker run native on build system, build it with native tools # TexturePacker run native on build system, build it with native tools
$(TARGET): $(SRCS) $(TARGET): $(SRCS)
- g++ $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET) - g++ $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET)
+ make -C @abs_top_srcdir@/lib/libsquish libsquish-native.so + make -C @abs_top_srcdir@/lib/libsquish libsquish-native.so
+ $(HOST_CXX) $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET) + $(HOST_CXX) $(DEFINES) $(NATIVE_ARCH) $(HOST_CXXFLAGS) $(SRCS) $(HOST_LIBS) -o $(TARGET)
clean: clean:
rm -f $(TARGET) rm -f $(TARGET)
else else

207
packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-pvr-3486b24-321-texturepacker-hostflags-and-rework.patch
View File

@ -1,99 +1,190 @@
diff -Naur xbmc-rpi-bffd7a7/lib/libsquish/Makefile.in xbmc-rpi-bffd7a7.patch/lib/libsquish/Makefile.in diff -Naur xbmc-frodo-433f681/configure.in xbmc-frodo-433f681.patch/configure.in
--- xbmc-rpi-bffd7a7/lib/libsquish/Makefile.in 2012-06-14 01:06:47.000000000 +0200 --- xbmc-frodo-433f681/configure.in 2012-06-15 02:52:26.000000000 +0200
+++ xbmc-rpi-bffd7a7.patch/lib/libsquish/Makefile.in 2012-06-18 04:35:28.769262149 +0200 +++ xbmc-frodo-433f681.patch/configure.in 2012-06-19 05:26:41.472596903 +0200
@@ -11,31 +11,29 @@ @@ -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 \ singlecolourfit.cpp \
squish.cpp squish.cpp
-CXXFLAGS+=-I. -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) ifeq ($(findstring powerpc,$(ARCH)),powerpc)
- CXXFLAGS+=-DSQUISH_USE_ALTIVEC=1 -maltivec - CXXFLAGS+=-DSQUISH_USE_ALTIVEC=1 -maltivec
+ OPTS = -DSQUISH_USE_ALTIVEC=1 -maltivec + CXXFLAGS += -DSQUISH_USE_ALTIVEC=1 -maltivec
+ HOST_CXXFLAGS += -DSQUISH_USE_ALTIVEC=1 -maltivec
else ifeq ($(findstring x86,$(ARCH)), x86) else ifeq ($(findstring x86,$(ARCH)), x86)
- CXXFLAGS+=-DSQUISH_USE_SSE=2 -msse2 - CXXFLAGS+=-DSQUISH_USE_SSE=2 -msse2
+ OPTS = -DSQUISH_USE_SSE=2 -msse2 + CXXFLAGS += -DSQUISH_USE_SSE=2 -msse2
+ HOST_CXXFLAGS += -DSQUISH_USE_SSE=2 -msse2
endif endif
-LIB=libsquish.a -LIB=libsquish.a
+LIB = libsquish.a -
+NATIVE_LIB = libsquish-native.so
+CXXFLAGS += -I. $(OPTS)
+HOST_CXX ?= g++
+CLEAN_FILES += $(NATIVE_LIB)
-ifeq (@USE_TEXTUREPACKER_NATIVE@,1) -ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
-NATIVE_LIB=libsquish-native.so -NATIVE_LIB=libsquish-native.so
-CLEAN_FILES+=$(NATIVE_LIB) -CLEAN_FILES+=$(NATIVE_LIB)
+$(LIB): $(SRCS)
-ifeq ($(findstring osx,$(ARCH)),osx)
-NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
-endif
- -
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) -all: $(LIB) $(NATIVE_LIB)
+$(LIB): $(SRCS)
+
# TexturePacker links to libsquish and needs to run on build system, so make a native flavor. # TexturePacker links to libsquish and needs to run on build system, so make a native flavor.
$(NATIVE_LIB): $(SRCS) $(NATIVE_LIB): $(SRCS)
ifeq ($(findstring osx,$(ARCH)),osx) ifeq ($(findstring osx,$(ARCH)),osx)
- g++ $(NATIVE_ARCH) -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@ - g++ $(NATIVE_ARCH) -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
-else + $(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 $@ - g++ -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
+ NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) -endif
endif + $(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
+ifeq ($(findstring osx,$(ARCH)),osx)
+ $(HOST_CXX) $(NATIVE_ARCH) -I. $(OPTS) $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
+else
+ $(HOST_CXX) -I.$(OPTS) $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
endif endif
include ../../Makefile.include include ../../Makefile.include
diff -Naur xbmc-rpi-bffd7a7/tools/TexturePacker/Makefile.in xbmc-rpi-bffd7a7.patch/tools/TexturePacker/Makefile.in diff -Naur xbmc-frodo-433f681/tools/TexturePacker/Makefile.in xbmc-frodo-433f681.patch/tools/TexturePacker/Makefile.in
--- xbmc-rpi-bffd7a7/tools/TexturePacker/Makefile.in 2012-06-14 01:07:10.000000000 +0200 --- xbmc-frodo-433f681/tools/TexturePacker/Makefile.in 2012-06-15 02:52:20.000000000 +0200
+++ xbmc-rpi-bffd7a7.patch/tools/TexturePacker/Makefile.in 2012-06-18 05:09:06.085353812 +0200 +++ xbmc-frodo-433f681.patch/tools/TexturePacker/Makefile.in 2012-06-19 05:35:15.349564918 +0200
@@ -3,12 +3,6 @@ @@ -1,48 +1,51 @@
DEFINES += -DHOST_BIGENDIAN -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 endif
-CXXFLAGS+= \ -CXXFLAGS+= \
- -I. \ +SRCS = \
- -I@abs_top_srcdir@/lib \ + md5.cpp \
- -I@abs_top_srcdir@/xbmc \ + SDL_anigif.cpp \
- -I@abs_top_srcdir@/xbmc/linux + XBTFWriter.cpp \
- + XBMCTex.cpp \
ifeq (@USE_TEXTUREPACKER_NATIVE@,1) + @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@ +
ifdef NATIVE_ROOT_PATH +TARGET = TexturePacker
@@ -16,8 +10,9 @@ +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 DEFINES += -DTARGET_DARWIN
NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32) NATIVE_ARCH=$(shell echo $(CXXFLAGS) | grep x86_64 >/dev/null && echo -m64 || echo -m32)
endif endif
-CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include -CXXFLAGS+= -I$(NATIVE_ROOT_PATH)/include
-LIBS += -L$(NATIVE_ROOT_PATH)/lib -LIBS += -L$(NATIVE_ROOT_PATH)/lib
+HOST_CXX?= g++ -endif
+CXXFLAGS = -I$(NATIVE_ROOT_PATH)/include -LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
+LIBS = -L$(NATIVE_ROOT_PATH)/lib -else
endif -LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish
LIBS += -L@abs_top_srcdir@/lib/libsquish -lsquish-native -endif
else -
@@ -26,6 +21,12 @@ -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)
LIBS += -lSDL_image -lSDL -llzo2
+CXXFLAGS+= \
+ -I. \
+ -I@abs_top_srcdir@/lib \
+ -I@abs_top_srcdir@/xbmc \
+ -I@abs_top_srcdir@/xbmc/linux
+
SRCS = \
md5.cpp \
SDL_anigif.cpp \
@@ -42,7 +43,8 @@
ifeq (@USE_TEXTUREPACKER_NATIVE@,1) ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
# TexturePacker run native on build system, build it with native tools # TexturePacker run native on build system, build it with native tools
$(TARGET): $(SRCS) $(TARGET): $(SRCS)
- g++ $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET) - g++ $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET)
+ make -C @abs_top_srcdir@/lib/libsquish libsquish-native.so + make -C @abs_top_srcdir@/lib/libsquish libsquish-native.so
+ $(HOST_CXX) $(DEFINES) $(NATIVE_ARCH) $(CXXFLAGS) $(SRCS) $(LIBS) -o $(TARGET) + $(HOST_CXX) $(DEFINES) $(NATIVE_ARCH) $(HOST_CXXFLAGS) $(SRCS) $(HOST_LIBS) -o $(TARGET)
clean: clean:
rm -f $(TARGET) rm -f $(TARGET)
else else