Date: Tue, 7 Aug 2012 11:10:03 GMT From: Grzegorz Blach <magik@roorback.net> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/163438: New port: multimedia/mplayer2 Message-ID: <201208071110.q77BA3we042005@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/163438; it has been noted by GNATS.
From: Grzegorz Blach <magik@roorback.net>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org
Cc:
Subject: Re: ports/163438: New port: multimedia/mplayer2
Date: Tue, 07 Aug 2012 12:59:01 +0200
--=-zB4ey259FBkbEizw3NgV
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
Now mplayer2 depends on ffmpeg-011 instead of ffmpeg and don't conflict
with ffmpeg
--=-zB4ey259FBkbEizw3NgV
Content-Type: application/x-shar; name="multimedia_mplayer2.shar"
Content-Disposition: attachment; filename="multimedia_mplayer2.shar"
Content-Transfer-Encoding: 7bit
# This is a shell archive. Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file". Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
# multimedia/mplayer2
# multimedia/mplayer2/Makefile
# multimedia/mplayer2/distinfo
# multimedia/mplayer2/files
# multimedia/mplayer2/files/patch-configure
# multimedia/mplayer2/files/patch-libao2-ao_oss.c
# multimedia/mplayer2/files/extra-patch-base_system_log2f
# multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c
# multimedia/mplayer2/files/patch-stream-tvi_v4l.c
# multimedia/mplayer2/files/patch-stream-tvi_v4l2.c
# multimedia/mplayer2/files/pkg-message.in
# multimedia/mplayer2/pkg-descr
# multimedia/mplayer2/pkg-plist
#
echo c - multimedia/mplayer2
mkdir -p multimedia/mplayer2 > /dev/null 2>&1
echo x - multimedia/mplayer2/Makefile
sed 's/^X//' >multimedia/mplayer2/Makefile << '3933f3d4f1ac54d31de6978e55286690'
X# New ports collection makefile for: mplayer
X# Date created: 10 August 2001
X# Whom: Thomas E. Zander
X# with lots of help from Vladimir Kushnir
X# $FreeBSD$
X#
X
XPORTNAME= mplayer2
XPORTVERSION= ${MPLAYER2_PORT_VERSION}
XCATEGORIES= multimedia audio
XMASTER_SITES= http://files.roorback.net/
XDISTNAME= ${PORTNAME}-${MPLAYER2_PORT_VERSION}
X
XMAINTAINER= magik@roorback.net
XCOMMENT= Advanced general-purpose video player
X
XLICENSE= GPLv2
X
XLIB_DEPENDS= avcodec:${PORTSDIR}/multimedia/ffmpeg-011 \
X png15:${PORTSDIR}/graphics/png \
X freetype:${PORTSDIR}/print/freetype2
X
XUSE_XZ= yes
XUSE_GMAKE= yes
XUSE_ICONV= yes
XUSE_NCURSES= yes
XHAS_CONFIGURE= yes
XCONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
X PTHREAD_LIBS="${PTHREAD_LIBS}" \
X TMPDIR="${WRKSRC}"
XCONFIGURE_ARGS= --cc=${CC} \
X --host-cc=${CC} \
X --extra-cflags=-I${LOCALBASE}/include/ffmpeg-011 \
X --extra-ldflags=-L${LOCALBASE}/lib/ffmpeg-011 \
X --mandir=${PREFIX}/man \
X --disable-alsa \
X --disable-bitmap-font \
X --disable-liba52 \
X --disable-directfb \
X --disable-svga \
X --disable-dga1 \
X --disable-dga2 \
X --disable-faad \
X --disable-mng \
X --disable-libdca \
X --disable-xvid \
X --disable-mpg123 \
X --disable-musepack
XMAKE_ARGS+= BINDIR=${PREFIX}/bin \
X CONFDIR=${PREFIX}/etc/mplayer
X
XMPLAYER2_SNAPSHOT_DATE= 2012-05-17
XMPLAYER2_PORT_VERSION= 2.0.${MPLAYER2_SNAPSHOT_DATE:S/-//g}
X
XMAKE_JOBS_SAFE= yes
X
XOPTIONS_DEFINE= DEBUG NLS RTC IPV6 SMB JOYSTICK \
X DVDREAD LIBBLURAY V4L LIVEMEDIA DV THEORA \
X X11 XVMC XINERAMA OPENGL SDL VDPAU GIF AALIB CACA \
X MAD SPEEX LIBCDIO LADSPA REALPLAYER \
X JACK NAS PULSE PORTAUDIO \
X ASS FRIBIDI LIRC
XOPTIONS_DEFAULT=DVDREAD X11 ASS
X
X.if !defined(PACKAGE_BUILDING)
XOPTIONS_DEFINE+= WIN32
XOPTIONS_DEFAULT+= WIN32
X.endif
X
XDVDREAD_DESC= Enable dvdread support
XRTC_DESC= Enable kernel realtime clock timing
XPULSE_DESC= Enable PulseAudio support
XTHEORA_DESC= Enable ogg theora video support
XASS_DESC= Enable ASS/SSA subtitle rendering
XWIN32_DESC= Enable win32 codec set on the IA32 arch
XREALPLAYER_DESC=Enable realplayer plugin
XLIVEMEDIA_DESC= Enable LIVE555 streaming support
XFRIBIDI_DESC= Enable FriBiDi support
XLIRC_DESC= Enable lirc support
XLIBCDIO_DESC= Enable libcdio support
XJOYSTICK_DESC= Enable joystick support
XV4L_DESC= Enable Video4Linux TV support
X
XMAN1= mplayer.1
XMANCOMPRESSED= no
X
XSUB_FILES= pkg-message
X
XCONFLICTS= mplayer-1.*
X
X.include <bsd.port.pre.mk>
X
X.if ${ARCH} == "sparc64"
XBROKEN= Does not compile on sparc64
X.endif
X
X.if ${OSVERSION} < 802502
XEXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_log2f
X.endif
X
X.if ${PORT_OPTIONS:MNLS}
XUSE_GETTEXT= yes
XCONFIGURE_ARGS+= --enable-translation --language=all \
X --extra-libs-mplayer=-lintl
XMANLANG= "" cs de es fr hu it pl ru zh_CN
X.else
XCONFIGURE_ARGS+= --disable-translation --language=en
X.endif
X
X#On i386, gcc runs out of general purpose registers when
X#trying to compile a debug version with the default flags.
X.if ${PORT_OPTIONS:MDEBUG}
X.if ${ARCH} == "i386"
XDEBUG_FLAGS= -g -O -fomit-frame-pointer
X.endif
X.else
X.if defined(PACKAGE_BUILDING)
XCONFIGURE_ARGS+= --enable-runtime-cpudetection
XCFLAGS+= -O2 -fomit-frame-pointer
X.else
XCONFIGURE_ENV+= CPPFLAGS= CFLAGS= LDFLAGS=
X.endif
X.endif
X
X.if ${PORT_OPTIONS:MIPV6}
XCATEGORIES+= ipv6
X.else
XCONFIGURE_ARGS+= --disable-inet6
X.endif
X
X.if ${PORT_OPTIONS:MGIF}
XLIB_DEPENDS+= gif:${PORTSDIR}/graphics/giflib
X.else
XCONFIGURE_ARGS+= --disable-gif
X.endif
X
X.if ${PORT_OPTIONS:MMAD}
XLIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad
X.else
XCONFIGURE_ARGS+= --disable-mad
X.endif
X
X.if ${PORT_OPTIONS:MDV}
XLIB_DEPENDS+= dv:${PORTSDIR}/multimedia/libdv
X.else
XCONFIGURE_ARGS+= --disable-libdv
X.endif
X
X.if ${PORT_OPTIONS:MTHEORA}
XLIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora
X.else
XCONFIGURE_ARGS+= --disable-theora
X.endif
X
X.if ${PORT_OPTIONS:MSPEEX}
XLIB_DEPENDS+= speex:${PORTSDIR}/audio/speex
X.else
XCONFIGURE_ARGS+= --disable-speex
X.endif
X
X.if ${PORT_OPTIONS:MLIVEMEDIA}
XBUILD_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
X.else
XCONFIGURE_ARGS+= --disable-live
X.endif
X
X.if ${PORT_OPTIONS:MJACK}
XLIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
X.else
XCONFIGURE_ARGS+= --disable-jack
X.endif
X
X.if ${PORT_OPTIONS:MNAS}
XLIB_DEPENDS+= audio:${PORTSDIR}/audio/nas
X.else
XCONFIGURE_ARGS+= --disable-nas
X.endif
X
X.if ${PORT_OPTIONS:MPULSE}
XLIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio
X.else
XCONFIGURE_ARGS+= --disable-pulse
X.endif
X
X.if ${PORT_OPTIONS:MPORTAUDIO}
XLIB_DEPENDS+= portaudio.2:${PORTSDIR}/audio/portaudio2
X.else
XCONFIGURE_ARGS+= --disable-portaudio
X.endif
X
X.if ${PORT_OPTIONS:MLIBBLURAY}
XLIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray
XCONFIGURE_ARGS+= --enable-bluray
X.else
XCONFIGURE_ARGS+= --disable-bluray
X.endif
X
X.if ${PORT_OPTIONS:MDVDREAD}
XLIB_DEPENDS+= dvdread:${PORTSDIR}/multimedia/libdvdread
XCONFIGURE_ARGS+= --enable-dvdread
X.else
XCONFIGURE_ARGS+= --disable-dvdread
X.endif
X
X.if ${PORT_OPTIONS:MSMB}
XLIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient
X.else
XCONFIGURE_ARGS+= --disable-smb
X.endif
X
X.if ${PORT_OPTIONS:MFRIBIDI}
XLIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi
X.else
XCONFIGURE_ARGS+= --disable-fribidi
X.endif
X
X.if ${PORT_OPTIONS:MLIBCDIO}
XLIB_DEPENDS+= cdio:${PORTSDIR}/sysutils/libcdio
X.else
XCONFIGURE_ARGS+= --disable-libcdio
X.endif
X
X.if ${PORT_OPTIONS:MLADSPA}
XRUN_DEPENDS+= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
X.else
XCONFIGURE_ARGS+= --disable-ladspa
X.endif
X
X.if defined(WITH_DVD_DEVICE)
XDEFAULT_DVD_DEVICE= ${WITH_DVD_DEVICE}
X.else
XDEFAULT_DVD_DEVICE= /dev/acd0
X.endif
X
X.if defined(WITH_CDROM_DEVICE)
XDEFAULT_CDROM_DEVICE= ${WITH_CDROM_DEVICE}
X.else
XDEFAULT_CDROM_DEVICE= /dev/acd0
X.endif
X
X.if ${ARCH} == "i386" || ${ARCH} == "amd64"
X.if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
XCODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs
XCODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
XRUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
XCONFIGURE_ARGS+= --win32codecsdir=${LOCALBASE}/lib/win32
X.else
XCONFIGURE_ARGS+= --disable-win32dll --disable-qtx
X.endif
X.endif # ARCH == i386/amd64
X
X.if ${PORT_OPTIONS:MREALPLAYER}
XRUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
XBUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
X.else
XCONFIGURE_ARGS+= --disable-real
X.endif
X
X.if ${PORT_OPTIONS:MV4L}
XBUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
XLIB_DEPENDS+= v4l2:${PORTSDIR}/multimedia/libv4l
XCONFIGURE_ARGS+= --enable-tv-v4l1 --enable-tv-v4l2
XEXTRA_LIBS+= -lv4l1 -lv4l2
X.else
XCONFIGURE_ARGS+= --disable-tv-v4l1 --disable-tv-v4l2
X.endif
X
X.if defined(EXTRA_LIBS)
XCONFIGURE_ARGS+= --extra-libs="${EXTRA_LIBS}"
X.endif
X
X.if ${PORT_OPTIONS:MASS}
XLIB_DEPENDS+= ass:${PORTSDIR}/multimedia/libass
X.else
XCONFIGURE_ARGS+= --disable-libass --disable-enca
X.endif
X
X.if ${PORT_OPTIONS:MX11}
XUSE_XORG= x11 xv xxf86vm
X.if ${PORT_OPTIONS:MOPENGL}
XUSE_XORG+= glproto
XLIB_DEPENDS+= GL:${PORTSDIR}/graphics/libGL
X.else
XCONFIGURE_ARGS+= --disable-gl
X.endif
X.if ${PORT_OPTIONS:MXINERAMA}
XUSE_XORG+= xinerama xineramaproto
X.else
XCONFIGURE_ARGS+= --disable-xinerama
X.endif
X.if ${PORT_OPTIONS:MXVMC}
XUSE_XORG+= xvmc
XCONFIGURE_ARGS+= --enable-xvmc --with-xvmclib=XvMCW
X.endif
X.else #WITHOUT_X11
XCONFIGURE_ARGS+= --disable-x11 --disable-fontconfig
X.endif
X
X.if ${PORT_OPTIONS:MVDPAU}
XLIB_DEPENDS+= vdpau:${PORTSDIR}/multimedia/libvdpau
X.else
XCONFIGURE_ARGS+= --disable-vdpau
X.endif
X
X.if ${PORT_OPTIONS:MRTC}
XBUILD_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
XRUN_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
XCONFIGURE_ARGS+= --enable-rtc
X.else
XCONFIGURE_ARGS+= --disable-rtc
X.endif
X
X.if ${PORT_OPTIONS:MLIBCACA}
XLIB_DEPENDS+= caca:${PORTSDIR}/graphics/libcaca
X.else
XCONFIGURE_ARGS+= --disable-caca
X.endif
X
X.if ${PORT_OPTIONS:MLIRC}
XLIB_DEPENDS+= lirc_client:${PORTSDIR}/comms/lirc
X.else
XCONFIGURE_ARGS+= --disable-lirc
X.endif
X
X.if ${PORT_OPTIONS:MSDL}
XUSE_SDL= sdl
X.else
XCONFIGURE_ARGS+= --disable-sdl
X.endif
X
X.if ${PORT_OPTIONS:MAALIB}
XLIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib
X.else
XCONFIGURE_ARGS+= --disable-aa
X.endif
X
X.if defined(WITH_KERN_HZ)
XDEFAULT_KERN_HZ=${WITH_KERN_HZ}
X.else
XDEFAULT_KERN_HZ=1024
X.endif
X
X.if ${PORT_OPTIONS:MJOYSTICK}
XBUILD_DEPENDS+= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
XCONFIGURE_ARGS+= --enable-joystick
X.else
XCONFIGURE_ARGS+= --disable-joystick
X.endif
X
Xpre-everything::
X @${ECHO_MSG} "N - O - T - E"
X @${ECHO_MSG} ""
X @${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
X @${ECHO_MSG} "OPTIONS framework. You might want to check the Makefile in"
X @${ECHO_MSG} "order to learn more about them."
X
Xpost-patch:
X.if ${OSVERSION} >= 900010
X @${REINPLACE_CMD} -e \
X '/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \
X ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
X.endif
X @${REINPLACE_CMD} \
X -e 's/libavutil/libavutil-011/' \
X -e 's/libavcodec/libavcodec-011/' \
X -e 's/libavformat/libavformat-011/' \
X -e 's/libswscale/libswscale-011/' \
X ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
X @${REINPLACE_CMD} \
X -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
X s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
X -e 's|/usr/local|${LOCALBASE}|' \
X -e 's|-lbz2|/usr/lib/libbz2.so|' \
X -e 's|-lncurses|/usr/lib/libncurses.so|' \
X ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
X @${FIND} -E ${WRKSRC} -type f \
X -iregex ".*(configure|.sh|Makefile)" -print0 | \
X ${XARGS} -x -0 -n 10 \
X ${REINPLACE_CMD} -E \
X -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
X -e 's|[[:space:]]gcc| ${CC}|' \
X -e 's|\$$\(CC\)|${CC}|' \
X -e 's|/usr/X11R6|${LOCALBASE}|'
X @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
X 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
X s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
X s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
X.if ${PORT_OPTIONS:MRTC}
X @${REINPLACE_CMD} -e \
X 's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
X ${WRKSRC}/mplayer.c
X.endif
X
Xpost-install:
X @${INSTALL_DATA} ${WRKSRC}/etc/example.conf ${PREFIX}/etc/mplayer/mplayer.conf.sample
X.for conf in codecs input
X @${INSTALL_DATA} ${WRKSRC}/etc/${conf}.conf ${PREFIX}/etc/mplayer/${conf}.conf.sample
X.endfor
X @${CAT} ${PKGMESSAGE}
X
X.include <bsd.port.post.mk>
3933f3d4f1ac54d31de6978e55286690
echo x - multimedia/mplayer2/distinfo
sed 's/^X//' >multimedia/mplayer2/distinfo << '552f69ce077a0f249c1d88987f16be34'
XSHA256 (mplayer2-2.0.20120517.tar.xz) = 1aba353930064a778f0a3381d8cc54256adafbecd2ae9a581e531ad7ac72ab2b
XSIZE (mplayer2-2.0.20120517.tar.xz) = 3320192
552f69ce077a0f249c1d88987f16be34
echo c - multimedia/mplayer2/files
mkdir -p multimedia/mplayer2/files > /dev/null 2>&1
echo x - multimedia/mplayer2/files/patch-configure
sed 's/^X//' >multimedia/mplayer2/files/patch-configure << 'c967d72974e83d8b7971ab37c94175d9'
X--- configure.orig 2012-05-12 01:08:28.473233004 -0500
X+++ configure 2012-05-12 01:10:33.294799627 -0500
X@@ -3111,7 +3111,7 @@ echocheck "pthread"
X if linux ; then
X THREAD_CFLAGS=-D_REENTRANT
X elif freebsd || netbsd || openbsd || bsdos ; then
X- THREAD_CFLAGS=-D_THREAD_SAFE
X+ THREAD_CFLAGS=${PTHREAD_CFLAGS}
X fi
X if test "$_pthreads" = auto ; then
X cat > $TMPC << EOF
X@@ -3128,7 +3128,7 @@ int main(void) {
X EOF
X _pthreads=no
X if ! hpux ; then
X- for _ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
X+ for _ld_tmp in ${PTHREAD_LIBS} ; do
X # for crosscompilation, we cannot execute the program, be happy if we can link statically
X cc_check $THREAD_CFLAGS $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break
X done
X@@ -6340,7 +6340,7 @@ TIMER = $_timer
X EXESUF = $_exesuf
X EXESUFS_ALL = .exe
X
X-ARCH = $arch
X+MPLAYER_ARCH = $arch
X $(mak_enable "$arch_all" "$arch" ARCH)
X $(mak_enable "$subarch_all" "$subarch" ARCH)
X $(mak_enable "$cpuexts_all" "$cpuexts" HAVE)
c967d72974e83d8b7971ab37c94175d9
echo x - multimedia/mplayer2/files/patch-libao2-ao_oss.c
sed 's/^X//' >multimedia/mplayer2/files/patch-libao2-ao_oss.c << '7645e8efb55a7a0930a83c7b290826ac'
X--- libao2/ao_oss.c~ 2012-05-10 23:45:22.000000000 -0500
X+++ libao2/ao_oss.c 2012-05-11 00:03:17.820525648 -0500
X@@ -460,6 +460,7 @@ static void reset(void){
X fcntl(audio_fd, F_SETFD, FD_CLOEXEC);
X #endif
X
X+ ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
X oss_format = format2oss(ao_data.format);
X if(AF_FORMAT_IS_AC3(ao_data.format))
X ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
X@@ -471,7 +472,6 @@ static void reset(void){
X int c = ao_data.channels-1;
X ioctl (audio_fd, SNDCTL_DSP_STEREO, &c);
X }
X- ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
X }
X }
X
7645e8efb55a7a0930a83c7b290826ac
echo x - multimedia/mplayer2/files/extra-patch-base_system_log2f
sed 's/^X//' >multimedia/mplayer2/files/extra-patch-base_system_log2f << '227e4bb4f179b1c1c8045a88dcda1331'
X--- configure~ 2012-05-12 01:10:33.294799627 -0500
X+++ configure 2012-05-12 01:13:51.714477505 -0500
X@@ -2819,7 +2819,7 @@ if test "$_posix4" = yes ; then
X fi
X echores "$_posix4"
X
X-for func in exp2 exp2f llrint log2 log2f lrint lrintf round roundf truncf; do
X+for func in exp2 exp2f llrint lrint lrintf round roundf truncf; do
X echocheck $func
X eval _$func=no
X statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE $_ld_lm && eval _$func=yes
X@@ -2831,6 +2831,9 @@ else
X echores no
X fi
X done
X+for func in log2 log2f; do
X+ eval def_$func="\"#define HAVE_$(echo $func | tr '[a-z]' '[A-Z]') 0\""
X+done
X
X
X echocheck "mkstemp"
227e4bb4f179b1c1c8045a88dcda1331
echo x - multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c
sed 's/^X//' >multimedia/mplayer2/files/patch-stream-tvi_bsdbt848.c << '05193c6ef8cf9dbc9b18daa5bb71e7b7'
X--- stream/tvi_bsdbt848.c.orig 2009-05-12 21:58:57.000000000 -0500
X+++ stream/tvi_bsdbt848.c 2009-07-23 20:39:13.536681248 -0500
X@@ -352,11 +352,11 @@
X int req_mode = *(int *)arg;
X u_short tmp_fps;
X
X- priv->iformat = METEOR_FMT_AUTOMODE;
X+ priv->iformat = BT848_IFORM_F_AUTO;
X
X if(req_mode == TV_NORM_PAL)
X {
X- priv->iformat = METEOR_FMT_PAL;
X+ priv->iformat = BT848_IFORM_F_PALBDGHI;
X priv->maxheight = PAL_HEIGHT;
X priv->maxwidth = PAL_WIDTH;
X priv->maxfps = PAL_FPS;
X@@ -377,7 +377,7 @@
X
X if(req_mode == TV_NORM_NTSC)
X {
X- priv->iformat = METEOR_FMT_NTSC;
X+ priv->iformat = BT848_IFORM_F_NTSCM;
X priv->maxheight = NTSC_HEIGHT;
X priv->maxwidth = NTSC_WIDTH;
X priv->maxfps = NTSC_FPS;
X@@ -401,9 +401,28 @@
X }
X }
X
X- if(req_mode == TV_NORM_SECAM) priv->iformat = METEOR_FMT_SECAM;
X+ if(req_mode == TV_NORM_SECAM)
X+ {
X+ priv->iformat = BT848_IFORM_F_SECAM;
X+ priv->maxheight = PAL_HEIGHT;
X+ priv->maxwidth = PAL_WIDTH;
X+ priv->maxfps = PAL_FPS;
X+ priv->fps = PAL_FPS;
X+
X+ if(priv->fps > priv->maxfps) priv->fps = priv->maxfps;
X+
X+ if(priv->geom.rows > priv->maxheight)
X+ {
X+ priv->geom.rows = priv->maxheight;
X+ }
X+
X+ if(priv->geom.columns > priv->maxwidth)
X+ {
X+ priv->geom.columns = priv->maxwidth;
X+ }
X+ }
X
X- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
X+ if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
X {
X mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno));
X return TVI_CONTROL_FALSE;
X@@ -532,8 +551,9 @@
X /* Video Configuration */
X
X priv->videoready = TRUE;
X+priv->btdev = strdup("/dev/bktr0");
X priv->immediatemode = FALSE;
X-priv->iformat = METEOR_FMT_PAL;
X+priv->iformat = BT848_IFORM_F_PALBDGHI;
X priv->maxheight = PAL_HEIGHT;
X priv->maxwidth = PAL_WIDTH;
X priv->maxfps = PAL_FPS;
X@@ -558,7 +578,7 @@
X }
X
X if(priv->videoready == TRUE &&
X- ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
X+ ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
X {
X mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "SETEORSFMT", strerror(errno));
X }
05193c6ef8cf9dbc9b18daa5bb71e7b7
echo x - multimedia/mplayer2/files/patch-stream-tvi_v4l.c
sed 's/^X//' >multimedia/mplayer2/files/patch-stream-tvi_v4l.c << '3c485e9fb331090821782330e33d4af4'
X--- stream/tvi_v4l.c 2007-10-07 23:49:26.000000000 +0400
X+++ stream/tvi_v4l.c 2010-01-27 13:42:17.781746063 +0300
X@@ -48,6 +48,14 @@
X
X #include "audio_in.h"
X
X+#include <libv4l1.h>
X+#define open v4l1_open
X+#define close v4l1_close
X+#define dup v4l1_dup
X+#define ioctl v4l1_ioctl
X+#define mmap v4l1_mmap
X+#define munmap v4l1_munmap
X+
X static tvi_handle_t *tvi_init_v4l(tv_param_t* tv_param);
X
X tvi_info_t tvi_info_v4l = {
3c485e9fb331090821782330e33d4af4
echo x - multimedia/mplayer2/files/patch-stream-tvi_v4l2.c
sed 's/^X//' >multimedia/mplayer2/files/patch-stream-tvi_v4l2.c << '0b601c11251532e26164a069b4c73c60'
X--- stream/tvi_v4l2.c~ 2012-05-10 23:45:22.000000000 -0500
X+++ stream/tvi_v4l2.c 2012-05-11 00:08:34.930938536 -0500
X@@ -52,7 +52,6 @@ known issues:
X #ifdef HAVE_SYS_VIDEOIO_H
X #include <sys/videoio.h>
X #else
X-#include <linux/types.h>
X #include <linux/videodev2.h>
X #endif
X #include "mp_msg.h"
X@@ -62,6 +61,14 @@ known issues:
X #include "tv.h"
X #include "audio_in.h"
X
X+#include <libv4l2.h>
X+#define open v4l2_open
X+#define close v4l2_close
X+#define dup v4l2_dup
X+#define ioctl v4l2_ioctl
X+#define mmap v4l2_mmap
X+#define munmap v4l2_munmap
X+
X #define info tvi_info_v4l2
X static tvi_handle_t *tvi_init_v4l2(tv_param_t* tv_param);
X /* information about this file */
0b601c11251532e26164a069b4c73c60
echo x - multimedia/mplayer2/files/pkg-message.in
sed 's/^X//' >multimedia/mplayer2/files/pkg-message.in << '8a05a9b752c44d2070c46369e080bf74'
X
X==================================================================
XMPlayer's system-wide configuration dir is
X
X%%PREFIX%%/etc/mplayer
X
X===================================================================
XIf seeking in streams causes the playback volume to be reset to
Xthe previous setting (on 8.x or newer system with VPC enabled),
Xyou and you dislike this behaviour, you have two options:
X- Use mplayer's -softvol command line option
X- Set the sysctl hw.snd.vpc_autoreset to 0
X===================================================================
8a05a9b752c44d2070c46369e080bf74
echo x - multimedia/mplayer2/pkg-descr
sed 's/^X//' >multimedia/mplayer2/pkg-descr << 'd6e26db6bfe9f357b60a347d0d207133'
XMPlayer2 is an advanced general-purpose video player.
XA fork of the original MPlayer project, it contains significant further
Xdevelopment and supports a number of features not available
Xin other Unix players.
X
XWWW: http://www.mplayer2.org/
d6e26db6bfe9f357b60a347d0d207133
echo x - multimedia/mplayer2/pkg-plist
sed 's/^X//' >multimedia/mplayer2/pkg-plist << '9f91d3f5a312bd648d96982e4e91e498'
Xbin/mplayer
Xetc/mplayer/codecs.conf.sample
Xetc/mplayer/input.conf.sample
Xetc/mplayer/mplayer.conf.sample
X@dirrmtry etc/mplayer
X@dirrmtry man/cs/man1
X@dirrmtry man/cs
X@dirrmtry man/de/man1
X@dirrmtry man/de
X@dirrmtry man/es/man1
X@dirrmtry man/es
X@dirrmtry man/fr/man1
X@dirrmtry man/fr
X@dirrmtry man/hu/man1
X@dirrmtry man/hu
X@dirrmtry man/it/man1
X@dirrmtry man/it
X@dirrmtry man/pl/man1
X@dirrmtry man/pl
X@dirrmtry man/ru/man1
X@dirrmtry man/ru
X@dirrmtry man/zh_CN/man1
X@dirrmtry man/zh_CN
9f91d3f5a312bd648d96982e4e91e498
exit
--=-zB4ey259FBkbEizw3NgV--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208071110.q77BA3we042005>