[arch-commits] Commit in phonon/repos (6 files)
Andrea Scarpino
andrea at archlinux.org
Wed Feb 8 14:44:09 UTC 2012
Date: Wednesday, February 8, 2012 @ 09:44:08
Author: andrea
Revision: 149569
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
phonon/repos/extra-i686/PKGBUILD
(from rev 149568, phonon/trunk/PKGBUILD)
phonon/repos/extra-i686/fix-plugindir-for-qt-app.patch
(from rev 149568, phonon/trunk/fix-plugindir-for-qt-app.patch)
phonon/repos/extra-x86_64/PKGBUILD
(from rev 149568, phonon/trunk/PKGBUILD)
phonon/repos/extra-x86_64/fix-plugindir-for-qt-app.patch
(from rev 149568, phonon/trunk/fix-plugindir-for-qt-app.patch)
Deleted:
phonon/repos/extra-i686/PKGBUILD
phonon/repos/extra-x86_64/PKGBUILD
---------------------------------------------+
extra-i686/PKGBUILD | 73 +++++++++++++-------------
extra-i686/fix-plugindir-for-qt-app.patch | 11 +++
extra-x86_64/PKGBUILD | 73 +++++++++++++-------------
extra-x86_64/fix-plugindir-for-qt-app.patch | 11 +++
4 files changed, 100 insertions(+), 68 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-02-08 14:43:44 UTC (rev 149568)
+++ extra-i686/PKGBUILD 2012-02-08 14:44:08 UTC (rev 149569)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=phonon
-pkgver=4.6.0
-pkgrel=1
-epoch=1
-arch=('i686' 'x86_64')
-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' 'qtwebkit')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
- -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
- make
-}
-
-package(){
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
Copied: phonon/repos/extra-i686/PKGBUILD (from rev 149568, phonon/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-02-08 14:44:08 UTC (rev 149569)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=phonon
+pkgver=4.6.0
+pkgrel=2
+epoch=1
+arch=('i686' 'x86_64')
+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' 'qtwebkit')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+ 'fix-plugindir-for-qt-app.patch')
+md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
+ 'e37d67038c2501f25ac7ee7c2de54a9a')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
+
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
+ -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
+ make
+}
+
+package(){
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
Copied: phonon/repos/extra-i686/fix-plugindir-for-qt-app.patch (from rev 149568, phonon/trunk/fix-plugindir-for-qt-app.patch)
===================================================================
--- extra-i686/fix-plugindir-for-qt-app.patch (rev 0)
+++ extra-i686/fix-plugindir-for-qt-app.patch 2012-02-08 14:44:08 UTC (rev 149569)
@@ -0,0 +1,11 @@
+--- a/phonon/CMakeLists.txt
++++ b/phonon/CMakeLists.txt
+@@ -78,7 +78,7 @@ if (PHONON_NO_PLATFORMPLUGIN)
+ add_definitions(-DQT_NO_PHONON_PLATFORMPLUGIN)
+ endif (PHONON_NO_PLATFORMPLUGIN)
+
+-add_definitions(-DPHONON_LIBRARY_PATH="${PLUGIN_INSTALL_DIR}/plugins")
++add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/plugins")
+
+ automoc4_add_library(phonon SHARED ${phonon_LIB_SRCS})
+ target_link_libraries(phonon ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-02-08 14:43:44 UTC (rev 149568)
+++ extra-x86_64/PKGBUILD 2012-02-08 14:44:08 UTC (rev 149569)
@@ -1,34 +0,0 @@
-# $Id$
-# Maintainer: Andrea Scarpino <andrea at archlinux.org>
-
-pkgname=phonon
-pkgver=4.6.0
-pkgrel=1
-epoch=1
-arch=('i686' 'x86_64')
-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' 'qtwebkit')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
-md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173')
-
-build() {
- cd "${srcdir}"
- mkdir build
- cd build
- cmake ../${pkgname}-${pkgver} \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_SKIP_RPATH=ON \
- -DCMAKE_INSTALL_PREFIX=/usr
- -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
- -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
- make
-}
-
-package(){
- cd "${srcdir}"/build
- make DESTDIR="${pkgdir}" install
-}
Copied: phonon/repos/extra-x86_64/PKGBUILD (from rev 149568, phonon/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-02-08 14:44:08 UTC (rev 149569)
@@ -0,0 +1,39 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgname=phonon
+pkgver=4.6.0
+pkgrel=2
+epoch=1
+arch=('i686' 'x86_64')
+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' 'qtwebkit')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz"
+ 'fix-plugindir-for-qt-app.patch')
+md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
+ 'e37d67038c2501f25ac7ee7c2de54a9a')
+
+build() {
+ cd "${srcdir}"/${pkgname}-${pkgver}
+ patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
+
+ cd "${srcdir}"
+ mkdir build
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPHONON_QT_MKSPECS_INSTALL_DIR=/usr/share/qt/mkspecs/modules \
+ -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib/qt/plugins/designer
+ make
+}
+
+package(){
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+}
Copied: phonon/repos/extra-x86_64/fix-plugindir-for-qt-app.patch (from rev 149568, phonon/trunk/fix-plugindir-for-qt-app.patch)
===================================================================
--- extra-x86_64/fix-plugindir-for-qt-app.patch (rev 0)
+++ extra-x86_64/fix-plugindir-for-qt-app.patch 2012-02-08 14:44:08 UTC (rev 149569)
@@ -0,0 +1,11 @@
+--- a/phonon/CMakeLists.txt
++++ b/phonon/CMakeLists.txt
+@@ -78,7 +78,7 @@ if (PHONON_NO_PLATFORMPLUGIN)
+ add_definitions(-DQT_NO_PHONON_PLATFORMPLUGIN)
+ endif (PHONON_NO_PLATFORMPLUGIN)
+
+-add_definitions(-DPHONON_LIBRARY_PATH="${PLUGIN_INSTALL_DIR}/plugins")
++add_definitions(-DPHONON_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_DIR}/plugins")
+
+ automoc4_add_library(phonon SHARED ${phonon_LIB_SRCS})
+ target_link_libraries(phonon ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
More information about the arch-commits
mailing list