Patchwork [meta-oe,PATCHv2] mplayer2: drop virtual/kernel dependency and s/ARM/arm/ in ARM_INSTRUCTION_SET

login
register
mail settings
Submitter Martin Jansa
Date Feb. 28, 2012, 10:04 a.m.
Message ID <1330423441-653-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/22303/
State Accepted
Commit add085b0c905a038b54119f23b38720345280ee5
Headers show

Comments

Martin Jansa - Feb. 28, 2012, 10:04 a.m.
* virtual/kernel was needed only to provide omapfb.h in staging
  but that's now moved to BSP layers, no need to make sstate hash
  machine specific here.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Graeme Gregory - Feb. 28, 2012, 10:14 a.m.
Undetailed change below

Graeme

On 28/02/12 10:04, Martin Jansa wrote:
> * virtual/kernel was needed only to provide omapfb.h in staging
>    but that's now moved to BSP layers, no need to make sstate hash
>    machine specific here.
>
> Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> ---
>   meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
> index 3e4d369..0b73d57 100644
> --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
> +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
> @@ -1,7 +1,7 @@
>   DESCRIPTION = "Open Source multimedia player."
>   SECTION = "multimedia"
>   HOMEPAGE = "http://www.mplayerhq.hu/"
> -DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 virtual/kernel libass \
> +DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 libass \
>   	   ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
>
>   RDEPENDS_${PN} = "mplayer-common"
> @@ -18,10 +18,10 @@ SRC_URI = "git://repo.or.cz/mplayer.git;protocol=git;branch=master \
>
>   SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac"
>
> -ARM_INSTRUCTION_SET = "ARM"
> +ARM_INSTRUCTION_SET = "arm"
This is obvious to us old school but should be detailed in changelog.

>
>   PV = "2.0+gitr${SRCPV}"
> -PR = "r7"
> +PR = "r8"
>
>   PARALLEL_MAKE = ""
>
Martin Jansa - Feb. 28, 2012, 10:40 a.m.
On Tue, Feb 28, 2012 at 10:14:09AM +0000, Graeme Gregory wrote:
> Undetailed change below
> 
> Graeme
> 
> On 28/02/12 10:04, Martin Jansa wrote:
> > * virtual/kernel was needed only to provide omapfb.h in staging
> >    but that's now moved to BSP layers, no need to make sstate hash
> >    machine specific here.
> >
> > Signed-off-by: Martin Jansa<Martin.Jansa@gmail.com>
> > ---
> >   meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb |    6 +++---
> >   1 files changed, 3 insertions(+), 3 deletions(-)
> >
> > diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
> > index 3e4d369..0b73d57 100644
> > --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
> > +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
> > @@ -1,7 +1,7 @@
> >   DESCRIPTION = "Open Source multimedia player."
> >   SECTION = "multimedia"
> >   HOMEPAGE = "http://www.mplayerhq.hu/"
> > -DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 virtual/kernel libass \
> > +DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 libass \
> >   	   ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
> >
> >   RDEPENDS_${PN} = "mplayer-common"
> > @@ -18,10 +18,10 @@ SRC_URI = "git://repo.or.cz/mplayer.git;protocol=git;branch=master \
> >
> >   SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac"
> >
> > -ARM_INSTRUCTION_SET = "ARM"
> > +ARM_INSTRUCTION_SET = "arm"
> This is obvious to us old school but should be detailed in changelog.

This recipe was only one using upper case ARM in this, and as classes
check only for '== "thumb"' then this is just cosmetics no change in
behavior.

> 
> >
> >   PV = "2.0+gitr${SRCPV}"
> > -PR = "r7"
> > +PR = "r8"
> >
> >   PARALLEL_MAKE = ""
> >
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
index 3e4d369..0b73d57 100644
--- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
+++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb
@@ -1,7 +1,7 @@ 
 DESCRIPTION = "Open Source multimedia player."
 SECTION = "multimedia"
 HOMEPAGE = "http://www.mplayerhq.hu/"
-DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 virtual/kernel libass \
+DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses lame libxv virtual/libx11 libass \
 	   ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}"
 
 RDEPENDS_${PN} = "mplayer-common"
@@ -18,10 +18,10 @@  SRC_URI = "git://repo.or.cz/mplayer.git;protocol=git;branch=master \
 
 SRCREV = "e3f5043233336d8b4b0731c6a8b42a8fda5535ac"
 
-ARM_INSTRUCTION_SET = "ARM"
+ARM_INSTRUCTION_SET = "arm"
 
 PV = "2.0+gitr${SRCPV}"
-PR = "r7"
+PR = "r8"
 
 PARALLEL_MAKE = ""