From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Dec 1 09:30:00 2013 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CA7E3616 for ; Sun, 1 Dec 2013 09:30:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A45881A38 for ; Sun, 1 Dec 2013 09:30:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rB19U0Vv074323 for ; Sun, 1 Dec 2013 09:30:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rB19U0wk074322; Sun, 1 Dec 2013 09:30:00 GMT (envelope-from gnats) Resent-Date: Sun, 1 Dec 2013 09:30:00 GMT Resent-Message-Id: <201312010930.rB19U0wk074322@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Thomas Zander Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5758658B for ; Sun, 1 Dec 2013 09:27:16 +0000 (UTC) Received: from oldred.freebsd.org (oldred.freebsd.org [8.8.178.121]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4273C19FA for ; Sun, 1 Dec 2013 09:27:16 +0000 (UTC) Received: from oldred.freebsd.org ([127.0.1.6]) by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rB19RGh4026122 for ; Sun, 1 Dec 2013 09:27:16 GMT (envelope-from nobody@oldred.freebsd.org) Received: (from nobody@localhost) by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rB19RGQ6026118; Sun, 1 Dec 2013 09:27:16 GMT (envelope-from nobody) Message-Id: <201312010927.rB19RGQ6026118@oldred.freebsd.org> Date: Sun, 1 Dec 2013 09:27:16 GMT From: Thomas Zander To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/184407: Update for multimedia/mplayer and mencoder to a new snapshot X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 01 Dec 2013 09:30:00 -0000 >Number: 184407 >Category: ports >Synopsis: Update for multimedia/mplayer and mencoder to a new snapshot >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sun Dec 01 09:30:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Thomas Zander >Release: >Organization: >Environment: >Description: Update for multimedia/mplayer and mencoder to a new upstream snapshot. >How-To-Repeat: >Fix: Patch for both multimedia/mplayer and multimedia/mencoder ports is attached. Patch attached with submission follows: diff -r 5fbdfd360945 TODO.txt --- a/TODO.txt Sat Nov 09 12:33:07 2013 +0100 +++ b/TODO.txt Sun Dec 01 10:23:50 2013 +0100 @@ -0,0 +1,2 @@ +Check dependencies again, also e-mail reports +Build on 386, different compilers, cflags etc. diff -r 5fbdfd360945 mencoder/Makefile --- a/mencoder/Makefile Sat Nov 09 12:33:07 2013 +0100 +++ b/mencoder/Makefile Sun Dec 01 10:23:50 2013 +0100 @@ -3,16 +3,16 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +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 \ + 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 @@ -21,13 +21,12 @@ 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 @@ -43,10 +42,10 @@ subedit.pl subsearch.sh vobshift.py \ w32codec_dl.pl wma2ogg.pl +.include "${.CURDIR}/../mplayer/Makefile.optvars" +.include .include -LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame - CONFIGURE_ARGS+= --disable-mplayer \ --disable-libdca \ --disable-x11 \ @@ -65,46 +64,12 @@ --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} "" @@ -141,20 +106,16 @@ s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g' do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin post-install: - @${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${MAN1PREFIX}/man/man1/mencoder.1 - @${MKDIR} ${DATADIR} - @${CHMOD} 755 ${DATADIR} - @${MKDIR} ${DATADIR}/tools - @${CHMOD} 755 ${DATADIR}/tools + @${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} ${DATADIR}/tools + @${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 diff -r 5fbdfd360945 mencoder/distinfo --- a/mencoder/distinfo Sat Nov 09 12:33:07 2013 +0100 +++ b/mencoder/distinfo Sun Dec 01 10:23:50 2013 +0100 @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258 -SIZE (mplayer-1.1.20130308.tar.xz) = 10326840 +SHA256 (mplayer-1.1.20131109.tar.xz) = 5647919b61f01396af20273419d5fc74f8b3523177c40e7d1ca063ad45eb13eb +SIZE (mplayer-1.1.20131109.tar.xz) = 10738036 diff -r 5fbdfd360945 mencoder/pkg-plist --- a/mencoder/pkg-plist Sat Nov 09 12:33:07 2013 +0100 +++ b/mencoder/pkg-plist Sun Dec 01 10:23:50 2013 +0100 @@ -1,4 +1,5 @@ bin/mencoder +man/man1/mencoder.1.gz %%DATADIR%%/tools/aconvert.sh %%DATADIR%%/tools/binary_codecs.sh %%DATADIR%%/tools/calcbpp.pl diff -r 5fbdfd360945 mplayer/Makefile --- a/mplayer/Makefile Sat Nov 09 12:33:07 2013 +0100 +++ b/mplayer/Makefile Sun Dec 01 10:23:50 2013 +0100 @@ -7,13 +7,12 @@ 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 \ - JOYSTICK LADSPA LIBMNG LIRC LIVEMEDIA LZO MAD \ - NAS OCFLAGS OPENAL OPENGL OPENJPEG OTCHAIN \ + 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 @@ -26,9 +25,9 @@ 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 @@ -38,24 +37,20 @@ X11DGA_DESC?= X11 DGA video driver support X11VM_DESC?= X11 VidMode support -MAN1= mplayer.1 -MANCOMPRESSED= no +#MANCOMPRESSED= no SUB_FILES= pkg-message CONFFILES= example.conf input.conf menu.conf dvb-menu.conf -USES= pkgconfig +USES+= pkgconfig +.include "${.CURDIR}/Makefile.optvars" +.include .include -.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 \ @@ -67,15 +62,9 @@ --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} @@ -94,7 +83,7 @@ .endif #GUI && X11 .if ${PORT_OPTIONS:MX11} -USE_XORG= x11 +USE_XORG= x11 xscrnsaver .if ${PORT_OPTIONS:MXVIDEO} USE_XORG+= xv .else @@ -130,75 +119,6 @@ --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} "" @@ -248,16 +168,17 @@ .endif post-install: - @${MKDIR} ${DATADIR} - @${CHMOD} 755 ${DATADIR} - @${MKDIR} ${DATADIR}/examples/etc - @${CHMOD} 755 ${DATADIR}/examples/etc + @${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} ${DATADIR}/examples/etc + ${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc .endfor .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} - @${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer - ${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${LOCALBASE}/share/pixmaps/mplayer.png + @${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} diff -r 5fbdfd360945 mplayer/Makefile.options --- a/mplayer/Makefile.options Sat Nov 09 12:33:07 2013 +0100 +++ b/mplayer/Makefile.options Sun Dec 01 10:23:50 2013 +0100 @@ -1,5 +1,6 @@ -# Contains the options and dependencies that are shared -# among mplayer and mencoder +# 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. @@ -27,14 +28,87 @@ # 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 # -.if ${OSVERSION} < 802502 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_log2f -.endif +# Non-OPTIONS knob handling +# ========================= .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} @@ -49,11 +123,25 @@ .endif #OCFLAGS .endif #DEBUG -#Supported architectures for clang +# 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 @@ -85,152 +173,6 @@ .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} @@ -243,57 +185,7 @@ .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 - diff -r 5fbdfd360945 mplayer/Makefile.optvars --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mplayer/Makefile.optvars Sun Dec 01 10:23:50 2013 +0100 @@ -0,0 +1,110 @@ +# 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 diff -r 5fbdfd360945 mplayer/Makefile.shared --- a/mplayer/Makefile.shared Sat Nov 09 12:33:07 2013 +0100 +++ b/mplayer/Makefile.shared Sun Dec 01 10:23:50 2013 +0100 @@ -4,7 +4,7 @@ # # $FreeBSD: head/multimedia/mplayer/Makefile.shared 327683 2013-09-20 10:54:22Z ak $ -MPLAYER_SNAPSHOT_DATE= 2013-03-08 +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} @@ -17,14 +17,13 @@ LICENSE= GPLv2 -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - freetype:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ + libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm -USES= iconv ncurses +USES= gmake iconv ncurses USE_XZ= yes -USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ @@ -34,16 +33,22 @@ --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 \ - --enable-ass-internal \ - --disable-libvorbis \ + --disable-nemesi \ --disable-speex \ - --disable-libopus \ - --disable-libilbc + --enable-ass-internal WANT_GNOME= yes WANT_SDL= yes diff -r 5fbdfd360945 mplayer/distinfo --- a/mplayer/distinfo Sat Nov 09 12:33:07 2013 +0100 +++ b/mplayer/distinfo Sun Dec 01 10:23:50 2013 +0100 @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258 -SIZE (mplayer-1.1.20130308.tar.xz) = 10326840 +SHA256 (mplayer-1.1.20131109.tar.xz) = 5647919b61f01396af20273419d5fc74f8b3523177c40e7d1ca063ad45eb13eb +SIZE (mplayer-1.1.20131109.tar.xz) = 10738036 diff -r 5fbdfd360945 mplayer/files/patch-configure --- a/mplayer/files/patch-configure Sat Nov 09 12:33:07 2013 +0100 +++ b/mplayer/files/patch-configure Sun Dec 01 10:23:50 2013 +0100 @@ -1,6 +1,6 @@ ---- configure.orig 2013-03-03 11:29:18.000000000 +0100 -+++ configure 2013-03-22 17:20:44.452775673 +0100 -@@ -668,7 +668,7 @@ +--- 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 @@ -9,7 +9,7 @@ _ranlib=ranlib _windres=windres _cc=cc -@@ -1534,7 +1534,6 @@ +@@ -1452,7 +1452,6 @@ *) echo "Unknown parameter: $ac_option" @@ -17,8 +17,8 @@ ;; esac -@@ -1669,7 +1668,7 @@ - case "$(uname -m 2>&1)" in +@@ -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 ;; @@ -26,15 +26,7 @@ alpha) host_arch=alpha ;; sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; -@@ -1709,6 +1708,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 @@ +@@ -3822,7 +3821,7 @@ if linux ; then THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then @@ -43,7 +35,7 @@ fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF -@@ -3775,7 +3775,7 @@ +@@ -3832,7 +3831,7 @@ EOF _pthreads=no if ! hpux ; then @@ -52,7 +44,16 @@ # 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 -@@ -5904,7 +5904,7 @@ +@@ -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 @@ -61,7 +62,7 @@ elif openbsd ; then default_cdrom_device="/dev/rcd0c" elif sunos ; then -@@ -5917,7 +5917,7 @@ +@@ -5916,7 +5915,7 @@ default_cdrom_device="/dev/cdrom" fi @@ -70,7 +71,7 @@ default_dvd_device=$default_cdrom_device elif darwin ; then default_dvd_device="/dev/rdiskN" -@@ -6470,7 +6470,7 @@ +@@ -6514,7 +6513,7 @@ echocheck "libgsm" if test "$_libgsm" = auto ; then _libgsm=no @@ -79,7 +80,7 @@ fi if test "$_libgsm" = yes ; then def_libgsm='#define CONFIG_LIBGSM 1' -@@ -6954,6 +6954,16 @@ +@@ -6999,6 +6998,16 @@ nolibrtmp=no def_librtmp='#define CONFIG_LIBRTMP 1' inputmodules="librtmp $inputmodules" @@ -96,7 +97,7 @@ else nolibrtmp=yes _librtmp=no -@@ -7346,7 +7356,7 @@ +@@ -7391,7 +7400,7 @@ echocheck "mencoder" if test "$_mencoder" = no ; then # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint, @@ -105,7 +106,7 @@ fi echores "$_mencoder" -@@ -7684,8 +7694,11 @@ +@@ -7729,8 +7738,11 @@ if test "$_gui" = yes ; then # Required libraries @@ -119,7 +120,7 @@ die "The GUI requires libavcodec with PNG support (needs zlib)." fi test "$_freetype" = no && test "$_bitmap_font" = no && -@@ -8271,7 +8284,7 @@ +@@ -8318,7 +8330,7 @@ EXESUF = $_exesuf EXESUFS_ALL = .exe diff -r 5fbdfd360945 mplayer/files/patch-libavcodec-x86-ac3dsp_init.c --- a/mplayer/files/patch-libavcodec-x86-ac3dsp_init.c Sat Nov 09 12:33:07 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- ffmpeg/libavcodec/x86/ac3dsp_init.c 2013-07-03 21:34:20.000000000 +0200 -+++ ffmpeg/libavcodec/x86/ac3dsp_init.c 2013-07-03 21:34:45.000000000 +0200 -@@ -51,7 +51,7 @@ - extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs); - extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs); - --#if ARCH_X86_32 && defined(__INTEL_COMPILER) -+#if ARCH_X86_32 && (defined(__INTEL_COMPILER) || defined(__clang__)) - # undef HAVE_7REGS - # define HAVE_7REGS 0 - #endif diff -r 5fbdfd360945 mplayer/files/patch-libavutil-x86-asm.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mplayer/files/patch-libavutil-x86-asm.h Sun Dec 01 10:23:50 2013 +0100 @@ -0,0 +1,11 @@ +--- ffmpeg/libavutil/x86/asm.h.orig 2013-05-25 19:20:04.000000000 +0200 ++++ ffmpeg/libavutil/x86/asm.h 2013-11-11 21:51:57.940269764 +0100 +@@ -70,7 +70,7 @@ + typedef int x86_reg; + #endif + +-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) ++#define HAVE_7REGS (ARCH_X86_64) + #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) + + #if ARCH_X86_64 && defined(PIC) diff -r 5fbdfd360945 mplayer/files/patch-libmpdemux-demux_gif.c --- a/mplayer/files/patch-libmpdemux-demux_gif.c Sat Nov 09 12:33:07 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,99 +0,0 @@ ---- 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); - } diff -r 5fbdfd360945 mplayer/files/patch-stream-tvi_bsdbt848.c --- a/mplayer/files/patch-stream-tvi_bsdbt848.c Sat Nov 09 12:33:07 2013 +0100 +++ b/mplayer/files/patch-stream-tvi_bsdbt848.c Sun Dec 01 10:23:50 2013 +0100 @@ -1,6 +1,6 @@ ---- stream/tvi_bsdbt848.c.orig 2009-05-12 21:58:57.000000000 -0500 -+++ stream/tvi_bsdbt848.c 2009-07-23 20:39:13.536681248 -0500 -@@ -352,11 +352,11 @@ +--- 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; @@ -14,7 +14,7 @@ priv->maxheight = PAL_HEIGHT; priv->maxwidth = PAL_WIDTH; priv->maxfps = PAL_FPS; -@@ -377,7 +377,7 @@ +@@ -391,7 +391,7 @@ if(req_mode == TV_NORM_NTSC) { @@ -23,7 +23,7 @@ priv->maxheight = NTSC_HEIGHT; priv->maxwidth = NTSC_WIDTH; priv->maxfps = NTSC_FPS; -@@ -401,9 +401,28 @@ +@@ -415,9 +415,28 @@ } } @@ -54,21 +54,21 @@ { mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno)); return TVI_CONTROL_FALSE; -@@ -532,8 +551,9 @@ +@@ -546,8 +565,9 @@ /* Video Configuration */ - priv->videoready = TRUE; + priv->videoready = 1; +priv->btdev = strdup("/dev/bktr0"); - priv->immediatemode = FALSE; + 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; -@@ -558,7 +578,7 @@ +@@ -572,7 +592,7 @@ } - if(priv->videoready == TRUE && + if(priv->videoready && - ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) + ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) { diff -r 5fbdfd360945 mplayer/pkg-plist --- a/mplayer/pkg-plist Sat Nov 09 12:33:07 2013 +0100 +++ b/mplayer/pkg-plist Sun Dec 01 10:23:50 2013 +0100 @@ -1,5 +1,7 @@ bin/mplayer +man/man1/mplayer.1.gz %%GMPLAYER%%bin/gmplayer +%%GMPLAYER%%man/man1/gmplayer.1.gz %%GMPLAYER%%share/pixmaps/mplayer.png %%DATADIR%%/examples/etc/example.conf %%DATADIR%%/examples/etc/input.conf >Release-Note: >Audit-Trail: >Unformatted: