Ack for ffmpeg patch

Ack for ffmpeg patch

[Henning Heinold]

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

Hi,

is the attached patch okay for dev. The patch removes the install
of the headers to the legacy directories. Without the patch it is very complicated
to compile xine 1.1.16.3.

Bye Henning

[-- Attachment #2: 0001-ffmpeg-0.5-install-the-header-to-staging-only-to-th.patch --]
[-- Type: text/x-diff, Size: 1877 bytes --]

 recipes/ffmpeg/ffmpeg_0.5.bb |   34 +++++++++++++++++++++++++++++++++-
 1 files changed, 33 insertions(+), 1 deletions(-)

diff --git a/recipes/ffmpeg/ffmpeg_0.5.bb b/recipes/ffmpeg/ffmpeg_0.5.bb
index 54db004..244dba1 100644
--- a/recipes/ffmpeg/ffmpeg_0.5.bb
+++ b/recipes/ffmpeg/ffmpeg_0.5.bb
@@ -3,7 +3,7 @@ require ffmpeg.inc
 DEPENDS += "schroedinger libgsm"
 
 PE = "1"
-PR = "r1"
+PR = "r2"
 
 DEFAULT_PREFERENCE = "1"
 
@@ -59,3 +59,35 @@ do_configure() {
 		sed -i -e s:Os:O4:g ${B}/config.h
 }
 
+do_stage() {
+        for lib in libavcodec libavdevice libavformat \
+                   libavutil libpostproc libswscale
+        do
+            oe_libinstall -a -so -C $lib $lib ${STAGING_LIBDIR} || true
+            install -d ${STAGING_INCDIR}/$lib 
+        done 
+
+        install -m 0644 ${S}/libavcodec/avcodec.h ${STAGING_INCDIR}/libavcodec/avcodec.h
+        install -m 0644 ${S}/libavcodec/opt.h ${STAGING_INCDIR}/libavcodec/opt.h
+
+        
+        for h in avformat.h avio.h rtp.h rtsp.h rtspcodes.h
+        do
+           install -m 0644 ${S}/libavformat/$h  ${STAGING_INCDIR}/libavformat/$h        
+        done
+
+                for h in adler32.h avstring.h avutil.h base64.h bswap.h \
+                 common.h crc.h fifo.h integer.h intfloat_readwrite.h \
+                 log.h lzo.h mathematics.h md5.h mem.h pixfmt.h random.h \
+                 rational.h sha1.h
+                do
+           install -m 0644 ${S}/libavutil/$h        ${STAGING_INCDIR}/libavutil/$h 
+        done
+
+        install -d ${STAGING_INCDIR}/libswscale/ 
+        install -m 0644 ${S}/libswscale/*.h ${STAGING_INCDIR}/libswscale/
+
+        install -d ${STAGING_INCDIR}/libpostproc
+        install -m 0644 ${S}/libpostproc/postprocess.h ${STAGING_INCDIR}/libpostproc/postprocess.h
+}
+
-- 
1.6.2.3

Re: Ack for ffmpeg patch

[Tom Rini]

On Tue, Apr 21, 2009 at 06:13:42PM +0200, Henning Heinold wrote:

> Hi,
> 
> is the attached patch okay for dev. The patch removes the install
> of the headers to the legacy directories. Without the patch it is very complicated
> to compile xine 1.1.16.3.

Did you mean "adds the install of the headers ..." ?  If so, yes, this
looks good.

-- 
Tom Rini

Re: Ack for ffmpeg patch

[Henning Heinold]

On Tue, Apr 21, 2009 at 09:29:45AM -0700, Tom Rini wrote:
> On Tue, Apr 21, 2009 at 06:13:42PM +0200, Henning Heinold wrote:
> 
> > Hi,
> > 
> > is the attached patch okay for dev. The patch removes the install
> > of the headers to the legacy directories. Without the patch it is very complicated
> > to compile xine 1.1.16.3.
> 
> Did you mean "adds the install of the headers ..." ?  If so, yes, this
> looks good.
> 

Not excatly the normal install with the install to the old diretories is still
in ffmpeg.inc

Bye Henning

Re: Ack for ffmpeg patch

[Koen Kooi]

On 21-04-09 18:13, Henning Heinold wrote:
> Hi,
>
> is the attached patch okay for dev. The patch removes the install
> of the headers to the legacy directories. Without the patch it is very complicated
> to compile xine 1.1.16.3.

NACK, it installs to both for a reason. You'll break other ffmpeg 
dependants by removing them. I don't think that's worth it to make xine 
work.

regards,

Koen

Re: Ack for ffmpeg patch

[Henning Heinold]

On Tue, Apr 21, 2009 at 08:20:44PM +0200, Koen Kooi wrote:
> On 21-04-09 18:13, Henning Heinold wrote:
>> Hi,
>>
>> is the attached patch okay for dev. The patch removes the install
>> of the headers to the legacy directories. Without the patch it is very complicated
>> to compile xine 1.1.16.3.
>
> NACK, it installs to both for a reason. You'll break other ffmpeg  
> dependants by removing them. I don't think that's worth it to make xine  
> work.
>
> regards,
>
> Koen

Which one breaks? Then they have to be fixed.

Bye Henning