summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kde/kdemultimedia/.md5sum.i6863
-rw-r--r--kde/kdemultimedia/.md5sum.x86_643
-rwxr-xr-xkde/kdemultimedia/Pkgfile17
-rw-r--r--kde/kdemultimedia/kdemultimedia-mplayerthumbs-horizontal.patch19
4 files changed, 34 insertions, 8 deletions
diff --git a/kde/kdemultimedia/.md5sum.i686 b/kde/kdemultimedia/.md5sum.i686
index b1da74d66..c05659291 100644
--- a/kde/kdemultimedia/.md5sum.i686
+++ b/kde/kdemultimedia/.md5sum.i686
@@ -1 +1,2 @@
-e575d0d8cd23060a7baec5c1aa046645 kdemultimedia-4.6.4.tar.bz2
+7198fc277b1b98920c0e970a23559e53 kdemultimedia-4.6.5.tar.bz2
+3761095291625a8c49e4edc2dc24b372 kdemultimedia-mplayerthumbs-horizontal.patch
diff --git a/kde/kdemultimedia/.md5sum.x86_64 b/kde/kdemultimedia/.md5sum.x86_64
index b1da74d66..c05659291 100644
--- a/kde/kdemultimedia/.md5sum.x86_64
+++ b/kde/kdemultimedia/.md5sum.x86_64
@@ -1 +1,2 @@
-e575d0d8cd23060a7baec5c1aa046645 kdemultimedia-4.6.4.tar.bz2
+7198fc277b1b98920c0e970a23559e53 kdemultimedia-4.6.5.tar.bz2
+3761095291625a8c49e4edc2dc24b372 kdemultimedia-mplayerthumbs-horizontal.patch
diff --git a/kde/kdemultimedia/Pkgfile b/kde/kdemultimedia/Pkgfile
index b3275ecee..e4b62af04 100755
--- a/kde/kdemultimedia/Pkgfile
+++ b/kde/kdemultimedia/Pkgfile
@@ -2,24 +2,29 @@
# URL: http://www.kde.org
# Maintainer: NuTyX packager team
# Packager: lesibel at free dot fr
-# Depends on: cmake, automoc4, kdelibs, phonon, alsa-lib, ffmpeg, libmusicbrainz, xine-lib, docbook-xsl, cdparanoia, taglib, taglib-extras, libogg, libvorbis, gst-ffmpeg, gst-plugins-bad, gst-plugins-base, gst-plugins-good, gst-plugins-ugly
+# Depends on: cmake, automoc4, pulseaudio, xorg-libxtst, kdelibs, phonon, alsa-lib, ffmpeg, libmusicbrainz, xine-lib, docbook-xsl, cdparanoia, taglib, taglib-extras, libogg, libvorbis, gst-ffmpeg, gst-plugins-bad, gst-plugins-base, gst-plugins-good, gst-plugins-ugly, ffmpegthumbnailer
-# Run on: kdelibs,phonon,alsa-lib,ffmpeg,libmusicbrainz,xine-lib,docbook-xsl,cdparanoia,taglib,taglib-extras,libogg,libvorbis,gst-ffmpeg,gst-plugins-bad,gst-plugins-base,gst-plugins-good,gst-plugins-ugly
+# Run on: kdelibs,phonon,alsa-lib,ffmpeg,libmusicbrainz,xine-lib,docbook-xsl,cdparanoia,taglib,taglib-extras,libogg,libvorbis,gst-ffmpeg,gst-plugins-bad,gst-plugins-base,gst-plugins-good,gst-plugins-ugly,ffmpegthumbnailer
name=kdemultimedia
-version=4.6.4
-release=2
-source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2)
+version=4.6.5
+release=1
+source=( ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2
+ kdemultimedia-mplayerthumbs-horizontal.patch)
build() {
+ unset MAKEFLAGS
cd $name-*
+ patch -Np1 -i ../kdemultimedia-mplayerthumbs-horizontal.patch
mkdir build
cd build
cmake ../ -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
-DKDE_DEFAULT_HOME=.kde \
- -DSYSCONF_INSTALL_DIR=/etc
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DWITH_PulseAudio=ON \
+ -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
make
make DESTDIR=$PKG install
diff --git a/kde/kdemultimedia/kdemultimedia-mplayerthumbs-horizontal.patch b/kde/kdemultimedia/kdemultimedia-mplayerthumbs-horizontal.patch
new file mode 100644
index 000000000..51113d5d2
--- /dev/null
+++ b/kde/kdemultimedia/kdemultimedia-mplayerthumbs-horizontal.patch
@@ -0,0 +1,19 @@
+diff -Naur kdemultimedia-4.6.5.orig/mplayerthumbs/src/videopreview.cpp kdemultimedia-4.6.5/mplayerthumbs/src/videopreview.cpp
+--- kdemultimedia-4.6.5.orig/mplayerthumbs/src/videopreview.cpp 2009-05-14 19:27:36.000000000 +0200
++++ kdemultimedia-4.6.5/mplayerthumbs/src/videopreview.cpp 2010-01-16 00:43:05.000000000 +0100
+@@ -91,8 +91,13 @@
+ else
+ sprocket = QPixmap(KStandardDirs::locate( "data", "videothumbnail/sprocket-large.png" ));
+
+- for (int y = 0; y < pix.height() + sprocket.height(); y += sprocket.height()) {
+- painter.drawPixmap( 0, y, sprocket );
++// for (int y = 0; y < pix.height() + sprocket.height(); y += sprocket.height()) {
++// painter.drawPixmap( 0, y, sprocket );
++// }
++
++ for (int x = 0; x < pix.width() + sprocket.width(); x += sprocket.width()) {
++ painter.drawPixmap( x, 0, sprocket );
++ painter.drawPixmap( x, (pix.height() - sprocket.height()), sprocket );
+ }
+ }
+ // End of xine-artsplugin code