Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=9718dbbf28d6041e09a33bd378a102a421bc9bd1
commit 9718dbbf28d6041e09a33bd378a102a421bc9bd1 Author: Marius Cirsta <[email protected]> Date: Sun Nov 15 22:44:46 2015 +0200 phonon-qt5-4.8.3-1-x86_64 * use new qt5 packages diff --git a/source/xmultimedia/phonon-qt5/FrugalBuild b/source/xmultimedia/phonon-qt5/FrugalBuild index d9e79d0..015b3b8 100644 --- a/source/xmultimedia/phonon-qt5/FrugalBuild +++ b/source/xmultimedia/phonon-qt5/FrugalBuild @@ -1,24 +1,27 @@ # Compiling Time: 0.09 SBU # Maintainer: Melko <[email protected]> -options+=('asneeded') - pkgname=phonon-qt5 -pkgver=4.8.0 -pkgrel=2 +pkgver=4.8.3 +pkgrel=1 pkgdesc='The multimedia API for KDE 5.' groups=('xmultimedia') archs=('i686' 'x86_64') _F_kde_name="phonon" _F_kde_folder="stable/$_F_kde_name" -_F_kde_dirname="$_F_kde_folder/$pkgver" +_F_kde_dirname="$_F_kde_folder/$pkgver/src" _F_kde_ext=".tar.xz" -_F_cmake_confopts="-DPHONON_BUILD_PHONON4QT5=ON" +_F_cmake_confopts="-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" Finclude kde url='http://phonon.kde.org' -depends=('libxml2>=2.7.8' "libqt5dbus>=$_F_kde_qtver" "libqt5gui>=$_F_kde_qtver" \ +depends=('libxml2>=2.7.8' "qt5-base>=$_F_kde_qtver" \ 'libuuid' 'libpulse>=6.0') -makedepends=("${makedepends[@]}" "libqt5test>=$_F_kde_qtver" "pulseaudio>=5.0" 'libqt5imageformats' 'libqt5x11extras' 'libqt5platformsupport' 'libqt5quick') -sha1sums=('b01da88ddba0d2d501bf1b6bb86abbff61ab6a12') - -# optimization OK +makedepends=('qt5-tools') +source=(${source[@]} qt-5.4.2.patch) +sha1sums=('aac5dc44ae4821e6165c6735b9c6063dd111ac03' \ + '1ae84f2aa3916065ae360da69781ac5f26e4d5ef') diff --git a/source/xmultimedia/phonon-qt5/qt-5.4.2.patch b/source/xmultimedia/phonon-qt5/qt-5.4.2.patch new file mode 100644 index 0000000..f4231e3 --- /dev/null +++ b/source/xmultimedia/phonon-qt5/qt-5.4.2.patch @@ -0,0 +1,23 @@ +From: Hrvoje Senjan <[email protected]> +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}") + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
