[arch-commits] Commit in kdemultimedia/repos (3 files)

Pierre Schmitz pierre at archlinux.org
Tue Sep 1 14:20:20 UTC 2009


    Date: Tuesday, September 1, 2009 @ 10:20:20
  Author: pierre
Revision: 50709

Merged revisions 49395,50060,50553 via svnmerge from 
svn+ssh://gerolde.archlinux.org/srv/svn-packages/kdemultimedia/trunk

........
  r49395 | pierre | 2009-08-07 15:36:39 +0200 (Fr, 07 Aug 2009) | 1 line
  
  set mplayer as default backend for videothumbs
........
  r50060 | pierre | 2009-08-19 10:19:58 +0200 (Mi, 19 Aug 2009) | 1 line
  
  strigi-analyzer is not yet available
........
  r50553 | pierre | 2009-08-29 22:11:25 +0200 (Sa, 29 Aug 2009) | 1 line
  
  prepare KDE 4.3.1; package cleanup
........

Added:
  kdemultimedia/repos/extra-x86_64/mplayerthumbs.config
    (from rev 50553, kdemultimedia/trunk/mplayerthumbs.config)
Modified:
  kdemultimedia/repos/extra-x86_64/	(properties)
  kdemultimedia/repos/extra-x86_64/PKGBUILD

----------------------+
 PKGBUILD             |   50 +++++++++++++------------------------------------
 mplayerthumbs.config |    2 +
 2 files changed, 16 insertions(+), 36 deletions(-)


Property changes on: kdemultimedia/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /kdemultimedia/trunk:1-48864
   + /kdemultimedia/trunk:1-50708

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-09-01 14:19:38 UTC (rev 50708)
+++ extra-x86_64/PKGBUILD	2009-09-01 14:20:20 UTC (rev 50709)
@@ -7,19 +7,18 @@
          'kdemultimedia-kioslave'
          'kdemultimedia-kmix'
          'kdemultimedia-kscd'
-         'kdemultimedia-libkcddb'
-         'kdemultimedia-libkcompactdisc'
-         'kdemultimedia-mplayerthumbs'
-         'kdemultimedia-strigi-analyzer')
-pkgver=4.3.0
+         'kdemultimedia-mplayerthumbs')
+pkgver=4.3.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdemultimedia')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'kdelibs' 'kdelibs-experimental' 'kdebase-runtime' 'tunepimp' 'cdparanoia' 'mplayer')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('75c0c42f22f5ffc98262441751ccb247')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
+        'mplayerthumbs.config')
+md5sums=('e9a74626bc7eec8496ff9157e65025da'
+         '698c1579905135043dcdd4dbe55f2c7e')
 
 build() {
 	cd $srcdir
@@ -57,11 +56,13 @@
 
 package_kdemultimedia-kioslave() {
 	pkgdesc='Audio CD Browser'
-	depends=('kdemultimedia-libkcompactdisc' 'kdemultimedia-libkcddb' 'cdparanoia' 'flac')
-	cd $srcdir/build/kioslave
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/doc/kioslave
-	make DESTDIR=$pkgdir install
+	depends=('kdelibs' 'flac' 'musicbrainz')
+	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() {
@@ -84,22 +85,6 @@
 	make DESTDIR=$pkgdir install
 }
 
-package_kdemultimedia-libkcddb() {
-	pkgdesc='Configure the CDDB Retrieval'
-	groups=()
-	depends=('kdelibs' 'musicbrainz')
-	cd $srcdir/build/libkcddb
-	make DESTDIR=$pkgdir install
-}
-
-package_kdemultimedia-libkcompactdisc() {
-	pkgdesc='A CD drive interface for the KDE Project'
-	groups=()
-	depends=('kdelibs')
-	cd $srcdir/build/libkcompactdisc
-	make DESTDIR=$pkgdir install
-}
-
 package_kdemultimedia-mplayerthumbs() {
 	pkgdesc='Video Files (MPlayerThumbs)'
 	depends=('kdelibs' 'kdebase-runtime' 'mplayer')
@@ -107,12 +92,5 @@
 	conflicts=('mplayerthumbs')
 	cd $srcdir/build/mplayerthumbs
 	make DESTDIR=$pkgdir install
+	install -D -m644 $srcdir/mplayerthumbs.config $pkgdir/usr/share/config/mplayerthumbs
 }
-
-package_kdemultimedia-strigi-analyzer() {
-	pkgdesc='Strigi-Analyzer for KDE Multimedia'
-	depends=('kdelibs')
-	groups=(${groups[@]} 'strigi-analyzer')
-	cd $srcdir/build/strigi-analyzer
-	make DESTDIR=$pkgdir install
-}

Copied: kdemultimedia/repos/extra-x86_64/mplayerthumbs.config (from rev 50553, kdemultimedia/trunk/mplayerthumbs.config)
===================================================================
--- extra-x86_64/mplayerthumbs.config	                        (rev 0)
+++ extra-x86_64/mplayerthumbs.config	2009-09-01 14:20:20 UTC (rev 50709)
@@ -0,0 +1,2 @@
+[MPlayerThumbsCfg]
+backend=0




More information about the arch-commits mailing list