diff options
| author | nox <nox@FreeBSD.org> | 2012-09-05 04:56:27 +0800 |
|---|---|---|
| committer | nox <nox@FreeBSD.org> | 2012-09-05 04:56:27 +0800 |
| commit | f556dd291f19a27c6d7c65bfe8e2bac45cdaaf35 (patch) | |
| tree | 83ceb15a11e0b43141979f010eadb5d3b7412969 /multimedia | |
| parent | 1e041df89b86e13ccb9dfafb71df2d86435e6541 (diff) | |
| download | freebsd-ports-gnome-f556dd291f19a27c6d7c65bfe8e2bac45cdaaf35.tar.gz freebsd-ports-gnome-f556dd291f19a27c6d7c65bfe8e2bac45cdaaf35.tar.zst freebsd-ports-gnome-f556dd291f19a27c6d7c65bfe8e2bac45cdaaf35.zip | |
- Only default to clang on amd64 and when /usr/bin/clang exists.
- Set CPP= clang-cpp in that case too.
- Fix windows codecs dir configure arg.
- Bump PORTREVISIONs.
PR: ports/171249
Submitted by: "Herbert J. Skuhra" <h.skuhra@gmail.com>
Submitted by: Thomas Zander <thomas.e.zander@googlemail.com> (maintainer)
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/mencoder/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile.options | 12 |
3 files changed, 12 insertions, 2 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 3821f0db8bc8..cdd8aaa413b1 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -6,6 +6,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 COMMENT= Convenient video file and movie encoder diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index f153d9e4cfd4..cd7eb749a882 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -7,6 +7,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 COMMENT= High performance media player supporting many formats diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options index 0db7acfe46be..b6f249be0fe7 100644 --- a/multimedia/mplayer/Makefile.options +++ b/multimedia/mplayer/Makefile.options @@ -51,17 +51,25 @@ CFLAGS+= -O3 -fomit-frame-pointer -ffast-math .endif .endif #WITH_DEBUG +#Supported architectures for clang +.if ${ARCH} == "amd64" +MPLAYER_CLANG_SUPPORTED_ARCH= yes +.endif + .if !defined(WITHOUT_RTCPU) CONFIGURE_ARGS+=--enable-runtime-cpudetection .endif -.if ${OSVERSION} >= 900033 +.if ${OSVERSION} >= 900033 \ + && exists(/usr/bin/clang) \ + && defined(MPLAYER_CLANG_SUPPORTED_ARCH) WITH_BASE_CLANG=yes .endif .if defined(WITH_BASE_CLANG) CC= clang CXX= clang++ +CPP= clang-cpp .else .if defined(WITH_OTCHAIN) USE_GCC?= 4.6+ @@ -232,7 +240,7 @@ DEFAULT_CDROM_DEVICE=/dev/acd0 .if ${ARCH} == "i386" || ${ARCH} == "amd64" .if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386" RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT} -CONFIGURE_ARGS+= --win32codecsdir=${LOCALBASE}/lib/win32 +CONFIGURE_ARGS+= --codecsdir=${LOCALBASE}/lib/win32 CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE .else |