Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=playground.git;a=commitdiff;h=e02c40ee4e31251892a58de2b91f0f0e65aca16a
commit e02c40ee4e31251892a58de2b91f0f0e65aca16a
Author: crazy <[EMAIL PROTECTED]>
Date: Mon Feb 11 18:24:52 2008 +0100
kdemultimedia-4.00.99-0playground2-i686
* newer snapshot
diff --git a/source/kde4/kdemultimedia/FrugalBuild
b/source/kde4/kdemultimedia/FrugalBuild
index fb864d7..f2ce883 100644
--- a/source/kde4/kdemultimedia/FrugalBuild
+++ b/source/kde4/kdemultimedia/FrugalBuild
@@ -2,9 +2,9 @@
# Maintainer: crazy <[EMAIL PROTECTED]>
pkgname=kdemultimedia
-kdesvn=770098
+kdesvn=773461
pkgver=4.00.99
-pkgrel=0playground1
+pkgrel=0playground2
pkgdesc="KDE Multimedia Programs"
depends=()
makedepends=('libkde>=4.00.99' 'libtunepimp' 'cdparanoia' 'flac'
'libmusicbrainz' 'libvorbis' \
@@ -17,7 +17,7 @@ _F_kde4_subpkgs=('juk' 'kmix' 'kscd' 'libkcddb'
'libkcompactdisc' 'dragonplayer'
Finclude kde4
source=(http://192.168.0.2/.KDE4/$pkgname-${pkgver}_${kdesvn}.tar.bz2)
_F_cd_path="$pkgname-${pkgver}_${kdesvn}"
-sha1sums=('c5777cb1066a34823e63c1ded685019fdc3f70ad')
+sha1sums=('1bb4e26c7e4e4b7fa27f4e3bdf79c57253e723b7')
subpkgs=("[EMAIL PROTECTED]" "$pkgname-audiocd-kio")
subdescs=('Jukebox and music manager.' \
diff --git a/source/kde4/kdemultimedia/flac.patch
b/source/kde4/kdemultimedia/flac.patch
deleted file mode 100644
index 62b89c4..0000000
--- a/source/kde4/kdemultimedia/flac.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-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;
- }
-
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git
