svn commit: r393396 - in head/multimedia: mencoder mplayer
Thomas Zander
riggs at FreeBSD.org
Sat Aug 1 17:16:41 UTC 2015
Author: riggs
Date: Sat Aug 1 17:16:39 2015
New Revision: 393396
URL: https://svnweb.freebsd.org/changeset/ports/393396
Log:
- Retire WIN32 OPTION for win32 binary codecs support on i386, instead
- 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 at zxy.spb.ru> via personal mail
Modified:
head/multimedia/mencoder/Makefile
head/multimedia/mplayer/Makefile
head/multimedia/mplayer/Makefile.options
Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile Sat Aug 1 10:19:24 2015 (r393395)
+++ head/multimedia/mencoder/Makefile Sat Aug 1 17:16:39 2015 (r393396)
@@ -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 CDI
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
Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile Sat Aug 1 10:19:24 2015 (r393395)
+++ head/multimedia/mplayer/Makefile Sat Aug 1 17:16:39 2015 (r393396)
@@ -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 BLUR
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
Modified: head/multimedia/mplayer/Makefile.options
==============================================================================
--- head/multimedia/mplayer/Makefile.options Sat Aug 1 10:19:24 2015 (r393395)
+++ head/multimedia/mplayer/Makefile.options Sat Aug 1 17:16:39 2015 (r393396)
@@ -134,21 +134,15 @@ CFLAGS+= -O3 -fomit-frame-pointer -ffast
.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
# ===================================
More information about the svn-ports-head
mailing list