diff options
| author | riggs <riggs@FreeBSD.org> | 2015-08-02 01:16:39 +0800 |
|---|---|---|
| committer | riggs <riggs@FreeBSD.org> | 2015-08-02 01:16:39 +0800 |
| commit | de52330d7e8f9bab91033b653d684b70de85a2bf (patch) | |
| tree | 72ba60a232b0dfc471004b85062e978009cf18d8 /multimedia/mplayer | |
| parent | 869a5405f4b1169a0432dca2362e17414877613e (diff) | |
| download | freebsd-ports-gnome-de52330d7e8f9bab91033b653d684b70de85a2bf.tar.gz freebsd-ports-gnome-de52330d7e8f9bab91033b653d684b70de85a2bf.tar.zst freebsd-ports-gnome-de52330d7e8f9bab91033b653d684b70de85a2bf.zip | |
- 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@zxy.spb.ru> via personal mail
Diffstat (limited to 'multimedia/mplayer')
| -rw-r--r-- | multimedia/mplayer/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/mplayer/Makefile.options | 10 |
2 files changed, 5 insertions, 12 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index 85d1c13f6e7b..ff77c440adf3 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -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 diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options index 5a8b381f0b0c..5c0887566551 100644 --- a/multimedia/mplayer/Makefile.options +++ b/multimedia/mplayer/Makefile.options @@ -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 # =================================== |