[Frugalware-git] playground: kdemultimedia-3.96.1_740628-0playground1-i686

crazy crazy at frugalware.org
Tue Nov 27 08:17:18 CET 2007


Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=1eed03d8068752086ecc43b4d75a45d557004928

commit 1eed03d8068752086ecc43b4d75a45d557004928
Author: crazy <crazy at frugalware.org>
Date:   Tue Nov 27 08:06:47 2007 +0100

kdemultimedia-3.96.1_740628-0playground1-i686
* split work done
* removed old flac patch and added an new one , same issue
* but now I have to patch kdelibs cmake file as well =)

diff --git a/source/kde4/kdemultimedia/FrugalBuild b/source/kde4/kdemultimedia/FrugalBuild
index 38fb01e..10fcceb 100644
--- a/source/kde4/kdemultimedia/FrugalBuild
+++ b/source/kde4/kdemultimedia/FrugalBuild
@@ -1,28 +1,48 @@
-# Compiling Time: 8.04 SBU
+# Compiling Time: 0.01 SBU
# Maintainer: crazy <crazy at frugalware.org>
-# Contributor: Kapolnasi Tamas <ktamas at tdc.hu>

pkgname=kdemultimedia
-pkgver=3.5.8
-pkgrel=1
-pkgdesc="KDE Multimedia Programs."
-groups=('kde')
-archs=('i686' 'x86_64')
-depends=('libxv' 'kdebase>=3.5.8' 'cdparanoia>=9.8-4' 'lame>=3.97-3' 'speex' 'taglib' 'xine-lib>=1.1.6' \
-	'akode>=2.0.2' 'libxml2' 'libxxf86dga' 'flac>=1.1.4' 'audiofile' 'gstreamer')
-_F_kde_reconf=1
-_F_kde_split_docs=1
-Finclude kde
-source=($source $pkgname-3.5.6-flac-1.1.3.patch)
-Fconfopts="$Fconfopts --with-lame --with-cdparanoia --with-alsa --without-esd --with-speex --with-gstreamer \
-        --with-akode --with-audiofile --without-musicbrainz --with-theora --with-flac --with-xine"
+pkgver=3.96.1_740628
+pkgrel=0playground1
+pkgdesc="KDE Multimedia Programs"
+depends=()
+makedepends=('kdelibs' 'libtunepimp' 'cdparanoia' 'flac' 'libmusicbrainz' 'libvorbis')
+groups=('kde4')
+archs=('i686')
+options=('nomirror' 'nodocs' 'nobuild') #empty
+_F_kde4_subpkgs=('juk' 'kmix' 'kscd' 'libkcddb' 'libkcompactdisc')
+Finclude kde4
+source=(http://192.168.0.2/.KDE4/$pkgname-$pkgver.tar.bz2 \
+	flac.patch)
+sha1sums=('d3934bd6c59aae421af489ac0ce237d091b0c502' \
+          '26bdd6cd8a68b1a60753a12b29260265393e63f9')

-subpkgs=("$pkgname-docs")
-subdescs=("Kdemultimedia Documentation")
-subdepends=('')
-subgroups=('docs-extra kde-docs')
-subarchs=('i686 x86_64')
+subpkgs=("${_F_kde4_subpkgs[@]}" "$pkgname-audiocd-kio")
+subdescs=('Jukebox and music manager.' \
+          'Full featured mini mixer.' \
+	  'A multi-plaform CD-Player library.' \
+	  'A library for retrieving and sending cddb information.' \
+	  'CD Player.' \
+	  'Audiocd KIO Slave Configuration.')
+subdepends=('kdelibs libtunepimp' \
+	    'kdelibs' \
+	    'kdelibs libkcddb libkcompactdisc libmusicbrainz' \
+	    'kdelibs libmusicbrainz' \
+	    'kdelibs libqtnetwork' \
+	    'kdelibs libkcddb libmusicbrainz flac libvorbis cdparanoia libkcompactdisc')
+subgroups=('kde4' 'kde4' 'kde4' 'kde4' 'kde4' 'kde4')
+subarchs=('i686' 'i686' 'i686' 'i686' 'i686' 'kde4')
+
+build()
+{
+	CMakeKDE_make
+	CMakeKDE_split
+
+	## -audiocd KIO
+	kde4_install "kioslave"
+	Fsplit $pkgname-audiocd-kio /etc /usr
+
+	## shut up tar
+	Fmkdir usr/share/doc/$pkgname/DUMMY_PACKAGE_DO_NOT_USE
+}

-sha1sums=('fd70cf7f7378653e92c03fa0b9d9a5368451632c' \
-          '600d3c4f929aac29803a4866c8132aff52ac10b5')
-# optimization OK
diff --git a/source/kde4/kdemultimedia/flac.patch b/source/kde4/kdemultimedia/flac.patch
new file mode 100644
index 0000000..62b89c4
--- /dev/null
+++ b/source/kde4/kdemultimedia/flac.patch
@@ -0,0 +1,52 @@
+diff -Naur kdemultimedia-3.96.1_740628/kioslave/audiocd/plugins/flac/encoderflac.cpp kdemultimedia-3.96.1_740628-flac/kioslave/audiocd/plugins/flac/encoderflac.cpp
+--- kdemultimedia-3.96.1_740628/kioslave/audiocd/plugins/flac/encoderflac.cpp	2007-11-24 00:50:44.000000000 +0100
++++ kdemultimedia-3.96.1_740628-flac/kioslave/audiocd/plugins/flac/encoderflac.cpp	2007-11-27 07:49:22.000000000 +0100
+@@ -31,6 +31,7 @@
+ #include <QPair>
+ #include <QDateTime>
+
++
+ extern "C"
+ {
+   KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, QList<AudioCDEncoder*> &encoders)
+@@ -48,7 +49,10 @@
+     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[], size_t bytes, unsigned samples,
++				unsigned current_frame, void *client_data)
++
+ {
+     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
+
+@@ -77,7 +81,6 @@
+
+
+
+-
+ EncoderFLAC::EncoderFLAC(KIO::SlaveBase *slave) : AudioCDEncoder(slave) {
+     d = new Private();
+     d->ioslave = slave;
+@@ -110,9 +113,6 @@
+ long EncoderFLAC::readInit(long size) {
+     kDebug(7117) << "EncoderFLAC::readInit() called";
+     d->data = 0;
+-    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);
+
+     // The options match approximely those of flac compression-level-3
+     FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true);
+@@ -124,8 +124,8 @@
+     FLAC__stream_encoder_set_streamable_subset(d->encoder, true);
+     if (size > 0)
+         FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4);
+-
+-    FLAC__stream_encoder_init(d->encoder);
++    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
+     return d->data;
+ }
+
diff --git a/source/kde4/kdemultimedia/kdemultimedia-3.5.6-flac-1.1.3.patch b/source/kde4/kdemultimedia/kdemultimedia-3.5.6-flac-1.1.3.patch
deleted file mode 100644
index 0aa45f0..0000000
--- a/source/kde4/kdemultimedia/kdemultimedia-3.5.6-flac-1.1.3.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff -Naur kdemultimedia-3.5.6/kioslave/audiocd/configure.in.in kdemultimedia-3.5.6-flac/kioslave/audiocd/configure.in.in
---- kdemultimedia-3.5.6/kioslave/audiocd/configure.in.in	2005-09-10 10:19:49.000000000 +0200
-+++ kdemultimedia-3.5.6-flac/kioslave/audiocd/configure.in.in	2007-01-28 02:05:41.000000000 +0100
-@@ -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)
-
-     ])
-diff -Naur kdemultimedia-3.5.6/kioslave/audiocd/plugins/flac/encoderflac.cpp kdemultimedia-3.5.6-flac/kioslave/audiocd/plugins/flac/encoderflac.cpp
---- kdemultimedia-3.5.6/kioslave/audiocd/plugins/flac/encoderflac.cpp	2006-01-19 17:40:33.000000000 +0100
-+++ kdemultimedia-3.5.6-flac/kioslave/audiocd/plugins/flac/encoderflac.cpp	2007-01-28 02:05:41.000000000 +0100
-@@ -30,6 +30,12 @@
- #include <kdebug.h>
-
-
-+#if !defined FLAC_API_VERSION_CURRENT || FLAC_API_VERSION_CURRENT < 8
-+#define LEGACY_FLAC
-+#else
-+#undef LEGACY_FLAC
-+#endif
-+
- extern "C"
- {
-   KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, QPtrList<AudioCDEncoder> &encoders)
-@@ -47,7 +53,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;
-
-@@ -76,7 +86,6 @@
-
-
-
--
- EncoderFLAC::EncoderFLAC(KIO::SlaveBase *slave) : AudioCDEncoder(slave) {
-     d = new Private();
-     d->ioslave = slave;
-@@ -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;
- }
-


More information about the Frugalware-git mailing list