summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2011-12-21 12:55:10 +0000
committerAlexis Ballier <aballier@gentoo.org>2011-12-21 12:55:10 +0000
commit35fc08168b7a62dea9d8f30b41c8b0f8fdc4ddcd (patch)
tree1edb03b102eaacfc2fd090676ba9fa7870ba1ce1 /media-sound/gejengel
parentAdd tools.jar to build classpath, thanks to Chewi for noticing. (diff)
downloadhistorical-35fc08168b7a62dea9d8f30b41c8b0f8fdc4ddcd.tar.gz
historical-35fc08168b7a62dea9d8f30b41c8b0f8fdc4ddcd.tar.bz2
historical-35fc08168b7a62dea9d8f30b41c8b0f8fdc4ddcd.zip
fix build with latest ffmpeg, bug #377991
Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64
Diffstat (limited to 'media-sound/gejengel')
-rw-r--r--media-sound/gejengel/ChangeLog6
-rw-r--r--media-sound/gejengel/Manifest15
-rw-r--r--media-sound/gejengel/files/gejengel-0.1.4-ffmpeg.patch13
-rw-r--r--media-sound/gejengel/gejengel-0.1.4.ebuild5
4 files changed, 27 insertions, 12 deletions
diff --git a/media-sound/gejengel/ChangeLog b/media-sound/gejengel/ChangeLog
index 8fbb7bad61e7..7576af8bdcbe 100644
--- a/media-sound/gejengel/ChangeLog
+++ b/media-sound/gejengel/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/gejengel
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.20 2011/11/11 20:26:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/ChangeLog,v 1.21 2011/12/21 12:55:10 aballier Exp $
+
+ 21 Dec 2011; Alexis Ballier <aballier@gentoo.org> gejengel-0.1.4.ebuild,
+ +files/gejengel-0.1.4-ffmpeg.patch:
+ fix build with latest ffmpeg, bug #377991
11 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> gejengel-0.1.4.ebuild:
Remove libsexymm from dependencies wrt #381205
diff --git a/media-sound/gejengel/Manifest b/media-sound/gejengel/Manifest
index 2653f7fdc1bd..c3e2eceff84d 100644
--- a/media-sound/gejengel/Manifest
+++ b/media-sound/gejengel/Manifest
@@ -1,19 +1,16 @@
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+AUX gejengel-0.1.4-ffmpeg.patch 639 RMD160 27a35d3ac9f2876596910f95a65999e98d361a0c SHA1 f61908d1f3bb816514529ed77765a704e114ef52 SHA256 9daf1d2b82cb13c111b1ceeadd2e91964124cd298b82aff1824c993b7c535410
AUX gejengel-0.1.4-libnotify-0.7.patch 683 RMD160 3eee4f00e583562265e314c7fcabb3276204e594 SHA1 cbb4e8d8e9cb28a00b478bdcab180e52532c834d SHA256 6aa63dc74e335a806f35376b75a72beee06df9dedafcfef7d8b1afc035ffcdd5
DIST gejengel-0.1.4.tar.gz 473674 RMD160 380070e12e527e69fc4c233c524dbc81e496f46b SHA1 c45b0d0b09592f21f9be7a8a1f8c13b4a1ebe9da SHA256 036a4ff2520b6ff9f73fc3012d8810939583f0dc25be6bac28689dffb6e9023b
-EBUILD gejengel-0.1.4.ebuild 1735 RMD160 b001d7888ab42318c0b77a874fedd07d476008f7 SHA1 15411fac253852cdcffd71ac79011d681f83516b SHA256 8be2058973f0ef7fbe4356e4e9c9c904c2d9f8c2037998ac0e53edebc823ab0f
-MISC ChangeLog 3110 RMD160 b0be689641a251f389c857b33a5244975de5b8b0 SHA1 20cc43d68859ef10d75de4ac8d28629aead41e30 SHA256 795292747649b3e6ef4fadd1793230c17fb39b8d979760e57b33dd0fb21826f9
+EBUILD gejengel-0.1.4.ebuild 1770 RMD160 b350acd2da0754fcac31963271d052c3cff9b080 SHA1 3cadaef80f76ede1d181769f5e09438aa3964387 SHA256 4108894cc5f705be0da7e44ccd34c0ea542609dbd2f2c70580180eaa58a95170
+MISC ChangeLog 3267 RMD160 7a033ff0e22667c5ee9234deaeebdb3c9bd777ca SHA1 d6dc3f23476508c51fc0dfeeb7ac7d9c3234df38 SHA256 37283d616e5bca02c43baad69658395738d5d757f936b968212dee5c0225cfd2
MISC metadata.xml 561 RMD160 fa1cd6eae8181d8de7776f3766ab04b2fb4f8327 SHA1 7434df6d71d08be1838f006715454ba105eea6b1 SHA256 c536a2322d23676f2c59c1ccf080671e24d9a1950c9b334b1daf67231ebcc574
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (GNU/Linux)
-iQEcBAEBAgAGBQJOvYSlAAoJEEdUh39IaPFNieUH/3r5qHDUbXXIuWwjhfqmS2Nh
-zRM1I8GU9RqECCRBtm0jUN0OiOJ8WI4FSA6joVqhjGN8mkgFePFlKLIK+NTzPZ+e
-i7/FqULUW0ZbgfCwAIGStG4ajsU6k6SHQLOgohaOMwbUvcvHF0M3yAvbukKiUT/b
-uG4C9s+e2VpmQGMeR6PV3ERnW8kyH19Nr5UHbm3E7rKPnWzH+H6C3njzkzWvZKdr
-lGhQ4bCkPbDllVLMoAZe3zAofQYCLtxwEzsDiD1gFFFSirrBjbifqr0wVc2UixLN
-Oqpzyx+WOAdJUlcsORCHzVrlDJTeUya11REsjv3++V/ZtLEh1qR2Rc4+61uP+Pc=
-=0Sg1
+iEYEARECAAYFAk7x1zMACgkQvFcC4BYPU0qX2wCffdk4/L+sBRuozbeWagS3g3xg
+FH0An0Y9l3Z8Hr80Sd5k6Z7+7dtP446A
+=1VxH
-----END PGP SIGNATURE-----
diff --git a/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg.patch b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg.patch
new file mode 100644
index 000000000000..658ff0ca675c
--- /dev/null
+++ b/media-sound/gejengel/files/gejengel-0.1.4-ffmpeg.patch
@@ -0,0 +1,13 @@
+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
+@@ -104,7 +104,7 @@ void FFmpegDecoder::initializeAudio()
+ {
+ for(uint32_t i = 0; i < m_pFormatContext->nb_streams; ++i)
+ {
+- if (m_pFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
++ if (m_pFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
+ {
+ m_pAudioStream = m_pFormatContext->streams[i];
+ m_AudioStream = i;
diff --git a/media-sound/gejengel/gejengel-0.1.4.ebuild b/media-sound/gejengel/gejengel-0.1.4.ebuild
index b8657e3718ce..387f763c526a 100644
--- a/media-sound/gejengel/gejengel-0.1.4.ebuild
+++ b/media-sound/gejengel/gejengel-0.1.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.ebuild,v 1.7 2011/11/11 20:26:09 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gejengel/gejengel-0.1.4.ebuild,v 1.8 2011/12/21 12:55:10 aballier Exp $
EAPI=4
inherit eutils multilib
@@ -36,7 +36,8 @@ DEPEND="${RDEPEND}
DOCS=( AUTHORS ChangeLog README TODO )
src_prepare() {
- epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
+ epatch "${FILESDIR}"/${P}-libnotify-0.7.patch \
+ "${FILESDIR}"/${P}-ffmpeg.patch
}
src_configure() {