mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-05 06:27:37 +00:00
Code Issues Releases Activity

- Retire WIN32 OPTION for win32 binary codecs support on i386, instead

Browse Source 
- always compile in the loader code for win32 dlls on i386:
  i386 users can install multimedia/win32-codecs and just use them
  with mplayer/mencoder without compile-time knobs
- Bump PORTREVISION

Reported by:	Slawa Olhovchenkov <slw@zxy.spb.ru> via personal mail
This commit is contained in:
Thomas Zander 2015-08-01 17:16:39 +00:00
parent f0904698b6
commit 95f10edd34
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=393396
3 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
multimedia/mencoder/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}
PORTREVISION= 1
PORTREVISION= 2
COMMENT= Convenient video file and movie encoder
@ -13,16 +13,15 @@ OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO DEBUG DV FAAC FONTCONFIG \
FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \
MAD NAS OCFLAGS OPENAL OPENJPEG OPUS PULSEAUDIO REAL \
RTCPU RTMP SCHROEDINGER SMB THEORA TWOLAME V4L VPX \
WIN32 X264 XVID
X264 XVID
OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS RTCPU WIN32 X264 XVID
OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS RTCPU X264 XVID
BLURAY_DESC?= BluRay support
LZO_DESC?= Enable external liblzo library
OCFLAGS_DESC?= Use optimized compiler flags
REAL_DESC?= Enable realplayer plugin
RTCPU_DESC?= Use runtime CPU detection on supported archs
WIN32_DESC?= Install win32 binary codecs
RESTRICTED= Port has restricted dependencies

7
multimedia/mplayer/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
PORTREVISION= 3
PORTREVISION= 4
COMMENT= High performance media player supporting many formats
@ -14,10 +14,10 @@ OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV \
LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \
OPENJPEG OPUS PULSEAUDIO REAL RTC RTCPU RTMP \
SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \
WIN32 X11 X11DGA X11VM XINERAMA XVIDEO XVMC
X11 X11DGA X11VM XINERAMA XVIDEO XVMC
OPTIONS_DEFAULT=FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL RTCPU \
SKINS WIN32 X11 X11DGA X11VM XINERAMA XVIDEO
SKINS X11 X11DGA X11VM XINERAMA XVIDEO
BLURAY_DESC?= BluRay support
ENCA_DESC?= Charset conversion via enca
@ -27,7 +27,6 @@ REAL_DESC?= Enable realplayer plugin
RTC_DESC?= Add support for kernel real time clock
RTCPU_DESC?= Use runtime CPU detection on supported archs
SKINS_DESC?= Install skins for GUI
WIN32_DESC?= Install win32 binary codecs
X11DGA_DESC?= X11 DGA video driver support
X11VM_DESC?= X11 VidMode support

10
multimedia/mplayer/Makefile.options
View File

@ -134,21 +134,15 @@ CFLAGS+= -O3 -fomit-frame-pointer -ffast-math
.endif #OCFLAGS
.endif #DEBUG
# Edge case: binary codecs on i386, mostly superseded by internal ffmpeg
# Win32 DLL codecs support on i386, mostly superseded by internal ffmpeg
# ======================================================================
.if ${ARCH} == "i386" || ${ARCH} == "amd64"
.if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
.if ${ARCH} == "i386"
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
CONFIGURE_ARGS+= --disable-win32dll \
--disable-qtx
.endif
.endif # ARCH == i386/amd64
# Additional extra libraries handling
# ===================================