[arch-commits] Commit in phonon/repos (6 files)
Antonio Rojas
arojas at archlinux.org
Mon Apr 18 06:55:48 UTC 2016
Date: Monday, April 18, 2016 @ 08:55:48
Author: arojas
Revision: 265123
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
phonon/repos/staging-i686/
phonon/repos/staging-i686/PKGBUILD
(from rev 265122, phonon/trunk/PKGBUILD)
phonon/repos/staging-i686/qt-5.4.2.patch
(from rev 265122, phonon/trunk/qt-5.4.2.patch)
phonon/repos/staging-x86_64/
phonon/repos/staging-x86_64/PKGBUILD
(from rev 265122, phonon/trunk/PKGBUILD)
phonon/repos/staging-x86_64/qt-5.4.2.patch
(from rev 265122, phonon/trunk/qt-5.4.2.patch)
-------------------------------+
staging-i686/PKGBUILD | 71 ++++++++++++++++++++++++++++++++++++++++
staging-i686/qt-5.4.2.patch | 23 ++++++++++++
staging-x86_64/PKGBUILD | 71 ++++++++++++++++++++++++++++++++++++++++
staging-x86_64/qt-5.4.2.patch | 23 ++++++++++++
4 files changed, 188 insertions(+)
Copied: phonon/repos/staging-i686/PKGBUILD (from rev 265122, phonon/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2016-04-18 06:55:48 UTC (rev 265123)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=phonon
+pkgname=('phonon-qt4' 'phonon-qt5')
+pkgver=4.9.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://phonon.kde.org/'
+license=('LGPL')
+makedepends=('extra-cmake-modules' 'automoc4' 'libpulse' 'libqzeitgeist' 'qt5-base' 'qt5-tools')
+options=('!emptydirs')
+source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz")
+md5sums=('8abeb7b1eaf4935668c7fb441fc2491a')
+
+prepare() {
+ mkdir build
+ mkdir build-qt5
+}
+
+build() {
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
+ -D__KDE_HAVE_GCC_VISIBILITY=NO \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ 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 \
+ -D__KDE_HAVE_GCC_VISIBILITY=NO \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ make
+}
+
+package_phonon-qt4(){
+ pkgdesc="The multimedia framework for KDE4"
+ depends=('phonon-qt4-backend' 'libpulse' 'libqzeitgeist')
+ optdepends=('pulseaudio: PulseAudio support')
+ replaces=('phonon')
+ provides=('phonon')
+ conflicts=('phonon')
+
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ # Install headers into the Qt4 dir
+ install -d "${pkgdir}"/usr/include/qt4
+ mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/
+
+ sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \
+ "${pkgdir}/usr/lib/pkgconfig/phonon.pc"
+}
+
+package_phonon-qt5(){
+ pkgdesc="The multimedia framework for KF5"
+ depends=('phonon-qt5-backend' 'libpulse' 'qt5-base')
+ optdepends=('pulseaudio: PulseAudio support')
+
+ cd build-qt5
+ make DESTDIR="${pkgdir}" install
+}
Copied: phonon/repos/staging-i686/qt-5.4.2.patch (from rev 265122, phonon/trunk/qt-5.4.2.patch)
===================================================================
--- staging-i686/qt-5.4.2.patch (rev 0)
+++ staging-i686/qt-5.4.2.patch 2016-04-18 06:55:48 UTC (rev 265123)
@@ -0,0 +1,23 @@
+From: Hrvoje Senjan <hrvoje.senjan at gmail.com>
+Date: Thu, 28 May 2015 15:56:47 +0000
+Subject: Yet another _include_dirs fix
+X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=635b65fa417f49ac4ae189e926bf138efc6544d6
+---
+Yet another _include_dirs fix
+
+The variable is set as a definition, so mark it as such
+---
+
+
+--- a/cmake/FindPhononInternal.cmake
++++ b/cmake/FindPhononInternal.cmake
+@@ -409,7 +409,7 @@
+ file(WRITE "${_source_file}" "${_source}")
+ set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
+
+- try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
++ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" COMPILE_DEFINITIONS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
+
+ if(NOT _compile_result)
+ message("${_compile_output_var}")
+
Copied: phonon/repos/staging-x86_64/PKGBUILD (from rev 265122, phonon/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2016-04-18 06:55:48 UTC (rev 265123)
@@ -0,0 +1,71 @@
+# $Id$
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+
+pkgbase=phonon
+pkgname=('phonon-qt4' 'phonon-qt5')
+pkgver=4.9.0
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://phonon.kde.org/'
+license=('LGPL')
+makedepends=('extra-cmake-modules' 'automoc4' 'libpulse' 'libqzeitgeist' 'qt5-base' 'qt5-tools')
+options=('!emptydirs')
+source=("http://download.kde.org/stable/${pkgbase}/${pkgver}/${pkgbase}-${pkgver}.tar.xz")
+md5sums=('8abeb7b1eaf4935668c7fb441fc2491a')
+
+prepare() {
+ mkdir build
+ mkdir build-qt5
+}
+
+build() {
+ cd build
+ cmake ../${pkgbase}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=ON \
+ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
+ -D__KDE_HAVE_GCC_VISIBILITY=NO \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ 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 \
+ -D__KDE_HAVE_GCC_VISIBILITY=NO \
+ -DCMAKE_INSTALL_LIBDIR=lib
+ make
+}
+
+package_phonon-qt4(){
+ pkgdesc="The multimedia framework for KDE4"
+ depends=('phonon-qt4-backend' 'libpulse' 'libqzeitgeist')
+ optdepends=('pulseaudio: PulseAudio support')
+ replaces=('phonon')
+ provides=('phonon')
+ conflicts=('phonon')
+
+ cd build
+ make DESTDIR="${pkgdir}" install
+
+ # Install headers into the Qt4 dir
+ install -d "${pkgdir}"/usr/include/qt4
+ mv "${pkgdir}"/usr/include/{phonon,KDE} "${pkgdir}"/usr/include/qt4/
+
+ sed -i 's#includedir=/usr/include#includedir=/usr/include/qt4#' \
+ "${pkgdir}/usr/lib/pkgconfig/phonon.pc"
+}
+
+package_phonon-qt5(){
+ pkgdesc="The multimedia framework for KF5"
+ depends=('phonon-qt5-backend' 'libpulse' 'qt5-base')
+ optdepends=('pulseaudio: PulseAudio support')
+
+ cd build-qt5
+ make DESTDIR="${pkgdir}" install
+}
Copied: phonon/repos/staging-x86_64/qt-5.4.2.patch (from rev 265122, phonon/trunk/qt-5.4.2.patch)
===================================================================
--- staging-x86_64/qt-5.4.2.patch (rev 0)
+++ staging-x86_64/qt-5.4.2.patch 2016-04-18 06:55:48 UTC (rev 265123)
@@ -0,0 +1,23 @@
+From: Hrvoje Senjan <hrvoje.senjan at gmail.com>
+Date: Thu, 28 May 2015 15:56:47 +0000
+Subject: Yet another _include_dirs fix
+X-Git-Url: http://quickgit.kde.org/?p=phonon.git&a=commitdiff&h=635b65fa417f49ac4ae189e926bf138efc6544d6
+---
+Yet another _include_dirs fix
+
+The variable is set as a definition, so mark it as such
+---
+
+
+--- a/cmake/FindPhononInternal.cmake
++++ b/cmake/FindPhononInternal.cmake
+@@ -409,7 +409,7 @@
+ file(WRITE "${_source_file}" "${_source}")
+ set(_include_dirs "-DINCLUDE_DIRECTORIES:STRING=${QT_INCLUDES}")
+
+- try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
++ try_compile(_compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${CMAKE_CXX_FLAGS}" COMPILE_DEFINITIONS "${_include_dirs}" OUTPUT_VARIABLE _compile_output_var)
+
+ if(NOT _compile_result)
+ message("${_compile_output_var}")
+
More information about the arch-commits
mailing list