reinit the tree, so we can have metadata

2 files changed, 55 insertions, 0 deletions

diff --git a/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
new file mode 100644
index 000000000000..111ee70c8774
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.0-ffmpeg3.patch
@@ -0,0 +1,29 @@
+From 3f60efe3dbab8e9d2c07a7b183fd009b3c999d60 Mon Sep 17 00:00:00 2001
+From: Jamie Heilman <jamie@audible.transient.net>
+Date: Sun, 8 May 2016 19:34:36 +0000
+Subject: [PATCH] ffmpeg/libav: support libavcodec API 55 and later
+
+With FFmpeg 1.0 and libav 10, AVCodecContext.{get,release}_buffer()
+were deprecated; the new default AVCodecContext.get_buffer2()
+implementation works fine for us.
+---
+ src/decoder/dec_lavc.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/decoder/dec_lavc.c b/src/decoder/dec_lavc.c
+index e2c81c6..5268a64 100644
+--- a/src/decoder/dec_lavc.c
++++ b/src/decoder/dec_lavc.c
+@@ -280,10 +280,12 @@ lavc_decoder_open(decoder_t * dec, char * filename) {
+ 		return DECODER_OPEN_BADLIB;
+ 
+ 	pd->avCodecCtx = pd->avFormatCtx->streams[pd->audioStream]->codec;
++#if LIBAVCODEC_VERSION_MAJOR < 55
+ #if LIBAVCODEC_VERSION_MAJOR >= 53
+ 	pd->avCodecCtx->get_buffer = avcodec_default_get_buffer;
+ 	pd->avCodecCtx->release_buffer = avcodec_default_release_buffer;
+ #endif /* LIBAVCODEC_VERSION_MAJOR >= 53 */
++#endif /* LIBAVCODEC_VERSION_MAJOR < 55 */
+ 
+ 	pd->time_base = pd->avFormatCtx->streams[pd->audioStream]->time_base;
+ 
diff --git a/media-sound/aqualung/files/aqualung-1.0-mac.patch b/media-sound/aqualung/files/aqualung-1.0-mac.patch
new file mode 100644
index 000000000000..16689ee0ae75
--- /dev/null
+++ b/media-sound/aqualung/files/aqualung-1.0-mac.patch
@@ -0,0 +1,26 @@
+Revert this patch.
+
+From 12c3a45a6d5b6ef0da70e0cdc424beff993eeef6 Mon Sep 17 00:00:00 2001
+From: Tom Szilagyi <tszilagyi@users.sourceforge.net>
+Date: Mon, 9 Jun 2014 12:54:54 +0000
+Subject: [PATCH] Make the APE decoder compile with current libmac-dev
+ (4.11-u4-b5-s7-d)
+
+git-svn-id: https://svn.code.sf.net/p/aqualung/code/trunk@1303 3cd24cdc-1f22-0410-b8b1-dcf80e670293
+---
+ src/decoder/dec_mac.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/decoder/dec_mac.cpp b/src/decoder/dec_mac.cpp
+index 024c8b9..2e9bc01 100644
+--- a/src/decoder/dec_mac.cpp
++++ b/src/decoder/dec_mac.cpp
+@@ -174,7 +174,7 @@ mac_decoder_open(decoder_t * dec, char * filename) {
+ 
+ 
+ 	int ret = 0;
++        wchar_t * pUTF16 = GetUTF16FromANSI(filename);
+-        wchar_t * pUTF16 = CAPECharacterHelper::GetUTF16FromANSI(filename);
+         pdecompress = CreateIAPEDecompress(pUTF16, &ret);
+         free(pUTF16);
+