Do not force C90 and remove some other pointless options that will create issues with Clang builds. Bump revision.diff -r1.36 -r1.37 pkgsrc/multimedia/phonon/Makefile
(joerg)
@@ -1,37 +1,38 @@ | @@ -1,37 +1,38 @@ | |||
1 | # $NetBSD: Makefile,v 1.36 2013/11/09 22:45:05 markd Exp $ | 1 | # $NetBSD: Makefile,v 1.37 2013/11/13 22:51:06 joerg Exp $ | |
2 | 2 | |||
3 | DISTNAME= phonon-4.7.0 | 3 | DISTNAME= phonon-4.7.0 | |
4 | PKGREVISION= 1 | |||
4 | CATEGORIES= multimedia | 5 | CATEGORIES= multimedia | |
5 | MASTER_SITES= ${MASTER_SITE_KDE:=phonon/4.7.0/} | 6 | MASTER_SITES= ${MASTER_SITE_KDE:=phonon/4.7.0/} | |
6 | EXTRACT_SUFX= .tar.xz | 7 | EXTRACT_SUFX= .tar.xz | |
7 | 8 | |||
8 | MAINTAINER= markd@NetBSD.org | 9 | MAINTAINER= markd@NetBSD.org | |
9 | HOMEPAGE= http://phonon.kde.org/ | 10 | HOMEPAGE= http://phonon.kde.org/ | |
10 | COMMENT= Multimedia API for KDE and QT | 11 | COMMENT= Multimedia API for KDE and QT | |
11 | LICENSE= gnu-lgpl-v2.1 | 12 | LICENSE= gnu-lgpl-v2.1 | |
12 | 13 | |||
13 | # BUILD_MAKE_FLAGS+= VERBOSE=1 | 14 | # BUILD_MAKE_FLAGS+= VERBOSE=1 | |
14 | 15 | |||
15 | BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 | 16 | BUILD_DEPENDS+= automoc4>=0.9.83:../../devel/automoc4 | |
16 | 17 | |||
17 | USE_TOOLS+= pkg-config | 18 | USE_TOOLS+= pkg-config | |
18 | USE_LANGUAGES= c c++ | 19 | USE_LANGUAGES= c c++ | |
19 | USE_CMAKE= yes | 20 | USE_CMAKE= yes | |
20 | CMAKE_ARG_PATH= .. | 21 | CMAKE_ARG_PATH= .. | |
21 | CONFIGURE_DIRS= _build | 22 | CONFIGURE_DIRS= _build | |
22 | CMAKE_ARGS+= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE | 23 | CMAKE_ARGS+= -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=TRUE | |
23 | 24 | |||
24 | .include "options.mk" | 25 | .include "options.mk" | |
25 | 26 | |||
26 | PKGCONFIG_OVERRIDE+= phonon.pc.cmake | 27 | PKGCONFIG_OVERRIDE+= phonon.pc.cmake | |
27 | 28 | |||
28 | pre-configure: | 29 | pre-configure: | |
29 | ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ | 30 | ${LN} -sf ${QTDIR}/bin/qmake ${BUILDLINK_DIR}/bin/ | |
30 | ${MKDIR} ${WRKSRC}/_build | 31 | ${MKDIR} ${WRKSRC}/_build | |
31 | 32 | |||
32 | .include "../../x11/qt4-libs/buildlink3.mk" | 33 | .include "../../x11/qt4-libs/buildlink3.mk" | |
33 | BUILDLINK_DEPMETHOD.qt4-tools= full | 34 | BUILDLINK_DEPMETHOD.qt4-tools= full | |
34 | .include "../../x11/qt4-tools/buildlink3.mk" | 35 | .include "../../x11/qt4-tools/buildlink3.mk" | |
35 | .include "../../x11/qt4-qdbus/buildlink3.mk" | 36 | .include "../../x11/qt4-qdbus/buildlink3.mk" | |
36 | 37 | |||
37 | .include "../../mk/bsd.pkg.mk" | 38 | .include "../../mk/bsd.pkg.mk" |
@@ -1,5 +1,6 @@ | @@ -1,5 +1,6 @@ | |||
1 | $NetBSD: distinfo,v 1.8 2013/11/09 22:45:05 markd Exp $ | 1 | $NetBSD: distinfo,v 1.9 2013/11/13 22:51:06 joerg Exp $ | |
2 | 2 | |||
3 | SHA1 (phonon-4.7.0.tar.xz) = feda28afe016fe38eb253f2be01973fc0226d10f | 3 | SHA1 (phonon-4.7.0.tar.xz) = feda28afe016fe38eb253f2be01973fc0226d10f | |
4 | RMD160 (phonon-4.7.0.tar.xz) = dfe1dd8febc3b8304368340438d4f4f692ac8572 | 4 | RMD160 (phonon-4.7.0.tar.xz) = dfe1dd8febc3b8304368340438d4f4f692ac8572 | |
5 | Size (phonon-4.7.0.tar.xz) = 329792 bytes | 5 | Size (phonon-4.7.0.tar.xz) = 329792 bytes | |
6 | SHA1 (patch-cmake_FindPhononInternal.cmake) = b44464daf9542d985e1163cd0b5eb6db73a0b457 |
$NetBSD: patch-cmake_FindPhononInternal.cmake,v 1.1 2013/11/13 22:51:06 joerg Exp $
--- cmake/FindPhononInternal.cmake.orig 2013-11-13 13:44:42.000000000 +0000
+++ cmake/FindPhononInternal.cmake
@@ -320,16 +320,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")
- set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+ set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-inline")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -DNDEBUG -DQT_NO_DEBUG")
set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
- set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
+ set(CMAKE_C_FLAGS_DEBUG "-g -O2 -fno-inline")
set(CMAKE_C_FLAGS_DEBUGFULL "-g3 -fno-inline")
set(CMAKE_C_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
# 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")