[arch-commits] Commit in kdemultimedia/repos (12 files)
Andrea Scarpino
andrea at archlinux.org
Mon Jun 4 20:00:59 UTC 2012
Date: Monday, June 4, 2012 @ 16:00:59
Author: andrea
Revision: 160743
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
kdemultimedia/repos/staging-i686/
kdemultimedia/repos/staging-i686/PKGBUILD
(from rev 160742, kdemultimedia/trunk/PKGBUILD)
kdemultimedia/repos/staging-i686/ffmpeg0.11.patch
(from rev 160742, kdemultimedia/trunk/ffmpeg0.11.patch)
kdemultimedia/repos/staging-i686/kdemultimedia-dragonplayer.install
(from rev 160742, kdemultimedia/trunk/kdemultimedia-dragonplayer.install)
kdemultimedia/repos/staging-i686/kdemultimedia.install
(from rev 160742, kdemultimedia/trunk/kdemultimedia.install)
kdemultimedia/repos/staging-i686/mplayerthumbs.config
(from rev 160742, kdemultimedia/trunk/mplayerthumbs.config)
kdemultimedia/repos/staging-x86_64/
kdemultimedia/repos/staging-x86_64/PKGBUILD
(from rev 160742, kdemultimedia/trunk/PKGBUILD)
kdemultimedia/repos/staging-x86_64/ffmpeg0.11.patch
(from rev 160742, kdemultimedia/trunk/ffmpeg0.11.patch)
kdemultimedia/repos/staging-x86_64/kdemultimedia-dragonplayer.install
(from rev 160742, kdemultimedia/trunk/kdemultimedia-dragonplayer.install)
kdemultimedia/repos/staging-x86_64/kdemultimedia.install
(from rev 160742, kdemultimedia/trunk/kdemultimedia.install)
kdemultimedia/repos/staging-x86_64/mplayerthumbs.config
(from rev 160742, kdemultimedia/trunk/mplayerthumbs.config)
---------------------------------------------------+
staging-i686/PKGBUILD | 113 ++++++++++++++++++++
staging-i686/ffmpeg0.11.patch | 29 +++++
staging-i686/kdemultimedia-dragonplayer.install | 12 ++
staging-i686/kdemultimedia.install | 11 +
staging-i686/mplayerthumbs.config | 2
staging-x86_64/PKGBUILD | 113 ++++++++++++++++++++
staging-x86_64/ffmpeg0.11.patch | 29 +++++
staging-x86_64/kdemultimedia-dragonplayer.install | 12 ++
staging-x86_64/kdemultimedia.install | 11 +
staging-x86_64/mplayerthumbs.config | 2
10 files changed, 334 insertions(+)
Copied: kdemultimedia/repos/staging-i686/PKGBUILD (from rev 160742, kdemultimedia/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2012-06-04 20:00:59 UTC (rev 160743)
@@ -0,0 +1,113 @@
+# $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.8.3
+pkgrel=3
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdemultimedia')
+makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse'
+ 'libmusicbrainz3' 'taglib' 'libcanberra')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+ 'mplayerthumbs.config'
+ 'ffmpeg0.11.patch')
+sha1sums=('8f2b9181d5ccab5a9efd62f2778cf6c2b88abb3e'
+ 'ba016fa2563c14ffcba852c62506b66bfc6ee683'
+ '48331f7e2dab760c20708b81fe6c4d47c83a63e7')
+
+build() {
+ cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs
+ patch -p1 -i ${srcdir}/ffmpeg0.11.patch
+
+ cd ${srcdir}
+ mkdir build
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_TunePimp=OFF
+ make
+}
+
+package_kdemultimedia-dragonplayer() {
+ pkgdesc='Video Player'
+ depends=('kdebase-runtime')
+ url="http://kde.org/applications/multimedia/dragonplayer/"
+ install='kdemultimedia-dragonplayer.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' 'taglib')
+ 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/repos/staging-i686/ffmpeg0.11.patch (from rev 160742, kdemultimedia/trunk/ffmpeg0.11.patch)
===================================================================
--- staging-i686/ffmpeg0.11.patch (rev 0)
+++ staging-i686/ffmpeg0.11.patch 2012-06-04 20:00:59 UTC (rev 160743)
@@ -0,0 +1,29 @@
+From: Christoph Feck <christoph at maxiom.de>
+Date: Tue, 29 May 2012 13:53:18 +0000
+Subject: Two deprecated calls have been removed from ffmpeg 0.11.
+X-Git-Tag: v4.8.80
+X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&a=commitdiff&h=4f03b20614c122e3e14473d42a000c0bffdce39c
+---
+Two deprecated calls have been removed from ffmpeg 0.11.
+
+BUG:300732
+---
+
+
+--- a/ffmpegthumbnailer/moviedecoder.cpp
++++ b/ffmpegthumbnailer/moviedecoder.cpp
+@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder()
+ void MovieDecoder::initialize(const QString& filename)
+ {
+ av_register_all();
+- avcodec_init();
+ avcodec_register_all();
+
+ QFileInfo fileInfo(filename);
+
+- if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) {
++ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) {
+ kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath();
+ return;
+ }
+
Copied: kdemultimedia/repos/staging-i686/kdemultimedia-dragonplayer.install (from rev 160742, kdemultimedia/trunk/kdemultimedia-dragonplayer.install)
===================================================================
--- staging-i686/kdemultimedia-dragonplayer.install (rev 0)
+++ staging-i686/kdemultimedia-dragonplayer.install 2012-06-04 20:00:59 UTC (rev 160743)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdemultimedia/repos/staging-i686/kdemultimedia.install (from rev 160742, kdemultimedia/trunk/kdemultimedia.install)
===================================================================
--- staging-i686/kdemultimedia.install (rev 0)
+++ staging-i686/kdemultimedia.install 2012-06-04 20:00:59 UTC (rev 160743)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdemultimedia/repos/staging-i686/mplayerthumbs.config (from rev 160742, kdemultimedia/trunk/mplayerthumbs.config)
===================================================================
--- staging-i686/mplayerthumbs.config (rev 0)
+++ staging-i686/mplayerthumbs.config 2012-06-04 20:00:59 UTC (rev 160743)
@@ -0,0 +1,2 @@
+[MPlayerThumbsCfg]
+backend=0
Copied: kdemultimedia/repos/staging-x86_64/PKGBUILD (from rev 160742, kdemultimedia/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2012-06-04 20:00:59 UTC (rev 160743)
@@ -0,0 +1,113 @@
+# $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.8.3
+pkgrel=3
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL' 'LGPL' 'FDL')
+groups=('kde' 'kdemultimedia')
+makedepends=('cmake' 'automoc4' 'kdelibs' 'ffmpeg' 'mplayer' 'libpulse'
+ 'libmusicbrainz3' 'taglib' 'libcanberra')
+source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
+ 'mplayerthumbs.config'
+ 'ffmpeg0.11.patch')
+sha1sums=('8f2b9181d5ccab5a9efd62f2778cf6c2b88abb3e'
+ 'ba016fa2563c14ffcba852c62506b66bfc6ee683'
+ '48331f7e2dab760c20708b81fe6c4d47c83a63e7')
+
+build() {
+ cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs
+ patch -p1 -i ${srcdir}/ffmpeg0.11.patch
+
+ cd ${srcdir}
+ mkdir build
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_TunePimp=OFF
+ make
+}
+
+package_kdemultimedia-dragonplayer() {
+ pkgdesc='Video Player'
+ depends=('kdebase-runtime')
+ url="http://kde.org/applications/multimedia/dragonplayer/"
+ install='kdemultimedia-dragonplayer.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' 'taglib')
+ 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/repos/staging-x86_64/ffmpeg0.11.patch (from rev 160742, kdemultimedia/trunk/ffmpeg0.11.patch)
===================================================================
--- staging-x86_64/ffmpeg0.11.patch (rev 0)
+++ staging-x86_64/ffmpeg0.11.patch 2012-06-04 20:00:59 UTC (rev 160743)
@@ -0,0 +1,29 @@
+From: Christoph Feck <christoph at maxiom.de>
+Date: Tue, 29 May 2012 13:53:18 +0000
+Subject: Two deprecated calls have been removed from ffmpeg 0.11.
+X-Git-Tag: v4.8.80
+X-Git-Url: http://quickgit.kde.org/?p=ffmpegthumbs.git&a=commitdiff&h=4f03b20614c122e3e14473d42a000c0bffdce39c
+---
+Two deprecated calls have been removed from ffmpeg 0.11.
+
+BUG:300732
+---
+
+
+--- a/ffmpegthumbnailer/moviedecoder.cpp
++++ b/ffmpegthumbnailer/moviedecoder.cpp
+@@ -52,12 +52,11 @@ MovieDecoder::~MovieDecoder()
+ void MovieDecoder::initialize(const QString& filename)
+ {
+ av_register_all();
+- avcodec_init();
+ avcodec_register_all();
+
+ QFileInfo fileInfo(filename);
+
+- if ((!m_FormatContextWasGiven) && av_open_input_file(&m_pFormatContext, fileInfo.absoluteFilePath().toUtf8().data(), NULL, 0, NULL) != 0) {
++ if ((!m_FormatContextWasGiven) && avformat_open_input(&m_pFormatContext, fileInfo.absoluteFilePath().toLocal8Bit().data(), NULL, NULL) != 0) {
+ kDebug() << "Could not open input file: " << fileInfo.absoluteFilePath();
+ return;
+ }
+
Copied: kdemultimedia/repos/staging-x86_64/kdemultimedia-dragonplayer.install (from rev 160742, kdemultimedia/trunk/kdemultimedia-dragonplayer.install)
===================================================================
--- staging-x86_64/kdemultimedia-dragonplayer.install (rev 0)
+++ staging-x86_64/kdemultimedia-dragonplayer.install 2012-06-04 20:00:59 UTC (rev 160743)
@@ -0,0 +1,12 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdemultimedia/repos/staging-x86_64/kdemultimedia.install (from rev 160742, kdemultimedia/trunk/kdemultimedia.install)
===================================================================
--- staging-x86_64/kdemultimedia.install (rev 0)
+++ staging-x86_64/kdemultimedia.install 2012-06-04 20:00:59 UTC (rev 160743)
@@ -0,0 +1,11 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdemultimedia/repos/staging-x86_64/mplayerthumbs.config (from rev 160742, kdemultimedia/trunk/mplayerthumbs.config)
===================================================================
--- staging-x86_64/mplayerthumbs.config (rev 0)
+++ staging-x86_64/mplayerthumbs.config 2012-06-04 20:00:59 UTC (rev 160743)
@@ -0,0 +1,2 @@
+[MPlayerThumbsCfg]
+backend=0
More information about the arch-commits
mailing list