diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2012-02-28 23:30:58 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2012-02-28 23:30:58 +0000 |
| commit | f1df98f3aa8bd3e9ceff34b6201d74fba8e2ea49 (patch) | |
| tree | a5ee4f24f225885c29e8cb8c22218946ae283eb8 /app-cdr | |
| parent | Add package to emacs herd. Don't force autoloading of uncompiled lisp file. F... (diff) | |
| download | historical-f1df98f3aa8bd3e9ceff34b6201d74fba8e2ea49.tar.gz historical-f1df98f3aa8bd3e9ceff34b6201d74fba8e2ea49.tar.bz2 historical-f1df98f3aa8bd3e9ceff34b6201d74fba8e2ea49.zip | |
fix build with libavformat 54 (ffmpeg/libav git atm)
Package-Manager: portage-2.2.0_alpha89/cvs/Linux x86_64
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/k3b/ChangeLog | 8 | ||||
| -rw-r--r-- | app-cdr/k3b/Manifest | 13 | ||||
| -rw-r--r-- | app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch | 22 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-2.0.2-r1.ebuild | 7 |
4 files changed, 39 insertions, 11 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index fa322ccd734a..c24baeebd9ae 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-cdr/k3b -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.268 2011/11/24 01:55:23 reavertm Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.269 2012/02/28 23:30:58 aballier Exp $ + + 28 Feb 2012; Alexis Ballier <aballier@gentoo.org> k3b-2.0.2-r1.ebuild, + +files/k3b-2.0.2-libavformat54.patch: + fix build with libavformat 54 (ffmpeg/libav git atm) 24 Nov 2011; Maciej Mrozowski <reavertm@gentoo.org> k3b-2.0.2-r1.ebuild: Require kdelibs with udev (udisks) support, bug 391177 diff --git a/app-cdr/k3b/Manifest b/app-cdr/k3b/Manifest index cef5b9987cd2..cc9dba89a213 100644 --- a/app-cdr/k3b/Manifest +++ b/app-cdr/k3b/Manifest @@ -2,14 +2,15 @@ Hash: SHA1 AUX k3b-2.0.2-ffmpeg.patch 3298 RMD160 0e7cff12151cfa33f87f4d4d425921e01fd1a9ba SHA1 8120c0e22e6c41ea285ca6060be13723ed91c52b SHA256 4285080dd207ba7282bde1de73b98c49c80e0d02e7ab53cb0317a94b08a2a547 +AUX k3b-2.0.2-libavformat54.patch 917 RMD160 5cf3edb1bb46ceee8ff6c47fd8342e044488d40e SHA1 5b35bff3f7670686a32bd71afea2deaca4331631 SHA256 516efa7ad0d9806c603f761769f8d1457fe9fa047a7475e7f11615db89ee1271 DIST k3b-2.0.2.tar.bz2 12833321 RMD160 a0289eb9ccec9607c2bdac3fc7c69102eec5ee40 SHA1 8b30a4d07942e82559b01bc07dea6bcf2defd532 SHA256 af176f29c1d2339c4648d461476227cb07bcd0c75056f2a4006f253e3ef5b7cd -EBUILD k3b-2.0.2-r1.ebuild 3369 RMD160 b653ad250ec098f3ca834621a795f912dc72379d SHA1 106fb1ae2e05c60b3015f3c75b4f71a97aed107a SHA256 95f4635d4f6be4aefe90e217a575bb7b8c9f42961ca97f3fe2d2019f7eb34a9b -MISC ChangeLog 38830 RMD160 00b42b0a5aab4a815400b4d808f17d289b36b5c2 SHA1 c50817803349834fd6e8492a40a20d829451e343 SHA256 43e54d33702b817420a2169329355dfdbab66dfabfa0f807139e5dc99daac70e +EBUILD k3b-2.0.2-r1.ebuild 3412 RMD160 bd84124d0d845017c79a930d30105381e2f20d4d SHA1 1226cf144b964ee0025fd029b445c7e1e450bbd9 SHA256 fdc5088812ef0d71b0ae2de0705318fb907e08c8da80316a6dcaf4149fd95cee +MISC ChangeLog 38999 RMD160 daeedae90eef17df0cb3f0c4fe8e55dd0db53fe9 SHA1 27ee798ae48cf8f490a223f16510b8fa2fbe1fe7 SHA256 b0767a22a905218e1641f363b5aa26a7eb041100560f94f74d80303ae50ceb17 MISC metadata.xml 328 RMD160 5b743e23199d1fe9055c726d7d177ee0e2f7e915 SHA1 73b1368091e675957fe43af4c9ce71b6049def16 SHA256 c7ade5871825684e83ad0a4126a78df11f40cfb6d7ac6578c8b65f3491ef01a0 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk7NpA8ACgkQFuHa/bHpVdsIbgCgx7QMWxfeBhMNtou6Mlc055fE -0hwAnRrGuO2tI+9O60Ts9LLyADeY4Px3 -=VYdA +iEYEARECAAYFAk9NY7cACgkQvFcC4BYPU0q6YACfQ62K9xEDMU0/epr5Lr3ggPFC +wJcAoMsViQqgaFKLAWp0wI6yf1cpEldI +=U1+W -----END PGP SIGNATURE----- diff --git a/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch new file mode 100644 index 000000000000..174a776b8b93 --- /dev/null +++ b/app-cdr/k3b/files/k3b-2.0.2-libavformat54.patch @@ -0,0 +1,22 @@ +Index: k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +=================================================================== +--- k3b-2.0.2.orig/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp ++++ k3b-2.0.2/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -88,7 +88,7 @@ bool K3bFFMpegFile::open() + close(); + + // open the file +- int err = ::av_open_input_file( &d->formatContext, m_filename.toLocal8Bit(), 0, 0, 0 ); ++ int err = ::avformat_open_input( &d->formatContext, m_filename.toLocal8Bit(), 0, NULL); + if( err < 0 ) { + kDebug() << "(K3bFFMpegFile) unable to open " << m_filename << " with error " << err; + return false; +@@ -143,7 +143,7 @@ bool K3bFFMpegFile::open() + } + + // dump some debugging info +- ::dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); ++ ::av_dump_format( d->formatContext, 0, m_filename.toLocal8Bit(), 0 ); + + return true; + } diff --git a/app-cdr/k3b/k3b-2.0.2-r1.ebuild b/app-cdr/k3b/k3b-2.0.2-r1.ebuild index e42422721469..c8397efa43ac 100644 --- a/app-cdr/k3b/k3b-2.0.2-r1.ebuild +++ b/app-cdr/k3b/k3b-2.0.2-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r1.ebuild,v 1.10 2011/11/24 01:55:23 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.2-r1.ebuild,v 1.11 2012/02/28 23:30:58 aballier Exp $ EAPI=4 @@ -64,7 +64,8 @@ RDEPEND="${DEPEND} DOCS+=( ChangeLog ) -PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" ) +PATCHES=( "${FILESDIR}/${P}-ffmpeg.patch" + "${FILESDIR}/${P}-libavformat54.patch" ) src_configure() { mycmakeargs=( |