From patchwork Fri Dec 24 19:01:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: =?iso-8859-1?q?=5BPATCH_2/2_v2=5D_xbmc=5Fsvn=3A_apply_upstre?= =?iso-8859-1?q?am_patch_=BBcomplete_replacement_of_liblzo_with_liblzo2=2C?= =?iso-8859-1?q?_linux_was_already_liblzo2=AB?= Date: Fri, 24 Dec 2010 19:01:03 -0000 From: Paul Menzel X-Patchwork-Id: 121 Message-Id: <1293217263.4027.38.camel@mattotaupa> To: openembedded-devel@lists.openembedded.org Date: Tue, 30 Nov 2010 16:45:26 +0100 Task `compile` fails with `/bin/grep: /usr/lib/libz.la: No such file or directory`. | SDL_anigif.c:1: warning: switch -mcpu=cortex-a8 conflicts with -march= switch | arm-angstrom-linux-gnueabi-g++ -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb -MD -c -isystem/oe/build/angstrom-dev/sysroots /armv7a-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REEN TRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon -quad -isystem/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb2 -fper missive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march= armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -isystem/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations - frename-registers -fomit-frame-pointer -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall - O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -D_LINUX -D_FILE_DEFINED -D__STDC_CONSTANT_MACROS -DBIN_INSTALL _PATH="\"/usr/lib/xbmc\"" -DINSTALL_PATH="\"/usr/share/xbmc\"" -DHAS_SDL_JOYSTICK -D'SVN_REV="Unknown"' -D_ARMEL -DHAVE_CONFIG_H -I../../xbmc/utils -I../../guilib -I../../xbmc/lin ux -I../../xbmc/lib/libsquish -D_GNU_SOURCE=1 -D_REENTRANT -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/ -I/oe/build/angstrom-dev /sysroots/armv7a-angstrom-linux-gnueabi/usr/include/SDL -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/alsa -I/oe/build/angstrom-de v/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/dbus-1.0 -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/freetype2 -I/oe/build/ angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/fribidi -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/glib-2.0 -I/ oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/libpng12 -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/dbus-1.0/include -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/glib-2.0/include -I/oe/build/angstrom-dev/sysroots/i686-linux/usr/armv7a/include -I/hom e/paul/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git XBTFWriter.cpp -o XBTFWriter.o | XBTFWriter.cpp:1: warning: switch -mcpu=cortex-a8 conflicts with -march= switch | arm-angstrom-linux-gnueabi-g++ -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb -MD -c -isystem/oe/build/angstrom-dev/sysroots /armv7a-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REEN TRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon -quad -isystem/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb2 -fper missive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march= armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -isystem/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations - frename-registers -fomit-frame-pointer -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall - O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -D_LINUX -D_FILE_DEFINED -D__STDC_CONSTANT_MACROS -DBIN_INSTALL _PATH="\"/usr/lib/xbmc\"" -DINSTALL_PATH="\"/usr/share/xbmc\"" -DHAS_SDL_JOYSTICK -D'SVN_REV="Unknown"' -D_ARMEL -DHAVE_CONFIG_H -I../../xbmc/utils -I../../guilib -I../../xbmc/lin ux -I../../xbmc/lib/libsquish -D_GNU_SOURCE=1 -D_REENTRANT -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/ -I/oe/build/angstrom-dev /sysroots/armv7a-angstrom-linux-gnueabi/usr/include/SDL -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/alsa -I/oe/build/angstrom-de v/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/dbus-1.0 -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/freetype2 -I/oe/build/ angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/fribidi -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/glib-2.0 -I/ oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/libpng12 -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/dbus-1.0/include -I/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/glib-2.0/include -I/oe/build/angstrom-dev/sysroots/i686-linux/usr/armv7a/include -I/hom e/paul/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git XBMCTex.cpp -o XBMCTex.o | XBMCTex.cpp:1: warning: switch -mcpu=cortex-a8 conflicts with -march= switch | XBMCTex.cpp: In function 'CXBTFFrame createXBTFFrame(SDL_Surface*, CXBTFWriter&, double, unsigned int)': | XBMCTex.cpp:235: warning: unused variable 'format' | XBMCTex.cpp:236: warning: unused variable 'colorMSE' | XBMCTex.cpp:236: warning: unused variable 'alphaMSE' | arm-angstrom-linux-gnueabi-g++ -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb -isystem/oe/build/angstrom-dev/sysroots/armv7a -angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT - D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad - isystem/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -frename-registers -fomit-frame-pointer -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfloat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad -isystem/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include -fexpensive-optimizations -frename -registers -fomit-frame-pointer -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -g -D_DEBUG -Wall -O2 -mfl oat-abi=softfp -mno-apcs-stack-check -Wa,-march=armv7a -mcpu=cortex-a8 -mfpu=neon -mvectorize-with-neon-quad SDL_anigif.o XBTFWriter.o XBMCTex.o ../../guilib/XBTF.o -L/home/pa ul/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib -Wl,-rpath-link,/oe/build/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib -Wl,-O1 -Wl, --hash-style=gnu ../../xbmc/lib/libsquish/libsquish-arm.a -lSDL_image -lSDL -llzo2 -o TexturePacker | XBMCTex.o: In function `main': | /oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/tools/TexturePacker/XBMCTex.cpp:394: undefined reference to `__lzo_init2' | collect2: ld returned 1 exit status | make[1]: *** [TexturePacker] Error 1 | make[1]: Leaving directory `/oe/build/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/tools/TexturePacker' | make: *** [tools/TexturePacker/TexturePacker] Error 2 | FATAL: oe_runmake failed | ERROR: Function do_compile failed NOTE: package xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe: task do_compile: Failed ERROR: TaskFailed event exception, aborting ERROR: Build of /oe/openembedded/recipes/xbmc/xbmc_svn.bb do_compile failed ERROR: Task 13 (/oe/openembedded/recipes/xbmc/xbmc_svn.bb, do_compile) failed with 256 ERROR: '/oe/openembedded/recipes/xbmc/xbmc_svn.bb' failed ERROR: '/oe/openembedded/recipes/xbmc/xbmc_svn.bb' failed ERROR: '/oe/openembedded/recipes/xbmc/xbmc_svn.bb' failed A fix was provided upstream in changeset 35484 [1][2] and on the list by Eric Colleu [3]. This patch is build tested with `angstrom-2008.1` and `minimal`. [1] http://trac.xbmc.org/changeset/35484 [2] https://github.com/xbmc/xbmc/commit/9e765ccae4ef9753c94b793f44931d84f65ca99c [3] http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-November/027418.html Signed-off-by: Paul Menzel --- v2: fix error message in commit message --- recipes/xbmc/xbmc/0012-fix-lzo-things.patch | 45 +++++++++++++++++++++++++++ recipes/xbmc/xbmc_svn.bb | 3 +- 2 files changed, 47 insertions(+), 1 deletions(-) create mode 100644 recipes/xbmc/xbmc/0012-fix-lzo-things.patch diff --git a/recipes/xbmc/xbmc/0012-fix-lzo-things.patch b/recipes/xbmc/xbmc/0012-fix-lzo-things.patch new file mode 100644 index 0000000..4b3e771 --- /dev/null +++ b/recipes/xbmc/xbmc/0012-fix-lzo-things.patch @@ -0,0 +1,45 @@ +status: applied +origin: https://github.com/xbmc/xbmc/commit/9e765ccae4ef9753c94b793f44931d84f65ca99c + +Index: /tools/TexturePacker/Makefile.in +=================================================================== +--- /tools/TexturePacker/Makefile.in (revision 33752) ++++ /tools/TexturePacker/Makefile.in (revision 35484) +@@ -3,5 +3,5 @@ + DEFINES = + ifeq ($(findstring osx,$(ARCH)),osx) +-LIBS = ../../xbmc/lib/libsquish/libsquish-@ARCH@.a -L/opt/local/lib -lSDL_image -lSDL -llzo ++LIBS = ../../xbmc/lib/libsquish/libsquish-@ARCH@.a -L/opt/local/lib -lSDL_image -lSDL -llzo2 + else + LIBS = ../../xbmc/lib/libsquish/libsquish-@ARCH@.a -lSDL_image -lSDL -llzo2 +Index: /tools/TexturePacker/XBMCTex.cpp +=================================================================== +--- /tools/TexturePacker/XBMCTex.cpp (revision 35328) ++++ /tools/TexturePacker/XBMCTex.cpp (revision 35484) +@@ -41,5 +41,5 @@ + + #ifdef _LINUX +-#include ++#include + #else + #include "../../xbmc/lib/liblzo/LZO1X.H" +Index: /configure.in +=================================================================== +--- /configure.in (revision 35468) ++++ /configure.in (revision 35484) +@@ -1074,5 +1074,4 @@ + AC_HEADER_STDC + AC_HEADER_SYS_WAIT +-AC_CHECK_HEADERS([lzo/lzo1.h]) + AC_CHECK_HEADERS([arpa/inet.h fcntl.h float.h inttypes.h limits.h locale.h \ + malloc.h memory.h netdb.h netinet/in.h stddef.h stdint.h stdlib.h string.h \ +@@ -1186,10 +1185,4 @@ + else + final_message="$final_message\n MID Support:\tNo" +-fi +- +-if test -d "/usr/include/lzo"; then +- INCLUDES="$INCLUDES -I/usr/include/lzo" +-else +- INCLUDES="$INCLUDES" + fi diff --git a/recipes/xbmc/xbmc_svn.bb b/recipes/xbmc/xbmc_svn.bb index 3ca90e0..766d74a 100644 --- a/recipes/xbmc/xbmc_svn.bb +++ b/recipes/xbmc/xbmc_svn.bb @@ -7,7 +7,7 @@ require recipes/egl/egl.inc SRCREV = "e2ab481ebe964321c358ab9d6402088c714adcbe" PV = "10.05" -PR = "r10" +PR = "r11" PR_append = "+gitr${SRCPV}" SRC_URI = "git://xbmc.git.sourceforge.net/gitroot/xbmc/xbmc;protocol=git;branch=master \ @@ -22,6 +22,7 @@ file://0008-configure.in-also-pass-down-target-when-using-host-a.patch \ file://0009-Added-a-configure-option-disable-optical-drive.patch \ file://0010-Fixed-so-compile-worked-when-disabling-optical.patch \ file://0011-reverted-so-normal-bootstrap-doesn-t-exclude-gnu-con.patch \ +file://0012-fix-lzo-things.patch \ " inherit autotools gettext