[arch-commits] Commit in kdemultimedia/trunk (PKGBUILD flac.patch tunepimp.patch)

Pierre Schmitz pierre at archlinux.org
Wed Jul 23 19:42:32 EDT 2008


    Date: Wednesday, July 23, 2008 @ 19:42:32
  Author: pierre
Revision: 6149

upgpkg: kdemultimedia 4.1.0-1
    updating to 4.1.0

Modified:
  kdemultimedia/trunk/PKGBUILD
Deleted:
  kdemultimedia/trunk/flac.patch
  kdemultimedia/trunk/tunepimp.patch

----------------+
 PKGBUILD       |   58 +++++++++++++++------------------------------
 flac.patch     |   64 --------------------------------------------------
 tunepimp.patch |   70 -------------------------------------------------------
 3 files changed, 20 insertions(+), 172 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-07-23 23:42:04 UTC (rev 6148)
+++ PKGBUILD	2008-07-23 23:42:32 UTC (rev 6149)
@@ -1,45 +1,27 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+# $ Id: $
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
 
 pkgname=kdemultimedia
-pkgver=3.5.9
-kdever=3.5.9 # if minor 0, then without .0
+pkgver=4.1.0
 pkgrel=1
-pkgdesc="KDE Multimedia Programs."
-arch=(i686 x86_64)
-url="http://www.kde.org"
-license=('GPL')
+pkgdesc="KDE Multimedia Programs"
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
 groups=('kde')
-depends=('kdelibs>=3.5.9' 'cdparanoia' 'lame' 'flac>=1.1.4' 'musicbrainz' 'tunepimp>=0.5.3' 'taglib' 'xine-lib' 'perl' 'libtool' 'libsamplerate' 'gstreamer0.10' 'libxxf86dga' 'libxv' 'libxxf86vm')
-makedepends=('pkgconfig')
+depends=('kdelibs' 'xine-lib' 'tunepimp' 'cdparanoia')
+makedepends=('pkgconfig' 'cmake' 'automoc4')
+options=('docs')
+source=("ftp://ftp.archlinux.org/other/kde/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('d822080344fb88776682fee021d878c6')
 
-# for easier build, just uncomment the mirror you want to use
-  mirror="ftp.solnet.ch/mirror/KDE"         # updated every 2 hours, very fast for Europe
-# mirror="ftp.kde.org/pub/kde/"             # main server
-# mirror="ibiblio.org/pub/mirrors/kde/"     # ibiblio mirror
-
-source=(ftp://$mirror/stable/$kdever/src/$pkgname-$pkgver.tar.bz2 tunepimp.patch flac.patch)
-
 build() {
-  # Uninstall akode before compile!
-  # Source the QT and KDE profile
-  [ "$QTDIR" = "" ] && source /etc/profile.d/qt3.sh 
-  [ "$KDEDIR" = "" ] && source /etc/profile.d/kde.sh
-  # start building
-  cd $startdir/src/$pkgname-$pkgver
-  patch -Rp4 -i ../tunepimp.patch || return 1
-  patch -Np1 -i ../flac.patch || return 1
-  sed -i -e 's/applications-merged/kde-applications-merged/g' kappfinder-data/Makefile.{am,in}
-  make -f admin/Makefile.common
-  ./configure --prefix=/opt/kde \
-  --with-alsa --with-lame --with-vorbis \
-  --disable-dependency-tracking --disable-debug --with-speex --enable-gcc-hidden-visibility \
-  --enable-final
-  # --disable-strict --disable-warnings
-  #--enable-final # remove this if you build with < 512mb ram.
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
+	cd $srcdir
+	mkdir build
+	cd build
+	cmake ../${pkgname}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr
+	make
+	make DESTDIR=$pkgdir install
 }
-md5sums=('fdfafe38d2c7e3019dafc80c177add15'
-         '75d337a1ed6dee17cd8715a12cb99464'
-         '72791ea8b5767cec50d02375322a2315')

Deleted: flac.patch
===================================================================
--- flac.patch	2008-07-23 23:42:04 UTC (rev 6148)
+++ flac.patch	2008-07-23 23:42:32 UTC (rev 6149)
@@ -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;
- }
- 

Deleted: tunepimp.patch
===================================================================
--- tunepimp.patch	2008-07-23 23:42:04 UTC (rev 6148)
+++ tunepimp.patch	2008-07-23 23:42:32 UTC (rev 6149)
@@ -1,70 +0,0 @@
---- branches/KDE/3.5/kdemultimedia/juk/configure.in.in	2006/08/19 21:15:57	574685
-+++ branches/KDE/3.5/kdemultimedia/juk/configure.in.in	2006/08/29 18:46:18	578607
-@@ -18,9 +18,18 @@
- fi
- 
- if test "x$have_musicbrainz" = xyes; then
-+	v=1
-   	KDE_CHECK_LIB(tunepimp, tp_SetFileNameEncoding,
--	AC_DEFINE(HAVE_MUSICBRAINZ, 5, [have MusicBrainz 0.5.x]), 
--	AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz]))
-+		[v=4])
-+	case "$v" in
-+	4) KDE_CHECK_LIB(tunepimp, tp_SetTRMCollisionThreshold,
-+		AC_DEFINE(HAVE_MUSICBRAINZ, 4, [have MusicBrainz 0.4.x]),
-+		[AC_MSG_WARN([Tunepimp 0.5 detected - disabled.])
-+		AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz 0.5.x - disabled])
-+		])
-+		;;
-+	*) AC_DEFINE(HAVE_MUSICBRAINZ, 1, [have MusicBrainz]) ;;
-+	esac
- else
-   	AC_DEFINE(HAVE_MUSICBRAINZ, 0, [have MusicBrainz])
- fi
---- branches/KDE/3.5/kdemultimedia/juk/ktrm.cpp	2006/08/21 20:04:03	575631
-+++ branches/KDE/3.5/kdemultimedia/juk/ktrm.cpp	2006/08/29 18:46:18	578607
-@@ -125,9 +125,7 @@
-     {
-         m_pimp = tp_New("KTRM", "0.1");
-         //tp_SetDebug(m_pimp, true);
--#if HAVE_MUSICBRAINZ < 5
-         tp_SetTRMCollisionThreshold(m_pimp, 100);
--#endif
-         tp_SetAutoSaveThreshold(m_pimp, -1);
-         tp_SetMoveFiles(m_pimp, false);
-         tp_SetRenameFiles(m_pimp, false);
-@@ -325,9 +323,7 @@
-     case eUnrecognized:
-         KTRMEventHandler::send(fileId, KTRMEvent::Unrecognized);
-         break;
--#if HAVE_MUSICBRAINZ < 5
-     case eTRMCollision:
--#endif
- #if HAVE_MUSICBRAINZ >= 4
-     case eUserSelection:
- #endif
-@@ -492,7 +488,7 @@
- void KTRMLookup::unrecognized()
- {
-     kdDebug() << k_funcinfo << d->file << endl;
--#if HAVE_MUSICBRAINZ == 4
-+#if HAVE_MUSICBRAINZ >= 4
-     char trm[255];
-     bool finish = false;
-     trm[0] = 0;
-@@ -518,7 +514,6 @@
- {
-     kdDebug() << k_funcinfo << d->file << endl;
- 
--#if HAVE_MUSICBRAINZ < 5
-     track_t track = tp_GetTrack(KTRMRequestHandler::instance()->tunePimp(), d->fileId);
- 
-     if(track <= 0) {
-@@ -579,7 +574,6 @@
-     }
- 
-     tr_Unlock(track);
--#endif
- 
-     finished();
- }





More information about the arch-commits mailing list