Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=xfcetesting.git;a=commitdiff;h=7930e7662cbeaf4cc114ff4b58e98741a6ef0ee2

commit 7930e7662cbeaf4cc114ff4b58e98741a6ef0ee2
Author: Melko <[email protected]>
Date:   Sat Aug 4 14:12:13 2012 +0200

kdemultimedia-4.9.0-1-x86_64

* version bump
* some refactoring

diff --git a/source/kde/kdemultimedia/FrugalBuild 
b/source/kde/kdemultimedia/FrugalBuild
index eee4d9d..e27f74a 100644
--- a/source/kde/kdemultimedia/FrugalBuild
+++ b/source/kde/kdemultimedia/FrugalBuild
@@ -6,75 +6,75 @@ pkgrel=1
pkgdesc="KDE Multimedia Programs"
groups=('kde')
Finclude kde
-depends=("kdelibs>=${_F_kde_ver}" 'libmusicbrainz3' 
"libqt3support>=$_F_kde_qtver" "libqtcore>=$_F_kde_qtver" \
-       'libgcc' 'libice' 'libxrender' 'util-linux' 'libxi' 'alsa-lib' 
'libvorbis' 'cdparanoia' \
-       'flac' "libnepomuk>=$_F_kde_ver")
-makedepends=("${makedepends[@]}"  "libqtxml>=$_F_kde_qtver" 
"libqtgui>=$_F_kde_qtver" "libxext" \
-           "libxrender" "libtunepimp" "libjpeg" "xine-lib>=1.1.19-6" 
'openssl>=1.0.0' 'docbook-xsl' \
-           "libdbusmenu-qt>=0.8.0" "libqtdeclarative>=_F_kde_qtver" 
"kdelibs-compiletime>=$_F_kde_ver")
+archs=('i686' 'x86_64')
+depends=()
+makedepends=("${makedepends[@]}" "kdelibs>=$_F_kde_ver" 
"kdelibs-compiletime>=$_F_kde_ver")
+source=()
+sha1sums=()

-provides=('mplayerthumbs')
-replaces=('mplayerthumbs' 'codeine')
-conflicts=('mplayerthumbs')
+provides=("$pkgname-compiletime" "$pkgname-docs")
+replaces=("${provides[@]}")
+conflicts=("${provides[@]}")

-archs=('i686' 'x86_64')
-source=($source kdemultimedia-no_thumbs.patch)
-sha1sums=("${sha1sums[@]}" \
-          'b660d177ed5a1411597bfbefd4c845da33556c23')
+subpkgs=("${subpkgs[@]}" "audiocd-kio")
+subdescs=("${subdescs[@]}" "Kioslave for audio CDs.")
+subdepends=("${subdepends[@]}" "libkcompactdisc>=${_F_kde_ver} 
libkcddb>=$_F_kde_ver cdparanoia")
+subgroups=("${subgroups[@]}" 'kde')
+subarchs=("${subarchs[@]}" 'i686 x86_64')

-subpkgs=("${subpkgs[@]}" "dragonplayer")
-subdescs=("${subdescs[@]}" "KDE Video Player")
-subdepends=("${subdepends[@]}" "kdelibs>=${_F_kde_ver} xine-lib>=1.1.19-6 
libqtxml>=$_F_kde_qtver \
-          libqtgui>=$_F_kde_qtver libgcc libice libxext libxrender util-linux 
libnepomuk>=$_F_kde_ver")
+subpkgs=("${subpkgs[@]}" "dragon")
+subdescs=("${subdescs[@]}" "KDE Video Player.")
+subdepends=("${subdepends[@]}" "phonon libpulse")
subgroups=("${subgroups[@]}" 'kde kde-minimal')
subarchs=("${subarchs[@]}" 'i686 x86_64')

+subpkgs=("${subpkgs[@]}" "ffmpegthumbs")
+subdescs=("${subdescs[@]}" "FFmpeg based thumbnail generator.")
+subdepends=("${subdepends[@]}" "ffmpeg kdelibs-core>=$_F_kde_ver")
+subgroups=("${subgroups[@]}" 'kde')
+subarchs=("${subarchs[@]}" 'i686 x86_64')
+
subpkgs=("${subpkgs[@]}" "juk")
subdescs=("${subdescs[@]}" "Jukebox and music manager for KDE")
-subdepends=("${subdepends[@]}" "kdelibs>=${_F_kde_ver} libtunepimp 
libqt3support>=$_F_kde_qtver \
-          libqtcore>=$_F_kde_qtver libgcc libjpeg libice libxrender util-linux 
libxi openssl>=1.0.0 \
-          libnepomuk>=$_F_kde_ver")
+subdepends=("${subdepends[@]}" "libkde3support>=$_F_kde_ver phonon libtunepimp 
libpulse")
subgroups=("${subgroups[@]}" 'kde')
subarchs=("${subarchs[@]}" 'i686 x86_64')

-makedepends=("${makedepends[@]}")
-
subpkgs=("${subpkgs[@]}" "kmix")
subdescs=("${subdescs[@]}" "KDE mixer")
-subdepends=("${subdepends[@]}" "kdelibs>=${_F_kde_ver} libqtxml alsa-lib 
libqtgui>=$_F_kde_qtver \
-          libgcc libice libxext libxrender util-linux libcanberra 
libnepomuk>=$_F_kde_ver")
+subdepends=("${subdepends[@]}" "libpulse libcanberra libtool 
libplasma>=$_F_kde_ver libqtsql>=$_F_kde_qtver
+       libqtdeclarative>=$_F_kde_qtver libkdewebkit>=$_F_kde_ver 
libkutils>=$_F_kde_ver")
subgroups=("${subgroups[@]}" 'kde kde-minimal')
subarchs=("${subarchs[@]}" 'i686 x86_64')

subpkgs=("${subpkgs[@]}" "kscd")
subdescs=("${subdescs[@]}" "CD player")
-subdepends=("${subdepends[@]}" "kdelibs>=${_F_kde_ver} libkdeui libsolid 
phonon libmusicbrainz3")
+subdepends=("${subdepends[@]}" "libkdeui>=$_F_kde_ver libsolid>=$_F_kde_ver 
phonon libmusicbrainz3 libpulse")
subgroups=("${subgroups[@]}" 'kde')
subarchs=("${subarchs[@]}" 'i686 x86_64')

-subpkgs=("${subpkgs[@]}" "libkcddb")
-subdescs=("${subdescs[@]}" "A library for retrieving and sending cddb 
information")
-subdepends=("${subdepends[@]}" "kdelibs>=${_F_kde_ver} libmusicbrainz3 
libqtnetwork>=$_F_kde_qtver \
-          libqtxml>=$_F_kde_qtver libgcc zlib strigi xfsprogs-acl libxrender 
libice libxtst \
-          libxfixes xz>=5.0.3 libqtsql>=$_F_kde_qtver libuuid 
libnepomuk>=$_F_kde_ver")
+subpkgs=("${subpkgs[@]}" "mplayerthumbs")
+subdescs=("${subdescs[@]}" "MPlayer based thumbnail generator.")
+subdepends=("${subdepends[@]}" "mplayer kdelibs-core>=$_F_kde_ver")
subgroups=("${subgroups[@]}" 'kde')
subarchs=("${subarchs[@]}" 'i686 x86_64')

rodepends=("${rodepends[@]}" "${subpkgs[@]}")

-subpkgs=("${subpkgs[@]}" "$pkgname-compiletime")
-subdescs=("${subdescs[@]}" "Kdebase Multimedia extra headers, cmake and 
pkgconfig files")
-subdepends=("${subdepends[@]}" "kdelibs-compiletime>=${_F_kde_ver}")
-subgroups=("${subgroups[@]}" 'devel-extra kde-build')
-subarchs=("${subarchs[@]}" 'i686 x86_64')
-
-subpkgs=("${subpkgs[@]}" "$pkgname-docs")
-subdescs=("${subdescs[@]}" "Kdebase Multimedia Documentation")
-subdepends=("${subdepends[@]}" '')
-subgroups=("${subgroups[@]}" 'docs-extra kde-docs')
-subarchs=("${subarchs[@]}" 'i686 x86_64')
+for ksub in "${subpkgs[@]}"
+do
+        source=("${source[@]}" 
"$_F_kde_mirror/$_F_kde_dirname/${ksub}-${_F_kde_pkgver}${_F_kde_ext}")
+        sha1sums=("${sha1sums[@]}" "${_F_kdever_sha1sums["$ksub"]}")
+done

-_F_kde_subpkgs=("${subpkgs[@]}")
-rodepends=("${rodepends[@]}" "mplayer")
+build()
+{
+        for ksub in "${subpkgs[@]}"
+        do
+                cd "$Fsrcdir/$ksub-$pkgver" || Fdie
+                KDE_build
+               Fsplit $ksub /\*
+        done
+}

# optimization OK
diff --git a/source/kde/kdemultimedia/kdemultimedia-no_thumbs.patch 
b/source/kde/kdemultimedia/kdemultimedia-no_thumbs.patch
deleted file mode 100644
index 2b04597..0000000
--- a/source/kde/kdemultimedia/kdemultimedia-no_thumbs.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -up kdemultimedia-4.6.2/CMakeLists.txt.no_mplayerthumbs 
kdemultimedia-4.6.2/CMakeLists.txt
---- kdemultimedia-4.6.2/CMakeLists.txt.no_mplayerthumbs        2011-01-19 
16:23:35.000000000 -0600
-+++ kdemultimedia-4.6.2/CMakeLists.txt 2011-04-17 15:52:42.161989091 -0500
-@@ -42,10 +42,10 @@ configure_file (config.h.cmake ${CMAKE_C
-
- add_subdirectory(libkcddb)
- add_subdirectory(libkcompactdisc)
--macro_optional_add_subdirectory(mplayerthumbs)
-+#macro_optional_add_subdirectory(mplayerthumbs)
-
- if (FFMPEG_FOUND AND SWSCALE_FOUND)
--     macro_optional_add_subdirectory(ffmpegthumbs)
-+#     macro_optional_add_subdirectory(ffmpegthumbs)
- endif (FFMPEG_FOUND AND SWSCALE_FOUND)
-
- if (TAGLIB_FOUND)
_______________________________________________
Frugalware-git mailing list
[email protected]
http://frugalware.org/mailman/listinfo/frugalware-git

Reply via email to