diff options
author | markd <markd> | 2016-03-01 08:54:42 +0000 |
---|---|---|
committer | markd <markd> | 2016-03-01 08:54:42 +0000 |
commit | f03505175366ddc53987677adbb9d5a6f497f6de (patch) | |
tree | 04b19b1c2685ac6ae4bb9ac6972780da2666d08c /multimedia | |
parent | 1979e15d80019af2b3a51cff2b94c22e97f83238 (diff) | |
download | pkgsrc-f03505175366ddc53987677adbb9d5a6f497f6de.tar.gz |
Add patch for qt 5.4.2
Split shared settings into Makefile.common
Diffstat (limited to 'multimedia')
-rw-r--r-- | multimedia/phonon/Makefile | 27 | ||||
-rw-r--r-- | multimedia/phonon/Makefile.common | 27 | ||||
-rw-r--r-- | multimedia/phonon/distinfo | 4 | ||||
-rw-r--r-- | multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake | 12 |
4 files changed, 43 insertions, 27 deletions
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index 526ecb069c6..ee8055c3807 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -1,35 +1,14 @@ -# $NetBSD: Makefile,v 1.50 2016/02/18 20:53:38 jperkin Exp $ +# $NetBSD: Makefile,v 1.51 2016/03/01 08:54:42 markd Exp $ DISTNAME= phonon-4.8.3 -PKGREVISION= 1 -CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_KDE:=phonon/4.8.3/src/} -EXTRACT_SUFX= .tar.xz +PKGREVISION= 2 -MAINTAINER= markd@NetBSD.org -HOMEPAGE= http://phonon.kde.org/ COMMENT= Multimedia API for KDE and QT -LICENSE= gnu-lgpl-v2.1 -# BUILD_MAKE_FLAGS+= VERBOSE=1 +.include "Makefile.common" BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 -USE_TOOLS+= pkg-config gmake -USE_LANGUAGES= c c++ -USE_CMAKE= yes -CMAKE_ARG_PATH= .. -CONFIGURE_DIRS= _build -CMAKE_ARGS+= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE - -.include "options.mk" - -PKGCONFIG_OVERRIDE+= phonon.pc.cmake - -pre-configure: - ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ - ${MKDIR} ${WRKSRC}/_build - .include "../../x11/qt4-libs/buildlink3.mk" BUILDLINK_DEPMETHOD.qt4-tools= full .include "../../x11/qt4-tools/buildlink3.mk" diff --git a/multimedia/phonon/Makefile.common b/multimedia/phonon/Makefile.common new file mode 100644 index 00000000000..10afc6b6372 --- /dev/null +++ b/multimedia/phonon/Makefile.common @@ -0,0 +1,27 @@ +# $NetBSD: Makefile.common,v 1.1 2016/03/01 08:54:42 markd Exp $ + +CATEGORIES= multimedia +MASTER_SITES= ${MASTER_SITE_KDE:=phonon/4.8.3/src/} +EXTRACT_SUFX= .tar.xz + +MAINTAINER= markd@NetBSD.org +HOMEPAGE= http://phonon.kde.org/ +LICENSE= gnu-lgpl-v2.1 + +PATCHDIR= ${.CURDIR}/../../multimedia/phonon/patches +DISTINFO_FILE= ${.CURDIR}/../../multimedia/phonon/distinfo + +USE_TOOLS+= pkg-config gmake +USE_LANGUAGES= c c++ +USE_CMAKE= yes +CMAKE_ARG_PATH= .. +CONFIGURE_DIRS= _build +CMAKE_ARGS+= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE + +.include "../../multimedia/phonon/options.mk" + +PKGCONFIG_OVERRIDE+= phonon.pc.cmake + +pre-configure: + ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ + ${MKDIR} ${WRKSRC}/_build diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo index 0858f179c0f..383b4249228 100644 --- a/multimedia/phonon/distinfo +++ b/multimedia/phonon/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.15 2016/02/18 20:53:38 jperkin Exp $ +$NetBSD: distinfo,v 1.16 2016/03/01 08:54:42 markd Exp $ SHA1 (phonon-4.8.3.tar.xz) = aac5dc44ae4821e6165c6735b9c6063dd111ac03 RMD160 (phonon-4.8.3.tar.xz) = c035f253eda49635377122423bb72161f97f18d3 SHA512 (phonon-4.8.3.tar.xz) = 368014e808fe9ac84cdb4caf99dec93470907ca959e9a900fd6a8d86b3a44603b91be06b64b0f484d199663647bf82e84f643900edcf6a0c90ea55c53f767701 Size (phonon-4.8.3.tar.xz) = 322012 bytes -SHA1 (patch-cmake_FindPhononInternal.cmake) = e3dc36a21ff96ec67fcc7593c7fa7629d41119ba +SHA1 (patch-cmake_FindPhononInternal.cmake) = 3b578d419b86eb12078fa650aca61f1f2f2fff6f diff --git a/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake b/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake index 9d3a96c0d49..ea742cedeee 100644 --- a/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake +++ b/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake @@ -1,6 +1,7 @@ -$NetBSD: patch-cmake_FindPhononInternal.cmake,v 1.2 2016/02/18 20:53:39 jperkin Exp $ +$NetBSD: patch-cmake_FindPhononInternal.cmake,v 1.3 2016/03/01 08:54:42 markd Exp $ Disable Darwin section, creates unusable libraries. +_include_dirs fix for qt-5.4.2 --- cmake/FindPhononInternal.cmake.orig 2014-12-04 09:30:26.000000000 +0000 +++ cmake/FindPhononInternal.cmake @@ -41,3 +42,12 @@ Disable Darwin section, creates unusable libraries. # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") +@@ -409,7 +409,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) + 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}") |