summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2009-11-20 01:33:12 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2009-11-20 01:33:12 +0000
commitadd0745117aba858b5d296732a80838edf4338b3 (patch)
tree15e77de7daa6523e06bd82932d088afa03d34e8f /kde-base/kdemultimedia-kioslaves
parentRemove KDE 3.5.10. (diff)
downloadgentoo-2-add0745117aba858b5d296732a80838edf4338b3.tar.gz
gentoo-2-add0745117aba858b5d296732a80838edf4338b3.tar.bz2
gentoo-2-add0745117aba858b5d296732a80838edf4338b3.zip
Remove KDE 3.5.10.
Diffstat (limited to 'kde-base/kdemultimedia-kioslaves')
-rw-r--r--kde-base/kdemultimedia-kioslaves/files/kdemultimedia-3.5.5+flac-1.1.3.patch64
-rw-r--r--kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-3.5.6-arts.patch11
-rw-r--r--kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-3.5.8-freebsd.patch27
-rw-r--r--kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.10.ebuild50
4 files changed, 0 insertions, 152 deletions
diff --git a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-3.5.5+flac-1.1.3.patch b/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-3.5.5+flac-1.1.3.patch
deleted file mode 100644
index 193ce3044b04..000000000000
--- a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-3.5.5+flac-1.1.3.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- kdemultimedia-3.5.5/kioslave/audiocd/configure.in.in 2005-09-10 01:19:49.000000000 -0700
-+++ kdemultimedia-3.5.5-b2/kioslave/audiocd/configure.in.in 2006-10-19 14:24:10.000000000 -0700
-@@ -5,7 +5,7 @@
- have_libFLAC=no
- KDE_CHECK_HEADER(FLAC/metadata.h,
- [
-- KDE_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
-+ KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_process_single,
- have_libFLAC=yes)
-
- ])
---- kdemultimedia-3.5.5/kioslave/audiocd/plugins/flac/encoderflac.cpp 2006-01-19 08:40:33.000000000 -0800
-+++ kdemultimedia-3.5.5-b2/kioslave/audiocd/plugins/flac/encoderflac.cpp 2006-10-19 14:36:32.000000000 -0700
-@@ -29,6 +29,11 @@
- #include <kconfig.h>
- #include <kdebug.h>
-
-+#if !defined FLAC_API_VERSION_CURRENT || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-
- extern "C"
- {
-@@ -47,7 +52,11 @@
- unsigned long data;
- };
-
-+#ifdef LEGACY_FLAC
- static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
-+#else
-+static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
-+#endif
- {
- EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
-
-@@ -109,9 +118,11 @@
- long EncoderFLAC::readInit(long size) {
- kdDebug(7117) << "EncoderFLAC::readInit() called"<< endl;
- d->data = 0;
-+#ifdef LEGACY_FLAC
- 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);
-@@ -124,7 +135,13 @@
- if (size > 0)
- FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4);
-
-- FLAC__stream_encoder_init(d->encoder);
-+#ifdef LEGACY_FLAC
-+ if(FLAC__stream_encoder_init(d->encoder) != FLAC__STREAM_ENCODER_OK)
-+ ; // really should handle an init failure
-+#else
-+ if(FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d) != FLAC__STREAM_ENCODER_INIT_STATUS_OK)
-+ ; // really should handle an init failure
-+#endif
- return d->data;
- }
-
diff --git a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-3.5.6-arts.patch b/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-3.5.6-arts.patch
deleted file mode 100644
index 4552ebe0784b..000000000000
--- a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-3.5.6-arts.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdemultimedia-kioslaves/configure.in.in.orig 2007-03-18 17:47:52.000000000 -0100
-+++ kdemultimedia-kioslaves/configure.in.in 2007-03-18 17:49:06.000000000 -0100
-@@ -397,7 +397,7 @@
- dnl but if we find arts we need the include
- dnl path for it.
-
-- if test x$kde_artsplug_compiles = xyes; then
-+ if test "x$build_arts" = "xyes" && test x$kde_artsplug_compiles = xyes; then
- ARTSC_INCLUDE=`${ARTSCCONFIG} --cflags`
- AC_MSG_RESULT([arts includes... $ARTSC_INCLUDE])
- AC_SUBST(ARTSC_INCLUDE)
diff --git a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-3.5.8-freebsd.patch b/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-3.5.8-freebsd.patch
deleted file mode 100644
index be8a7d927eae..000000000000
--- a/kde-base/kdemultimedia-kioslaves/files/kdemultimedia-kioslaves-3.5.8-freebsd.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- kdemultimedia-kioslaves-3.5.8/kioslave/audiocd/plugins/lame/encoderlame.cpp.old 2007-10-21 10:16:12 -0600
-+++ kdemultimedia-kioslaves-3.5.8/kioslave/audiocd/plugins/lame/encoderlame.cpp 2007-10-21 09:50:00 -0600
-@@ -17,7 +17,11 @@
- */
-
- #include <config.h>
-+#ifdef HAVE_MACHINE_ENDIAN_H
-+#include <machine/endian.h>
-+#else
- #include <endian.h>
-+#endif
- #include "encoderlame.h"
- #include "encoderlameconfig.h"
- #include "audiocd_lame_encoder.h"
-@@ -221,6 +225,12 @@
- // -x bitswap
- // -r raw/pcm
- // -s 44.1 (because it is raw you have to specify this)
-+#if !defined(__BYTE_ORDER) && defined(_BYTE_ORDER)
-+#define __BYTE_ORDER _BYTE_ORDER
-+#endif
-+#if !defined(__LITTLE_ENDIAN) && defined(_LITTLE_ENDIAN)
-+#define __LITTLE_ENDIAN _LITTLE_ENDIAN
-+#endif
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- *(d->currentEncodeProcess) << "lame" << "--verbose" << "-x" << "-r" << "-s" << "44.1";
- #else
diff --git a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.10.ebuild b/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.10.ebuild
deleted file mode 100644
index 24e5af58d5ff..000000000000
--- a/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdemultimedia-kioslaves/kdemultimedia-kioslaves-3.5.10.ebuild,v 1.7 2009/07/12 11:35:37 armin76 Exp $
-
-KMNAME=kdemultimedia
-KMMODULE=kioslave
-EAPI="1"
-inherit kde-meta eutils
-
-DESCRIPTION="kioslaves from kdemultimedia package"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="encode flac mp3 vorbis"
-DEPEND=">=kde-base/libkcddb-${PV}:${SLOT}
- media-sound/cdparanoia
- media-libs/taglib
- encode? ( vorbis? ( media-libs/libvorbis )
- flac? ( >=media-libs/flac-1.1.2 ) )"
-RDEPEND="${DEPEND}
- encode? ( mp3? ( media-sound/lame ) )"
-
-KMCOPYLIB="libkcddb libkcddb"
-KMEXTRACTONLY="akode/configure.in.in"
-KMCOMPILEONLY="
- kscd
- kscd/libwm
- libkcddb"
-
-PATCHES=( "${FILESDIR}/kdemultimedia-3.5.5+flac-1.1.3.patch"
- "${FILESDIR}/kdemultimedia-kioslaves-3.5.6-arts.patch"
- "${FILESDIR}/kdemultimedia-kioslaves-3.5.8-freebsd.patch" )
-
-src_compile() {
- myconf="--with-cdparanoia --enable-cdparanoia"
- if use encode; then
- myconf="$myconf $(use_with vorbis) $(use_with flac)"
- else
- myconf="$myconf --without-vorbis --without-flac"
- fi
-
- DO_NOT_COMPILE="libkcddb kscd" kde-meta_src_compile myconf configure
- cd "${S}"/libkcddb && emake configbase.h cdinfodialogbase.h
-
- # Library deps seems not to be built as they should :/
- cd "${S}"/kscd/libwm/audio && emake libworkmanaudio.la && \
- cd "${S}"/kscd/libwm && emake libworkman.la && \
- cd "${S}"/kscd && emake libkcompactdisc.la || \
- die "failed to make prerequisite libraries."
-
- DO_NOT_COMPILE="libkcddb kscd" kde-meta_src_compile make
-}