diff options
| author |   Gregorio Guidi <greg_g@gentoo.org> | 2005-08-24 23:26:27 +0000 |
|---|---|---|
| committer | Gregorio Guidi <greg_g@gentoo.org> | 2005-08-24 23:26:27 +0000 |
| commit | 991524965c3db9c2d412ef0c7e7df7663b51819c (patch) | |
| tree | 8fa95c13364a680d470f9259667313ebf9510d27 /kde-base/kdemultimedia/files | |
| parent | stable on ia64 (diff) | |
| download | gentoo-2-991524965c3db9c2d412ef0c7e7df7663b51819c.tar.gz gentoo-2-991524965c3db9c2d412ef0c7e7df7663b51819c.tar.bz2 gentoo-2-991524965c3db9c2d412ef0c7e7df7663b51819c.zip | |
KDE 3.5 prerelease.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'kde-base/kdemultimedia/files')
| -rw-r--r-- | kde-base/kdemultimedia/files/digest-kdemultimedia-3.5_alpha1 | 1 | ||||
| -rw-r--r-- | kde-base/kdemultimedia/files/kdemultimedia-3.5_alpha1-compile.patch | 90 |
2 files changed, 91 insertions, 0 deletions
diff --git a/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5_alpha1 b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5_alpha1 new file mode 100644 index 000000000000..b06a0ad53e64 --- /dev/null +++ b/kde-base/kdemultimedia/files/digest-kdemultimedia-3.5_alpha1 @@ -0,0 +1 @@ +MD5 d07e12a7389bd03f1f4bfb57df73f26a kdemultimedia-3.4.90.tar.bz2 5430692 diff --git a/kde-base/kdemultimedia/files/kdemultimedia-3.5_alpha1-compile.patch b/kde-base/kdemultimedia/files/kdemultimedia-3.5_alpha1-compile.patch new file mode 100644 index 000000000000..11b67024e724 --- /dev/null +++ b/kde-base/kdemultimedia/files/kdemultimedia-3.5_alpha1-compile.patch @@ -0,0 +1,90 @@ +diff -Nur kdemultimedia-3.4.90.orig/kioslave/audiocd/configure.in.in kdemultimedia-3.4.90/kioslave/audiocd/configure.in.in +--- kdemultimedia-3.4.90.orig/kioslave/audiocd/configure.in.in 2005-08-06 11:40:01.000000000 +0200 ++++ kdemultimedia-3.4.90/kioslave/audiocd/configure.in.in 2005-08-22 14:53:39.000000000 +0200 +@@ -0,0 +1,46 @@ ++AC_DEFUN([AC_CHECK_LIBFLAC], ++[ ++ AC_LANG_SAVE ++ AC_LANG_C ++ have_libFLAC=no ++ KDE_CHECK_HEADER(FLAC/metadata.h, ++ [ ++ KDE_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single, ++ have_libFLAC=yes) ++ ++ ]) ++ if test "x$have_libFLAC" = "xyes"; then ++ LIBFLAC="-lFLAC" ++ AC_DEFINE(HAVE_LIBFLAC, 1, ++ [Define if you have libFLAC (required for loading FLAC files)]) ++ fi ++ AC_SUBST(LIBFLAC) ++ AC_LANG_RESTORE ++]) ++ ++AC_DEFUN([AC_CHECK_LIBOGGFLAC], ++[ ++ AC_LANG_SAVE ++ AC_LANG_C ++ have_libOggFLAC=no ++ KDE_CHECK_HEADER(OggFLAC/seekable_stream_decoder.h, ++ [ ++ KDE_CHECK_LIB(OggFLAC,OggFLAC__seekable_stream_decoder_process_single, ++ have_libOggFLAC=yes,,[-lm -lOggFLAC -lFLAC]) ++ ++ ]) ++ if test "x$have_libOggFLAC" = "xyes"; then ++ LIBOGGFLAC="-lOggFLAC" ++ AC_DEFINE(HAVE_LIBOGGFLAC, 1, ++ [Define if you have libOggFLAC (required for loading OggFLAC files)]) ++ fi ++ AC_SUBST(LIBOGGFLAC) ++ AC_LANG_RESTORE ++]) ++ ++AC_ARG_WITH(flac,AC_HELP_STRING([--with-flac],[Enable FLAC support @<:@default=check@:>@]),[flac_test="$withval"],[flac_test="yes"]) ++ ++if test "x$flac_test" = "xyes" ; then ++ AC_CHECK_LIBFLAC ++ AC_CHECK_LIBOGGFLAC ++fi +diff -Nur kdemultimedia-3.4.90.orig/kioslave/audiocd/plugins/flac/encoderflac.cpp kdemultimedia-3.4.90/kioslave/audiocd/plugins/flac/encoderflac.cpp +--- kdemultimedia-3.4.90.orig/kioslave/audiocd/plugins/flac/encoderflac.cpp 2005-08-06 11:40:01.000000000 +0200 ++++ kdemultimedia-3.4.90/kioslave/audiocd/plugins/flac/encoderflac.cpp 2005-08-22 14:54:00.000000000 +0200 +@@ -32,7 +32,7 @@ + + extern "C" + { +- void create_audiocd_encoders(KIO::SlaveBase *slave, QPtrList<AudioCDEncoder> &encoders) ++ KDE_EXPORT void create_audiocd_encoders(KIO::SlaveBase *slave, QPtrList<AudioCDEncoder> &encoders) + { + encoders.append(new EncoderFLAC(slave)); + } +@@ -153,14 +153,14 @@ + return 0; + } + +-void EncoderLame::fillSongInfo( KCDDB::CDInfo info, int track, const QString &comment ) ++void EncoderFLAC::fillSongInfo( KCDDB::CDInfo info, int track, const QString &comment ) + { + d->metadata = new FLAC__StreamMetadata*[1]; + d->metadata[0] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_VORBIS_COMMENT); + // d->metadata[1] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_PADDING); + // d->metadata[2] = FLAC__metadata_object_new(FLAC__METADATA_TYPE_SEEKTABLE) + +- typedef QPair<QString, QVarient> Comment; ++ typedef QPair<QString, QVariant> Comment; + Comment comments[7] = { Comment("Title", info.trackInfoList[track].get("title")), + Comment("Artist", info.get("artist")), + Comment("Album", info.get("title")), +@@ -168,8 +168,8 @@ + Comment("Tracknumber", QString::number(track)), + Comment("Comment", comment), + Comment("Date", QString::null )}; +- if (cdYear > 0) { +- QDateTime dt = QDate(info.year, 1, 1); ++ if (info.get("Year").toInt() > 0) { ++ QDateTime dt = QDate(info.get("Year").toInt(), 1, 1); + comments[6] = Comment("Date", dt.toString(Qt::ISODate)); + } + |