Patchwork xbmc: add `libass` to `DEPENDS`

login
mail settings
Submitter Paul Menzel
Date March 18, 2011, 12:38 p.m.
Message ID <1300451882.3830.54.camel@mattotaupa>
Download mbox | patch
Permalink /patch/1597/
State Accepted
Commit 12270185faaf8d4fad76badde50028ae77ab16e5
Headers show

Comments

Paul Menzel - March 18, 2011, 12:38 p.m.
Date: Fri, 18 Mar 2011 09:51:52 +0100

Task compile of `xbmc_svn.bb` fails with the following error message when using `angstrom-2010.x`. `angstrom-2008.1` does/did not have this problem probably because of using Libtool 2.2.

	arm-angstrom-linux-gnueabi-g++ -march=armv7-a -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp -mthumb-interwork -mno-thumb --sysroot=/oe/build-angstrom-next/angstrom-dev/s
	ysroots/armv7a-angstrom-linux-gnueabi -MD -c -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb2 -fpermissive -fvisibility-inlines-hidden -fPIC -DPIC -D_RE
	ENTRANT -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-ne
	on-quad -fexpensive-optimizations -fomit-frame-pointer -frename-registers -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 -fexpensive-optimizations -fo
	mit-frame-pointer -frename-registers -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_PA
	TH="\"/usr/lib/xbmc\"" -DINSTALL_PATH="\"/usr/share/xbmc\"" -DHAS_SDL_JOYSTICK -D'SVN_REV="Unknown"' -D_ARMEL -DHAVE_CONFIG_H  -I. -I.. -I../../ -I../linux -I../cores -I../../guili
	b -I../posix -I../../lib/jsoncpp/jsoncpp/include -D_GNU_SOURCE=1 -D_REENTRANT -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/ -
	I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/SDL -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-lin
	ux-gnueabi/usr/include/alsa -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/dbus-1.0 -I/oe/build-angstrom-next/angstro
	m-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/freetype2 -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/fribidi -I/ho
	me/paul/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/include/glib-2.0 -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-li
	nux-gnueabi/usr/include/libpng12 -I/oe/build-angstrom-next/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/dbus-1.0/include -I/oe/build-angstrom-nex
	t/angstrom-dev/sysroots/armv7a-angstrom-linux-gnueabi/usr/lib/glib-2.0/include -I/oe/build-angstrom-next/angstrom-dev/sysroots/i686-linux/usr/armv7a/include -I/
	oe/build-angstrom-next/angstrom-dev/work/armv7a-angstrom-linux-gnueabi/xbmc-10.05-r11+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git Socket.cpp -o Socket.o
		LINK  libass.la
	In file included from log.h:25:0,
		               from Socket.cpp:26:
	../../guilib/StdString.h:1597:14: note: the mangling of 'va_list' has changed in GCC 4.4
	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-r11+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-r11+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-r11+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-r11+gitr0+e2ab481ebe964321c358ab9d6402088c714adcbe/git/lib/
	libass/xbmc'
	make: *** [dvdpcodecs] Error 2
	make: *** Waiting for unfinished jobs....

Using the external package fixes this problem.

	Build Configuration:
	BB_VERSION        = "1.12.0"
	METADATA_BRANCH   = "<unknown>"
	METADATA_REVISION = "a36e1dd"
	TARGET_ARCH       = "arm"
	TARGET_OS         = "linux-gnueabi"
	MACHINE           = "beagleboard"
	DISTRO            = "angstrom"
	DISTRO_VERSION    = "v20110318"
	TARGET_FPU        = "hard"

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
 recipes/xbmc/xbmc_svn.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Henning Heinold - March 18, 2011, 3:14 p.m.
Hi Paul,

the problem is this

do_configure() {
        if [ -e bootstrap.angstrom ] ; then
                sh bootstrap.angstrom
        else
                sh bootstrap
        fi
        oe_runconf
}


which prevents the autoreconf run and so the regenerating of libtool stuff, which results
in that the configure option --with-sysrootdir is not available. I cannt see how
your patch is fixing that.

Bye Henning
Paul Menzel - March 18, 2011, 10:18 p.m.
Dear Henning,


Am Freitag, den 18.03.2011, 16:14 +0100 schrieb Henning Heinold:
> Hi Paul,
> 
> the problem is this
> 
> do_configure() {
>         if [ -e bootstrap.angstrom ] ; then
>                 sh bootstrap.angstrom
>         else
>                 sh bootstrap
>         fi
>         oe_runconf
> }
> 
> 
> which prevents the autoreconf run and so the regenerating of libtool stuff, which results
> in that the configure option --with-sysrootdir is not available. I cannt see how
> your patch is fixing that.

I think the following goes on. XBMC’s configure script detects that the
external libass is available and just uses that. XBMC ships all used
libraries with it, so it is buildable without downloading additional
stuff (which is of course bad for maintainability reasons). So
beforehand the configure script set up compilation of the internal
libass which failed for the reason you pointed out above.

I build tested this, so it should be fine?


Thanks,

Paul
Koen Kooi - March 20, 2011, 1:05 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 18-03-11 23:18, Paul Menzel wrote:
> Dear Henning,
> 
> 
> Am Freitag, den 18.03.2011, 16:14 +0100 schrieb Henning Heinold:
>> Hi Paul,
>>
>> the problem is this
>>
>> do_configure() {
>>         if [ -e bootstrap.angstrom ] ; then
>>                 sh bootstrap.angstrom
>>         else
>>                 sh bootstrap
>>         fi
>>         oe_runconf
>> }
>>
>>
>> which prevents the autoreconf run and so the regenerating of libtool stuff, which results
>> in that the configure option --with-sysrootdir is not available. I cannt see how
>> your patch is fixing that.
> 
> I think the following goes on. XBMC’s configure script detects that the
> external libass is available and just uses that. XBMC ships all used
> libraries with it, so it is buildable without downloading additional
> stuff (which is of course bad for maintainability reasons). So
> beforehand the configure script set up compilation of the internal
> libass which failed for the reason you pointed out above.
> 
> I build tested this, so it should be fine?

The proper fix is to overhaul the recipe with some help from Tobias, but
till then:

Acked-by: Koen Kooi <koen@dominion.thruhere.net>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNhfukMkyGM64RGpERArNGAJwM47lNVoTT5k0Eor639NlvV2CPtwCfakPW
jdmocV9ZzfpYCnn8pzVhDiI=
=CIjD
-----END PGP SIGNATURE-----

Patch

diff --git a/recipes/xbmc/xbmc_svn.bb b/recipes/xbmc/xbmc_svn.bb
index be2e34e..45a7dad 100644
--- a/recipes/xbmc/xbmc_svn.bb
+++ b/recipes/xbmc/xbmc_svn.bb
@@ -1,13 +1,13 @@ 
 DESCRIPTION = "XBMC Media Center"
 LICENSE = "xbmc"
 
-DEPENDS = "gperf-native libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl python libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo2 enca avahi libsamplerate0 libxinerama libxrandr libxtst bzip2 virtual/libsdl jasper zip-native zlib"
+DEPENDS = "gperf-native libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl python libass libmodplug libmicrohttpd wavpack libmms cmake-native libsdl-image libsdl-mixer virtual/egl mysql5 sqlite3 libmms faad2 libcdio libpcre boost lzo2 enca avahi libsamplerate0 libxinerama libxrandr libxtst bzip2 virtual/libsdl jasper zip-native zlib"
 require recipes/egl/egl.inc
 
 SRCREV = "e2ab481ebe964321c358ab9d6402088c714adcbe"
 
 PV = "10.05"
-PR = "r11"
+PR = "r12"
 PR_append = "+gitr${SRCPV}"
 
 SRC_URI = "git://xbmc.git.sourceforge.net/gitroot/xbmc/xbmc;protocol=git;branch=master \