svn commit: r303671 - in head/multimedia: mencoder mplayer

[Juergen Lock]

Author: nox
Date: Tue Sep  4 20:56:27 2012
New Revision: 303671
URL: http://svn.freebsd.org/changeset/ports/303671

Log:
  - 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 at gmail.com>
  Submitted by:	Thomas Zander <thomas.e.zander at googlemail.com> (maintainer)

Modified:
  head/multimedia/mencoder/Makefile
  head/multimedia/mplayer/Makefile
  head/multimedia/mplayer/Makefile.options

Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile	Tue Sep  4 20:46:54 2012	(r303670)
+++ head/multimedia/mencoder/Makefile	Tue Sep  4 20:56:27 2012	(r303671)
@@ -6,6 +6,7 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
+PORTREVISION=	1
 
 COMMENT=	Convenient video file and movie encoder
 

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Tue Sep  4 20:46:54 2012	(r303670)
+++ head/multimedia/mplayer/Makefile	Tue Sep  4 20:56:27 2012	(r303671)
@@ -7,6 +7,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
+PORTREVISION=	1
 
 COMMENT=	High performance media player supporting many formats
 

Modified: head/multimedia/mplayer/Makefile.options
==============================================================================
--- head/multimedia/mplayer/Makefile.options	Tue Sep  4 20:46:54 2012	(r303670)
+++ head/multimedia/mplayer/Makefile.options	Tue Sep  4 20:56:27 2012	(r303671)
@@ -51,17 +51,25 @@ CFLAGS+=	-O3 -fomit-frame-pointer -ffast
 .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