Date: Sun, 1 Jan 2017 18:55:22 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430272 - in head/multimedia: mencoder mplayer Message-ID: <201701011855.v01ItM50039261@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Jan 1 18:55:22 2017 New Revision: 430272 URL: https://svnweb.freebsd.org/changeset/ports/430272 Log: 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 Modified: head/multimedia/mencoder/Makefile head/multimedia/mplayer/Makefile head/multimedia/mplayer/Makefile.common head/multimedia/mplayer/Makefile.options Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Sun Jan 1 18:48:22 2017 (r430271) +++ head/multimedia/mencoder/Makefile Sun Jan 1 18:55:22 2017 (r430272) @@ -12,11 +12,11 @@ COMMENT= Convenient video file and movie 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 Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Sun Jan 1 18:48:22 2017 (r430271) +++ head/multimedia/mplayer/Makefile Sun Jan 1 18:55:22 2017 (r430272) @@ -12,12 +12,12 @@ COMMENT= High performance media player s 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 su 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 Modified: head/multimedia/mplayer/Makefile.common ============================================================================== --- head/multimedia/mplayer/Makefile.common Sun Jan 1 18:48:22 2017 (r430271) +++ head/multimedia/mplayer/Makefile.common Sun Jan 1 18:55:22 2017 (r430272) @@ -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 Modified: head/multimedia/mplayer/Makefile.options ============================================================================== --- head/multimedia/mplayer/Makefile.options Sun Jan 1 18:48:22 2017 (r430271) +++ head/multimedia/mplayer/Makefile.options Sun Jan 1 18:55:22 2017 (r430272) @@ -53,26 +53,18 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701011855.v01ItM50039261>