diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
commit | 51d25a8023c8dafdbcafd8bcc6adb19979f15ac6 (patch) | |
tree | 3419b254ec8c04b09a938d993fdb768eae03c005 /extra/kdemultimedia | |
parent | 11fe0679d59f68c3fbe3d0a205e5087bf694262e (diff) | |
parent | 7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/kdemultimedia/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/wine/PKGBUILD
staging/kdemultimedia/PKGBUILD
Diffstat (limited to 'extra/kdemultimedia')
-rw-r--r-- | extra/kdemultimedia/PKGBUILD | 33 | ||||
-rw-r--r-- | extra/kdemultimedia/ffmpeg0.11.patch | 29 |
2 files changed, 47 insertions, 15 deletions
diff --git a/extra/kdemultimedia/PKGBUILD b/extra/kdemultimedia/PKGBUILD index e980aceb1..fea2c2d94 100644 --- a/extra/kdemultimedia/PKGBUILD +++ b/extra/kdemultimedia/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 159443 2012-05-24 12:12:39Z andrea $ +# $Id: PKGBUILD 161219 2012-06-08 06:38:12Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Pierre Schmitz <pierre@archlinux.de> @@ -10,8 +10,8 @@ pkgname=('kdemultimedia-dragonplayer' 'kdemultimedia-kmix' 'kdemultimedia-kscd' 'kdemultimedia-mplayerthumbs') -pkgver=4.8.3 -pkgrel=2 +pkgver=4.8.4 +pkgrel=1 arch=('i686' 'x86_64' 'mips64el') url='http://www.kde.org' license=('GPL' 'LGPL' 'FDL') @@ -19,11 +19,16 @@ 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') -sha1sums=('8f2b9181d5ccab5a9efd62f2778cf6c2b88abb3e' - 'ba016fa2563c14ffcba852c62506b66bfc6ee683') + 'mplayerthumbs.config' + 'ffmpeg0.11.patch') +sha1sums=('dac721e82308a6347d578361e25da7c466a26ba7' + 'ba016fa2563c14ffcba852c62506b66bfc6ee683' + '48331f7e2dab760c20708b81fe6c4d47c83a63e7') build() { + cd ${srcdir}/${pkgbase}-${pkgver}/ffmpegthumbs + patch -p1 -i ${srcdir}/ffmpeg0.11.patch + cd ${srcdir} mkdir build cd build @@ -41,8 +46,8 @@ package_kdemultimedia-dragonplayer() { install='kdemultimedia-dragonplayer.install' cd $srcdir/build/dragonplayer make DESTDIR=$pkgdir install - cd $srcdir/build/doc/dragonplayer - make DESTDIR=$pkgdir install + cd $srcdir/build/dragonplayer/doc + make DESTDIR=$pkgdir install } package_kdemultimedia-ffmpegthumbs() { @@ -60,8 +65,8 @@ package_kdemultimedia-juk() { install='kdemultimedia.install' cd $srcdir/build/juk make DESTDIR=$pkgdir install - cd $srcdir/build/doc/juk - make DESTDIR=$pkgdir install + cd $srcdir/build/juk/doc + make DESTDIR=$pkgdir install } package_kdemultimedia-kioslave() { @@ -69,7 +74,7 @@ package_kdemultimedia-kioslave() { depends=('kdelibs' 'libmusicbrainz3' 'cdparanoia') conflicts=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') replaces=('kdemultimedia-libkcddb' 'kdemultimedia-libkcompactdisc') - for i in kioslave doc/kioslave libkcddb libkcompactdisc; do + for i in kioslave libkcddb libkcompactdisc; do cd $srcdir/build/${i} make DESTDIR=$pkgdir install done @@ -82,8 +87,8 @@ package_kdemultimedia-kmix() { install='kdemultimedia.install' cd $srcdir/build/kmix make DESTDIR=$pkgdir install - cd $srcdir/build/doc/kmix - make DESTDIR=$pkgdir install + cd $srcdir/build/kmix/doc + make DESTDIR=$pkgdir install } package_kdemultimedia-kscd() { @@ -93,8 +98,6 @@ package_kdemultimedia-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() { diff --git a/extra/kdemultimedia/ffmpeg0.11.patch b/extra/kdemultimedia/ffmpeg0.11.patch new file mode 100644 index 000000000..527ac3992 --- /dev/null +++ b/extra/kdemultimedia/ffmpeg0.11.patch @@ -0,0 +1,29 @@ +From: Christoph Feck <christoph@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; + } + |