[PATCH] ffmpeg: Stage `avconfig.h` which is built at compile time.

[PATCH] ffmpeg: Stage `avconfig.h` which is built at compile time.

[Paul Menzel]

[-- Attachment #1: Type: text/plain, Size: 980 bytes --]

This header is needed for `libvalhalla`.

Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
---
Could someone please test this with `ffmpeg_0.4.9-pre1.bb` as it includes `ffmpeg.inc` too.
---
 recipes/ffmpeg/ffmpeg.inc |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
index cd330f8..437a822 100644
--- a/recipes/ffmpeg/ffmpeg.inc
+++ b/recipes/ffmpeg/ffmpeg.inc
@@ -61,6 +61,8 @@ do_stage() {
            install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/ffmpeg/$h
            install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/libavutil/$h 
         done
+        install -m 0644 ${B}/libavutil/avconfig.h ${STAGING_INCDIR}/ffmpeg/
+        install -m 0644 ${B}/libavutil/avconfig.h ${STAGING_INCDIR}/libavutil/
 
         install -d ${STAGING_INCDIR}/libswscale/ 
         install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/
-- 
1.7.0

[-- Attachment #2: Dies ist ein digital signierter Nachrichtenteil --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH] ffmpeg: Stage `avconfig.h` which is built at compile time.

[Frans Meulenbroeks]

2010/3/16 Paul Menzel <paulepanter@users.sourceforge.net>:
> This header is needed for `libvalhalla`.
>
> Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> ---
> Could someone please test this with `ffmpeg_0.4.9-pre1.bb` as it includes `ffmpeg.inc` too.
> ---
>  recipes/ffmpeg/ffmpeg.inc |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
> index cd330f8..437a822 100644
> --- a/recipes/ffmpeg/ffmpeg.inc
> +++ b/recipes/ffmpeg/ffmpeg.inc
> @@ -61,6 +61,8 @@ do_stage() {
>            install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/ffmpeg/$h
>            install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/libavutil/$h
>         done
> +        install -m 0644 ${B}/libavutil/avconfig.h ${STAGING_INCDIR}/ffmpeg/
> +        install -m 0644 ${B}/libavutil/avconfig.h ${STAGING_INCDIR}/libavutil/
>
>         install -d ${STAGING_INCDIR}/libswscale/
>         install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/
> --
> 1.7.0
>

It might be better to try to move to the new default staging (by
removing the do_stage and testing whether it installs the required
things in staging).

FM

Re: [PATCH] ffmpeg: Stage `avconfig.h` which is built at compile time.

[Martin Jansa]

On Tue, Mar 16, 2010 at 10:58:39AM +0100, Frans Meulenbroeks wrote:
> 2010/3/16 Paul Menzel <paulepanter@users.sourceforge.net>:
> > This header is needed for `libvalhalla`.
> >
> > Signed-off-by: Paul Menzel <paulepanter@users.sourceforge.net>
> > ---
> > Could someone please test this with `ffmpeg_0.4.9-pre1.bb` as it includes `ffmpeg.inc` too.
> > ---
> >  recipes/ffmpeg/ffmpeg.inc |    2 ++
> >  1 files changed, 2 insertions(+), 0 deletions(-)
> >
> > diff --git a/recipes/ffmpeg/ffmpeg.inc b/recipes/ffmpeg/ffmpeg.inc
> > index cd330f8..437a822 100644
> > --- a/recipes/ffmpeg/ffmpeg.inc
> > +++ b/recipes/ffmpeg/ffmpeg.inc
> > @@ -61,6 +61,8 @@ do_stage() {
> >            install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/ffmpeg/$h
> >            install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/libavutil/$h
> >         done
> > +        install -m 0644 ${B}/libavutil/avconfig.h ${STAGING_INCDIR}/ffmpeg/
> > +        install -m 0644 ${B}/libavutil/avconfig.h ${STAGING_INCDIR}/libavutil/
> >
> >         install -d ${STAGING_INCDIR}/libswscale/
> >         install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/ffmpeg/
> > --
> > 1.7.0
> >
> 
> It might be better to try to move to the new default staging (by
> removing the do_stage and testing whether it installs the required
> things in staging).

I agree it would be better, but right now it fixes mplayer build, so I
would like to push it as-is + INC_PR bump.

Regards,

-- 
uin:136542059                jid:Martin.Jansa@gmail.com
Jansa Martin                 sip:jamasip@voip.wengo.fr 
JaMa