[arch-commits] Commit in kdemultimedia/trunk (8 files)

Andrea Scarpino andrea at archlinux.org
Sun Jul 24 20:15:27 EDT 2011


    Date: Sunday, July 24, 2011 @ 20:15:27
  Author: andrea
Revision: 132628

move pkgbuilds to trunk; cleanup

Added:
  kdemultimedia/trunk/PKGBUILD
    (from rev 132557, kdemultimedia/kde-unstable/PKGBUILD)
  kdemultimedia/trunk/fix-memleak-in-kmix.patch
    (from rev 132557, kdemultimedia/kde-unstable/fix-memleak-in-kmix.patch)
  kdemultimedia/trunk/kdemultimedia.install
    (from rev 132557, kdemultimedia/kde-unstable/kdemultimedia.install)
  kdemultimedia/trunk/mplayerthumbs.config
    (from rev 132557, kdemultimedia/kde-unstable/mplayerthumbs.config)
Deleted:
  kdemultimedia/trunk/PKGBUILD
  kdemultimedia/trunk/fix-memleak-in-kmix.patch
  kdemultimedia/trunk/kdemultimedia.install
  kdemultimedia/trunk/mplayerthumbs.config

---------------------------+
 PKGBUILD                  |  228 ++++++++++++++++++++++----------------------
 fix-memleak-in-kmix.patch |  110 ++++++++++-----------
 kdemultimedia.install     |   22 ++--
 mplayerthumbs.config      |    4 
 4 files changed, 182 insertions(+), 182 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2011-07-25 00:15:24 UTC (rev 132627)
+++ PKGBUILD	2011-07-25 00:15:27 UTC (rev 132628)
@@ -1,114 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-# Contributor: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=kdemultimedia
-pkgname=('kdemultimedia-dragonplayer'
-         'kdemultimedia-ffmpegthumbs'
-         'kdemultimedia-juk'
-         'kdemultimedia-kioslave'
-         'kdemultimedia-kmix'
-         'kdemultimedia-kscd'
-         'kdemultimedia-mplayerthumbs')
-pkgver=4.6.5
-pkgrel=2
-arch=('i686' 'x86_64')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdemultimedia')
-makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdebase-runtime' 'tunepimp'
-        'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'mplayerthumbs.config'
-        'fix-memleak-in-kmix.patch')
-sha1sums=('081bead5ee758d169f3119c138424929b001d04f'
-          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
-          '80370de30898f1ba1a6db057d34324abdcc57384')
-
-build() {
-    cd "${srcdir}"/${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/fix-memleak-in-kmix.patch
-
-    cd ${srcdir}
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DWITH_Xine=OFF
-	make
-}
-
-package_kdemultimedia-dragonplayer() {
-	pkgdesc='Video Player'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/dragonplayer/"
-	install='kdemultimedia.install'
-	cd $srcdir/build/dragonplayer
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/dragonplayer
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-ffmpegthumbs() {
-	pkgdesc='Video Files (ffmpegthumbs)'
-	depends=('kdebase-runtime' 'ffmpeg')
-	install='kdemultimedia.install'
-	cd $srcdir/build/ffmpegthumbs
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-juk() {
-	pkgdesc='Music Player'
-	depends=('kdebase-runtime' 'tunepimp')
-	url="http://kde.org/applications/multimedia/juk"
-	install='kdemultimedia.install'
-	cd $srcdir/build/juk
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/juk
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kioslave() {
-	pkgdesc='Audio CD Browser'
-	depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
-	conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
-	for i in kioslave doc/kioslave libkcddb libkcompactdisc; do
-		cd $srcdir/build/${i}
-		make DESTDIR=$pkgdir install
-	done
-}
-
-package_kdemultimedia-kmix() {
-	pkgdesc='Sound Mixer'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/multimedia/kmix"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kmix
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kmix
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-kscd() {
-	pkgdesc='CD Player'
-	depends=('kdebase-runtime' 'libmusicbrainz3')
-	url="http://kde.org/applications/multimedia/kscd"
-	install='kdemultimedia.install'
-	cd $srcdir/build/kscd
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kcontrol/cddbretrieval
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-mplayerthumbs() {
-	pkgdesc='Video Files (MPlayerThumbs)'
-	depends=('kdebase-runtime' 'mplayer')
-	replaces=('mplayerthumbs')
-	conflicts=('mplayerthumbs')
-	cd $srcdir/build/mplayerthumbs
-	make DESTDIR=$pkgdir install
-	install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
-}

Copied: kdemultimedia/trunk/PKGBUILD (from rev 132557, kdemultimedia/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2011-07-25 00:15:27 UTC (rev 132628)
@@ -0,0 +1,114 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=kdemultimedia
+pkgname=('kdemultimedia-dragonplayer'
+         'kdemultimedia-ffmpegthumbs'
+         'kdemultimedia-juk'
+         'kdemultimedia-kioslave'
+         'kdemultimedia-kmix'
+         'kdemultimedia-kscd'
+         'kdemultimedia-mplayerthumbs')
+pkgver=4.7.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdemultimedia')
+makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'tunepimp'
+            'ffmpeg' 'mplayer' 'pulseaudio' 'libmusicbrainz3')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+        'mplayerthumbs.config'
+        'fix-memleak-in-kmix.patch')
+sha1sums=('3ad5f6e806a0e8ea9f7c88697d6f605a112a9d21'
+          'ba016fa2563c14ffcba852c62506b66bfc6ee683'
+          '80370de30898f1ba1a6db057d34324abdcc57384')
+
+build() {
+    cd "${srcdir}"/${pkgbase}-${pkgver}
+    patch -p1 -i "${srcdir}"/fix-memleak-in-kmix.patch
+
+    cd ${srcdir}
+	mkdir build
+	cd build
+	cmake ../${pkgbase}-${pkgver} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DWITH_Xine=OFF
+	make
+}
+
+package_kdemultimedia-dragonplayer() {
+	pkgdesc='Video Player'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/multimedia/dragonplayer/"
+	install='kdemultimedia.install'
+	cd $srcdir/build/dragonplayer
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/dragonplayer
+	make DESTDIR=$pkgdir install
+}
+
+package_kdemultimedia-ffmpegthumbs() {
+	pkgdesc='Video Files (ffmpegthumbs)'
+	depends=('kdebase-runtime' 'ffmpeg')
+	install='kdemultimedia.install'
+	cd $srcdir/build/ffmpegthumbs
+	make DESTDIR=$pkgdir install
+}
+
+package_kdemultimedia-juk() {
+	pkgdesc='Music Player'
+	depends=('kdebase-runtime' 'tunepimp')
+	url="http://kde.org/applications/multimedia/juk"
+	install='kdemultimedia.install'
+	cd $srcdir/build/juk
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/juk
+	make DESTDIR=$pkgdir install
+}
+
+package_kdemultimedia-kioslave() {
+	pkgdesc='Audio CD Browser'
+	depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia')
+	conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
+	replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc')
+	for i in kioslave doc/kioslave libkcddb libkcompactdisc; do
+		cd $srcdir/build/${i}
+		make DESTDIR=$pkgdir install
+	done
+}
+
+package_kdemultimedia-kmix() {
+	pkgdesc='Sound Mixer'
+	depends=('kdebase-runtime')
+	url="http://kde.org/applications/multimedia/kmix"
+	install='kdemultimedia.install'
+	cd $srcdir/build/kmix
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kmix
+	make DESTDIR=$pkgdir install
+}
+
+package_kdemultimedia-kscd() {
+	pkgdesc='CD Player'
+	depends=('kdebase-runtime' 'libmusicbrainz3')
+	url="http://kde.org/applications/multimedia/kscd"
+	install='kdemultimedia.install'
+	cd $srcdir/build/kscd
+	make DESTDIR=$pkgdir install
+	cd $srcdir/build/doc/kcontrol/cddbretrieval
+	make DESTDIR=$pkgdir install
+}
+
+package_kdemultimedia-mplayerthumbs() {
+	pkgdesc='Video Files (MPlayerThumbs)'
+	depends=('kdebase-runtime' 'mplayer')
+	replaces=('mplayerthumbs')
+	conflicts=('mplayerthumbs')
+	cd $srcdir/build/mplayerthumbs
+	make DESTDIR=$pkgdir install
+	install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
+}

Deleted: fix-memleak-in-kmix.patch
===================================================================
--- fix-memleak-in-kmix.patch	2011-07-25 00:15:24 UTC (rev 132627)
+++ fix-memleak-in-kmix.patch	2011-07-25 00:15:27 UTC (rev 132628)
@@ -1,55 +0,0 @@
-Index: kdemultimedia/kmix/backends/mixer_pulse.cpp
-===================================================================
---- kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241345)
-+++ kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241346)
-@@ -754,7 +754,12 @@
-         return;
-     }
-     addDevice((*map)[index]);
--    emit controlsReconfigured(_mixer->id());
-+    // Do not emit directly to ensure all connected slots are executed
-+    // in their own event loop.
-+    QMetaObject::invokeMethod(this,
-+                              "controlsReconfigured",
-+                              Qt::QueuedConnection,
-+                              Q_ARG(QString, _mixer->id()));
- }
- 
- void Mixer_PULSE::removeWidget(int index)
-@@ -778,7 +783,12 @@
-         {
-             delete *iter;
-             m_mixDevices.erase(iter);
--            emit controlsReconfigured(_mixer->id());
-+            // Do not emit directly to ensure all connected slots are executed
-+            // in their own event loop.
-+            QMetaObject::invokeMethod(this,
-+                                      "controlsReconfigured",
-+                                      Qt::QueuedConnection,
-+                                      Q_ARG(QString, _mixer->id()));
-             return;
-         }
-     }
-@@ -799,7 +809,12 @@
-         delete *iter;
-         m_mixDevices.erase(iter);
-     }
--    emit controlsReconfigured(_mixer->id());
-+    // Do not emit directly to ensure all connected slots are executed
-+    // in their own event loop.
-+    QMetaObject::invokeMethod(this,
-+                              "controlsReconfigured",
-+                              Qt::QueuedConnection,
-+                              Q_ARG(QString, _mixer->id()));
- }
- 
- void Mixer_PULSE::addDevice(devinfo& dev)
-@@ -990,7 +1005,7 @@
-         kDebug(67100) <<  "Using PulseAudio for mixer: " << m_mixerName;
-         m_isOpen = true;
-     }
-- 
-+
-     return 0;
- }
- 

Copied: kdemultimedia/trunk/fix-memleak-in-kmix.patch (from rev 132557, kdemultimedia/kde-unstable/fix-memleak-in-kmix.patch)
===================================================================
--- fix-memleak-in-kmix.patch	                        (rev 0)
+++ fix-memleak-in-kmix.patch	2011-07-25 00:15:27 UTC (rev 132628)
@@ -0,0 +1,55 @@
+Index: kdemultimedia/kmix/backends/mixer_pulse.cpp
+===================================================================
+--- kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241345)
++++ kdemultimedia/kmix/backends/mixer_pulse.cpp	(revision 1241346)
+@@ -754,7 +754,12 @@
+         return;
+     }
+     addDevice((*map)[index]);
+-    emit controlsReconfigured(_mixer->id());
++    // Do not emit directly to ensure all connected slots are executed
++    // in their own event loop.
++    QMetaObject::invokeMethod(this,
++                              "controlsReconfigured",
++                              Qt::QueuedConnection,
++                              Q_ARG(QString, _mixer->id()));
+ }
+ 
+ void Mixer_PULSE::removeWidget(int index)
+@@ -778,7 +783,12 @@
+         {
+             delete *iter;
+             m_mixDevices.erase(iter);
+-            emit controlsReconfigured(_mixer->id());
++            // Do not emit directly to ensure all connected slots are executed
++            // in their own event loop.
++            QMetaObject::invokeMethod(this,
++                                      "controlsReconfigured",
++                                      Qt::QueuedConnection,
++                                      Q_ARG(QString, _mixer->id()));
+             return;
+         }
+     }
+@@ -799,7 +809,12 @@
+         delete *iter;
+         m_mixDevices.erase(iter);
+     }
+-    emit controlsReconfigured(_mixer->id());
++    // Do not emit directly to ensure all connected slots are executed
++    // in their own event loop.
++    QMetaObject::invokeMethod(this,
++                              "controlsReconfigured",
++                              Qt::QueuedConnection,
++                              Q_ARG(QString, _mixer->id()));
+ }
+ 
+ void Mixer_PULSE::addDevice(devinfo& dev)
+@@ -990,7 +1005,7 @@
+         kDebug(67100) <<  "Using PulseAudio for mixer: " << m_mixerName;
+         m_isOpen = true;
+     }
+- 
++
+     return 0;
+ }
+ 

Deleted: kdemultimedia.install
===================================================================
--- kdemultimedia.install	2011-07-25 00:15:24 UTC (rev 132627)
+++ kdemultimedia.install	2011-07-25 00:15:27 UTC (rev 132628)
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}

Copied: kdemultimedia/trunk/kdemultimedia.install (from rev 132557, kdemultimedia/kde-unstable/kdemultimedia.install)
===================================================================
--- kdemultimedia.install	                        (rev 0)
+++ kdemultimedia.install	2011-07-25 00:15:27 UTC (rev 132628)
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}

Deleted: mplayerthumbs.config
===================================================================
--- mplayerthumbs.config	2011-07-25 00:15:24 UTC (rev 132627)
+++ mplayerthumbs.config	2011-07-25 00:15:27 UTC (rev 132628)
@@ -1,2 +0,0 @@
-[MPlayerThumbsCfg]
-backend=0

Copied: kdemultimedia/trunk/mplayerthumbs.config (from rev 132557, kdemultimedia/kde-unstable/mplayerthumbs.config)
===================================================================
--- mplayerthumbs.config	                        (rev 0)
+++ mplayerthumbs.config	2011-07-25 00:15:27 UTC (rev 132628)
@@ -0,0 +1,2 @@
+[MPlayerThumbsCfg]
+backend=0



More information about the arch-commits mailing list