[arch-commits] Commit in phonon/trunk (3 files)

[Andrea Scarpino]

    Date: Tuesday, November 5, 2013 @ 12:20:35
  Author: andrea
Revision: 198803

upgpkg: phonon 4.7.0-1

Upstream release

Modified:
  phonon/trunk/PKGBUILD
Deleted:
  phonon/trunk/fix-plugindir-for-qt-app.patch
  phonon/trunk/fix-qmake.patch

--------------------------------+
 PKGBUILD                       |   71 +++++++++++++++++++++++++--------------
 fix-plugindir-for-qt-app.patch |   11 ------
 fix-qmake.patch                |   27 --------------
 3 files changed, 46 insertions(+), 63 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-04 17:57:04 UTC (rev 198802)
+++ PKGBUILD	2013-11-05 11:20:35 UTC (rev 198803)
@@ -1,43 +1,51 @@
 # $Id$
 # Maintainer: Andrea Scarpino <andrea at archlinux.org>
 
-pkgname=phonon
-pkgver=4.6.0
-pkgrel=8
-epoch=1
+pkgbase=phonon
+pkgname=('phonon-qt4' 'phonon-qt5')
+pkgver=4.7.0
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://phonon.kde.org/'
 license=('LGPL')
-pkgdesc="The multimedia framework for KDE"
-depends=('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"
-        'fix-plugindir-for-qt-app.patch'
-        'fix-qmake.patch')
-md5sums=('bbe0c1c62ed14c31479c4c1a6cf1e173'
-         'e37d67038c2501f25ac7ee7c2de54a9a'
-         'c17d8617e9482f02b3e098842946b679')
+makedepends=('cmake' 'automoc4' 'libpulse' 'libqzeitgeist' 'qt5-base' 'qt5-tools' 'qt5-quick1')
+options=('!emptydirs')
+source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz")
+md5sums=('f5c1a847ac8ae73e67bf762199978278')
 
+prepare() {
+  mkdir build
+  mkdir build-qt5
+}
+
 build() {
-  cd ${pkgname}-${pkgver}
-  # Upstream fixes
-  patch -p1 -i "${srcdir}"/fix-plugindir-for-qt-app.patch
-  patch -p1 -i "${srcdir}"/fix-qmake.patch
-  cd ../
-
-  mkdir build
   cd build
-  cmake ../${pkgname}-${pkgver} \
+  cmake ../${pkgbase}-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
-    -DPHONON_BUILD_DESIGNER_PLUGIN=OFF
+    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4
   make
+
+  cd ../build-qt5
+  cmake ../${pkgbase}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+    -DPHONON_BUILD_PHONON4QT5=ON
+  make
 }
 
-package(){
+package_phonon-qt4(){
+  pkgdesc="The multimedia framework for KDE4"
+  depends=('phonon-backend' 'libpulse' 'libqzeitgeist')
+  optdepends=('pulseaudio: PulseAudio support')
+  replaces=('phonon')
+  provides=('phonon')
+  conflicts=('phonon')
+
   cd build
   make DESTDIR="${pkgdir}" install
 
@@ -45,6 +53,19 @@
   install -d "${pkgdir}"/usr/include/qt4
   mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/
 
+  [[ -d "${pkgdir}"/usr/lib64 ]] && mv "${pkgdir}"/usr/{lib64/*,lib}
+
   sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \
-    "${pkgdir}"/usr/lib/pkgconfig/phonon.pc
+    "${pkgdir}/usr/lib/pkgconfig/phonon.pc"
 }
+
+package_phonon-qt5(){
+  pkgdesc="The multimedia framework for KF5"
+  depends=('phonon-backend' 'libpulse' 'qt5-base')
+  optdepends=('pulseaudio: PulseAudio support')
+
+  cd build-qt5
+  make DESTDIR="${pkgdir}" install
+
+  [[ -d "${pkgdir}"/usr/lib64 ]] && mv "${pkgdir}"/usr/{lib64/*,lib}
+}

Deleted: fix-plugindir-for-qt-app.patch
===================================================================
--- fix-plugindir-for-qt-app.patch	2013-11-04 17:57:04 UTC (rev 198802)
+++ fix-plugindir-for-qt-app.patch	2013-11-05 11:20:35 UTC (rev 198803)
@@ -1,11 +0,0 @@
---- 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: fix-qmake.patch
===================================================================
--- fix-qmake.patch	2013-11-04 17:57:04 UTC (rev 198802)
+++ fix-qmake.patch	2013-11-05 11:20:35 UTC (rev 198803)
@@ -1,27 +0,0 @@
-From: Oswald Buddenhagen <ossi at kde.org>
-Date: Sat, 27 Oct 2012 07:58:16 +0000
-Subject: remove unnecessary if() statement
-X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=a8c431494d2a6f3785c132f14d00d38ea0e5b328
----
-remove unnecessary if() statement
-
-as it happens, this works around a qmake breakage relating to parsing if()
-
-BUG: 295037
-FIXED-IN: 4.6.1
----
-
-
---- a/qt_phonon.pri
-+++ b/qt_phonon.pri
-@@ -3,7 +3,7 @@
- # the next build of Qt. So pretend we're not there in this case.
- # This file is loaded by qt_config.prf, before .qmake.cache has been loaded.
- # Consequently, we have to do some stunts to get values out of the cache.
--if(!exists($$_QMAKE_CACHE_)| \
--   !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build)): \
-+!exists($$_QMAKE_CACHE_)| \
-+   !contains($$list($$fromfile($$_QMAKE_CACHE_, CONFIG)), QTDIR_build): \
-     QT_CONFIG += phonon
- 
-