Fix build with ffmpeg-1, part of bug #443220

Package-Manager: portage-2.2.0_alpha159/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 59 insertions, 7 deletions

diff --git a/media-sound/gejengel/ChangeLog b/media-sound/gejengel/ChangeLog
index 07cd641ad32a..cb14c3aabca6 100644
--- a/media-sound/gejengel/ChangeLog
+++ b/media-sound/gejengel/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/gejengel
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.25 2012/11/20 20:07:44 ago Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.26 2013/01/24 13:42:37 aballier Exp $
+
+  24 Jan 2013; Alexis Ballier <aballier@gentoo.org> gejengel-0.1.4-r1.ebuild,
+  +files/gejengel-0.1.4-ffmpeg-1.patch:
+  Fix build with ffmpeg-1, part of bug #443220
 
   20 Nov 2012; Agostino Sarubbo <ago@gentoo.org> gejengel-0.1.4-r1.ebuild:
   Stable for x86, wrt bug #441396
diff --git a/media-sound/gejengel/Manifest b/media-sound/gejengel/Manifest
index 67fb5f70e438..db67021725d3 100644
--- a/media-sound/gejengel/Manifest
+++ b/media-sound/gejengel/Manifest
@@ -1,7 +1,18 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gejengel-0.1.4-ffmpeg-1.patch 1292 SHA256 49f67c8bcf5021874cdb395662b1602491681ead87c4dfd4f887cf38052fc05e SHA512 5bcb6f6e2fa09f8c2b73db47f097391fd9661de914ab0aa405fa33c44990055dee59dd151e0c47ee516f1fb31f833a26ccc34415c997e549edaf09396fbd9024 WHIRLPOOL 2e0b68b2ec67a7d57a1d51543bba955e8d09495f059b74b7ebf5c62267febaa53e3f1b271a8c8c6cdeec095c6fe8f7024d8f5a71a8c5fffb6a2804395d6dd312
 AUX gejengel-0.1.4-ffmpeg.patch 639 SHA256 9daf1d2b82cb13c111b1ceeadd2e91964124cd298b82aff1824c993b7c535410 SHA512 e5c9e472a796b780ace1c77012bda92d20b687222ec6a14ba57b45cc458bd2e5879402e2bfe859c934b18a1d6fb2df9a648032d429c01fc97a5b0693ca2f0b1f WHIRLPOOL 76ca83353d9ec1ae5c3bccf0edef2ffa73abdb3cfcb0ca40dd83aaed6391fe93328c7d28699d4c47307e33cfcee6509c39b44b463d3ff320145931ff7e3128d7
 AUX gejengel-0.1.4-libnotify-0.7.patch 683 SHA256 6aa63dc74e335a806f35376b75a72beee06df9dedafcfef7d8b1afc035ffcdd5 SHA512 5967a64f947dd431e2065369944488e2401a49e6473f16490dcbd82e3020ca66ce3b1a8916caac63ea54f188c3d5ccbf4b09db0f6c670a879a0b309158b7817b WHIRLPOOL fd0796795910930a443992759ff8c104ce0c9d43845186c61080218fa78e11c4488a344b438e9ff8da4a22c8f9c13af1f713510aa6ebfaeef02c06ddadb5a220
 DIST gejengel-0.1.4.tar.gz 473674 SHA256 036a4ff2520b6ff9f73fc3012d8810939583f0dc25be6bac28689dffb6e9023b SHA512 584a6250ec87475babbeff86c7f2427cf731b3ec0906dcc6219bf40cf1c5533feaf3f076d0f34daeaa21a1c2596e5fe53e4530820a6d47dbca7f9afd6f489580 WHIRLPOOL 0afd7138782f6337bf7aa770ae8dbddf3d037978ffabf6b7f9c5fedddd6e1a3354714d9d80e7414c27b8250be8f41d7476454f2c1408b8709d063e61774d316f
-EBUILD gejengel-0.1.4-r1.ebuild 2013 SHA256 1feeafd2b8d594872a4b07415e8248fc91113876ded539ed3530bbb761f3fcac SHA512 f5ac9f649c2feaeb9b3152b5e29579a6b5f2af0eef4f568f7aeb7362e5a97fd8e52903405609c1012db68aeb7aabc8faeeafbd8881922b3456efb04bff138d83 WHIRLPOOL b6b39c82a9ac07212f83be4216b2cf06446d0a4f755e07b2dbf2bbef53650d746d0fc586b4b8257c0af60b321b901ab408c3b9ec2621122b35683d0ed9961648
+EBUILD gejengel-0.1.4-r1.ebuild 2056 SHA256 176524114c14d2024a5183d45019972dbc7fb35cf668a45d8bc2ac1117e43010 SHA512 e09d03c0b40f9b838606e074e87796a40706ad807a5624b3dfdac8fd370c36ff99b73d8bca93b5299cfda8f7c9a66abea8fb68e280f13c834eba420648799463 WHIRLPOOL 56920d0bfc92574c7c8bfca7f89acf376dc63f36baa72a4e84de4b66720e07655b8b23f6473f559100ae78269fe9a59ebc97af16587794694ed6836cd699d7a2
 EBUILD gejengel-0.1.4.ebuild 1770 SHA256 4108894cc5f705be0da7e44ccd34c0ea542609dbd2f2c70580180eaa58a95170 SHA512 d5348eff650f5b0075b69c61bf54cb599e8bd6396376b69c5f6648663af5440a1a21603d34f5d168cee3c6d3b0ce9dbb8db4b0abde79b748925312f75a2d057a WHIRLPOOL cfb6ba818fd377cb05b574d16b660f7659cf0d51ff808e9139676bb971a98e1f73b50fd5589bbc64b450e3a9c2810b6740489276d308f1a2f8ae6a3b972b13e0
-MISC ChangeLog 3775 SHA256 1896bbe4c4be474f33da6327cd7e9fa01071640eb50eb25bd3baa200af239a55 SHA512 3bc909b820da6bb5c5ca84e583f665d678c1332ca18e084f0d6c64cf059bbe47acd2ef4a50341d2d8df5b80e3f4493a149bb3201227dedd73580c246dfe1636c WHIRLPOOL ae1fa05921f5de03d50ded8cd5acb6316610ec277c9929379aa55b93c8718404646739b949bc2158a49e4c67d62f9251b5be15f06c02c0d0e13f1ebf4ad04c2e
+MISC ChangeLog 3946 SHA256 d8d392385675fb6a250add6e8b23264d6060f7151656087052ca33b8557be7bd SHA512 5c2fe246ac3f6291c5dc30f73d28f6e49d09d0aeebd52cf8b1966d405e1c6d0d1fe612d83bf2b9baff895d38b9dc2e0b26ab036308c649e8a63fd740d708c031 WHIRLPOOL 705b8f629244d0fad766278675f85e0621d43b2759d2562edecbfc2bd46b1005fee7d29931a146386a05425c755cc756339b539b02213c1bae80ab7b03af4e4f
 MISC metadata.xml 671 SHA256 f9c58744d6daed7062348e57b6c1f8d7aba55bbc1eff150167d28f73d92872c0 SHA512 5fe3224279519c324d79352eb1e2c74548cd4830f50a46bc7166fdb160a8cd6094e9d0de64bc6c85997462372ffbcbbe3f047aca6d5e15153549b87db9686d1c WHIRLPOOL c2406f1c2b36bdac58693f34c5efa90e8afb7749742557bcff8e105f886c979b488642c564641eb51597205f8fa78bb048db28590c67044fdad83e04492cce50
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEBOk8ACgkQvFcC4BYPU0qWLwCgk34hbDinW04r/QDUxgmB7XS6
+pJgAn0/DrApc/hfMpNd2w0gt5ucnsrVm
+=gkRS
+-----END PGP SIGNATURE-----
diff --git a/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg-1.patch b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg-1.patch
new file mode 100644
index 000000000000..10d43d3da1a4
--- /dev/null
+++ b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg-1.patch
@@ -0,0 +1,36 @@
+Index: gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp
+===================================================================
+--- gejengel-0.1.4.orig/src/AudioDecoder/ffmpegdecoder.cpp
++++ gejengel-0.1.4/src/AudioDecoder/ffmpegdecoder.cpp
+@@ -83,7 +83,7 @@ void FFmpegDecoder::initialise()
+     avcodec_register_all();
+     av_register_all();
+ 
+-    if (av_open_input_file(&m_pFormatContext, m_Filepath.c_str(), NULL, 0, NULL) != 0)
++    if (avformat_open_input(&m_pFormatContext, m_Filepath.c_str(), NULL, NULL) != 0)
+     {
+         throw logic_error("Could not open input file: " + m_Filepath);
+     }
+@@ -307,21 +307,7 @@ AudioFormat FFmpegDecoder::getAudioForma
+ {
+     AudioFormat format;
+ 
+-    switch(m_pAudioCodecContext->sample_fmt)
+-    {
+-    case SAMPLE_FMT_U8:
+-        format.bits = 8;
+-        break;
+-    case SAMPLE_FMT_S16:
+-        format.bits = 16;
+-        break;
+-    case SAMPLE_FMT_S32:
+-        format.bits = 32;
+-        break;
+-    default:
+-        format.bits = 0;
+-    }
+-
++    format.bits             = av_get_bytes_per_sample(m_pAudioCodecContext->sample_fmt) << 3;
+     format.rate             = m_pAudioCodecContext->sample_rate;
+     format.numChannels      = m_pAudioCodecContext->channels;
+     format.framesPerPacket  = m_pAudioCodecContext->frame_size;
diff --git a/media-sound/gejengel/gejengel-0.1.4-r1.ebuild b/media-sound/gejengel/gejengel-0.1.4-r1.ebuild
index 2c608503a6bc..ec234a88d729 100644
--- a/media-sound/gejengel/gejengel-0.1.4-r1.ebuild
+++ b/media-sound/gejengel/gejengel-0.1.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.4-r1.ebuild,v 1.3 2012/11/20 20:07:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.4-r1.ebuild,v 1.4 2013/01/24 13:42:37 aballier Exp $
 
 EAPI=4
 inherit eutils multilib flag-o-matic
@@ -37,7 +37,8 @@ DOCS=( AUTHORS ChangeLog README TODO )
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \
-		"${FILESDIR}"/${P}-ffmpeg.patch
+		"${FILESDIR}"/${P}-ffmpeg.patch \
+		"${FILESDIR}"/${P}-ffmpeg-1.patch
 	# Remove Vesion and Encoding from the desktop file
 	sed -i -e "/Version/d" -e "/Encoding/d" \
 		data/${PN}.desktop.in || die "sed failed"