Patchwork [1/2,v2] xbmc: add `zlib` to `DEPENDS`

login
register
mail settings
Submitter Paul Menzel
Date Dec. 24, 2010, 11:13 p.m.
Message ID <1293232419.4027.53.camel@mattotaupa>
Download mbox | patch
Permalink /patch/123/
State Accepted
Headers show

Comments

Paul Menzel - Dec. 24, 2010, 11:13 p.m.
Date: Wed, 1 Dec 2010 17:27:33 +0100

XBMC depends on `zlib` [1] which is indirectly provided by other dependencies like `ffmpeg.inc` [2]. Add `zlib` to `DEPENDS` to avoid possible future breakage.

[1] http://trac.xbmc.org/browser/trunk/README.linux?rev=35279#L54
[2] http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/ffmpeg/ffmpeg.inc?h=org.openembedded.dev&id=5316c5b1416391f15277ce867489e525b7eccd6e#n12

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
v2: Updated commit message.

The build still fails with `angstrom-2010.x` with the error message in v1.
---
 recipes/xbmc/xbmc_svn.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
Khem Raj - Dec. 25, 2010, 11:25 a.m.
Hi Paul

Can you rebase your patches and send them as a single patch for xbmc please

Thx
-Khem

On Fri, Dec 24, 2010 at 3:13 PM, Paul Menzel
<paulepanter@users.sourceforge.net> wrote:
> Date: Wed, 1 Dec 2010 17:27:33 +0100
>
> XBMC depends on `zlib` [1] which is indirectly provided by other dependencies like `ffmpeg.inc` [2]. Add `zlib` to `DEPENDS` to avoid possible future breakage.
>
> [1] http://trac.xbmc.org/browser/trunk/README.linux?rev=35279#L54
> [2] http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/ffmpeg/ffmpeg.inc?h=org.openembedded.dev&id=5316c5b1416391f15277ce867489e525b7eccd6e#n12
>
> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> ---
> v2: Updated commit message.
>
> The build still fails with `angstrom-2010.x` with the error message in v1.
> ---
>  recipes/xbmc/xbmc_svn.bb |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/xbmc/xbmc_svn.bb b/recipes/xbmc/xbmc_svn.bb
> index ad95a8a..3ca90e0 100644
> --- a/recipes/xbmc/xbmc_svn.bb
> +++ b/recipes/xbmc/xbmc_svn.bb
> @@ -1,13 +1,13 @@
>  DESCRIPTION = "XBMC Media Center"
>  LICENSE = "xbmc"
>
> -DEPENDS = "libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl 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"
> +DEPENDS = "libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl 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 = "r9"
> +PR = "r10"
>  PR_append = "+gitr${SRCPV}"
>
>  SRC_URI = "git://xbmc.git.sourceforge.net/gitroot/xbmc/xbmc;protocol=git;branch=master \
> --
> 1.7.2.3
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
>
Paul Menzel - Dec. 25, 2010, 11:55 a.m.
Dear Khem,


Am Samstag, den 25.12.2010, 03:25 -0800 schrieb Khem Raj:

> Can you rebase your patches and send them as a single patch for xbmc please

do you mean squash patch 1/2 and patch 2/2. In this case I am a little
reluctant since in the future, when a newer upstream version is used
where patch 2/2 is included already, then one could just say, the patch
introduced in Patch 2/2 is not needed anymore, where the dependency
change in 1/2 will not go away.


Thanks,

Paul

Patch

diff --git a/recipes/xbmc/xbmc_svn.bb b/recipes/xbmc/xbmc_svn.bb
index ad95a8a..3ca90e0 100644
--- a/recipes/xbmc/xbmc_svn.bb
+++ b/recipes/xbmc/xbmc_svn.bb
@@ -1,13 +1,13 @@ 
 DESCRIPTION = "XBMC Media Center"
 LICENSE = "xbmc"
 
-DEPENDS = "libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl 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"
+DEPENDS = "libxmu fribidi mpeg2dec ffmpeg samba fontconfig curl 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 = "r9"
+PR = "r10"
 PR_append = "+gitr${SRCPV}"
 
 SRC_URI = "git://xbmc.git.sourceforge.net/gitroot/xbmc/xbmc;protocol=git;branch=master \