diff options
| -rw-r--r-- | kde-base/kdemultimedia/ChangeLog | 9 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/files/digest-kdemultimedia-4.0.0-r1 (renamed from kde-base/kdemultimedia/files/digest-kdemultimedia-4.0.0) | 0 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/files/kdemultimedia-4.0.0-flac-1.1.3.patch | 46 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/kdemultimedia-4.0.0-r1.ebuild | 55 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/kdemultimedia-4.0.0.ebuild | 41 |
5 files changed, 109 insertions, 42 deletions
diff --git a/kde-base/kdemultimedia/ChangeLog b/kde-base/kdemultimedia/ChangeLog index 4059a9382a5e..e5bba19a8c2b 100644 --- a/kde-base/kdemultimedia/ChangeLog +++ b/kde-base/kdemultimedia/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for kde-base/kdemultimedia # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.259 2008/01/17 23:50:57 philantrop Exp $ +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/ChangeLog,v 1.260 2008/01/28 01:53:36 zlin Exp $ + +*kdemultimedia-4.0.0-r1 (28 Jan 2008) + + 28 Jan 2008; Bo Ørsted Andresen <zlin@gentoo.org> + +files/kdemultimedia-4.0.0-flac-1.1.3.patch, -kdemultimedia-4.0.0.ebuild, + +kdemultimedia-4.0.0-r1.ebuild: + Add USE=encode. Fix USE=flac. *kdemultimedia-4.0.0 (17 Jan 2008) diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-4.0.0 b/kde-base/kdemultimedia/files/digest-kdemultimedia-4.0.0-r1 index 95b7325c286d..95b7325c286d 100644 --- a/kde-base/kdemultimedia/files/digest-kdemultimedia-4.0.0 +++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-4.0.0-r1 diff --git a/kde-base/kdemultimedia/files/kdemultimedia-4.0.0-flac-1.1.3.patch b/kde-base/kdemultimedia/files/kdemultimedia-4.0.0-flac-1.1.3.patch new file mode 100644 index 000000000000..98df4cf05ec6 --- /dev/null +++ b/kde-base/kdemultimedia/files/kdemultimedia-4.0.0-flac-1.1.3.patch @@ -0,0 +1,46 @@ +Index: kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp +=================================================================== +--- kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp (revision 749997) ++++ kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp (working copy) +@@ -48,7 +48,16 @@ public: + unsigned long data; + }; + +-static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data) ++static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, ++ const FLAC__byte buffer[], ++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7 ++ unsigned bytes, ++#else ++ size_t bytes, ++#endif ++ unsigned samples, ++ unsigned current_frame, ++ void *client_data) + { + EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data; + +@@ -110,9 +119,11 @@ unsigned long EncoderFLAC::size(long tim + long EncoderFLAC::readInit(long size) { + kDebug(7117) << "EncoderFLAC::readInit() called"; + d->data = 0; ++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7 + FLAC__stream_encoder_set_write_callback(d->encoder, WriteCallback); + FLAC__stream_encoder_set_metadata_callback(d->encoder, MetadataCallback); + FLAC__stream_encoder_set_client_data(d->encoder, d); ++#endif + + // The options match approximely those of flac compression-level-3 + FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true); +@@ -125,7 +136,11 @@ long EncoderFLAC::readInit(long size) { + if (size > 0) + FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4); + ++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7 + FLAC__stream_encoder_init(d->encoder); ++#else ++ FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d); ++#endif + return d->data; + } + diff --git a/kde-base/kdemultimedia/kdemultimedia-4.0.0-r1.ebuild b/kde-base/kdemultimedia/kdemultimedia-4.0.0-r1.ebuild new file mode 100644 index 000000000000..169083d28267 --- /dev/null +++ b/kde-base/kdemultimedia/kdemultimedia-4.0.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-4.0.0-r1.ebuild,v 1.1 2008/01/28 01:53:36 zlin Exp $ + +EAPI="1" + +inherit kde4-base + +DESCRIPTION="KDE multimedia module" +HOMEPAGE="http://www.kde.org/" + +KEYWORDS="~amd64 ~x86" +IUSE="alsa debug encode htmlhandbook flac musicbrainz tunepimp vorbis" +LICENSE="GPL-2 LGPL-2" + +RESTRICT="test" + +DEPEND=">=kde-base/kdebase-${PV}:${SLOT} + media-libs/taglib + media-sound/cdparanoia + alsa? ( media-libs/alsa-lib ) + encode? ( flac? ( >=media-libs/flac-1.1.2 + >=kde-base/kdelibs-4.0.0-r1:kde-4 ) + vorbis? ( media-libs/libvorbis ) ) + musicbrainz? ( media-libs/musicbrainz ) + tunepimp? ( media-libs/tunepimp )" + +PATCHES="${FILESDIR}/${P}-flac-1.1.3.patch" + +src_compile() { + mycmakeargs="${mycmakeargs} + $(cmake-utils_use_with alsa Alsa) + $(cmake-utils_use_enable musicbrainz MusicBrainz) + $(cmake-utils_use_with tunepimp TunePimp)" + + if use encode; then + mycmakeargs="${mycmakeargs} + $(cmake-utils_use_with flac Flac)" + $(cmake-utils_use_with vorbis OggVorbis) + else + mycmakeargs="${mycmakeargs} + -DWITH_OggVorbis=OFF -DWITH_Flac=OFF" + fi + + kde4-base_src_compile +} + +pkg_postinst() { + if use encode; then + echo + elog "In order to use the lame plugin to encode mp3 files you will need to" + elog "install media-sound/lame" + echo + fi +} diff --git a/kde-base/kdemultimedia/kdemultimedia-4.0.0.ebuild b/kde-base/kdemultimedia/kdemultimedia-4.0.0.ebuild deleted file mode 100644 index bb3a4f38730d..000000000000 --- a/kde-base/kdemultimedia/kdemultimedia-4.0.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia/kdemultimedia-4.0.0.ebuild,v 1.2 2008/01/18 03:07:52 mr_bones_ Exp $ - -EAPI="1" - -inherit kde4-base - -DESCRIPTION="KDE multimedia module" -HOMEPAGE="http://www.kde.org/" - -KEYWORDS="~amd64 ~x86" -IUSE="debug htmlhandbook alsa flac musicbrainz tunepimp vorbis" -LICENSE="GPL-2 LGPL-2" - -RESTRICT="test" - -DEPEND="media-libs/taglib - media-sound/cdparanoia - vorbis? ( media-libs/libvorbis ) - tunepimp? ( media-libs/tunepimp ) - musicbrainz? ( media-libs/musicbrainz ) - alsa? ( media-libs/alsa-lib ) - >=kde-base/kdebase-${PV}:${SLOT}" - -src_compile() { - mycmakeargs="${mycmakeargs} - $(cmake-utils_use_with tunepimp TunePimp) - $(cmake-utils_use_with vorbis OggVorbis) - $(cmake-utils_use_with alsa Alsa) - $(cmake-utils_use_enable musicbrainz MusicBrainz)" - - kde4-base_src_compile -} - -pkg_postinst() { - echo - elog "In order to use the lame plugin to encode mp3 files you will need to" - elog "install media-sound/lame" - echo -} |