[proaudio] [1251] fix aqualung-9999 vs.

[subversion@xxxxxxxxxxxxx]

Revision: 1251
Author:   gimpel
Date:     2008-07-15 10:45:15 +0200 (Tue, 15 Jul 2008)

Log Message:
-----------
fix aqualung-9999 vs. ffmpeg

Modified Paths:
--------------
    trunk/overlays/proaudio/media-sound/aqualung/ChangeLog
    trunk/overlays/proaudio/media-sound/aqualung/Manifest
    trunk/overlays/proaudio/media-sound/aqualung/aqualung-9999.ebuild

Added Paths:
-----------
    trunk/overlays/proaudio/media-sound/aqualung/files/new-ffmpeg-headers.patch


Modified: trunk/overlays/proaudio/media-sound/aqualung/ChangeLog
===================================================================
--- trunk/overlays/proaudio/media-sound/aqualung/ChangeLog	2008-07-15 08:17:45 UTC (rev 1250)
+++ trunk/overlays/proaudio/media-sound/aqualung/ChangeLog	2008-07-15 08:45:15 UTC (rev 1251)
@@ -2,6 +2,10 @@
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  15 Jul 2008; Thomas Kuther <gimpel@xxxxxxxxxxxxxxxx>
+  +files/new-ffmpeg-headers.patch, aqualung-9999.ebuild:
+  fix for ffmpeg headers
+
   24 Feb 2008; Frieder Buerzele <evermind@xxxxxxxxxxxxx>;
   aqualung-9999.ebuild:
   updated ebuid (thx Maarten Maathuis)

Modified: trunk/overlays/proaudio/media-sound/aqualung/Manifest
===================================================================
--- trunk/overlays/proaudio/media-sound/aqualung/Manifest	2008-07-15 08:17:45 UTC (rev 1250)
+++ trunk/overlays/proaudio/media-sound/aqualung/Manifest	2008-07-15 08:45:15 UTC (rev 1251)
@@ -1,3 +1,4 @@
-EBUILD aqualung-9999.ebuild 2312 RMD160 ad768619d06d62f36a6b23d758b1698d41eda5b9 SHA1 a28b5bdba21ebc38e959b68c980ced067e73aedf SHA256 5eefd1d87157ea465fa05fcb301a63d49ba06c70fee99c65fb782f3478410f32
-MISC ChangeLog 330 RMD160 e0242d9149354c37c26a06be685b91dfc029b604 SHA1 6f4861134c700e0dcfbceb7b845c20d5a701598f SHA256 ca5e82f7bce510cf0a073913ae5f087f43d7bb3b09239e395d3da310ec480dfa
+AUX new-ffmpeg-headers.patch 920 RMD160 15e8f3bad767612722319cf4157dd904baef0b16 SHA1 598f5718822f8e838ec54ae41f49f14e61918e1c SHA256 0f5395d9bcc1e50bed1fbbad3c3f4cb060bed554191c339c0cd2ff1da27deebc
+EBUILD aqualung-9999.ebuild 2382 RMD160 6875de531e09b3e6bc0097d2ee5e8c34d35b5d6e SHA1 4c62eed9d24607214ebc6239601c882dd39ae080 SHA256 9a6b3a3c51a5f0372727da23c25c06403d8ea310e0bf5e4db626e17f7ca9789f
+MISC ChangeLog 468 RMD160 0d0d88ea84a56583a639748f27c3166f6ca5c0f0 SHA1 f7649db4a881b3efa5998ed8a2227ccf3b1549ff SHA256 f09cd36ddb564cf86e09a9ce5b722f38ef829a65e57518f1df42346ef1ec7662
 MISC metadata.xml 268 RMD160 facc07bd885f20615a1f2555069329c642e1a566 SHA1 2456bdb8a218c9d477d2d6ee4bf158de070c7be4 SHA256 96629b266b743f566c29158d4498edeeb1cd6b1f0cd9629e42d4f10b4da82f89

Modified: trunk/overlays/proaudio/media-sound/aqualung/aqualung-9999.ebuild
===================================================================
--- trunk/overlays/proaudio/media-sound/aqualung/aqualung-9999.ebuild	2008-07-15 08:17:45 UTC (rev 1250)
+++ trunk/overlays/proaudio/media-sound/aqualung/aqualung-9999.ebuild	2008-07-15 08:45:15 UTC (rev 1251)
@@ -53,6 +53,10 @@
 	echo "#define AQUALUNG_VERSION \"R-$(cd
 "${ESVN_STORE_DIR}/${ESVN_PROJECT}/${ESVN_REPO_URI##*/}" ; svn info |
 grep '^Revision' | awk '{print $2}')\"" > src/version.h
+
+	# FFMpeg headers...
+	epatch "${FILESDIR}/new-ffmpeg-headers.patch"
+
 	eautoreconf || die
 }
 

Added: trunk/overlays/proaudio/media-sound/aqualung/files/new-ffmpeg-headers.patch
===================================================================
--- trunk/overlays/proaudio/media-sound/aqualung/files/new-ffmpeg-headers.patch	                        (rev 0)
+++ trunk/overlays/proaudio/media-sound/aqualung/files/new-ffmpeg-headers.patch	2008-07-15 08:45:15 UTC (rev 1251)
@@ -0,0 +1,29 @@
+diff -burN aqualung-0.9beta9.1-orig/configure.ac aqualung-0.9beta9.1/configure.ac
+--- aqualung-0.9beta9.1-orig/configure.ac	2008-02-10 13:14:31.000000000 +0100
++++ aqualung-0.9beta9.1/configure.ac	2008-04-15 03:16:16.000000000 +0200
+@@ -562,6 +562,8 @@
+ 	if test "$lavc" = "detect"; then
+ 		lavc=$avc_lib
+ 	fi
++
++	AC_CHECK_HEADERS(libavcodec/avcodec.h)
+ fi
+ 
+ 
+diff -burN aqualung-0.9beta9.1-orig/src/decoder/dec_lavc.h aqualung-0.9beta9.1/src/decoder/dec_lavc.h
+--- aqualung-0.9beta9.1-orig/src/decoder/dec_lavc.h	2007-04-21 09:57:14.000000000 +0200
++++ aqualung-0.9beta9.1/src/decoder/dec_lavc.h	2008-04-15 04:02:41.000000000 +0200
+@@ -23,8 +23,13 @@
+ #define _DEC_LAVC_H
+ 
+ #ifdef HAVE_LAVC
++#if HAVE_LIBAVCODEC_AVCODEC_H
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
++#else
+ #include <ffmpeg/avcodec.h>
+ #include <ffmpeg/avformat.h>
++#endif
+ #endif /* HAVE_LAVC */
+ 
+ #include "file_decoder.h"