svn commit: r312152 - head/multimedia/mplayer

[Alex Kozlov]

Author: ak
Date: Wed Feb 13 10:39:13 2013
New Revision: 312152
URL: http://svnweb.freebsd.org/changeset/ports/312152

Log:
  - Fix build with clang [1]
  - Convert Makefile headers to new style
  
  PR:	ports/171707 [1]
  Submitted by:	anonymous <anonymous at gmail.com>
  Approved by:	Thomas Zander <thomas.e.zander at googlemail.com> (maintainer)

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

Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile	Wed Feb 13 10:24:15 2013	(r312151)
+++ head/multimedia/mplayer/Makefile	Wed Feb 13 10:39:13 2013	(r312152)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	mplayer
-# Date created:		10 August 2001
-# Whom:			Thomas E. Zander
-#			with lots of help from Vladimir Kushnir
+# Created by: Thomas E. Zander with help from Vladimir Kushnir
 # $FreeBSD$
-#
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
@@ -96,7 +92,7 @@ CONFIGURE_ARGS+=	--disable-directfb \
 
 # Fix a problem with unknown assembly opcodes in embedded ffmpeg
 .if ${ARCH} == "ppc"
-CONFIGURE_ARGS+=        --disable-asm
+CONFIGURE_ARGS+=	--disable-asm
 .endif
 
 .include "${.CURDIR}/Makefile.options"

Modified: head/multimedia/mplayer/Makefile.options
==============================================================================
--- head/multimedia/mplayer/Makefile.options	Wed Feb 13 10:24:15 2013	(r312151)
+++ head/multimedia/mplayer/Makefile.options	Wed Feb 13 10:39:13 2013	(r312152)
@@ -52,7 +52,7 @@ CFLAGS+=	-O3 -fomit-frame-pointer -ffast
 .endif #WITH_DEBUG
 
 #Supported architectures for clang
-.if ${ARCH} == "amd64"
+.if ${ARCH} == "i386" || ${ARCH} == "amd64"
 MPLAYER_CLANG_SUPPORTED_ARCH=	yes
 .endif
 

Modified: head/multimedia/mplayer/Makefile.shared
==============================================================================
--- head/multimedia/mplayer/Makefile.shared	Wed Feb 13 10:24:15 2013	(r312151)
+++ head/multimedia/mplayer/Makefile.shared	Wed Feb 13 10:39:13 2013	(r312152)
@@ -39,6 +39,7 @@ CONFIGURE_ARGS=	--cc="${CC}" \
 		--disable-liba52 \
 		--disable-alsa \
 		--disable-libbs2b \
+		--disable-mp3lib \
 		--enable-ass-internal
 
 WANT_GNOME=	yes