diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2015-02-17 03:51:19 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2015-02-17 03:51:19 +0000 |
| commit | e9ff1dbb814ea0ff7a484b502a1d0d2ee1c20e02 (patch) | |
| tree | dc6e0c91abc86999338d6cdcb6c0fd4de9613aee /app-cdr | |
| parent | version bump, cleanup old (diff) | |
| download | gentoo-2-e9ff1dbb814ea0ff7a484b502a1d0d2ee1c20e02.tar.gz gentoo-2-e9ff1dbb814ea0ff7a484b502a1d0d2ee1c20e02.tar.bz2 gentoo-2-e9ff1dbb814ea0ff7a484b502a1d0d2ee1c20e02.zip | |
Update CODEC_ID defines and drop old patch no longer needed #509332 by Nikoli.
(Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'app-cdr')
| -rw-r--r-- | app-cdr/k3b/ChangeLog | 8 | ||||
| -rw-r--r-- | app-cdr/k3b/files/k3b-2.0.3-libav-10.patch | 17 | ||||
| -rw-r--r-- | app-cdr/k3b/k3b-2.0.3-r1.ebuild | 6 |
3 files changed, 26 insertions, 5 deletions
diff --git a/app-cdr/k3b/ChangeLog b/app-cdr/k3b/ChangeLog index e7284815f343..7acd1c1abfb3 100644 --- a/app-cdr/k3b/ChangeLog +++ b/app-cdr/k3b/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-cdr/k3b -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.288 2014/12/12 21:16:26 mrueg Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/ChangeLog,v 1.289 2015/02/17 03:51:19 vapier Exp $ + + 17 Feb 2015; Mike Frysinger <vapier@gentoo.org> + +files/k3b-2.0.3-libav-10.patch, k3b-2.0.3-r1.ebuild: + Update CODEC_ID defines and drop old patch no longer needed #509332 by Nikoli. 12 Dec 2014; Manuel Rüger <mrueg@gentoo.org> k3b-2.0.3-r1.ebuild: Add support for kde applications dependency. diff --git a/app-cdr/k3b/files/k3b-2.0.3-libav-10.patch b/app-cdr/k3b/files/k3b-2.0.3-libav-10.patch new file mode 100644 index 000000000000..32bf69c17978 --- /dev/null +++ b/app-cdr/k3b/files/k3b-2.0.3-libav-10.patch @@ -0,0 +1,17 @@ +https://bugs.gentoo.org/509332 + +--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp. ++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp +@@ -423,9 +423,9 @@ + // mp3 being one of them sadly. Most importantly: allow the libsndfile decoder to do + // its thing. + // +- if( file->type() == CODEC_ID_WMAV1 || +- file->type() == CODEC_ID_WMAV2 || +- file->type() == CODEC_ID_AAC ) ++ if( file->type() == AV_CODEC_ID_WMAV1 || ++ file->type() == AV_CODEC_ID_WMAV2 || ++ file->type() == AV_CODEC_ID_AAC ) + #endif + return file; + } diff --git a/app-cdr/k3b/k3b-2.0.3-r1.ebuild b/app-cdr/k3b/k3b-2.0.3-r1.ebuild index 2363b09c39b4..a2ba2e4743b3 100644 --- a/app-cdr/k3b/k3b-2.0.3-r1.ebuild +++ b/app-cdr/k3b/k3b-2.0.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r1.ebuild,v 1.3 2014/12/12 21:16:26 mrueg Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-cdr/k3b/k3b-2.0.3-r1.ebuild,v 1.4 2015/02/17 03:51:19 vapier Exp $ EAPI=5 @@ -61,7 +61,7 @@ RDEPEND="${CDEPEND} DOCS+=( ChangeLog ) PATCHES=( - "${FILESDIR}/${PN}-2.0.2-ffmpeg2.patch" + "${FILESDIR}/${PN}-2.0.3-libav-10.patch" #509332 ) REQUIRED_USE=" |