sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-01 19:06:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Simplify handling of CFLAGS, retire OCFLAGS OPTION

Browse source 
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
This commit is contained in:
Thomas Zander 2017-01-01 18:55:22 +00:00
parent 4c65b332af
commit 90286075f1
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=430272
4 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
multimedia/mencoder/Makefile
View file

@ -12,11 +12,11 @@ COMMENT= Convenient video file and movie encoder
OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \ OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \
FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \ 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 \ RTMP SCHROEDINGER SMB SPEEX THEORA TWOLAME V4L VPX \
X264 XVID 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_i386= RTCPU
OPTIONS_DEFINE_amd64= RTCPU OPTIONS_DEFINE_amd64= RTCPU
@ -29,7 +29,6 @@ OPTIONS_DEFAULT_powerpc=RTCPU
BLURAY_DESC?= BluRay support BLURAY_DESC?= BluRay support
DVDNAV_DESC?= DVD navigation features support DVDNAV_DESC?= DVD navigation features support
LZO_DESC?= Enable external liblzo library LZO_DESC?= Enable external liblzo library
OCFLAGS_DESC?= Use optimized compiler flags
RTCPU_DESC?= Use runtime CPU detection RTCPU_DESC?= Use runtime CPU detection
RESTRICTED= Port has restricted dependencies RESTRICTED= Port has restricted dependencies

5
multimedia/mplayer/Makefile
View file

@ -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 \ OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV DVDNAV \
ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \ 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 \ OPENJPEG OPUS PULSEAUDIO RTC RTMP \
SCHROEDINGER SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \ SCHROEDINGER SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \
X11 X11DGA X11VM XINERAMA XVIDEO XVMC 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 SKINS X11 X11DGA X11VM XINERAMA XVIDEO
OPTIONS_DEFINE_i386= RTCPU OPTIONS_DEFINE_i386= RTCPU
@ -32,7 +32,6 @@ DVDNAV_DESC?= DVD navigation features support
BLURAY_DESC?= BluRay support BLURAY_DESC?= BluRay support
ENCA_DESC?= Charset conversion via enca ENCA_DESC?= Charset conversion via enca
LZO_DESC?= External liblzo support LZO_DESC?= External liblzo support
OCFLAGS_DESC?= ${OPTIMIZED_CFLAGS_DESC}
RTC_DESC?= Add support for kernel real time clock RTC_DESC?= Add support for kernel real time clock
RTCPU_DESC?= Use runtime CPU detection RTCPU_DESC?= Use runtime CPU detection
SKINS_DESC?= Install skins for GUI SKINS_DESC?= Install skins for GUI

5
multimedia/mplayer/Makefile.common
View file

@ -6,7 +6,7 @@
MPLAYER_PORT_VERSION= 1.3.0 MPLAYER_PORT_VERSION= 1.3.0
MPLAYER_SNAPSHOT_DATE= 2016-12-28 MPLAYER_SNAPSHOT_DATE= 2016-12-28
PORTREVISION?= 0 PORTREVISION?= 1
MASTER_SITES= LOCAL/riggs/mplayer MASTER_SITES= LOCAL/riggs/mplayer
DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
@ -48,7 +48,8 @@ CONFIGURE_ARGS= --cc="${CC}" \
--disable-libmpeg2 \ --disable-libmpeg2 \
--disable-nemesi \ --disable-nemesi \
--disable-real \ --disable-real \
--enable-ass-internal --enable-ass-internal \
--yasm=''
WANT_GNOME= yes WANT_GNOME= yes

18
multimedia/mplayer/Makefile.options
View file

@ -53,26 +53,18 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang-version
CFLAGS_i386+= -mstack-alignment=16 -mstackrealign CFLAGS_i386+= -mstack-alignment=16 -mstackrealign
.endif # ${CHOSEN_COMPILER_TYPE} == clang .endif # ${CHOSEN_COMPILER_TYPE} == clang
.if ${ARCH} == "amd64" || ${ARCH} == "i386"
BUILD_DEPENDS+= ${LOCALBASE}/bin/yasm:devel/yasm
.endif
CFLAGS_armv6+= -no-integrated-as CFLAGS_armv6+= -no-integrated-as
# Extra build options for debugging and optimised CFLAGS # Extra build options for debugging
# ====================================================== # =================================
.if ${PORT_OPTIONS:MDEBUG} .if ${PORT_OPTIONS:MDEBUG}
WITH_DEBUG= yes WITH_DEBUG= yes
CONFIGURE_ARGS+= --enable-debug=3 CONFIGURE_ARGS+= --enable-debug=3
.else .endif
.if ${PORT_OPTIONS:MOCFLAGS}
CFLAGS+= -O3 -fomit-frame-pointer -ffast-math
.endif #OCFLAGS
.endif #DEBUG
# Win32 DLL codecs support on i386, mostly superseded by internal ffmpeg # Win32 DLL codecs support on i386, mostly superseded by ffmpeg
# ====================================================================== # =============================================================
.if ${ARCH} == "i386" .if ${ARCH} == "i386"
CONFIGURE_ARGS+= --codecsdir=${LOCALBASE}/lib/win32 CONFIGURE_ARGS+= --codecsdir=${LOCALBASE}/lib/win32