From patchwork Fri Dec 24 13:29:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: =?iso-8859-1?q?=5BPATCH=5D_xbmc=5Fsvn=3A_apply_upstream_patc?= =?iso-8859-1?q?h_=BBcomplete_replacement_of_liblzo_with_liblzo2=2C_linux_?= =?iso-8859-1?q?was_already_liblzo2=AB?= Date: Fri, 24 Dec 2010 13:29:02 -0000 From: Paul Menzel X-Patchwork-Id: 120 Message-Id: <1293197342.4027.2.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`. | make -C .. | make[2]: Entering directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/libass' | cd . && /bin/sh ./config.status Makefile | config.status: creating Makefile | make[2]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/libass' | make[2]: Entering directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/libass' | make[3]: Entering directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/libass' | Making all in libass | make[4]: Entering directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/libass/libass' | cd .. && /bin/sh ./config.status libass/Makefile depfiles | config.status: creating libass/Makefile | config.status: executing depfiles commands | make[4]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/libass/libass' | make[4]: Entering directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/libass/libass' | CC ass.o | CC ass_cache.o | CC ass_font.o | CC ass_fontconfig.o | CC ass_render.o | CC ass_utils.o | CC ass_bitmap.o | CC ass_library.o | CC ass_drawing.o | CC ass_parse.o | CC ass_strtod.o | LINK libass.la | arm-angstrom-linux-gnueabi-libtool: link: warning: library `/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/libfreetype.la' was moved. | /bin/grep: /usr/lib/libz.la: No such file or directory | /bin/sed: can't read /usr/lib/libz.la: No such file or directory | arm-angstrom-linux-gnueabi-libtool: link: `/usr/lib/libz.la' is not a valid libtool archive | make[4]: *** [libass.la] Error 1 | make[4]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/libass/libass' | make[3]: *** [all-recursive] Error 1 | make[3]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/libass' | make[2]: *** [all] Error 2 | make[2]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/libass' | make[1]: *** [../libass/.libs/libass.so] Error 2 | make[1]: Leaving directory `/oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r9+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/libass/xbmc' | make: *** [dvdpcodecs] 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 --- 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..f4fb7ef --- /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 ad95a8a..9ae7cbe 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 = "r9" +PR = "r10" 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