diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2011-12-22 09:09:45 +0100 |
commit | 3680463fea4793ab39000b102bacf1bb66eceafc (patch) | |
tree | 7ed09ff631c5955e24bcf6fb1c6eb1a3cc4456fd /extra/phonon | |
parent | cf1b8826accdb5f1a092ed387f66f061920c4953 (diff) | |
parent | 69d24275e4d5296a5f02e4c4d0fc438a80d159b8 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/qtcreator/PKGBUILD
core/glibc/PKGBUILD
core/openldap/PKGBUILD
extra/libgsf/PKGBUILD
extra/phonon/PKGBUILD
extra/poppler/PKGBUILD
extra/smartmontools/PKGBUILD
extra/vlc/PKGBUILD
extra/xfwm4/PKGBUILD
kde-unstable/calligra/PKGBUILD
kde-unstable/kdelibs/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-krb5/PKGBUILD
multilib/lib32-libcap/PKGBUILD
multilib/lib32-libdrm/PKGBUILD
multilib/lib32-libogg/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libxcursor/PKGBUILD
multilib/lib32-libxext/PKGBUILD
multilib/lib32-libxfixes/PKGBUILD
multilib/lib32-libxi/PKGBUILD
multilib/lib32-libxrandr/PKGBUILD
multilib/lib32-llvm/PKGBUILD
multilib/lib32-llvm/clang-pure64.patch
multilib/lib32-llvm/enable-lto.patch
multilib/lib32-mesa/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-pixman/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/lib32-udev/PKGBUILD
multilib/lib32-v4l-utils/PKGBUILD
Diffstat (limited to 'extra/phonon')
-rw-r--r-- | extra/phonon/PKGBUILD | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/extra/phonon/PKGBUILD b/extra/phonon/PKGBUILD index cc259d36f..a257a5c38 100644 --- a/extra/phonon/PKGBUILD +++ b/extra/phonon/PKGBUILD @@ -1,33 +1,30 @@ -# $Id: PKGBUILD 141341 2011-10-29 16:03:56Z andrea $ +# $Id: PKGBUILD 145248 2011-12-20 07:59:43Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=phonon -pkgver=4.5.1 -pkgrel=2 +pkgver=4.6.0 +pkgrel=1 epoch=1 arch=('i686' 'x86_64' 'mips64el') -url="http://phonon.kde.org" +url='http://phonon.kde.org/' license=('LGPL') pkgdesc="The multimedia framework for KDE" depends=('qt' 'phonon-backend' 'libpulse' 'libqzeitgeist') optdepends=('pulseaudio: PulseAudio support') makedepends=('cmake' 'automoc4' 'pulseaudio') -source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz" - 'libqzeitgeist08.patch') -md5sums=('3df071b7f9996afcd67b18958955ecdd' - '99de3dc908277199b502e54613925ff6') +source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz") +md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173') build() { - cd "${srcdir}"/${pkgname}-${pkgver} - patch -Np1 -i "${srcdir}"/libqzeitgeist08.patch - cd "${srcdir}" mkdir build cd build cmake ../${pkgname}-${pkgver} \ -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_SKIP_RPATH=ON \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_SKIP_RPATH=ON + -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \ + -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer make } |