fix build with ffmpeg2, patch by Rick Moritz in bug #481062 with some extra changes by me for ffmpeg 2.4+

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 150 insertions, 14 deletions

diff --git a/media-sound/squeezeslave/ChangeLog b/media-sound/squeezeslave/ChangeLog
index e5a4f0efbcd0..614ef20b3d39 100644
--- a/media-sound/squeezeslave/ChangeLog
+++ b/media-sound/squeezeslave/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/squeezeslave
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/ChangeLog,v 1.13 2012/11/24 12:30:53 radhermit Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/ChangeLog,v 1.14 2015/02/06 14:24:50 aballier Exp $
+
+  06 Feb 2015; Alexis Ballier <aballier@gentoo.org>
+  squeezeslave-1.1_p381.ebuild, +files/squeezeslave-1.1_p381-ffmpeg2.patch:
+  fix build with ffmpeg2, patch by Rick Moritz in bug #481062 with some extra
+  changes by me for ffmpeg 2.4+
 
   24 Nov 2012; Tim Harder <radhermit@gentoo.org> -squeezeslave-1.1_p312.ebuild,
   -squeezeslave-1.1_p350.ebuild, -files/squeezeslave-1.1_p309-ffmpeg.patch,
diff --git a/media-sound/squeezeslave/Manifest b/media-sound/squeezeslave/Manifest
index c7b6a6d5c1c7..7a6a636ea7ba 100644
--- a/media-sound/squeezeslave/Manifest
+++ b/media-sound/squeezeslave/Manifest
@@ -2,22 +2,19 @@
 Hash: SHA256
 
 AUX squeezeslave-1.1_p350-tremor-headers.patch 666 SHA256 00089edfbc89c83520af08875a11681b855e9365cfbf860b9467f81818231631 SHA512 c49abc087da8ae3a01be6370df3bf595f1a8b592a04a20fc901e6035e308b7d9d6241415243df16ca093a6e7abdc4820beeccf3f6caa4dda3b1bac3b61a0d873 WHIRLPOOL ae627d14f6a5fd7fbd7314bd8ea53345f1b514cc556389afc8c967b06ea4b71eff5ea3868a3ad2113d312c32b9b8e4d89f1c42c23244d2269634adc760fd57d5
+AUX squeezeslave-1.1_p381-ffmpeg2.patch 3837 SHA256 eaf74608c3bbb8b6e59d46f421656aa369347ad8bc8c2b1dfa7c88431b7b3ff5 SHA512 efeee3e40ad5d2b150017fa55f3a8ca2be74d36f7d81537f4225fdc8c49d0e5f70a682741569e71319eed511dd03307ade895b2455dace8407cbb0ea9f1eb278 WHIRLPOOL 9aadaa772c18cd54e8de21f6aec724be59c714aa9fea1dcddf8d6d2d303453959502b944382ce8c2090c3e78da06a2a30b2cdd03835b8a8ed298c9ea30f8710e
 AUX squeezeslave.confd-r1 320 SHA256 17529183d90dff3c212e52de02a39565f9cf31e8a17e74f17f73f9c7fce54b59 SHA512 ab25fffea599d508b6fd6e054cc78e3bea60d0a33c1749e4ef5f62a4a8a3ae4f2e3d0ccc94102044ecf68a6a9fc4f5e0a4f84ac49e93463666439869b03c2276 WHIRLPOOL 192a074498715a6f875d30fc519b275909f60b376fea5bee925eaa8719b0a10097bd45612b2fef8604e66a2a4868a71bbf6da74968277b57569a3ebc1b165e56
 AUX squeezeslave.initd-r1 514 SHA256 4f13200020aa33e3c85f76655e4c5ad8102533b49d9ac5a70b2059c169609b91 SHA512 e3dd8016d083afed77d6c1cbc4b0c58de176b0420cea4495ee379238d1056a3d706c1b209d5093667c01bd1d31198ae38000fa3649634c00ac450b10fcbd4000 WHIRLPOOL 03d8dfe8e74820c8a55703ac50de544470c990ca5c7c563c7546bc8945b717768f237e7c6a6f20e398ddf26058ce99aeae07bd2408bb7a814f316b1afd00e1d4
 DIST squeezeslave-1.1_p365.tar.xz 122364 SHA256 504099547c449fd865226f84f9e9e9cd0636c0f50659f605cd518addc7b5f4ec SHA512 409ef279b5fe0157e79ccab49cf4bb4fc3c6df6c864175a0160cba1c0be5b1960ee462e60b04df16b627023e4a87dff6ab3928a65aa686d7dc6192496e4e5503 WHIRLPOOL fb440cd1a6748aa7d9dbfaa39292de2ccd211513002e2025de563767faf096e81dc9e75799985921a3785571e7d0954f859f68dafa880b592c7cd3439c8675c4
 DIST squeezeslave-1.1_p381.tar.xz 123164 SHA256 8f898bb7949c2352f9fccc7b396630a6b7a49d80b439ec8792f33f149d6f95c0 SHA512 3c58d5ec814270740db9303b031e83a038b15b518c219f6e73ada1ebf7c5faa2da356a80303a266244bb08b703153d9f5a001377c467e5204256f97b139ca1bb WHIRLPOOL 900656118ed45defb3f4275840c8c061864a122ab74001c425339e988cea0adb8991228ac74fc3d609db14411c80e12e1bafebcb616b5196f619ea5dac8d0708
 EBUILD squeezeslave-1.1_p365.ebuild 1231 SHA256 96e5c18fe1d8a465a9b0c6b8e2de03f2bcf043950e4133a7c392f225129a59a0 SHA512 f345614f1c41fab07b732c35e120664bb49fd8ee3bc699d333cf1a160e46a53fe2883457cba822331e3d4293a03f618c5156afa074abc17cc6902993bd548016 WHIRLPOOL b38200702a4d38897b76efbf090586d759544ca0d7f24cb447da4e99ecc2dd2a2cb26b38dc8daa2d2e58128fd39898fb4d8b6bcff06a05d29860151620b9d1ea
-EBUILD squeezeslave-1.1_p381.ebuild 1231 SHA256 6fe0fbfcbb058ed7adfabe9e378b1945f6e408adc1808912c6dc53ee868b5fae SHA512 e9e4c9c07866f24d7168a362081acb14304a49cfcc55e7380b55ff488ce87d6fc316729721399d205cf710ab3648f794bf13201ba914cbaccfeb3097ed7e7fba WHIRLPOOL e9a27fb44abb7e77fd2c30a90927f5375c843721f6bd16157255daf571b57b44a7b454ece0caec4ac5a1dd4b174a70d3470193c6c227458cac72d0f3aeb7f53e
-MISC ChangeLog 2428 SHA256 3f0085c48ac72962d6beb41db15181586d039e322cc77b64c7da7674468f78f7 SHA512 52ccf868e500a27f20ee9f44cdf8c7e02a6cac0dcf27ba4cdec47716781a2107c3887a75248bf7c6f44697a002522cd0db752576df8fc9ef8e128a02f3c1df35 WHIRLPOOL 4fc0a703aa5e73db12ea96d517d8f285da1ab28250fd4cd44d9a0aac3302b25a87c075854fdc698208472e2ab8ef85185d8c95fde7bfc1343dcec0509e7b3483
+EBUILD squeezeslave-1.1_p381.ebuild 1281 SHA256 e3d43e2957a0d0a2991205f2492709c1d4914cfde31071897b72dc19ad12488f SHA512 e414cbf0f48a6905c61666e69a07eae92aff77fe2f5f927d5b5dc3ce9adb83a5a91cd0fee87875a056debea61ef9b00c3d75fdec31701e413e29a65533afe286 WHIRLPOOL 647aafdd1aac124dacebe8bf2525be697ed7c108e6e33cea46e2faf2b58dc4673267ebb923727fe8f6b64bc2e64d16c974879159e32af1f1751300ddcf9daedb
+MISC ChangeLog 2666 SHA256 89f7d445758ec74be595a5c21fb4f29ba96d91fbb0fc57f959f5f82626f97977 SHA512 8288c595bc81d97787167e1918fd8677e84e5923a1ca01930f82b01073b4e52c4e6a46e055e06f248eb9b9701dafc13ab6c614297660b2959dd0b3b34e47c185 WHIRLPOOL e8815fa125b0b7ba9df142c5cc5fb2fece5ab3200bd4b498d2811a2f867058121e9cc98b13ee8a80c3b00681645c761d1a1998f6e887bc6def366542c2737801
 MISC metadata.xml 599 SHA256 9d70b57adb9ee4c6f62d11188c0f2c35735f936725f7925ce4afb0e39df2d34e SHA512 b8947bcf6344f93c230d523ff61c1a9bdf7cdf964e5038e128340c89d5a04b65f0c07aa167b49383f8861665e56e24f976f0611cd47479f2b015c9de4414f327 WHIRLPOOL 00c707aebd8fa97ba069a9aa1b0ebb61c573dd017512a88ad9cb877943cc3dc60f3a6fd3becd19eb51d67f059640faabe734a329581fa44fc5ad41b80fc4c64a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2
 
-iQEcBAEBCAAGBQJQsL3+AAoJEEqz6FtPBkyje2kH/0WKGAAQKk475kACAMKw0glX
-yJCNtg5rCmFhev3rTrxBODDBsADmd4d6OSK80xByVkz6NBxuaDhaiNTDc7PBzver
-9yhlTFwG1JA28cSOI4g40d4RHKfyVgWwR2m+bvaucFlHcawodR1YMXCIO/PLEN5b
-RExKyOAUV5pYTFFFJo7vKJ3DB51vVpmWHS6k65kZSMLTAqrvvmAkH0g++EIMZNvc
-9GpWgxJ/46Q/2eegtilHwjk5zsKHuMY5QaAJxscH8F1NqGahxzF2ypPfyE/iF0DV
-fKXgql0tu+iXaNFJmeeKkHu7FeWdeuHcO2EEQBPQJERNupj1WEwZU/yK2yghzSc=
-=f6d7
+iEYEAREIAAYFAlTUzrMACgkQvFcC4BYPU0pVLACfWvF6+S43ewLPHVIfJKSbBm0l
+QsQAoLd1c1d3ApyvsdB7tONIkb78oEhd
+=f3iQ
 -----END PGP SIGNATURE-----
diff --git a/media-sound/squeezeslave/files/squeezeslave-1.1_p381-ffmpeg2.patch b/media-sound/squeezeslave/files/squeezeslave-1.1_p381-ffmpeg2.patch
new file mode 100644
index 000000000000..d72aa04533dd
--- /dev/null
+++ b/media-sound/squeezeslave/files/squeezeslave-1.1_p381-ffmpeg2.patch
@@ -0,0 +1,133 @@
+Index: squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder.c
+===================================================================
+--- squeezeslave-1.1_p381.orig/src/slimaudio/slimaudio_decoder.c
++++ squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder.c
+@@ -69,7 +69,6 @@ void av_lib_setup (void)
+ 		av_register_all();
+ 		DEBUGF("decoder_thread: av_register_all\n");
+ 
+-		avcodec_init();
+ 		avcodec_register_all();
+ 		DEBUGF("decoder_thread: avcodec_register_all\n");
+ 
+Index: squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_aac.c
+===================================================================
+--- squeezeslave-1.1_p381.orig/src/slimaudio/slimaudio_decoder_aac.c
++++ squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_aac.c
+@@ -47,6 +47,11 @@
+ 
+ #define AUDIO_INBUF_SIZE (AUDIO_CHUNK_SIZE*2)
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
++
+ int slimaudio_decoder_aac_init(slimaudio_t *audio)
+ {
+ 	av_lib_setup();
+@@ -164,7 +169,7 @@ int slimaudio_decoder_aac_process(slimau
+ 	}
+ 	else
+ 	{
+-		AVIOCtx->is_streamed = 1;
++		AVIOCtx->seekable = 0;
+ 	}
+ 
+ 	AVInputFormat* pAVInputFormat = av_find_input_format(streamformat);
+@@ -199,7 +204,7 @@ int slimaudio_decoder_aac_process(slimau
+ 	}
+ 	else
+ 	{
+-		iRC = av_find_stream_info(pFormatCtx);
++		iRC = avformat_find_stream_info(pFormatCtx, NULL);
+ 		if ( iRC < 0 )
+ 		{
+ 			DEBUGF("aac: find stream info failed:%d\n", iRC);
+@@ -236,7 +241,7 @@ int slimaudio_decoder_aac_process(slimau
+ 	} 
+ 	
+ 	/* Open codec */
+-	iRC = avcodec_open(pCodecCtx, pCodec);
++	iRC = avcodec_open2(pCodecCtx, pCodec, NULL);
+ 	if ( iRC < 0)
+ 	{
+ 		DEBUGF("aac: could not open codec:%d\n", iRC);
+@@ -274,7 +279,7 @@ int slimaudio_decoder_aac_process(slimau
+ 				eos=true;
+ 			}
+ 
+-			if ( url_ferror(pFormatCtx->pb) )
++			if ( pFormatCtx->pb && pFormatCtx->pb->error )
+ 			{
+ 				DEBUGF("aac: url_ferror\n");
+ #if 0
+@@ -312,7 +317,7 @@ int slimaudio_decoder_aac_process(slimau
+ 
+ 	/* Close the stream */
+ 	DEBUGF ("aac: av_close_input_stream\n");
+-	av_close_input_stream(pFormatCtx);
++	avformat_close_input(&pFormatCtx);
+ 
+ 	return 0;
+ }
+Index: squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_wma.c
+===================================================================
+--- squeezeslave-1.1_p381.orig/src/slimaudio/slimaudio_decoder_wma.c
++++ squeezeslave-1.1_p381/src/slimaudio/slimaudio_decoder_wma.c
+@@ -47,6 +47,10 @@
+ 
+ #define AUDIO_INBUF_SIZE (AUDIO_CHUNK_SIZE*2)
+ 
++#ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
++#define AVCODEC_MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
++#endif
++
+ int slimaudio_decoder_wma_init(slimaudio_t *audio)
+ {
+ 	av_lib_setup();
+@@ -159,7 +163,7 @@ int slimaudio_decoder_wma_process(slimau
+ 	}
+ 	else
+ 	{
+-		AVIOCtx->is_streamed = 1;
++		AVIOCtx->seekable = 1;
+ 	}
+ 
+ 	AVInputFormat* pAVInputFormat = av_find_input_format(streamformat);
+@@ -194,7 +198,7 @@ int slimaudio_decoder_wma_process(slimau
+ 	}
+ 	else
+ 	{
+-		iRC = av_find_stream_info(pFormatCtx);
++		iRC = avformat_find_stream_info(pFormatCtx,NULL);
+ 		if ( iRC < 0 )
+ 		{
+ 			DEBUGF("wma: find stream info failed:%d\n", iRC);
+@@ -231,7 +235,7 @@ int slimaudio_decoder_wma_process(slimau
+ 	} 
+ 	
+ 	/* Open codec */
+-	iRC = avcodec_open(pCodecCtx, pCodec);
++	iRC = avcodec_open2(pCodecCtx, pCodec, NULL);
+ 	if ( iRC < 0)
+ 	{
+ 		DEBUGF("wma: could not open codec:%d\n", iRC);
+@@ -270,7 +274,7 @@ int slimaudio_decoder_wma_process(slimau
+ 				eos=true;
+ 			}
+ 
+-			if ( url_ferror(pFormatCtx->pb) )
++			if ( pFormatCtx->pb && pFormatCtx->pb->error )
+ 			{
+ 				DEBUGF("wma: url_ferror\n");
+ #if 0
+@@ -308,7 +312,7 @@ int slimaudio_decoder_wma_process(slimau
+ 
+ 	/* Close the stream */
+ 	DEBUGF ("wma: av_close_input_stream\n");
+-	av_close_input_stream(pFormatCtx);
++	avformat_close_input(&pFormatCtx);
+ 
+ 	return 0;
+ }
diff --git a/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild b/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild
index ad74b8c3b48a..4bbba7a53a69 100644
--- a/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild
+++ b/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild,v 1.1 2012/11/24 12:29:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/squeezeslave/squeezeslave-1.1_p381.ebuild,v 1.2 2015/02/06 14:24:50 aballier Exp $
 
 EAPI="5"
 
@@ -30,6 +30,7 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-1.1_p350-tremor-headers.patch
+	epatch "${FILESDIR}"/${PN}-1.1_p381-ffmpeg2.patch
 }
 
 src_compile() {