Attachment #138445 for bug #184407

View | Details | Raw Unified | Return to bug 184407
Collapse All | Expand All

Line 0 Link Here

(-)b/TODO.txt (+2 lines)
	1	Check dependencies again, also e-mail reports
	2	Build on 386, different compilers, cflags etc.





PORTNAME=	mencoder
PORTVERSION=	${MPLAYER_PORT_VERSION}
PORTREVISION=	0

COMMENT=	Convenient video file and movie encoder

NO_STAGE=	yes
.include "${.CURDIR}/../mplayer/Makefile.shared"

OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \
		DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK \
		LADSPA LIBMNG LIVEMEDIA LZO MAD NAS OCFLAGS \
		OPENAL OPENJPEG OPUS \
		OTCHAIN PULSEAUDIO REAL RTCPU RTMP SCHROEDINGER SMB \
		THEORA TWOLAME V4L VPX WIN32 X264 XVID


BLURAY_DESC?=	BluRay support
LZO_DESC?=	Enable external liblzo library
OCFLAGS_DESC?=	Use optimized compiler flags
OPUS_DESC?=	Opus decoding with libopus
OTCHAIN_DESC?=	Use gcc 4.6+ toolchain on legacy systems
REAL_DESC?=	Enable realplayer plugin
RTCPU_DESC?=	Use runtime CPU detection
WIN32_DESC?=	Install win32 binary codecs

MAN1=		mencoder.1

RESTRICTED=	Port has restricted dependencies

PATCHDIR=	${.CURDIR}/../mplayer/files

		subedit.pl subsearch.sh vobshift.py \
		w32codec_dl.pl wma2ogg.pl

.include "${.CURDIR}/../mplayer/Makefile.optvars"
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>

LIB_DEPENDS+=	mp3lame:${PORTSDIR}/audio/lame

CONFIGURE_ARGS+=	--disable-mplayer \
			--disable-libdca \
			--disable-x11 \

			--disable-enca \
			--disable-musepack

LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame

ALL_TARGET=	mencoder

.include "${.CURDIR}/../mplayer/Makefile.options"

.if ${PORT_OPTIONS:MFONTCONFIG}
LIB_DEPENDS+=		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
.else
CONFIGURE_ARGS+=	--disable-fontconfig
.endif

.if ${PORT_OPTIONS:MTWOLAME}
LIB_DEPENDS+=		twolame:${PORTSDIR}/audio/twolame
.else
CONFIGURE_ARGS+=	--disable-twolame
.endif

.if ${PORT_OPTIONS:MFAAC}
LIB_DEPENDS+=		faac:${PORTSDIR}/audio/faac
.else
CONFIGURE_ARGS+=	--disable-faac
.endif

.if ${PORT_OPTIONS:MX264}
LIB_DEPENDS+=		x264:${PORTSDIR}/multimedia/x264
.else
CONFIGURE_ARGS+=	--disable-x264
.endif

.if ${PORT_OPTIONS:MXVID}
LIB_DEPENDS+=		xvidcore:${PORTSDIR}/multimedia/xvid
.else
CONFIGURE_ARGS+=	--disable-xvid
.endif

.if ${PORT_OPTIONS:MDIRAC}
LIB_DEPENDS+=		dirac_encoder:${PORTSDIR}/multimedia/dirac
.else
CONFIGURE_ARGS+=	--disable-libdirac-lavc
.endif

pre-everything::
	@${ECHO_MSG} "N - O - T - E"
	@${ECHO_MSG} ""

		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'

do-install:
	@${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin

post-install:
	@${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/mencoder.1
	@${MKDIR} ${STAGEDIR}${DATADIR}
	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
	@${MKDIR} ${STAGEDIR}${DATADIR}/tools
	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/tools
.for tool in ${TOOLFILES}
	@${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${STAGEDIR}${DATADIR}/tools
.endfor

.if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
BROKEN=		Does not detect CPU correctly on ia64 or sparc64
.endif

.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)b/mencoder/distinfo (-2 / +2 lines)
1	SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258	1	SHA256 (mplayer-1.1.20131109.tar.xz) = 5647919b61f01396af20273419d5fc74f8b3523177c40e7d1ca063ad45eb13eb
2	SIZE (mplayer-1.1.20130308.tar.xz) = 10326840	2	SIZE (mplayer-1.1.20131109.tar.xz) = 10738036

Lines 1-4 Link Here

(-)b/mencoder/pkg-plist (+1 lines)
1	bin/mencoder	1	bin/mencoder
		2	man/man1/mencoder.1.gz
2	%%DATADIR%%/tools/aconvert.sh	3	%%DATADIR%%/tools/aconvert.sh
3	%%DATADIR%%/tools/binary_codecs.sh	4	%%DATADIR%%/tools/binary_codecs.sh
4	%%DATADIR%%/tools/calcbpp.pl	5	%%DATADIR%%/tools/calcbpp.pl





COMMENT=	High performance media player supporting many formats

NO_STAGE=	yes
.include "${.CURDIR}/Makefile.shared"

OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \
		ENCA ESOUND FRIBIDI GIF GSM GUI IPV6 JACK \
		LADSPA LIBMNG LIRC LZO NAS OCFLAGS \
		OPENAL OPENGL OPENJPEG OPUS OTCHAIN \
		PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \
		SKINS SMB SVGALIB V4L VDPAU WIN32 \
		X11 X11DGA X11VM XINERAMA XVIDEO XVMC


BLURAY_DESC?=	BluRay support
ENCA_DESC?=	Charset conversion via enca
JOYSTICK_DESC?=	Joystick support
LZO_DESC?=	External liblzo support
OCFLAGS_DESC?=	Use optimized compiler flags
OPUS_DESC?=	Opus decoding with libopus
OTCHAIN_DESC?=	Use gcc 4.6+ toolchain on legacy systems
REAL_DESC?=	Enable realplayer plugin
RTC_DESC?=	Add support for kernel real time clock

X11DGA_DESC?=	X11 DGA video driver support
X11VM_DESC?=	X11 VidMode support

#MANCOMPRESSED=	no
MANCOMPRESSED=	no

SUB_FILES=	pkg-message

CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
USES+=		pkgconfig

.include "${.CURDIR}/Makefile.optvars"
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>

.if ${ARCH} == "sparc64"
BROKEN=		Does not compile on sparc64
.endif

CONFIGURE_ARGS+=	--disable-arts \
			--disable-directfb \
			--disable-faac \
			--disable-faad \
			--disable-libdca \
			--disable-toolame \
			--disable-twolame \

			--disable-musepack \
			--disable-theora

# Fix a problem with unknown assembly opcodes in embedded ffmpeg
.if ${ARCH} == "ppc"
CONFIGURE_ARGS+=	--disable-asm
.endif

.include "${.CURDIR}/Makefile.options"

.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
MLINKS+=	mplayer.1 gmplayer.1
PLIST_SUB+=	GMPLAYER=""
DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
.if ${PORT_OPTIONS:MSKINS}

.endif #GUI && X11

.if ${PORT_OPTIONS:MX11}
USE_XORG=	x11 xscrnsaver
.if ${PORT_OPTIONS:MXVIDEO}
USE_XORG+=	xv
.else

		--disable-fontconfig
.endif

.if ${PORT_OPTIONS:MVDPAU}
LIB_DEPENDS+=	vdpau:${PORTSDIR}/multimedia/libvdpau
.else
CONFIGURE_ARGS+=	--disable-vdpau
.endif

.if ${PORT_OPTIONS:MRTC}
BUILD_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
RUN_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
CONFIGURE_ARGS+=	--enable-rtc
.else
CONFIGURE_ARGS+=	--disable-rtc
.endif

.if ${PORT_OPTIONS:MCACA}
LIB_DEPENDS+=		caca:${PORTSDIR}/graphics/libcaca
.else
CONFIGURE_ARGS+=	--disable-caca
.endif

.if ${PORT_OPTIONS:MLIRC}
LIB_DEPENDS+=		lirc_client:${PORTSDIR}/comms/lirc
.else
CONFIGURE_ARGS+=	--disable-lirc
.endif

.if ${PORT_OPTIONS:MSDL}
USE_SDL=	sdl
.else
CONFIGURE_ARGS+=	--disable-sdl
.endif

.if ${PORT_OPTIONS:MSVGALIB}
LIB_DEPENDS+=		vga:${PORTSDIR}/graphics/svgalib
.else
CONFIGURE_ARGS+=	--disable-svga
.endif

.if ${PORT_OPTIONS:MAALIB} || ${PORT_OPTIONS:MSDL}
LIB_DEPENDS+=		aa:${PORTSDIR}/graphics/aalib
.else
CONFIGURE_ARGS+=	--disable-aa
.endif

.if ${PORT_OPTIONS:MESOUND}
USE_GNOME+=	esound
.else
CONFIGURE_ARGS+=	--disable-esd
.endif

.if defined(WITH_KERN_HZ)
DEFAULT_KERN_HZ=${WITH_KERN_HZ}
.else
DEFAULT_KERN_HZ=1024
.endif

.if ${PORT_OPTIONS:MJOYSTICK}
BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
CONFIGURE_ARGS+=--enable-joystick
.else
CONFIGURE_ARGS+=--disable-joystick
.endif

.if ${PORT_OPTIONS:MENCA}
LIB_DEPENDS+=		enca:${PORTSDIR}/converters/enca
.else
CONFIGURE_ARGS+=	--disable-enca
.endif

pre-everything::
	@${ECHO_MSG} "N - O - T - E"
	@${ECHO_MSG} ""

.endif

post-install:
	@${MKDIR} ${STAGEDIR}${DATADIR}
	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
	@${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc
	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc
.for conf in ${CONFFILES}
	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc
.endfor
.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
	@${LN} -sf ${PREFIX}/bin/mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer
	@(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${LOCALBASE}/share/pixmaps/mplayer.png
.endif
	@${CAT} ${PKGMESSAGE}





# Contains non-trivial handling of option variables
# and build environment. Must be included after
# bsd.port.pre.mk
#
# Some of the knobs are not tunable by the OPTIONS framework. These are
# explained here in detail.

# Enables language support bg, cz, de, dk, en, es, fr, gr, hu, it, ko, nl, no, pl, pt_BR, ro, ru, sk, tr, uk, zh
#

# Non-OPTIONS knob handling
# =========================
.endif

.if defined(WITH_LANG)
CONFIGURE_ARGS+=--language=${WITH_LANG}
.endif

.if defined(WITH_DVD_DEVICE)
DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
.else
DEFAULT_DVD_DEVICE=/dev/cd0
.endif

.if defined(WITH_CDROM_DEVICE)
DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
.else
DEFAULT_CDROM_DEVICE=/dev/cd0
.endif

.if defined(WITH_KERN_HZ)
DEFAULT_KERN_HZ=${WITH_KERN_HZ}
.else
DEFAULT_KERN_HZ=1024
.endif


# Non-simplified OPTIONS handling
# ===============================

.if ${PORT_OPTIONS:MESOUND}
USE_GNOME+=	esound
.else
CONFIGURE_ARGS+=	--disable-esd
.endif

.if ${PORT_OPTIONS:MIPV6}
CATEGORIES+=	ipv6
.else
CONFIGURE_ARGS+=	--disable-inet6
.endif

.if ${PORT_OPTIONS:MOPENAL}
USE_OPENAL=	soft
.else
CONFIGURE_ARGS+=	--disable-openal
.endif

.if ${PORT_OPTIONS:MRTMP}
LIB_DEPENDS+=		librtmp.so:${PORTSDIR}/multimedia/librtmp
CONFIGURE_ARGS+=	--enable-librtmp
EXTRA_LIBS+=		-lrtmp
.else
CONFIGURE_ARGS+=	--disable-librtmp
.endif

.if ${PORT_OPTIONS:MSDL}
USE_SDL=	sdl
LIB_DEPENDS+=		libaa.so:${PORTSDIR}/graphics/aalib
.else
CONFIGURE_ARGS+=	--disable-sdl
.endif

.if ${PORT_OPTIONS:MV4L}
BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS+=		libv4l2.so:${PORTSDIR}/multimedia/libv4l
CONFIGURE_ARGS+=	--enable-tv-v4l1 \
			--enable-tv-v4l2
EXTRA_LIBS+=		-lv4l1 -lv4l2
.else
CONFIGURE_ARGS+=	--disable-tv-v4l1 \
			--disable-tv-v4l2
.endif


# Build system handling (including OPTIONS)
# =========================================

.if ${OSVERSION} < 802502
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-base_system_log2f
.endif

#On i386, gcc runs out of general purpose registers when
#trying to compile a debug version with the default flags.
.if ${PORT_OPTIONS:MDEBUG}

.endif #OCFLAGS
.endif #DEBUG

# Supported architectures for clang
.if ${ARCH} == "amd64" || ${ARCH} == "i386"
MPLAYER_CLANG_SUPPORTED_ARCH=	yes
.endif

# Unsupported architectures for inline assembly
.if ${ARCH} == "ppc"
CONFIGURE_ARGS+=	--disable-asm
.endif

# Unsupported architectures
.if ${ARCH} == "sparc64"
BROKEN=		Does not compile on sparc64
.endif
.if ${ARCH} == "ia64"
BROKEN=		Does not detect CPU correctly on ia64
.endif


.if ${PORT_OPTIONS:MRTCPU}
CONFIGURE_ARGS+=--enable-runtime-cpudetection
.endif

.endif
.endif

.if ${PORT_OPTIONS:MIPV6}
CATEGORIES+=	ipv6
.else
CONFIGURE_ARGS+=	--disable-inet6
.endif

.if ${PORT_OPTIONS:MGIF}
LIB_DEPENDS+=		gif:${PORTSDIR}/graphics/giflib
.else
CONFIGURE_ARGS+=	--disable-gif
.endif

.if ${PORT_OPTIONS:MOPENJPEG}
LIB_DEPENDS+=		openjpeg:${PORTSDIR}/graphics/openjpeg
.else
CONFIGURE_ARGS+=	--disable-libopenjpeg
.endif

.if ${PORT_OPTIONS:MMAD}
LIB_DEPENDS+=		mad:${PORTSDIR}/audio/libmad
.else
CONFIGURE_ARGS+=	--disable-mad
.endif

.if ${PORT_OPTIONS:MDV}
LIB_DEPENDS+=		dv:${PORTSDIR}/multimedia/libdv
.else
CONFIGURE_ARGS+=	--disable-libdv
.endif

.if ${PORT_OPTIONS:MTHEORA}
LIB_DEPENDS+=		theora:${PORTSDIR}/multimedia/libtheora
.else
CONFIGURE_ARGS+=	--disable-theora
.endif

.if ${PORT_OPTIONS:MVPX}
LIB_DEPENDS+=		vpx:${PORTSDIR}/multimedia/libvpx
.else
CONFIGURE_ARGS+=	--disable-libvpx-lavc
.endif

.if ${PORT_OPTIONS:MSCHROEDINGER}
LIB_DEPENDS+=		schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
.else
CONFIGURE_ARGS+=	--disable-libschroedinger-lavc
.endif

.if ${PORT_OPTIONS:MLIVEMEDIA}
CONFIGURE_ARGS+=	--enable-live
BUILD_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
CFLAGS+=		-I${LOCALBASE}/live/liveMedia/include \
			-I${LOCALBASE}/live/BasicUsageEnvironment/include \
			-I${LOCALBASE}/live/UsageEnvironment/include \
			-I${LOCALBASE}/live/groupsock/include
LDFLAGS+=		-L${LOCALBASE}/live/liveMedia \
			-L${LOCALBASE}/live/BasicUsageEnvironment \
			-L${LOCALBASE}/live/UsageEnvironment \
			-L${LOCALBASE}/live/groupsock \
			-lliveMedia \
			-lUsageEnvironment \
			-lBasicUsageEnvironment \
			-lgroupsock \
			-lstdc++
.else
CONFIGURE_ARGS+=	--disable-live
.endif

.if ${PORT_OPTIONS:MJACK}
LIB_DEPENDS+=		jack:${PORTSDIR}/audio/jack
.else
CONFIGURE_ARGS+=	--disable-jack
.endif

.if ${PORT_OPTIONS:MNAS}
LIB_DEPENDS+=		audio:${PORTSDIR}/audio/nas
.else
CONFIGURE_ARGS+=	--disable-nas
.endif

.if ${PORT_OPTIONS:MOPENAL}
USE_OPENAL=	soft
.else
CONFIGURE_ARGS+=	--disable-openal
.endif

.if ${PORT_OPTIONS:MPULSEAUDIO}
LIB_DEPENDS+=		pulse:${PORTSDIR}/audio/pulseaudio
.else
CONFIGURE_ARGS+=	--disable-pulse
.endif

.if ${PORT_OPTIONS:MBLURAY}
LIB_DEPENDS+=		bluray:${PORTSDIR}/multimedia/libbluray
.else
CONFIGURE_ARGS+=	--disable-bluray
.endif

.if ${PORT_OPTIONS:MSMB}
LIB_DEPENDS+=		smbclient:${PORTSDIR}/net/samba-libsmbclient
.else
CONFIGURE_ARGS+=	--disable-smb
.endif

.if ${PORT_OPTIONS:MFRIBIDI}
LIB_DEPENDS+=		fribidi:${PORTSDIR}/converters/fribidi
.else
CONFIGURE_ARGS+=	--disable-fribidi
.endif

.if ${PORT_OPTIONS:MCDPARANOIA}
LIB_DEPENDS+=		cdda_paranoia:${PORTSDIR}/audio/cdparanoia
.else
CONFIGURE_ARGS+=	--disable-cdparanoia
.endif

.if ${PORT_OPTIONS:MCDIO}
LIB_DEPENDS+=		cdio:${PORTSDIR}/sysutils/libcdio
.else
CONFIGURE_ARGS+=	--disable-libcdio
.endif

.if ${PORT_OPTIONS:MLADSPA}
RUN_DEPENDS+=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
.else
CONFIGURE_ARGS+=	--disable-ladspa
.endif

.if ${PORT_OPTIONS:MLZO}
LIB_DEPENDS+=		lzo2:${PORTSDIR}/archivers/lzo2
.else
CONFIGURE_ARGS+=	--disable-liblzo
.endif

.if defined(WITH_DVD_DEVICE)
DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
.else
DEFAULT_DVD_DEVICE=/dev/cd0
.endif

.if defined(WITH_CDROM_DEVICE)
DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
.else
DEFAULT_CDROM_DEVICE=/dev/cd0
.endif

.if ${ARCH} == "i386" || ${ARCH} == "amd64"
.if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}

.endif
.endif # ARCH == i386/amd64

.if ${PORT_OPTIONS:MREAL}
RUN_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
BUILD_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
.else
CONFIGURE_ARGS+=	--disable-real
.endif

.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB}
LIB_DEPENDS+=		opencore-amrnb:${PORTSDIR}/audio/opencore-amr
.endif

.if !${PORT_OPTIONS:MAMR_NB}
CONFIGURE_ARGS+=	--disable-libopencore_amrnb
.endif

.if !${PORT_OPTIONS:MAMR_WB}
CONFIGURE_ARGS+=	--disable-libopencore_amrwb
.endif

.if ${PORT_OPTIONS:MGSM}
LIB_DEPENDS+=		gsm:${PORTSDIR}/audio/gsm
.else
CONFIGURE_ARGS+=	--disable-libgsm
.endif

.if ${PORT_OPTIONS:MV4L}
BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS+=		v4l2.0:${PORTSDIR}/multimedia/libv4l
CONFIGURE_ARGS+=	--enable-tv-v4l1 \
			--enable-tv-v4l2
EXTRA_LIBS+=		-lv4l1 -lv4l2
.else
CONFIGURE_ARGS+=	--disable-tv-v4l1 \
			--disable-tv-v4l2
.endif

.if ${PORT_OPTIONS:MRTMP}
LIB_DEPENDS+=		rtmp:${PORTSDIR}/multimedia/rtmpdump
CONFIGURE_ARGS+=	--enable-librtmp
EXTRA_LIBS+=		-lrtmp
.else
CONFIGURE_ARGS+=	--disable-librtmp
.endif

.if ${PORT_OPTIONS:MLIBMNG}
LIB_DEPENDS+=		mng:${PORTSDIR}/graphics/libmng
.else
CONFIGURE_ARGS+=	--disable-mng
.endif

.if defined(EXTRA_LIBS)
CONFIGURE_ARGS+=	--extra-libs="${EXTRA_LIBS}"
.endif





# Contains simple option variables that are used
# before including bsd.port.options.mk
# in Makefiles

AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
AALIB_CONFIGURE_OFF=	--disable-aa

AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
AMR_NB_CONFIGURE_OFF=	--disable-libopencore_amrnb

AMR_WB_LIB_DEPENDS=	libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
AMR_WB_CONFIGURE_OFF=	--disable-libopencore_amrwb

BLURAY_LIB_DEPENDS=	libbluray.so:${PORTSDIR}/multimedia/libbluray
BLURAY_CONFIGURE_OFF=	--disable-bluray

CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
CACA_CONFIGURE_OFF=	--disable-caca

CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
CDIO_CONFIGURE_OFF=	--disable-libcdio

CDPARANOIA_LIB_DEPENDS=	libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
CDPARANOIA_CONFIGURE_OFF=	--disable-cdparanoia

DIRAC_LIB_DEPENDS=	libdirac_encoder.so:${PORTSDIR}/multimedia/dirac
DIRAC_CONFIGURE_OFF=	--disable-libdirac-lavc

DV_LIB_DEPENDS=		dv.so:${PORTSDIR}/multimedia/libdv
DV_CONFIGURE_OFF=	--disable-libdv

ENCA_LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca
ENCA_CONFIGURE_OFF=		--disable-enca

FAAC_LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac
FAAC_CONFIGURE_OFF=	--disable-faac

FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
FONTCONFIG_CONFIGURE_OFF=	--disable-fontconfig

FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
FRIBIDI_CONFIGURE_OFF=	--disable-fribidi

GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
GIF_CONFIGURE_OFF=	--disable-gif

GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
GSM_CONFIGURE_OFF=	--disable-libgsm

JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
JACK_CONFIGURE_OFF=	--disable-jack

LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
LADSPA_CONFIGURE_OFF=	--disable-ladspa

LIBMNG_LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng
LIBMNG_CONFIGURE_OFF=	--disable-mng

LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
LIRC_CONFIGURE_OFF=	--disable-lirc

LZO_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
LZO_CONFIGURE_OFF=	--disable-liblzo

NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
NAS_CONFIGURE_OFF=	--disable-nas

OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
OPENJPEG_CONFIGURE_OFF=	--disable-libopenjpeg

OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
OPUS_CONFIGURE_OFF=	--disable-libopus

PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse

REAL_RUN_DEPENDS=	realplay:${PORTSDIR}/multimedia/linux-realplayer
REAL_BUILD_DEPENDS=	realplay:${PORTSDIR}/multimedia/linux-realplayer
REAL_CONFIGURE_OFF=	--disable-real

RTC_BUILD_DEPENDS=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
RTC_RUN_DEPENDS=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
RTC_CONFIGURE_ENABLE=	rtc

SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
SCHROEDINGER_CONFIGURE_OFF=	--disable-libschroedinger-lavc

SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
SMB_CONFIGURE_OFF=	--disable-smb

SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
SVGALIB_CONFIGURE_OFF=	--disable-svga

THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
THEORA_CONFIGURE_OFF=	--disable-theora

TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
TWOLAME_CONFIGURE_OFF=	--disable-twolame

VDPAU_LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
VDPAU_CONFIGURE_OFF=	--disable-vdpau

VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
VPX_CONFIGURE_OFF=	--disable-libvpx-lavc

X264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/x264
X264_CONFIGURE_OFF=	--disable-x264

XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
XVID_CONFIGURE_OFF=	--disable-xvid




#
# $FreeBSD: head/multimedia/mplayer/Makefile.shared 327683 2013-09-20 10:54:22Z ak $

MPLAYER_SNAPSHOT_DATE=	2013-11-09
MPLAYER_PORT_VERSION=	1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
CATEGORIES?=	multimedia audio
MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}


LICENSE=	GPLv2

LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
		libfreetype.so:${PORTSDIR}/print/freetype2

BUILD_DEPENDS=	${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm

USES=		gmake iconv ncurses
USE_XZ=		yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
		PTHREAD_LIBS="${PTHREAD_LIBS}" \

		--as="${AS}" \
		--extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \
		--extra-libs="-L${PREFIX}/lib" \
		--disable-alsa \
		--disable-bitmap-font \
		--disable-crystalhd \
		--disable-faad \
		--disable-liba52 \
		--disable-alsa \
		--disable-libbs2b \
		--disable-libilbc \
		--disable-libnut \
		--disable-libvorbis \
		--disable-live \
		--disable-joystick \
		--disable-mad \
		--disable-mp3lib \
		--disable-nemesi \
		--disable-libvorbis \
		--disable-speex \
		--enable-ass-internal
		--disable-libilbc

WANT_GNOME=	yes
WANT_SDL=	yes

Lines 1-2 Link Here

(-)b/mplayer/distinfo (-2 / +2 lines)
1	SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258	1	SHA256 (mplayer-1.1.20131109.tar.xz) = 5647919b61f01396af20273419d5fc74f8b3523177c40e7d1ca063ad45eb13eb
2	SIZE (mplayer-1.1.20130308.tar.xz) = 10326840	2	SIZE (mplayer-1.1.20131109.tar.xz) = 10738036




--- configure.orig	2013-11-08 17:59:55.000000000 +0100
+++ configure	2013-11-09 14:34:53.996868923 +0100
@@ -640,7 +640,7 @@
 _iwmmxt=auto
 _mtrr=auto
 _altivec=auto

 _ranlib=ranlib
 _windres=windres
 _cc=cc
@@ -1452,7 +1452,6 @@
 
   *)
     echo "Unknown parameter: $ac_option"

     ;;
 
   esac
@@ -1689,7 +1688,7 @@
   case "$1" in
       x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
       ia64) host_arch=ia64 ;;
-      macppc|ppc*|Power*) host_arch=ppc ;;

       alpha) host_arch=alpha ;;
       sun4*|sparc*) host_arch=sparc ;;
       parisc*|hppa*|9000*) host_arch=hppa ;;
@@ -3822,7 +3821,7 @@
 fi
 
 extra_cflags="-I. -Iffmpeg $extra_cflags"
+extra_ldflags="$extra_ldflags -L$_prefix/lib"
 _timer=timer-linux.c
 _getch=getch2.c
 
@@ -3765,7 +3765,7 @@
 if linux ; then
   THREAD_CFLAGS=-D_REENTRANT
 elif freebsd || netbsd || openbsd || bsdos ; then

 fi
 if test "$_pthreads" = auto ; then
 cat > $TMPC << EOF
@@ -3832,7 +3831,7 @@
 EOF
 _pthreads=no
 if ! hpux ; then

     # for crosscompilation, we cannot execute the program, be happy if we can link statically
     cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
   done
@@ -3979,7 +3978,7 @@
   # NOTE: -L/usr/lib is a hack to avoid issues due to a
   # broken libiconv that e.g. macports installs into /opt/local/lib
   # which might get addded to the search path later by e.g. SDL
-  for ld_tmp in "" "-L/usr/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
+  for ld_tmp in "" "-L$_prefix/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
     cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
       ld_iconv="$ld_tmp" && _iconv=yes && break
   done
@@ -5903,7 +5902,7 @@
 elif dragonfly ; then
   default_cdrom_device="/dev/cd0"
 elif freebsd ; then

 elif openbsd ; then
   default_cdrom_device="/dev/rcd0c"
 elif sunos ; then
@@ -5916,7 +5915,7 @@
   default_cdrom_device="/dev/cdrom"
 fi
 

   default_dvd_device=$default_cdrom_device
 elif darwin ; then
   default_dvd_device="/dev/rdiskN"
@@ -6514,7 +6513,7 @@
 echocheck "libgsm"
 if test "$_libgsm" = auto ; then
   _libgsm=no

 fi
 if test "$_libgsm" = yes ; then
   def_libgsm='#define CONFIG_LIBGSM 1'
@@ -6999,6 +6998,16 @@
   nolibrtmp=no
   def_librtmp='#define CONFIG_LIBRTMP 1'
   inputmodules="librtmp $inputmodules"

 else
   nolibrtmp=yes
   _librtmp=no
@@ -7391,7 +7400,7 @@
 echocheck "mencoder"
 if test "$_mencoder" = no ; then
   # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,

 fi
 echores "$_mencoder"
 
@@ -7729,8 +7738,11 @@
 if test "$_gui" = yes ; then
 
   # Required libraries

     die "The GUI requires libavcodec with PNG support (needs zlib)."
   fi
   test "$_freetype" = no && test "$_bitmap_font" = no &&
@@ -8318,7 +8330,7 @@
 EXESUF      = $_exesuf
 EXESUFS_ALL = .exe
 

Removed Link Here

(-)a/mplayer/files/patch-libavcodec-x86-ac3dsp_init.c (-11 lines)
1	--- ffmpeg/libavcodec/x86/ac3dsp_init.c 2013-07-03 21:34:20.000000000 +0200
2	+++ ffmpeg/libavcodec/x86/ac3dsp_init.c 2013-07-03 21:34:45.000000000 +0200
3	@@ -51,7 +51,7 @@
4	extern void ff_ac3_extract_exponents_sse2 (uint8_t exp, int32_t coef, int nb_coefs);
5	extern void ff_ac3_extract_exponents_ssse3(uint8_t exp, int32_t coef, int nb_coefs);
6
7	-#if ARCH_X86_32 && defined(__INTEL_COMPILER)
8	+#if ARCH_X86_32 && (defined(__INTEL_COMPILER) \|\| defined(__clang__))
9	# undef HAVE_7REGS
10	# define HAVE_7REGS 0
11	#endif

Added Link Here

(-)b/mplayer/files/patch-libavutil-x86-asm.h (+11 lines)
1	--- ffmpeg/libavutil/x86/asm.h.orig 2013-05-25 19:20:04.000000000 +0200
2	+++ ffmpeg/libavutil/x86/asm.h 2013-11-11 21:51:57.940269764 +0100
3	@@ -70,7 +70,7 @@
4	typedef int x86_reg;
5	#endif
6
7	-#define HAVE_7REGS (ARCH_X86_64 \|\| (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
8	+#define HAVE_7REGS (ARCH_X86_64)
9	#define HAVE_6REGS (ARCH_X86_64 \|\| (HAVE_EBX_AVAILABLE \|\| HAVE_EBP_AVAILABLE))
10
11	#if ARCH_X86_64 && defined(PIC)




--- libmpdemux/demux_gif.c.orig	2010-12-12 11:37:15.000000000 +0100
+++ libmpdemux/demux_gif.c	2012-06-06 16:58:52.000000000 +0200
@@ -45,6 +45,16 @@
 
 #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
 
+static void localPrintGifError(void)
+{
+  char *Err = GifErrorString();
+
+  if (Err != NULL)
+    fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
+  else
+    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
+}
+
 #ifndef CONFIG_GIF_TVT_HACK
 // not supported by certain versions of the library
 static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)
@@ -94,14 +104,14 @@
 
   while (type != IMAGE_DESC_RECORD_TYPE) {
     if (DGifGetRecordType(gif, &type) == GIF_ERROR) {
-      PrintGifError();
+      localPrintGifError();
       return 0; // oops
     }
     if (type == TERMINATE_RECORD_TYPE)
       return 0; // eof
     if (type == SCREEN_DESC_RECORD_TYPE) {
       if (DGifGetScreenDesc(gif) == GIF_ERROR) {
-        PrintGifError();
+        localPrintGifError();
         return 0; // oops
       }
     }
@@ -109,7 +119,7 @@
       int code;
       unsigned char *p = NULL;
       if (DGifGetExtension(gif, &code, &p) == GIF_ERROR) {
-        PrintGifError();
+        localPrintGifError();
         return 0; // oops
       }
       if (code == 0xF9) {
@@ -138,7 +148,7 @@
 	  comments[length] = 0;
 	  printf("%s", comments);
           if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
-            PrintGifError();
+            localPrintGifError();
             return 0; // oops
           }
 	}
@@ -146,7 +156,7 @@
       }
       while (p != NULL) {
         if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
-          PrintGifError();
+          localPrintGifError();
           return 0; // oops
         }
       }
@@ -154,7 +164,7 @@
   }
 
   if (DGifGetImageDesc(gif) == GIF_ERROR) {
-    PrintGifError();
+    localPrintGifError();
     return 0; // oops
   }
 
@@ -167,7 +177,7 @@
     memset(dp->buffer, gif->SBackGroundColor, priv->w * priv->h);
 
   if (DGifGetLine(gif, buf, len) == GIF_ERROR) {
-    PrintGifError();
+    localPrintGifError();
     free(buf);
     return 0; // oops
   }
@@ -260,7 +270,7 @@
   gif = DGifOpen(demuxer->stream, my_read_gif);
 #endif
   if (!gif) {
-    PrintGifError();
+    localPrintGifError();
     free(priv);
     return NULL;
   }
@@ -302,7 +312,7 @@
   gif_priv_t *priv = demuxer->priv;
   if (!priv) return;
   if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR)
-    PrintGifError();
+    localPrintGifError();
   free(priv->refimg);
   free(priv);
 }




--- stream/tvi_bsdbt848.c.orig	2013-03-16 11:15:07.000000000 +0100
+++ stream/tvi_bsdbt848.c	2013-11-09 13:47:43.804868208 +0100
@@ -366,11 +366,11 @@
         int req_mode = *(int *)arg;
 	u_short tmp_fps;
 

             priv->maxheight = PAL_HEIGHT;
             priv->maxwidth = PAL_WIDTH;
             priv->maxfps = PAL_FPS;
@@ -391,7 +391,7 @@
 
         if(req_mode == TV_NORM_NTSC)
             {

             priv->maxheight = NTSC_HEIGHT;
             priv->maxwidth = NTSC_WIDTH;
             priv->maxfps = NTSC_FPS;
@@ -415,9 +415,28 @@
                 }
             }
 

             {
             mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno));
             return TVI_CONTROL_FALSE;
@@ -546,8 +565,9 @@
 /* Video Configuration */
 
 priv->videoready = 1;
+priv->btdev = strdup("/dev/bktr0");
 priv->immediatemode = 0;
-priv->iformat = METEOR_FMT_PAL;
+priv->iformat = BT848_IFORM_F_PALBDGHI;
 priv->maxheight = PAL_HEIGHT;
 priv->maxwidth = PAL_WIDTH;
 priv->maxfps = PAL_FPS;
@@ -572,7 +592,7 @@
     }
 
 if(priv->videoready &&
-   ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
+   ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
     {

Lines 1-5 Link Here

(-)b/mplayer/pkg-plist (+2 lines)
1	bin/mplayer	1	bin/mplayer
		2	man/man1/mplayer.1.gz
2	%%GMPLAYER%%bin/gmplayer	3	%%GMPLAYER%%bin/gmplayer
		4	%%GMPLAYER%%man/man1/gmplayer.1.gz
3	%%GMPLAYER%%share/pixmaps/mplayer.png	5	%%GMPLAYER%%share/pixmaps/mplayer.png
4	%%DATADIR%%/examples/etc/example.conf	6	%%DATADIR%%/examples/etc/example.conf
5	%%DATADIR%%/examples/etc/input.conf	7	%%DATADIR%%/examples/etc/input.conf

Return to bug 184407

Lines 3-18 Link Here

(-)b/mencoder/Makefile (-55 / +16 lines)
3		3
4	PORTNAME= mencoder	4	PORTNAME= mencoder
5	PORTVERSION= ${MPLAYER_PORT_VERSION}	5	PORTVERSION= ${MPLAYER_PORT_VERSION}
6	PORTREVISION= 1	6	PORTREVISION= 0
7		7
8	COMMENT= Convenient video file and movie encoder	8	COMMENT= Convenient video file and movie encoder
9		9
10	NO_STAGE= yes
11	.include "${.CURDIR}/../mplayer/Makefile.shared"	10	.include "${.CURDIR}/../mplayer/Makefile.shared"
12		11
13	OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \	12	OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \
14	DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK LADSPA \	13	DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK \
15	LIBMNG LIVEMEDIA LZO MAD NAS OCFLAGS OPENAL OPENJPEG \	14	LADSPA LIBMNG LIVEMEDIA LZO MAD NAS OCFLAGS \
		15	OPENAL OPENJPEG OPUS \
16	OTCHAIN PULSEAUDIO REAL RTCPU RTMP SCHROEDINGER SMB \	16	OTCHAIN PULSEAUDIO REAL RTCPU RTMP SCHROEDINGER SMB \
17	THEORA TWOLAME V4L VPX WIN32 X264 XVID	17	THEORA TWOLAME V4L VPX WIN32 X264 XVID
18		18
Lines 21-33 Link Here
21	BLURAY_DESC?= BluRay support	21	BLURAY_DESC?= BluRay support
22	LZO_DESC?= Enable external liblzo library	22	LZO_DESC?= Enable external liblzo library
23	OCFLAGS_DESC?= Use optimized compiler flags	23	OCFLAGS_DESC?= Use optimized compiler flags
		24	OPUS_DESC?= Opus decoding with libopus
24	OTCHAIN_DESC?= Use gcc 4.6+ toolchain on legacy systems	25	OTCHAIN_DESC?= Use gcc 4.6+ toolchain on legacy systems
25	REAL_DESC?= Enable realplayer plugin	26	REAL_DESC?= Enable realplayer plugin
26	RTCPU_DESC?= Use runtime CPU detection	27	RTCPU_DESC?= Use runtime CPU detection
27	WIN32_DESC?= Install win32 binary codecs	28	WIN32_DESC?= Install win32 binary codecs
28		29
29	MAN1= mencoder.1
30
31	RESTRICTED= Port has restricted dependencies	30	RESTRICTED= Port has restricted dependencies
32		31
33	PATCHDIR= ${.CURDIR}/../mplayer/files	32	PATCHDIR= ${.CURDIR}/../mplayer/files
Lines 43-52 Link Here
43	subedit.pl subsearch.sh vobshift.py \	42	subedit.pl subsearch.sh vobshift.py \
44	w32codec_dl.pl wma2ogg.pl	43	w32codec_dl.pl wma2ogg.pl
45		44
		45	.include "${.CURDIR}/../mplayer/Makefile.optvars"
		46	.include <bsd.port.options.mk>
46	.include <bsd.port.pre.mk>	47	.include <bsd.port.pre.mk>
47		48
48	LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame
49
50	CONFIGURE_ARGS+= --disable-mplayer \	49	CONFIGURE_ARGS+= --disable-mplayer \
51	--disable-libdca \	50	--disable-libdca \
52	--disable-x11 \	51	--disable-x11 \
Lines 65-110 Link Here
65	--disable-enca \	64	--disable-enca \
66	--disable-musepack	65	--disable-musepack
67		66
		67	LIB_DEPENDS+= libmp3lame.so:${PORTSDIR}/audio/lame
		68
68	ALL_TARGET= mencoder	69	ALL_TARGET= mencoder
69		70
70	.include "${.CURDIR}/../mplayer/Makefile.options"	71	.include "${.CURDIR}/../mplayer/Makefile.options"
71		72
72	.if ${PORT_OPTIONS:MFONTCONFIG}
73	LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig
74	.else
75	CONFIGURE_ARGS+= --disable-fontconfig
76	.endif
77
78	.if ${PORT_OPTIONS:MTWOLAME}
79	LIB_DEPENDS+= twolame:${PORTSDIR}/audio/twolame
80	.else
81	CONFIGURE_ARGS+= --disable-twolame
82	.endif
83
84	.if ${PORT_OPTIONS:MFAAC}
85	LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac
86	.else
87	CONFIGURE_ARGS+= --disable-faac
88	.endif
89
90	.if ${PORT_OPTIONS:MX264}
91	LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264
92	.else
93	CONFIGURE_ARGS+= --disable-x264
94	.endif
95
96	.if ${PORT_OPTIONS:MXVID}
97	LIB_DEPENDS+= xvidcore:${PORTSDIR}/multimedia/xvid
98	.else
99	CONFIGURE_ARGS+= --disable-xvid
100	.endif
101
102	.if ${PORT_OPTIONS:MDIRAC}
103	LIB_DEPENDS+= dirac_encoder:${PORTSDIR}/multimedia/dirac
104	.else
105	CONFIGURE_ARGS+= --disable-libdirac-lavc
106	.endif
107
108	pre-everything::	73	pre-everything::
109	@${ECHO_MSG} "N - O - T - E"	74	@${ECHO_MSG} "N - O - T - E"
110	@${ECHO_MSG} ""	75	@${ECHO_MSG} ""
Lines 141-160 Link Here
141	s\|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])\|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}\|g'	106	s\|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])\|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}\|g'
142		107
143	do-install:	108	do-install:
144	@${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${PREFIX}/bin	109	@${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin
145		110
146	post-install:	111	post-install:
147	@${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${MAN1PREFIX}/man/man1/mencoder.1	112	@${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/mencoder.1
148	@${MKDIR} ${DATADIR}	113	@${MKDIR} ${STAGEDIR}${DATADIR}
149	@${CHMOD} 755 ${DATADIR}	114	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
150	@${MKDIR} ${DATADIR}/tools	115	@${MKDIR} ${STAGEDIR}${DATADIR}/tools
151	@${CHMOD} 755 ${DATADIR}/tools	116	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/tools
152	.for tool in ${TOOLFILES}	117	.for tool in ${TOOLFILES}
153	@${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${DATADIR}/tools	118	@${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${STAGEDIR}${DATADIR}/tools
154	.endfor	119	.endfor
155		120
156	.if ${ARCH} == "ia64" \|\| ${ARCH} == "sparc64"
157	BROKEN= Does not detect CPU correctly on ia64 or sparc64
158	.endif
159
160	.include <bsd.port.post.mk>	121	.include <bsd.port.post.mk>

Lines 7-19 Link Here

(-)b/mplayer/Makefile (-95 / +16 lines)
7		7
8	COMMENT= High performance media player supporting many formats	8	COMMENT= High performance media player supporting many formats
9		9
10	NO_STAGE= yes
11	.include "${.CURDIR}/Makefile.shared"	10	.include "${.CURDIR}/Makefile.shared"
12		11
13	OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \	12	OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \
14	ENCA ESOUND FRIBIDI GIF GSM GUI IPV6 JACK \	13	ENCA ESOUND FRIBIDI GIF GSM GUI IPV6 JACK \
15	JOYSTICK LADSPA LIBMNG LIRC LIVEMEDIA LZO MAD \	14	LADSPA LIBMNG LIRC LZO NAS OCFLAGS \
16	NAS OCFLAGS OPENAL OPENGL OPENJPEG OTCHAIN \	15	OPENAL OPENGL OPENJPEG OPUS OTCHAIN \
17	PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \	16	PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \
18	SKINS SMB SVGALIB V4L VDPAU WIN32 \	17	SKINS SMB SVGALIB V4L VDPAU WIN32 \
19	X11 X11DGA X11VM XINERAMA XVIDEO XVMC	18	X11 X11DGA X11VM XINERAMA XVIDEO XVMC
Lines 26-34 Link Here
26		25
27	BLURAY_DESC?= BluRay support	26	BLURAY_DESC?= BluRay support
28	ENCA_DESC?= Charset conversion via enca	27	ENCA_DESC?= Charset conversion via enca
29	JOYSTICK_DESC?= Joystick support
30	LZO_DESC?= External liblzo support	28	LZO_DESC?= External liblzo support
31	OCFLAGS_DESC?= Use optimized compiler flags	29	OCFLAGS_DESC?= Use optimized compiler flags
		30	OPUS_DESC?= Opus decoding with libopus
32	OTCHAIN_DESC?= Use gcc 4.6+ toolchain on legacy systems	31	OTCHAIN_DESC?= Use gcc 4.6+ toolchain on legacy systems
33	REAL_DESC?= Enable realplayer plugin	32	REAL_DESC?= Enable realplayer plugin
34	RTC_DESC?= Add support for kernel real time clock	33	RTC_DESC?= Add support for kernel real time clock
Lines 38-61 Link Here
38	X11DGA_DESC?= X11 DGA video driver support	37	X11DGA_DESC?= X11 DGA video driver support
39	X11VM_DESC?= X11 VidMode support	38	X11VM_DESC?= X11 VidMode support
40		39
41	MAN1= mplayer.1	40	#MANCOMPRESSED= no
42	MANCOMPRESSED= no
43		41
44	SUB_FILES= pkg-message	42	SUB_FILES= pkg-message
45		43
46	CONFFILES= example.conf input.conf menu.conf dvb-menu.conf	44	CONFFILES= example.conf input.conf menu.conf dvb-menu.conf
47	USES= pkgconfig	45	USES+= pkgconfig
48		46
		47	.include "${.CURDIR}/Makefile.optvars"
		48	.include <bsd.port.options.mk>
49	.include <bsd.port.pre.mk>	49	.include <bsd.port.pre.mk>
50		50
51	.if ${ARCH} == "sparc64"
52	BROKEN= Does not compile on sparc64
53	.endif
54
55	CONFIGURE_ARGS+= --disable-arts \	51	CONFIGURE_ARGS+= --disable-arts \
56	--disable-directfb \	52	--disable-directfb \
57	--disable-faac \	53	--disable-faac \
58	--disable-faad \
59	--disable-libdca \	54	--disable-libdca \
60	--disable-toolame \	55	--disable-toolame \
61	--disable-twolame \	56	--disable-twolame \
Lines 67-81 Link Here
67	--disable-musepack \	62	--disable-musepack \
68	--disable-theora	63	--disable-theora
69		64
70	# Fix a problem with unknown assembly opcodes in embedded ffmpeg
71	.if ${ARCH} == "ppc"
72	CONFIGURE_ARGS+= --disable-asm
73	.endif
74
75	.include "${.CURDIR}/Makefile.options"	65	.include "${.CURDIR}/Makefile.options"
76		66
77	.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}	67	.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
78	MLINKS+= mplayer.1 gmplayer.1
79	PLIST_SUB+= GMPLAYER=""	68	PLIST_SUB+= GMPLAYER=""
80	DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false	69	DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
81	.if ${PORT_OPTIONS:MSKINS}	70	.if ${PORT_OPTIONS:MSKINS}
Lines 94-100 Link Here
94	.endif #GUI && X11	83	.endif #GUI && X11
95		84
96	.if ${PORT_OPTIONS:MX11}	85	.if ${PORT_OPTIONS:MX11}
97	USE_XORG= x11	86	USE_XORG= x11 xscrnsaver
98	.if ${PORT_OPTIONS:MXVIDEO}	87	.if ${PORT_OPTIONS:MXVIDEO}
99	USE_XORG+= xv	88	USE_XORG+= xv
100	.else	89	.else
Lines 130-204 Link Here
130	--disable-fontconfig	119	--disable-fontconfig
131	.endif	120	.endif
132		121
133	.if ${PORT_OPTIONS:MVDPAU}
134	LIB_DEPENDS+= vdpau:${PORTSDIR}/multimedia/libvdpau
135	.else
136	CONFIGURE_ARGS+= --disable-vdpau
137	.endif
138
139	.if ${PORT_OPTIONS:MRTC}
140	BUILD_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
141	RUN_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
142	CONFIGURE_ARGS+= --enable-rtc
143	.else
144	CONFIGURE_ARGS+= --disable-rtc
145	.endif
146
147	.if ${PORT_OPTIONS:MCACA}
148	LIB_DEPENDS+= caca:${PORTSDIR}/graphics/libcaca
149	.else
150	CONFIGURE_ARGS+= --disable-caca
151	.endif
152
153	.if ${PORT_OPTIONS:MLIRC}
154	LIB_DEPENDS+= lirc_client:${PORTSDIR}/comms/lirc
155	.else
156	CONFIGURE_ARGS+= --disable-lirc
157	.endif
158
159	.if ${PORT_OPTIONS:MSDL}
160	USE_SDL= sdl
161	.else
162	CONFIGURE_ARGS+= --disable-sdl
163	.endif
164
165	.if ${PORT_OPTIONS:MSVGALIB}
166	LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib
167	.else
168	CONFIGURE_ARGS+= --disable-svga
169	.endif
170
171	.if ${PORT_OPTIONS:MAALIB} \|\| ${PORT_OPTIONS:MSDL}
172	LIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib
173	.else
174	CONFIGURE_ARGS+= --disable-aa
175	.endif
176
177	.if ${PORT_OPTIONS:MESOUND}
178	USE_GNOME+= esound
179	.else
180	CONFIGURE_ARGS+= --disable-esd
181	.endif
182
183	.if defined(WITH_KERN_HZ)
184	DEFAULT_KERN_HZ=${WITH_KERN_HZ}
185	.else
186	DEFAULT_KERN_HZ=1024
187	.endif
188
189	.if ${PORT_OPTIONS:MJOYSTICK}
190	BUILD_DEPENDS+= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
191	CONFIGURE_ARGS+=--enable-joystick
192	.else
193	CONFIGURE_ARGS+=--disable-joystick
194	.endif
195
196	.if ${PORT_OPTIONS:MENCA}
197	LIB_DEPENDS+= enca:${PORTSDIR}/converters/enca
198	.else
199	CONFIGURE_ARGS+= --disable-enca
200	.endif
201
202	pre-everything::	122	pre-everything::
203	@${ECHO_MSG} "N - O - T - E"	123	@${ECHO_MSG} "N - O - T - E"
204	@${ECHO_MSG} ""	124	@${ECHO_MSG} ""
Lines 248-263 Link Here
248	.endif	168	.endif
249		169
250	post-install:	170	post-install:
251	@${MKDIR} ${DATADIR}	171	@${MKDIR} ${STAGEDIR}${DATADIR}
252	@${CHMOD} 755 ${DATADIR}	172	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
253	@${MKDIR} ${DATADIR}/examples/etc	173	@${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc
254	@${CHMOD} 755 ${DATADIR}/examples/etc	174	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc
255	.for conf in ${CONFFILES}	175	.for conf in ${CONFFILES}
256	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR}/examples/etc	176	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc
257	.endfor	177	.endfor
258	.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}	178	.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
259	@${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer	179	@${LN} -sf ${PREFIX}/bin/mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer
260	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${LOCALBASE}/share/pixmaps/mplayer.png	180	@(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
		181	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${LOCALBASE}/share/pixmaps/mplayer.png
261	.endif	182	.endif
262	@${CAT} ${PKGMESSAGE}	183	@${CAT} ${PKGMESSAGE}
263		184

Lines 1-5 Link Here

(-)b/mplayer/Makefile.options (-202 / +94 lines)
1	# Contains the options and dependencies that are shared	1	# Contains non-trivial handling of option variables
2	# among mplayer and mencoder	2	# and build environment. Must be included after
		3	# bsd.port.pre.mk
3	#	4	#
4	# Some of the knobs are not tunable by the OPTIONS framework. These are	5	# Some of the knobs are not tunable by the OPTIONS framework. These are
5	# explained here in detail.	6	# explained here in detail.
Lines 27-40 Link Here
27	# Enables language support bg, cz, de, dk, en, es, fr, gr, hu, it, ko, nl, no, pl, pt_BR, ro, ru, sk, tr, uk, zh	28	# Enables language support bg, cz, de, dk, en, es, fr, gr, hu, it, ko, nl, no, pl, pt_BR, ro, ru, sk, tr, uk, zh
28	#	29	#
29		30
30	.if ${OSVERSION} < 802502	31	# Non-OPTIONS knob handling
31	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_log2f	32	# =========================
32	.endif
33		33
34	.if defined(WITH_LANG)	34	.if defined(WITH_LANG)
35	CONFIGURE_ARGS+=--language=${WITH_LANG}	35	CONFIGURE_ARGS+=--language=${WITH_LANG}
36	.endif	36	.endif
37		37
		38	.if defined(WITH_DVD_DEVICE)
		39	DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
		40	.else
		41	DEFAULT_DVD_DEVICE=/dev/cd0
		42	.endif
		43
		44	.if defined(WITH_CDROM_DEVICE)
		45	DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
		46	.else
		47	DEFAULT_CDROM_DEVICE=/dev/cd0
		48	.endif
		49
		50	.if defined(WITH_KERN_HZ)
		51	DEFAULT_KERN_HZ=${WITH_KERN_HZ}
		52	.else
		53	DEFAULT_KERN_HZ=1024
		54	.endif
		55
		56
		57	# Non-simplified OPTIONS handling
		58	# ===============================
		59
		60	.if ${PORT_OPTIONS:MESOUND}
		61	USE_GNOME+= esound
		62	.else
		63	CONFIGURE_ARGS+= --disable-esd
		64	.endif
		65
		66	.if ${PORT_OPTIONS:MIPV6}
		67	CATEGORIES+= ipv6
		68	.else
		69	CONFIGURE_ARGS+= --disable-inet6
		70	.endif
		71
		72	.if ${PORT_OPTIONS:MOPENAL}
		73	USE_OPENAL= soft
		74	.else
		75	CONFIGURE_ARGS+= --disable-openal
		76	.endif
		77
		78	.if ${PORT_OPTIONS:MRTMP}
		79	LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/librtmp
		80	CONFIGURE_ARGS+= --enable-librtmp
		81	EXTRA_LIBS+= -lrtmp
		82	.else
		83	CONFIGURE_ARGS+= --disable-librtmp
		84	.endif
		85
		86	.if ${PORT_OPTIONS:MSDL}
		87	USE_SDL= sdl
		88	LIB_DEPENDS+= libaa.so:${PORTSDIR}/graphics/aalib
		89	.else
		90	CONFIGURE_ARGS+= --disable-sdl
		91	.endif
		92
		93	.if ${PORT_OPTIONS:MV4L}
		94	BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
		95	LIB_DEPENDS+= libv4l2.so:${PORTSDIR}/multimedia/libv4l
		96	CONFIGURE_ARGS+= --enable-tv-v4l1 \
		97	--enable-tv-v4l2
		98	EXTRA_LIBS+= -lv4l1 -lv4l2
		99	.else
		100	CONFIGURE_ARGS+= --disable-tv-v4l1 \
		101	--disable-tv-v4l2
102	.endif
103
104
105	# Build system handling (including OPTIONS)
106	# =========================================
107
108	.if ${OSVERSION} < 802502
109	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_log2f
110	.endif
111
38	#On i386, gcc runs out of general purpose registers when	112	#On i386, gcc runs out of general purpose registers when
39	#trying to compile a debug version with the default flags.	113	#trying to compile a debug version with the default flags.
40	.if ${PORT_OPTIONS:MDEBUG}	114	.if ${PORT_OPTIONS:MDEBUG}
Lines 49-59 Link Here
49	.endif #OCFLAGS	123	.endif #OCFLAGS
50	.endif #DEBUG	124	.endif #DEBUG
51		125
52	#Supported architectures for clang	126	# Supported architectures for clang
53	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"	127	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386"
54	MPLAYER_CLANG_SUPPORTED_ARCH= yes	128	MPLAYER_CLANG_SUPPORTED_ARCH= yes
55	.endif	129	.endif
56		130
		131	# Unsupported architectures for inline assembly
		132	.if ${ARCH} == "ppc"
		133	CONFIGURE_ARGS+= --disable-asm
		134	.endif
		135
		136	# Unsupported architectures
		137	.if ${ARCH} == "sparc64"
		138	BROKEN= Does not compile on sparc64
		139	.endif
		140	.if ${ARCH} == "ia64"
		141	BROKEN= Does not detect CPU correctly on ia64
		142	.endif
		143
		144
57	.if ${PORT_OPTIONS:MRTCPU}	145	.if ${PORT_OPTIONS:MRTCPU}
58	CONFIGURE_ARGS+=--enable-runtime-cpudetection	146	CONFIGURE_ARGS+=--enable-runtime-cpudetection
59	.endif	147	.endif
Lines 85-236 Link Here
85	.endif	173	.endif
86	.endif	174	.endif
87		175
88	.if ${PORT_OPTIONS:MIPV6}
89	CATEGORIES+= ipv6
90	.else
91	CONFIGURE_ARGS+= --disable-inet6
92	.endif
93
94	.if ${PORT_OPTIONS:MGIF}
95	LIB_DEPENDS+= gif:${PORTSDIR}/graphics/giflib
96	.else
97	CONFIGURE_ARGS+= --disable-gif
98	.endif
99
100	.if ${PORT_OPTIONS:MOPENJPEG}
101	LIB_DEPENDS+= openjpeg:${PORTSDIR}/graphics/openjpeg
102	.else
103	CONFIGURE_ARGS+= --disable-libopenjpeg
104	.endif
105
106	.if ${PORT_OPTIONS:MMAD}
107	LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad
108	.else
109	CONFIGURE_ARGS+= --disable-mad
110	.endif
111
112	.if ${PORT_OPTIONS:MDV}
113	LIB_DEPENDS+= dv:${PORTSDIR}/multimedia/libdv
114	.else
115	CONFIGURE_ARGS+= --disable-libdv
116	.endif
117
118	.if ${PORT_OPTIONS:MTHEORA}
119	LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora
120	.else
121	CONFIGURE_ARGS+= --disable-theora
122	.endif
123
124	.if ${PORT_OPTIONS:MVPX}
125	LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx
126	.else
127	CONFIGURE_ARGS+= --disable-libvpx-lavc
128	.endif
129
130	.if ${PORT_OPTIONS:MSCHROEDINGER}
131	LIB_DEPENDS+= schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
132	.else
133	CONFIGURE_ARGS+= --disable-libschroedinger-lavc
134	.endif
135
136	.if ${PORT_OPTIONS:MLIVEMEDIA}
137	CONFIGURE_ARGS+= --enable-live
138	BUILD_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
139	CFLAGS+= -I${LOCALBASE}/live/liveMedia/include \
140	-I${LOCALBASE}/live/BasicUsageEnvironment/include \
141	-I${LOCALBASE}/live/UsageEnvironment/include \
142	-I${LOCALBASE}/live/groupsock/include
143	LDFLAGS+= -L${LOCALBASE}/live/liveMedia \
144	-L${LOCALBASE}/live/BasicUsageEnvironment \
145	-L${LOCALBASE}/live/UsageEnvironment \
146	-L${LOCALBASE}/live/groupsock \
147	-lliveMedia \
148	-lUsageEnvironment \
149	-lBasicUsageEnvironment \
150	-lgroupsock \
151	-lstdc++
152	.else
153	CONFIGURE_ARGS+= --disable-live
154	.endif
155
156	.if ${PORT_OPTIONS:MJACK}
157	LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
158	.else
159	CONFIGURE_ARGS+= --disable-jack
160	.endif
161
162	.if ${PORT_OPTIONS:MNAS}
163	LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas
164	.else
165	CONFIGURE_ARGS+= --disable-nas
166	.endif
167
168	.if ${PORT_OPTIONS:MOPENAL}
169	USE_OPENAL= soft
170	.else
171	CONFIGURE_ARGS+= --disable-openal
172	.endif
173
174	.if ${PORT_OPTIONS:MPULSEAUDIO}
175	LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio
176	.else
177	CONFIGURE_ARGS+= --disable-pulse
178	.endif
179
180	.if ${PORT_OPTIONS:MBLURAY}
181	LIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray
182	.else
183	CONFIGURE_ARGS+= --disable-bluray
184	.endif
185
186	.if ${PORT_OPTIONS:MSMB}
187	LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient
188	.else
189	CONFIGURE_ARGS+= --disable-smb
190	.endif
191
192	.if ${PORT_OPTIONS:MFRIBIDI}
193	LIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi
194	.else
195	CONFIGURE_ARGS+= --disable-fribidi
196	.endif
197
198	.if ${PORT_OPTIONS:MCDPARANOIA}
199	LIB_DEPENDS+= cdda_paranoia:${PORTSDIR}/audio/cdparanoia
200	.else
201	CONFIGURE_ARGS+= --disable-cdparanoia
202	.endif
203
204	.if ${PORT_OPTIONS:MCDIO}
205	LIB_DEPENDS+= cdio:${PORTSDIR}/sysutils/libcdio
206	.else
207	CONFIGURE_ARGS+= --disable-libcdio
208	.endif
209
210	.if ${PORT_OPTIONS:MLADSPA}
211	RUN_DEPENDS+= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
212	.else
213	CONFIGURE_ARGS+= --disable-ladspa
214	.endif
215
216	.if ${PORT_OPTIONS:MLZO}
217	LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2
218	.else
219	CONFIGURE_ARGS+= --disable-liblzo
220	.endif
221
222	.if defined(WITH_DVD_DEVICE)
223	DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
224	.else
225	DEFAULT_DVD_DEVICE=/dev/cd0
226	.endif
227
228	.if defined(WITH_CDROM_DEVICE)
229	DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
230	.else
231	DEFAULT_CDROM_DEVICE=/dev/cd0
232	.endif
233
234	.if ${ARCH} == "i386" \|\| ${ARCH} == "amd64"	176	.if ${ARCH} == "i386" \|\| ${ARCH} == "amd64"
235	.if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"	177	.if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
236	RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT}	178	RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
Lines 243-299 Link Here
243	.endif	185	.endif
244	.endif # ARCH == i386/amd64	186	.endif # ARCH == i386/amd64
245		187
246	.if ${PORT_OPTIONS:MREAL}
247	RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
248	BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
249	.else
250	CONFIGURE_ARGS+= --disable-real
251	.endif
252
253	.if ${PORT_OPTIONS:MAMR_NB} \|\| ${PORT_OPTIONS:MAMR_WB}
254	LIB_DEPENDS+= opencore-amrnb:${PORTSDIR}/audio/opencore-amr
255	.endif
256
257	.if !${PORT_OPTIONS:MAMR_NB}
258	CONFIGURE_ARGS+= --disable-libopencore_amrnb
259	.endif
260
261	.if !${PORT_OPTIONS:MAMR_WB}
262	CONFIGURE_ARGS+= --disable-libopencore_amrwb
263	.endif
264
265	.if ${PORT_OPTIONS:MGSM}
266	LIB_DEPENDS+= gsm:${PORTSDIR}/audio/gsm
267	.else
268	CONFIGURE_ARGS+= --disable-libgsm
269	.endif
270
271	.if ${PORT_OPTIONS:MV4L}
272	BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
273	LIB_DEPENDS+= v4l2.0:${PORTSDIR}/multimedia/libv4l
274	CONFIGURE_ARGS+= --enable-tv-v4l1 \
275	--enable-tv-v4l2
276	EXTRA_LIBS+= -lv4l1 -lv4l2
277	.else
278	CONFIGURE_ARGS+= --disable-tv-v4l1 \
279	--disable-tv-v4l2
280	.endif
281
282	.if ${PORT_OPTIONS:MRTMP}
283	LIB_DEPENDS+= rtmp:${PORTSDIR}/multimedia/rtmpdump
284	CONFIGURE_ARGS+= --enable-librtmp
285	EXTRA_LIBS+= -lrtmp
286	.else
287	CONFIGURE_ARGS+= --disable-librtmp
288	.endif
289
290	.if ${PORT_OPTIONS:MLIBMNG}
291	LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng
292	.else
293	CONFIGURE_ARGS+= --disable-mng
294	.endif
295		188
296	.if defined(EXTRA_LIBS)	189	.if defined(EXTRA_LIBS)
297	CONFIGURE_ARGS+= --extra-libs="${EXTRA_LIBS}"	190	CONFIGURE_ARGS+= --extra-libs="${EXTRA_LIBS}"
298	.endif	191	.endif
299

Added Link Here

(-)b/mplayer/Makefile.optvars (+110 lines)
1	# Contains simple option variables that are used
2	# before including bsd.port.options.mk
3	# in Makefiles
4
5	AALIB_LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib
6	AALIB_CONFIGURE_OFF= --disable-aa
7
8	AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
9	AMR_NB_CONFIGURE_OFF= --disable-libopencore_amrnb
10
11	AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
12	AMR_WB_CONFIGURE_OFF= --disable-libopencore_amrwb
13
14	BLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray
15	BLURAY_CONFIGURE_OFF= --disable-bluray
16
17	CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca
18	CACA_CONFIGURE_OFF= --disable-caca
19
20	CDIO_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio
21	CDIO_CONFIGURE_OFF= --disable-libcdio
22
23	CDPARANOIA_LIB_DEPENDS= libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
24	CDPARANOIA_CONFIGURE_OFF= --disable-cdparanoia
25
26	DIRAC_LIB_DEPENDS= libdirac_encoder.so:${PORTSDIR}/multimedia/dirac
27	DIRAC_CONFIGURE_OFF= --disable-libdirac-lavc
28
29	DV_LIB_DEPENDS= dv.so:${PORTSDIR}/multimedia/libdv
30	DV_CONFIGURE_OFF= --disable-libdv
31
32	ENCA_LIB_DEPENDS= libenca.so:${PORTSDIR}/converters/enca
33	ENCA_CONFIGURE_OFF= --disable-enca
34
35	FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac
36	FAAC_CONFIGURE_OFF= --disable-faac
37
38	FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
39	FONTCONFIG_CONFIGURE_OFF= --disable-fontconfig
40
41	FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi
42	FRIBIDI_CONFIGURE_OFF= --disable-fribidi
43
44	GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib
45	GIF_CONFIGURE_OFF= --disable-gif
46
47	GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm
48	GSM_CONFIGURE_OFF= --disable-libgsm
49
50	JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
51	JACK_CONFIGURE_OFF= --disable-jack
52
53	LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
54	LADSPA_CONFIGURE_OFF= --disable-ladspa
55
56	LIBMNG_LIB_DEPENDS= libmng.so:${PORTSDIR}/graphics/libmng
57	LIBMNG_CONFIGURE_OFF= --disable-mng
58
59	LIRC_LIB_DEPENDS= liblirc_client.so:${PORTSDIR}/comms/lirc
60	LIRC_CONFIGURE_OFF= --disable-lirc
61
62	LZO_LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo2
63	LZO_CONFIGURE_OFF= --disable-liblzo
64
65	NAS_LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas
66	NAS_CONFIGURE_OFF= --disable-nas
67
68	OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
69	OPENJPEG_CONFIGURE_OFF= --disable-libopenjpeg
70
71	OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus
72	OPUS_CONFIGURE_OFF= --disable-libopus
73
74	PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio
75	PULSEAUDIO_CONFIGURE_OFF= --disable-pulse
76
77	REAL_RUN_DEPENDS= realplay:${PORTSDIR}/multimedia/linux-realplayer
78	REAL_BUILD_DEPENDS= realplay:${PORTSDIR}/multimedia/linux-realplayer
79	REAL_CONFIGURE_OFF= --disable-real
80
81	RTC_BUILD_DEPENDS= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
82	RTC_RUN_DEPENDS= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
83	RTC_CONFIGURE_ENABLE= rtc
84
85	SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
86	SCHROEDINGER_CONFIGURE_OFF= --disable-libschroedinger-lavc
87
88	SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
89	SMB_CONFIGURE_OFF= --disable-smb
90
91	SVGALIB_LIB_DEPENDS= libvga.so:${PORTSDIR}/graphics/svgalib
92	SVGALIB_CONFIGURE_OFF= --disable-svga
93
94	THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora
95	THEORA_CONFIGURE_OFF= --disable-theora
96
97	TWOLAME_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame
98	TWOLAME_CONFIGURE_OFF= --disable-twolame
99
100	VDPAU_LIB_DEPENDS= libvdpau.so:${PORTSDIR}/multimedia/libvdpau
101	VDPAU_CONFIGURE_OFF= --disable-vdpau
102
103	VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx
104	VPX_CONFIGURE_OFF= --disable-libvpx-lavc
105
106	X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/x264
107	X264_CONFIGURE_OFF= --disable-x264
108
109	XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid
110	XVID_CONFIGURE_OFF= --disable-xvid

Lines 4-10 Link Here

(-)b/mplayer/Makefile.shared (-10 / +15 lines)
4	#	4	#
5	# $FreeBSD: head/multimedia/mplayer/Makefile.shared 327683 2013-09-20 10:54:22Z ak $	5	# $FreeBSD: head/multimedia/mplayer/Makefile.shared 327683 2013-09-20 10:54:22Z ak $
6		6
7	MPLAYER_SNAPSHOT_DATE= 2013-03-08	7	MPLAYER_SNAPSHOT_DATE= 2013-11-09
8	MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}	8	MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
9	CATEGORIES?= multimedia audio	9	CATEGORIES?= multimedia audio
10	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}	10	MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
Lines 17-30 Link Here
17		17
18	LICENSE= GPLv2	18	LICENSE= GPLv2
19		19
20	LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \	20	LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \
21	freetype:${PORTSDIR}/print/freetype2	21	libfreetype.so:${PORTSDIR}/print/freetype2
22		22
23	BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm	23	BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
24		24
25	USES= iconv ncurses	25	USES= gmake iconv ncurses
26	USE_XZ= yes	26	USE_XZ= yes
27	USE_GMAKE= yes
28	GNU_CONFIGURE= yes	27	GNU_CONFIGURE= yes
29	CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \	28	CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
30	PTHREAD_LIBS="${PTHREAD_LIBS}" \	29	PTHREAD_LIBS="${PTHREAD_LIBS}" \
Lines 34-49 Link Here
34	--as="${AS}" \	33	--as="${AS}" \
35	--extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \	34	--extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \
36	--extra-libs="-L${PREFIX}/lib" \	35	--extra-libs="-L${PREFIX}/lib" \
		36	--disable-alsa \
37	--disable-bitmap-font \	37	--disable-bitmap-font \
		38	--disable-crystalhd \
		39	--disable-faad \
38	--disable-liba52 \	40	--disable-liba52 \
39	--disable-alsa \
40	--disable-libbs2b \	41	--disable-libbs2b \
		42	--disable-libilbc \
		43	--disable-libnut \
		44	--disable-libvorbis \
		45	--disable-live \
		46	--disable-joystick \
		47	--disable-mad \
41	--disable-mp3lib \	48	--disable-mp3lib \
42	--enable-ass-internal \	49	--disable-nemesi \
43	--disable-libvorbis \
44	--disable-speex \	50	--disable-speex \
45	--disable-libopus \	51	--enable-ass-internal
46	--disable-libilbc
47		52
48	WANT_GNOME= yes	53	WANT_GNOME= yes
49	WANT_SDL= yes	54	WANT_SDL= yes

Lines 1-6 Link Here

(-)b/mplayer/files/patch-configure (-23 / +24 lines)
1	--- configure.orig 2013-03-03 11:29:18.000000000 +0100	1	--- configure.orig 2013-11-08 17:59:55.000000000 +0100
2	+++ configure 2013-03-22 17:20:44.452775673 +0100	2	+++ configure 2013-11-09 14:34:53.996868923 +0100
3	@@ -668,7 +668,7 @@	3	@@ -640,7 +640,7 @@
4	_iwmmxt=auto	4	_iwmmxt=auto
5	_mtrr=auto	5	_mtrr=auto
6	_altivec=auto	6	_altivec=auto
Lines 9-15 Link Here
9	_ranlib=ranlib	9	_ranlib=ranlib
10	_windres=windres	10	_windres=windres
11	_cc=cc	11	_cc=cc
12	@@ -1534,7 +1534,6 @@	12	@@ -1452,7 +1452,6 @@
13		13
14	*)	14	*)
15	echo "Unknown parameter: $ac_option"	15	echo "Unknown parameter: $ac_option"
Lines 17-24 Link Here
17	;;	17	;;
18		18
19	esac	19	esac
20	@@ -1669,7 +1668,7 @@	20	@@ -1689,7 +1688,7 @@
21	case "$(uname -m 2>&1)" in	21	case "$1" in
22	x86_64\|amd64\|i[3-9]86\|i86pc\|x86\|x86pc\|k5\|k6\|k6_2\|k6_3\|k6-2\|k6-3\|pentium\|athlon*\|i586_i686\|i586-i686) host_arch=i386 ;;	22	x86_64\|amd64\|i[3-9]86\|i86pc\|x86\|x86pc\|k5\|k6\|k6_2\|k6_3\|k6-2\|k6-3\|pentium\|athlon*\|i586_i686\|i586-i686) host_arch=i386 ;;
23	ia64) host_arch=ia64 ;;	23	ia64) host_arch=ia64 ;;
24	- macppc\|ppc\|Power) host_arch=ppc ;;	24	- macppc\|ppc\|Power) host_arch=ppc ;;
Lines 26-40 Link Here
26	alpha) host_arch=alpha ;;	26	alpha) host_arch=alpha ;;
27	sun4\|sparc) host_arch=sparc ;;	27	sun4\|sparc) host_arch=sparc ;;
28	parisc\|hppa\|9000*) host_arch=hppa ;;	28	parisc\|hppa\|9000*) host_arch=hppa ;;
29	@@ -1709,6 +1708,7 @@	29	@@ -3822,7 +3821,7 @@
30	fi
31
32	extra_cflags="-I. -Iffmpeg $extra_cflags"
33	+extra_ldflags="$extra_ldflags -L$_prefix/lib"
34	_timer=timer-linux.c
35	_getch=getch2.c
36
37	@@ -3765,7 +3765,7 @@
38	if linux ; then	30	if linux ; then
39	THREAD_CFLAGS=-D_REENTRANT	31	THREAD_CFLAGS=-D_REENTRANT
40	elif freebsd \|\| netbsd \|\| openbsd \|\| bsdos ; then	32	elif freebsd \|\| netbsd \|\| openbsd \|\| bsdos ; then
Lines 43-49 Link Here
43	fi	35	fi
44	if test "$_pthreads" = auto ; then	36	if test "$_pthreads" = auto ; then
45	cat > $TMPC << EOF	37	cat > $TMPC << EOF
46	@@ -3775,7 +3775,7 @@	38	@@ -3832,7 +3831,7 @@
47	EOF	39	EOF
48	_pthreads=no	40	_pthreads=no
49	if ! hpux ; then	41	if ! hpux ; then
Lines 52-58 Link Here
52	# for crosscompilation, we cannot execute the program, be happy if we can link statically	44	# for crosscompilation, we cannot execute the program, be happy if we can link statically
53	cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run \|\| test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break	45	cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run \|\| test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
54	done	46	done
55	@@ -5904,7 +5904,7 @@	47	@@ -3979,7 +3978,7 @@
		48	# NOTE: -L/usr/lib is a hack to avoid issues due to a
		49	# broken libiconv that e.g. macports installs into /opt/local/lib
		50	# which might get addded to the search path later by e.g. SDL
		51	- for ld_tmp in "" "-L/usr/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
		52	+ for ld_tmp in "" "-L$_prefix/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
		53	cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
		54	ld_iconv="$ld_tmp" && _iconv=yes && break
		55	done
		56	@@ -5903,7 +5902,7 @@
56	elif dragonfly ; then	57	elif dragonfly ; then
57	default_cdrom_device="/dev/cd0"	58	default_cdrom_device="/dev/cd0"
58	elif freebsd ; then	59	elif freebsd ; then
Lines 61-67 Link Here
61	elif openbsd ; then	62	elif openbsd ; then
62	default_cdrom_device="/dev/rcd0c"	63	default_cdrom_device="/dev/rcd0c"
63	elif sunos ; then	64	elif sunos ; then
64	@@ -5917,7 +5917,7 @@	65	@@ -5916,7 +5915,7 @@
65	default_cdrom_device="/dev/cdrom"	66	default_cdrom_device="/dev/cdrom"
66	fi	67	fi
67		68
Lines 70-76 Link Here
70	default_dvd_device=$default_cdrom_device	71	default_dvd_device=$default_cdrom_device
71	elif darwin ; then	72	elif darwin ; then
72	default_dvd_device="/dev/rdiskN"	73	default_dvd_device="/dev/rdiskN"
73	@@ -6470,7 +6470,7 @@	74	@@ -6514,7 +6513,7 @@
74	echocheck "libgsm"	75	echocheck "libgsm"
75	if test "$_libgsm" = auto ; then	76	if test "$_libgsm" = auto ; then
76	_libgsm=no	77	_libgsm=no
Lines 79-85 Link Here
79	fi	80	fi
80	if test "$_libgsm" = yes ; then	81	if test "$_libgsm" = yes ; then
81	def_libgsm='#define CONFIG_LIBGSM 1'	82	def_libgsm='#define CONFIG_LIBGSM 1'
82	@@ -6954,6 +6954,16 @@	83	@@ -6999,6 +6998,16 @@
83	nolibrtmp=no	84	nolibrtmp=no
84	def_librtmp='#define CONFIG_LIBRTMP 1'	85	def_librtmp='#define CONFIG_LIBRTMP 1'
85	inputmodules="librtmp $inputmodules"	86	inputmodules="librtmp $inputmodules"
Lines 96-102 Link Here
96	else	97	else
97	nolibrtmp=yes	98	nolibrtmp=yes
98	_librtmp=no	99	_librtmp=no
99	@@ -7346,7 +7356,7 @@	100	@@ -7391,7 +7400,7 @@
100	echocheck "mencoder"	101	echocheck "mencoder"
101	if test "$_mencoder" = no ; then	102	if test "$_mencoder" = no ; then
102	# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,	103	# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
Lines 105-111 Link Here
105	fi	106	fi
106	echores "$_mencoder"	107	echores "$_mencoder"
107		108
108	@@ -7684,8 +7694,11 @@	109	@@ -7729,8 +7738,11 @@
109	if test "$_gui" = yes ; then	110	if test "$_gui" = yes ; then
110		111
111	# Required libraries	112	# Required libraries
Lines 119-125 Link Here
119	die "The GUI requires libavcodec with PNG support (needs zlib)."	120	die "The GUI requires libavcodec with PNG support (needs zlib)."
120	fi	121	fi
121	test "$_freetype" = no && test "$_bitmap_font" = no &&	122	test "$_freetype" = no && test "$_bitmap_font" = no &&
122	@@ -8271,7 +8284,7 @@	123	@@ -8318,7 +8330,7 @@
123	EXESUF = $_exesuf	124	EXESUF = $_exesuf
124	EXESUFS_ALL = .exe	125	EXESUFS_ALL = .exe
125		126

Removed Link Here

(-)a/mplayer/files/patch-libmpdemux-demux_gif.c (-99 lines)
1	--- libmpdemux/demux_gif.c.orig 2010-12-12 11:37:15.000000000 +0100
2	+++ libmpdemux/demux_gif.c 2012-06-06 16:58:52.000000000 +0200
3	@@ -45,6 +45,16 @@
4
5	#define GIF_SIGNATURE (('G' << 16) \| ('I' << 8) \| 'F')
6
7	+static void localPrintGifError(void)
8	+{
9	+ char *Err = GifErrorString();
10	+
11	+ if (Err != NULL)
12	+ fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
13	+ else
14	+ fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
15	+}
16	+
17	#ifndef CONFIG_GIF_TVT_HACK
18	// not supported by certain versions of the library
19	static int my_read_gif(GifFileType gif, uint8_t buf, int len)
20	@@ -94,14 +104,14 @@
21
22	while (type != IMAGE_DESC_RECORD_TYPE) {
23	if (DGifGetRecordType(gif, &type) == GIF_ERROR) {
24	- PrintGifError();
25	+ localPrintGifError();
26	return 0; // oops
27	}
28	if (type == TERMINATE_RECORD_TYPE)
29	return 0; // eof
30	if (type == SCREEN_DESC_RECORD_TYPE) {
31	if (DGifGetScreenDesc(gif) == GIF_ERROR) {
32	- PrintGifError();
33	+ localPrintGifError();
34	return 0; // oops
35	}
36	}
37	@@ -109,7 +119,7 @@
38	int code;
39	unsigned char *p = NULL;
40	if (DGifGetExtension(gif, &code, &p) == GIF_ERROR) {
41	- PrintGifError();
42	+ localPrintGifError();
43	return 0; // oops
44	}
45	if (code == 0xF9) {
46	@@ -138,7 +148,7 @@
47	comments[length] = 0;
48	printf("%s", comments);
49	if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
50	- PrintGifError();
51	+ localPrintGifError();
52	return 0; // oops
53	}
54	}
55	@@ -146,7 +156,7 @@
56	}
57	while (p != NULL) {
58	if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
59	- PrintGifError();
60	+ localPrintGifError();
61	return 0; // oops
62	}
63	}
64	@@ -154,7 +164,7 @@
65	}
66
67	if (DGifGetImageDesc(gif) == GIF_ERROR) {
68	- PrintGifError();
69	+ localPrintGifError();
70	return 0; // oops
71	}
72
73	@@ -167,7 +177,7 @@
74	memset(dp->buffer, gif->SBackGroundColor, priv->w * priv->h);
75
76	if (DGifGetLine(gif, buf, len) == GIF_ERROR) {
77	- PrintGifError();
78	+ localPrintGifError();
79	free(buf);
80	return 0; // oops
81	}
82	@@ -260,7 +270,7 @@
83	gif = DGifOpen(demuxer->stream, my_read_gif);
84	#endif
85	if (!gif) {
86	- PrintGifError();
87	+ localPrintGifError();
88	free(priv);
89	return NULL;
90	}
91	@@ -302,7 +312,7 @@
92	gif_priv_t *priv = demuxer->priv;
93	if (!priv) return;
94	if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR)
95	- PrintGifError();
96	+ localPrintGifError();
97	free(priv->refimg);
98	free(priv);
99	}

Lines 1-6 Link Here

(-)b/mplayer/files/patch-stream-tvi_bsdbt848.c (-10 / +10 lines)
1	--- stream/tvi_bsdbt848.c.orig 2009-05-12 21:58:57.000000000 -0500	1	--- stream/tvi_bsdbt848.c.orig 2013-03-16 11:15:07.000000000 +0100
2	+++ stream/tvi_bsdbt848.c 2009-07-23 20:39:13.536681248 -0500	2	+++ stream/tvi_bsdbt848.c 2013-11-09 13:47:43.804868208 +0100
3	@@ -352,11 +352,11 @@	3	@@ -366,11 +366,11 @@
4	int req_mode = (int )arg;	4	int req_mode = (int )arg;
5	u_short tmp_fps;	5	u_short tmp_fps;
6		6
Lines 14-20 Link Here
14	priv->maxheight = PAL_HEIGHT;	14	priv->maxheight = PAL_HEIGHT;
15	priv->maxwidth = PAL_WIDTH;	15	priv->maxwidth = PAL_WIDTH;
16	priv->maxfps = PAL_FPS;	16	priv->maxfps = PAL_FPS;
17	@@ -377,7 +377,7 @@	17	@@ -391,7 +391,7 @@
18		18
19	if(req_mode == TV_NORM_NTSC)	19	if(req_mode == TV_NORM_NTSC)
20	{	20	{
Lines 23-29 Link Here
23	priv->maxheight = NTSC_HEIGHT;	23	priv->maxheight = NTSC_HEIGHT;
24	priv->maxwidth = NTSC_WIDTH;	24	priv->maxwidth = NTSC_WIDTH;
25	priv->maxfps = NTSC_FPS;	25	priv->maxfps = NTSC_FPS;
26	@@ -401,9 +401,28 @@	26	@@ -415,9 +415,28 @@
27	}	27	}
28	}	28	}
29		29
Lines 54-74 Link Here
54	{	54	{
55	mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno));	55	mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno));
56	return TVI_CONTROL_FALSE;	56	return TVI_CONTROL_FALSE;
57	@@ -532,8 +551,9 @@	57	@@ -546,8 +565,9 @@
58	/* Video Configuration */	58	/* Video Configuration */
59		59
60	priv->videoready = TRUE;	60	priv->videoready = 1;
61	+priv->btdev = strdup("/dev/bktr0");	61	+priv->btdev = strdup("/dev/bktr0");
62	priv->immediatemode = FALSE;	62	priv->immediatemode = 0;
63	-priv->iformat = METEOR_FMT_PAL;	63	-priv->iformat = METEOR_FMT_PAL;
64	+priv->iformat = BT848_IFORM_F_PALBDGHI;	64	+priv->iformat = BT848_IFORM_F_PALBDGHI;
65	priv->maxheight = PAL_HEIGHT;	65	priv->maxheight = PAL_HEIGHT;
66	priv->maxwidth = PAL_WIDTH;	66	priv->maxwidth = PAL_WIDTH;
67	priv->maxfps = PAL_FPS;	67	priv->maxfps = PAL_FPS;
68	@@ -558,7 +578,7 @@	68	@@ -572,7 +592,7 @@
69	}	69	}
70		70
71	if(priv->videoready == TRUE &&	71	if(priv->videoready &&
72	- ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)	72	- ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
73	+ ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)	73	+ ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
74	{	74	{