diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-02-18 20:53:38 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-02-18 20:53:38 +0000 |
| commit | f0202526f26d87c3755f94b5f5b363114a9dd12c (patch) | |
| tree | a1b3431ddae590f32e34ed8f56e7d51f5c12cfdf /multimedia | |
| parent | 9f1aaa3fcd9db85d20ab70a8ae13060e4dd53d9f (diff) | |
| download | pkgsrc-f0202526f26d87c3755f94b5f5b363114a9dd12c.tar.gz | |
Disable Darwin-specific settings, creates libraries with an incorrect
install_name.
Bump PKGREVISION.
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/phonon/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/phonon/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake | 25 |
3 files changed, 26 insertions, 6 deletions
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile index c1f401e066d..526ecb069c6 100644 --- a/multimedia/phonon/Makefile +++ b/multimedia/phonon/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.49 2015/09/01 22:14:20 markd Exp $ +# $NetBSD: Makefile,v 1.50 2016/02/18 20:53:38 jperkin Exp $ DISTNAME= phonon-4.8.3 +PKGREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_KDE:=phonon/4.8.3/src/} EXTRACT_SUFX= .tar.xz diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo index 5bcdb1ea9af..0858f179c0f 100644 --- a/multimedia/phonon/distinfo +++ b/multimedia/phonon/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.14 2015/11/03 23:54:31 agc Exp $ +$NetBSD: distinfo,v 1.15 2016/02/18 20:53:38 jperkin 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) = b44464daf9542d985e1163cd0b5eb6db73a0b457 +SHA1 (patch-cmake_FindPhononInternal.cmake) = e3dc36a21ff96ec67fcc7593c7fa7629d41119ba diff --git a/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake b/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake index 83105476e51..9d3a96c0d49 100644 --- a/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake +++ b/multimedia/phonon/patches/patch-cmake_FindPhononInternal.cmake @@ -1,8 +1,27 @@ -$NetBSD: patch-cmake_FindPhononInternal.cmake,v 1.1 2013/11/13 22:51:06 joerg Exp $ +$NetBSD: patch-cmake_FindPhononInternal.cmake,v 1.2 2016/02/18 20:53:39 jperkin Exp $ ---- cmake/FindPhononInternal.cmake.orig 2013-11-13 13:44:42.000000000 +0000 +Disable Darwin section, creates unusable libraries. + +--- cmake/FindPhononInternal.cmake.orig 2014-12-04 09:30:26.000000000 +0000 +++ cmake/FindPhononInternal.cmake -@@ -320,16 +320,16 @@ if (CMAKE_COMPILER_IS_GNUCXX) +@@ -199,14 +199,14 @@ set(INSTALL_TARGETS_DEFAULT_ARGS RUNTIME + ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel) + + # on the Mac support an extra install directory for application bundles +-if(APPLE) ++if(notAPPLE) + set(INSTALL_TARGETS_DEFAULT_ARGS ${INSTALL_TARGETS_DEFAULT_ARGS} + BUNDLE DESTINATION "${BUNDLE_INSTALL_DIR}") + set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "${CMAKE_SHARED_MODULE_CREATE_C_FLAGS} -flat_namespace -undefined dynamic_lookup") + set(CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS "${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS} -flat_namespace -undefined dynamic_lookup") + + set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR}) +-endif(APPLE) ++endif(notAPPLE) + + # RPATH Handling + +@@ -324,16 +324,16 @@ if (CMAKE_COMPILER_IS_GNUCXX) # Select flags. set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG") |