From 90286075f1c3056176ae61fbc9607dfc8fb6bb0d Mon Sep 17 00:00:00 2001
From: Thomas Zander <riggs@FreeBSD.org>
Date: Sun, 1 Jan 2017 18:55:22 +0000
Subject: [PATCH] Simplify handling of CFLAGS, retire OCFLAGS OPTION

Log:
- Remove OCFLAGS option. This is no longer a big topic since all
  computationally expensive code is handled via external ffmpeg
  libraries now
- Remove BUILD_DEPENDS on yasm. No yasm asm files are compiled
  during mplayer / mencoder build process anymore
- Bump PORTREVISION
---
 multimedia/mencoder/Makefile        |  5 ++---
 multimedia/mplayer/Makefile         |  5 ++---
 multimedia/mplayer/Makefile.common  |  5 +++--
 multimedia/mplayer/Makefile.options | 18 +++++-------------
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index b3061b160f78..3773e48db0d5 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -12,11 +12,11 @@ COMMENT=	Convenient video file and movie encoder
 
 OPTIONS_DEFINE=	AMR_NB AMR_WB BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \
 		FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \
-		MAD NAS OCFLAGS OPENAL OPENJPEG OPUS PULSEAUDIO \
+		MAD NAS OPENAL OPENJPEG OPUS PULSEAUDIO \
 		RTMP SCHROEDINGER SMB SPEEX THEORA TWOLAME V4L VPX \
 		X264 XVID
 
-OPTIONS_DEFAULT=DVDNAV FONTCONFIG GIF GNUTLS OCFLAGS X264 XVID
+OPTIONS_DEFAULT=DVDNAV FONTCONFIG GIF GNUTLS X264 XVID
 
 OPTIONS_DEFINE_i386=	RTCPU
 OPTIONS_DEFINE_amd64=	RTCPU
@@ -29,7 +29,6 @@ OPTIONS_DEFAULT_powerpc=RTCPU
 BLURAY_DESC?=	BluRay support
 DVDNAV_DESC?=	DVD navigation features support
 LZO_DESC?=	Enable external liblzo library
-OCFLAGS_DESC?=	Use optimized compiler flags
 RTCPU_DESC?=	Use runtime CPU detection
 
 RESTRICTED=	Port has restricted dependencies
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index fbee8d88eee3..287a51582f01 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -12,12 +12,12 @@ COMMENT=	High performance media player supporting many formats
 
 OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV DVDNAV \
 		ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
-		LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \
+		LADSPA LIBMNG LIRC LZO NAS OPENAL OPENGL \
 		OPENJPEG OPUS PULSEAUDIO RTC RTMP \
 		SCHROEDINGER SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \
 		X11 X11DGA X11VM XINERAMA XVIDEO XVMC
 
-OPTIONS_DEFAULT=DVDNAV FONTCONFIG FRIBIDI GNUTLS OCFLAGS OPENGL \
+OPTIONS_DEFAULT=DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \
 		SKINS X11 X11DGA X11VM XINERAMA XVIDEO
 
 OPTIONS_DEFINE_i386=	RTCPU
@@ -32,7 +32,6 @@ DVDNAV_DESC?=	DVD navigation features support
 BLURAY_DESC?=	BluRay support
 ENCA_DESC?=	Charset conversion via enca
 LZO_DESC?=	External liblzo support
-OCFLAGS_DESC?=	${OPTIMIZED_CFLAGS_DESC}
 RTC_DESC?=	Add support for kernel real time clock
 RTCPU_DESC?=	Use runtime CPU detection
 SKINS_DESC?=	Install skins for GUI
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index 7c391fbd0dac..7e577a8a3708 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -6,7 +6,7 @@
 
 MPLAYER_PORT_VERSION=	1.3.0
 MPLAYER_SNAPSHOT_DATE=	2016-12-28
-PORTREVISION?=	0
+PORTREVISION?=	1
 MASTER_SITES=	LOCAL/riggs/mplayer
 DISTNAME=	mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
 WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
@@ -48,7 +48,8 @@ CONFIGURE_ARGS=	--cc="${CC}" \
 		--disable-libmpeg2 \
 		--disable-nemesi \
 		--disable-real \
-		--enable-ass-internal
+		--enable-ass-internal \
+		--yasm=''
 
 WANT_GNOME=	yes
 
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index abaeaef8619d..659a2dcd3651 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -53,26 +53,18 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang-version
 CFLAGS_i386+=	-mstack-alignment=16 -mstackrealign
 .endif # ${CHOSEN_COMPILER_TYPE} == clang
 
-.if ${ARCH} == "amd64" || ${ARCH} == "i386"
-BUILD_DEPENDS+=	${LOCALBASE}/bin/yasm:devel/yasm
-.endif
-
 CFLAGS_armv6+=	-no-integrated-as
 
-# Extra build options for debugging and optimised CFLAGS
-# ======================================================
+# Extra build options for debugging
+# =================================
 
 .if ${PORT_OPTIONS:MDEBUG}
 WITH_DEBUG=	yes
 CONFIGURE_ARGS+=	--enable-debug=3
-.else
-.if ${PORT_OPTIONS:MOCFLAGS}
-CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math
-.endif #OCFLAGS
-.endif #DEBUG
+.endif
 
-# Win32 DLL codecs support on i386, mostly superseded by internal ffmpeg
-# ======================================================================
+# Win32 DLL codecs support on i386, mostly superseded by ffmpeg
+# =============================================================
 
 .if ${ARCH} == "i386"
 CONFIGURE_ARGS+=	--codecsdir=${LOCALBASE}/lib/win32