sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-06-06 13:20:32 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update mplayer and mencoder to a recent snapshot. Major changes:

Browse source 
- Reduce the number of dependencies (use internal ffmpeg whenever possible)
  in mplayer
- Do not build with clang on i386
- Use new options framework

PR:		177083
Submitted by:	Thomas Zander <thomas.e.zander@googlemail.com> (maintainer)
This commit is contained in:
Christian Weisgerber 2013-03-23 15:45:25 +00:00
parent 7a0aa7c12d
commit 71ed9f76bb
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=315041
12 changed files with 241 additions and 256 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
multimedia/mencoder/Makefile
View file

@ -1,56 +1,28 @@
# New ports collection makefile for: mencoder # Created by: Thomas E. Zander
# Date created: 23 June 2007
# Whom: Thomas E. Zander
# $FreeBSD$ # $FreeBSD$
#
PORTNAME= mencoder PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION} PORTVERSION= ${MPLAYER_PORT_VERSION}
PORTREVISION= 1 PORTREVISION= 0
COMMENT= Convenient video file and movie encoder COMMENT= Convenient video file and movie encoder
.include "${.CURDIR}/../mplayer/Makefile.shared" .include "${.CURDIR}/../mplayer/Makefile.shared"
OPTIONS= DEBUG "Include debug symbols in mencoder's binary" off OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \
OPTIONS+= RTCPU "Allow runtime CPU detection" on DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK LADSPA \
OPTIONS+= OCFLAGS "Use optimized compiler flags" on LIBMNG LIVEMEDIA LZO MAD NAS OCFLAGS OPENAL OPENJPEG \
OPTIONS+= OTCHAIN "Use gcc 4.6+ toolchain on legacy systems" off OTCHAIN PULSEAUDIO REAL RTCPU RTMP SCHROEDINGER SMB \
OPTIONS+= IPV6 "Include inet6 network support" on THEORA TWOLAME V4L VPX WIN32 X264 XVID
OPTIONS+= JACK "Enable JackIt audio server support" off
OPTIONS+= NAS "Enable NAS sound server support" off OPTIONS_DEFAULT=GIF IPV6 OCFLAGS RTCPU WIN32 X264 XVID
OPTIONS+= OPENAL "Enable OpenAL sound support" off
OPTIONS+= PULSE "Enable PulseAudio" off BLURAY_DESC?= BluRay support
OPTIONS+= FONTCONFIG "Enable fontconfig support" off OCFLAGS_DESC?= Use optimized compiler flags
OPTIONS+= LIBUNGIF "Enable gif support" on OTCHAIN_DESC?= Use gcc 4.6+ toolchain on legacy systems
OPTIONS+= OPENJPEG "Enable JPEG2000 support" off REAL_DESC?= Enable realplayer plugin
OPTIONS+= MNG "Enable MNG input support" off RTCPU_DESC?= Use runtime CPU detection
OPTIONS+= LIBDV "Enable libdv support" off WIN32_DESC?= Install win32 binary codecs
OPTIONS+= MAD "Enable mad MPEG audio engine support" off
OPTIONS+= AMR_NB "AMR Narrow Band encoder (opencore)" off
OPTIONS+= AMR_WB "AMR Wide Band encoder (opencore)" off
OPTIONS+= GSM "GSM audio codec" off
OPTIONS+= TWOLAME "Enable twolame MPEG audio codec support" off
OPTIONS+= FAAC "Enable FAAC audio codec support" off
OPTIONS+= LADSPA "Enable LADSPA plugin support" off
OPTIONS+= SPEEX "Enable speex audio codec support" off
OPTIONS+= WIN32 "Enable win32 codec set on the IA32 arch" on
OPTIONS+= THEORA "Enable ogg theora video support" off
OPTIONS+= XVID "Enable XVID video codec support" on
OPTIONS+= X264 "Enable x264 (H.264) video codec support" on
OPTIONS+= VPX "Enable VP8 video via libvpx" off
OPTIONS+= DIRAC "Enable dirac video codec support" off
OPTIONS+= SCHROEDINGER "Dirac codec via libschroedinger" off
OPTIONS+= REALPLAYER "Enable real player plugin" off
OPTIONS+= LIVEMEDIA "Enable LIVE555 streaming support" off
OPTIONS+= SMB "Enable Samba input support" off
OPTIONS+= BLURAY "Build with libbluray support" off
OPTIONS+= FRIBIDI "Enable FriBiDi support" off
OPTIONS+= LIBCDIO "Enable libcdio support" off
OPTIONS+= CDPARANOIA "Enable cdparanoia support" off
OPTIONS+= LIBLZO "Enable external liblzo library" off
OPTIONS+= V4L "Enable Video4Linux TV support" off
OPTIONS+= LIBRTMP "Enable RTMPDump Streaming Media support" off
MAN1= mencoder.1 MAN1= mencoder.1
@ -95,37 +67,37 @@ ALL_TARGET= mencoder
.include "${.CURDIR}/../mplayer/Makefile.options" .include "${.CURDIR}/../mplayer/Makefile.options"
.if defined(WITH_FONTCONFIG) .if ${PORT_OPTIONS:MFONTCONFIG}
LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig
.else .else
CONFIGURE_ARGS+= --disable-fontconfig CONFIGURE_ARGS+= --disable-fontconfig
.endif .endif
.if defined(WITH_TWOLAME) .if ${PORT_OPTIONS:MTWOLAME}
LIB_DEPENDS+= twolame:${PORTSDIR}/audio/twolame LIB_DEPENDS+= twolame:${PORTSDIR}/audio/twolame
.else .else
CONFIGURE_ARGS+= --disable-twolame CONFIGURE_ARGS+= --disable-twolame
.endif .endif
.if defined(WITH_FAAC) .if ${PORT_OPTIONS:MFAAC}
LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac
.else .else
CONFIGURE_ARGS+= --disable-faac CONFIGURE_ARGS+= --disable-faac
.endif .endif
.if !defined(WITHOUT_X264) .if ${PORT_OPTIONS:MX264}
LIB_DEPENDS+= x264.125:${PORTSDIR}/multimedia/x264 LIB_DEPENDS+= x264.125:${PORTSDIR}/multimedia/x264
.else .else
CONFIGURE_ARGS+= --disable-x264 CONFIGURE_ARGS+= --disable-x264
.endif .endif
.if !defined(WITHOUT_XVID) .if ${PORT_OPTIONS:MXVID}
LIB_DEPENDS+= xvidcore:${PORTSDIR}/multimedia/xvid LIB_DEPENDS+= xvidcore:${PORTSDIR}/multimedia/xvid
.else .else
CONFIGURE_ARGS+= --disable-xvid CONFIGURE_ARGS+= --disable-xvid
.endif .endif
.ifdef(WITH_DIRAC) .if ${PORT_OPTIONS:MDIRAC}
LIB_DEPENDS+= dirac_encoder:${PORTSDIR}/multimedia/dirac LIB_DEPENDS+= dirac_encoder:${PORTSDIR}/multimedia/dirac
.else .else
CONFIGURE_ARGS+= --disable-libdirac-lavc CONFIGURE_ARGS+= --disable-libdirac-lavc
@ -135,9 +107,10 @@ pre-everything::
@${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "N - O - T - E"
@${ECHO_MSG} "" @${ECHO_MSG} ""
@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the" @${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
@${ECHO_MSG} "OPTIONS framework. As this one is a slave port of multimedia/" @${ECHO_MSG} "OPTIONS framework. At the moment, their defaults are:"
@${ECHO_MSG} "mplayer, you might want to check mplayer's Makefile(s) in" @${ECHO_MSG} "WITH_LANG=<LanguageCode>"
@${ECHO_MSG} "order to learn more about them." @${ECHO_MSG} "DEFAULT_DVD_DEVICE=/dev/cd0"
@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=/dev/cd0"
post-patch: post-patch:
.if ${OSVERSION} >= 900010 .if ${OSVERSION} >= 900010

4
multimedia/mencoder/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (mplayer-1.1.20120721.tar.xz) = 30b120bf8543b7cfad36272e3ae29a017282caa90f4d635fe157f29036393787 SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258
SIZE (mplayer-1.1.20120721.tar.xz) = 10480368 SIZE (mplayer-1.1.20130308.tar.xz) = 10326840

153
multimedia/mplayer/Makefile
View file

@ -3,67 +3,39 @@
PORTNAME= mplayer PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION} PORTVERSION= ${MPLAYER_PORT_VERSION}
PORTREVISION= 2 PORTREVISION= 0
COMMENT= High performance media player supporting many formats COMMENT= High performance media player supporting many formats
.include "${.CURDIR}/Makefile.shared" .include "${.CURDIR}/Makefile.shared"
OPTIONS= DEBUG "Include debug symbols in mplayer's binaries" off OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ARTS BLURAY CACA DEBUG DV \
OPTIONS+= RTCPU "Allow runtime CPU detection" on ENCA ESOUND FRIBIDI GIF GSM GUI IPV6 JACK \
OPTIONS+= OCFLAGS "Use optimized compiler flags" on JOYSTICK LADSPA LIBMNG LIRC LIVEMEDIA LZO MAD \
OPTIONS+= OTCHAIN "Use gcc 4.6+ toolchain on legacy systems" off NAS OCFLAGS OPENAL OPENGL OPENJPEG OTCHAIN \
OPTIONS+= IPV6 "Include inet6 network support" on PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \
OPTIONS+= X11 "Enable X11 support for mplayer's video output" on SKINS SMB SVGALIB V4L VDPAU WIN32 \
OPTIONS+= X11XV "X11 video drivers: XV" on X11 X11DGA X11VM XINERAMA XVIDEO XVMC
OPTIONS+= X11DGA "X11 video drivers: DGA" on
OPTIONS+= X11GL "X11 video drivers: OpenGL" on OPTIONS_RADIO= RGCD
OPTIONS+= X11XIN "X11 video drivers: Xinerama" on OPTIONS_RADIO_RGCD= CDIO CDPARANOIA
OPTIONS+= X11VM "X11 VidMode support" on
OPTIONS+= X11XVMC "Enable XvMC acceleration" off OPTIONS_DEFAULT=GUI IPV6 OCFLAGS OPENGL RTCPU SKINS \
OPTIONS+= VDPAU "Enable Nvidia VDPAU acceleration" off WIN32 X11 X11DGA X11VM XINERAMA XVIDEO
OPTIONS+= GUI "Enable GTK2 graphical user interface with X11" on
OPTIONS+= SDL "Enable SDL video output" off BLURAY_DESC?= BluRay support
OPTIONS+= SKINS "Force dependency on mplayer-skins" on ENCA_DESC?= Charset conversion via enca
OPTIONS+= RTC "Add support for kernel real time clock timing" off JOYSTICK_DESC?= Joystick support
OPTIONS+= ARTS "Enable KDE sound system support" off LZO_DESC?= External liblzo support
OPTIONS+= ESOUND "Enable GNOME esound support" off OCFLAGS_DESC?= Use optimized compiler flags
OPTIONS+= JACK "Enable JackIt audio server support" off OTCHAIN_DESC?= Use gcc 4.6+ toolchain on legacy systems
OPTIONS+= NAS "Enable NAS sound server support" off REAL_DESC?= Enable realplayer plugin
OPTIONS+= OPENAL "Enable OpenAL sound support" off RTC_DESC?= Add support for kernel real time clock
OPTIONS+= PULSE "Enable PulseAudio" off RTCPU_DESC?= Use runtime CPU detection
OPTIONS+= LIBUNGIF "Enable gif support" on SKINS_DESC?= Install skins for GUI
OPTIONS+= OPENJPEG "Enable JPEG2000 support" off WIN32_DESC?= Install win32 binary codecs
OPTIONS+= MNG "Enable MNG input support" off X11DGA_DESC?= X11 DGA video driver support
OPTIONS+= AALIB "Enable aalib support" off X11VM_DESC?= X11 VidMode support
OPTIONS+= LIBCACA "Enable libcaca support" off
OPTIONS+= SVGALIB "Enable svgalib support" off
OPTIONS+= LIBDV "Enable libdv support" off
OPTIONS+= MAD "Enable mad MPEG audio engine support" off
OPTIONS+= AMR_NB "AMR Narrow Band encoder (opencore)" off
OPTIONS+= AMR_WB "AMR Wide Band encoder (opencore)" off
OPTIONS+= GSM "GSM audio codec" off
OPTIONS+= LADSPA "Enable LADSPA plugin support" off
OPTIONS+= SPEEX "Enable speex audio codec support" on
OPTIONS+= THEORA "Enable ogg theora video support" off
OPTIONS+= VPX "Enable VP8 video via libvpx" off
OPTIONS+= SCHROEDINGER "Dirac codec via libschroedinger" off
.if !defined(PACKAGE_BUILDING)
OPTIONS+= WIN32 "Enable win32 codec set on the IA32 arch" on
.endif
OPTIONS+= REALPLAYER "Enable real player plugin" off
OPTIONS+= LIVEMEDIA "Enable LIVE555 streaming support" off
OPTIONS+= SMB "Enable Samba input support" off
OPTIONS+= BLURAY "Build with libbluray support" off
OPTIONS+= FRIBIDI "Enable FriBiDi support" off
OPTIONS+= LIRC "Enable lirc support" off
OPTIONS+= LIBCDIO "Enable libcdio support" off
OPTIONS+= CDPARANOIA "Enable cdparanoia support" off
OPTIONS+= LIBLZO "Enable external liblzo library" off
OPTIONS+= JOYSTICK "Enable joystick support" off
OPTIONS+= V4L "Enable Video4Linux TV support" off
OPTIONS+= LIBRTMP "Enable RTMPDump Streaming Media support" off
OPTIONS+= ENCA "Enable enca charset detection" off
MAN1= mplayer.1 MAN1= mplayer.1
MANCOMPRESSED= no MANCOMPRESSED= no
@ -82,13 +54,15 @@ CONFIGURE_ARGS+= --disable-directfb \
--disable-faac \ --disable-faac \
--disable-faad \ --disable-faad \
--disable-libdca \ --disable-libdca \
--disable-toolame \
--disable-twolame \ --disable-twolame \
--disable-x264 \ --disable-x264 \
--disable-xvid \ --disable-xvid \
--disable-libdirac-lavc \ --disable-libdirac-lavc \
--disable-mencoder \ --disable-mencoder \
--disable-mpg123 \ --disable-mpg123 \
--disable-musepack --disable-musepack \
--disable-theora
# Fix a problem with unknown assembly opcodes in embedded ffmpeg # Fix a problem with unknown assembly opcodes in embedded ffmpeg
.if ${ARCH} == "ppc" .if ${ARCH} == "ppc"
@ -97,11 +71,11 @@ CONFIGURE_ARGS+= --disable-asm
.include "${.CURDIR}/Makefile.options" .include "${.CURDIR}/Makefile.options"
.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11) .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
MLINKS+= mplayer.1 gmplayer.1 MLINKS+= mplayer.1 gmplayer.1
PLIST_SUB+= GMPLAYER="" PLIST_SUB+= GMPLAYER=""
DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
.if !defined(WITHOUT_SKINS) .if ${PORT_OPTIONS:MSKINS}
RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/skins:${PORTSDIR}/multimedia/mplayer-skins RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/skins:${PORTSDIR}/multimedia/mplayer-skins
.endif .endif
@ -114,52 +88,52 @@ WITH_LANG= ""
.else .else
PLIST_SUB+= GMPLAYER="@comment " PLIST_SUB+= GMPLAYER="@comment "
.endif #WITHOUT_GUI .endif #GUI && X11
.if !defined(WITHOUT_X11) .if ${PORT_OPTIONS:MX11}
USE_XORG= x11 USE_XORG= x11
.if !defined(WITHOUT_X11XV) .if ${PORT_OPTIONS:MXVIDEO}
USE_XORG+= xv USE_XORG+= xv
.else .else
CONFIGURE_ARGS+=--disable-xv CONFIGURE_ARGS+=--disable-xv
.endif .endif
.if !defined(WITHOUT_X11DGA) .if ${PORT_OPTIONS:MX11DGA}
USE_XORG+= xxf86dga USE_XORG+= xxf86dga
.else .else
CONFIGURE_ARGS+=--disable-dga1 --disable-dga2 CONFIGURE_ARGS+=--disable-dga1 --disable-dga2
.endif .endif
.if !defined(WITHOUT_X11GL) .if ${PORT_OPTIONS:MOPENGL}
USE_XORG+= glproto USE_XORG+= glproto
LIB_DEPENDS+= GL:${PORTSDIR}/graphics/libGL LIB_DEPENDS+= GL:${PORTSDIR}/graphics/libGL
.else .else
CONFIGURE_ARGS+=--disable-gl CONFIGURE_ARGS+=--disable-gl
.endif .endif
.if !defined(WITHOUT_X11XIN) .if ${PORT_OPTIONS:MXINERAMA}
USE_XORG+= xinerama xineramaproto USE_XORG+= xinerama xineramaproto
.else .else
CONFIGURE_ARGS+=--disable-xinerama CONFIGURE_ARGS+=--disable-xinerama
.endif .endif
.if !defined(WITHOUT_X11VM) .if ${PORT_OPTIONS:MX11VM}
USE_XORG+= xxf86vm USE_XORG+= xxf86vm
.else .else
CONFIGURE_ARGS+=--disable-vm CONFIGURE_ARGS+=--disable-vm
.endif .endif
.if defined(WITH_X11XVMC) .if ${PORT_OPTIONS:MXVMC}
USE_XORG+= xvmc USE_XORG+= xvmc
CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW
.endif .endif
.else #WITHOUT_X11 .else #X11
CONFIGURE_ARGS+=--disable-x11 \ CONFIGURE_ARGS+=--disable-x11 \
--disable-fontconfig --disable-fontconfig
.endif .endif
.if defined(WITH_VDPAU) .if ${PORT_OPTIONS:MVDPAU}
LIB_DEPENDS+= vdpau:${PORTSDIR}/multimedia/libvdpau LIB_DEPENDS+= vdpau:${PORTSDIR}/multimedia/libvdpau
.else .else
CONFIGURE_ARGS+= --disable-vdpau CONFIGURE_ARGS+= --disable-vdpau
.endif .endif
.if defined(WITH_RTC) .if ${PORT_OPTIONS:MRTC}
BUILD_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc BUILD_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
RUN_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc RUN_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
CONFIGURE_ARGS+= --enable-rtc CONFIGURE_ARGS+= --enable-rtc
@ -167,45 +141,43 @@ CONFIGURE_ARGS+= --enable-rtc
CONFIGURE_ARGS+= --disable-rtc CONFIGURE_ARGS+= --disable-rtc
.endif .endif
.if defined(WITH_ARTS) .if ${PORT_OPTIONS:MARTS}
LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts LIB_DEPENDS+= artsc:${PORTSDIR}/audio/arts
.else .else
CONFIGURE_ARGS+= --disable-arts CONFIGURE_ARGS+= --disable-arts
.endif .endif
.if defined(WITH_LIBCACA) .if ${PORT_OPTIONS:MCACA}
LIB_DEPENDS+= caca:${PORTSDIR}/graphics/libcaca LIB_DEPENDS+= caca:${PORTSDIR}/graphics/libcaca
.else .else
CONFIGURE_ARGS+= --disable-caca CONFIGURE_ARGS+= --disable-caca
.endif .endif
.if defined(WITH_LIRC) .if ${PORT_OPTIONS:MLIRC}
LIB_DEPENDS+= lirc_client:${PORTSDIR}/comms/lirc LIB_DEPENDS+= lirc_client:${PORTSDIR}/comms/lirc
.else .else
CONFIGURE_ARGS+= --disable-lirc CONFIGURE_ARGS+= --disable-lirc
.endif .endif
.if defined(WITH_SDL) .if ${PORT_OPTIONS:MSDL}
USE_SDL= sdl USE_SDL= sdl
WITH_AALIB= yes
.undef(WITHOUT_AALIB)
.else .else
CONFIGURE_ARGS+= --disable-sdl CONFIGURE_ARGS+= --disable-sdl
.endif .endif
.if defined(WITH_SVGALIB) .if ${PORT_OPTIONS:MSVGALIB}
LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib
.else .else
CONFIGURE_ARGS+= --disable-svga CONFIGURE_ARGS+= --disable-svga
.endif .endif
.if defined(WITH_AALIB) .if ${PORT_OPTIONS:MAALIB} || ${PORT_OPTIONS:MSDL}
LIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib LIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib
.else .else
CONFIGURE_ARGS+= --disable-aa CONFIGURE_ARGS+= --disable-aa
.endif .endif
.if defined(WITH_ESOUND) .if ${PORT_OPTIONS:MESOUND}
USE_GNOME+= esound USE_GNOME+= esound
.else .else
CONFIGURE_ARGS+= --disable-esd CONFIGURE_ARGS+= --disable-esd
@ -217,14 +189,14 @@ DEFAULT_KERN_HZ=${WITH_KERN_HZ}
DEFAULT_KERN_HZ=1024 DEFAULT_KERN_HZ=1024
.endif .endif
.if defined(WITH_JOYSTICK) .if ${PORT_OPTIONS:MJOYSTICK}
BUILD_DEPENDS+= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js BUILD_DEPENDS+= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
CONFIGURE_ARGS+=--enable-joystick CONFIGURE_ARGS+=--enable-joystick
.else .else
CONFIGURE_ARGS+=--disable-joystick CONFIGURE_ARGS+=--disable-joystick
.endif .endif
.if defined(WITH_ENCA) .if ${PORT_OPTIONS:MENCA}
LIB_DEPENDS+= enca:${PORTSDIR}/converters/enca LIB_DEPENDS+= enca:${PORTSDIR}/converters/enca
.else .else
CONFIGURE_ARGS+= --disable-enca CONFIGURE_ARGS+= --disable-enca
@ -234,14 +206,17 @@ pre-everything::
@${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "N - O - T - E"
@${ECHO_MSG} "" @${ECHO_MSG} ""
@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the" @${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
@${ECHO_MSG} "OPTIONS framework. You might want to check Makefile.options" @${ECHO_MSG} "OPTIONS framework. At the moment, their defaults are:"
@${ECHO_MSG} "in order to learn more about them." @${ECHO_MSG} "WITH_LANG=<LanguageCode>"
@${ECHO_MSG} "WITH_KERN_HZ=1024"
@${ECHO_MSG} "DEFAULT_DVD_DEVICE=/dev/cd0"
@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=/dev/cd0"
.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11) .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
@${ECHO_MSG} "If you want to use the GUI, you can either install" @${ECHO_MSG} "If you want to use the GUI, you can use the skins from"
@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins" @${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
@${ECHO_MSG} "or download official skin collections from" @${ECHO_MSG} "or download them from"
@${ECHO_MSG} "http://www.mplayerhq.hu/homepage/dload.html" @${ECHO_MSG} "http://www.mplayerhq.hu/"
.endif .endif
post-patch: post-patch:
@ -269,7 +244,7 @@ post-patch:
's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \ 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \ s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g' s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
.if defined(WITH_RTC) .if ${PORT_OPTIONS:MRTC}
@${REINPLACE_CMD} -e \ @${REINPLACE_CMD} -e \
's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \ 's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
${WRKSRC}/mplayer.c ${WRKSRC}/mplayer.c
@ -283,7 +258,7 @@ post-install:
.for conf in ${CONFFILES} .for conf in ${CONFFILES}
${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR}/examples/etc ${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR}/examples/etc
.endfor .endfor
.if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11) .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
@${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer @${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer
${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${LOCALBASE}/share/pixmaps/mplayer.png ${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${LOCALBASE}/share/pixmaps/mplayer.png
.endif .endif

97
multimedia/mplayer/Makefile.options
View file

@ -14,14 +14,12 @@
# the variable to make during build, e.g. make WITH_DVD_DEVICE=/dev/cd0 # the variable to make during build, e.g. make WITH_DVD_DEVICE=/dev/cd0
# #
# WITH_DVD_DEVICE=/path/to/desired/device # WITH_DVD_DEVICE=/path/to/desired/device
# default 5.x: /dev/acd0 # default: /dev/cd0
# default 4.x: /dev/acd0c
# This option changes the default device where mplayer looks for # This option changes the default device where mplayer looks for
# a DVD medium # a DVD medium
# #
# WITH_CDROM_DEVICE=/path/to/desired/device # WITH_CDROM_DEVICE=/path/to/desired/device
# default 5.x: /dev/acd0 # default: /dev/cd0
# default 4.x: /dev/acd0c
# This option changes the default cdrom device, maybe useful for VCDs # This option changes the default cdrom device, maybe useful for VCDs
# #
# WITH_LANG=<your choice> # WITH_LANG=<your choice>
@ -39,24 +37,24 @@ CONFIGURE_ARGS+=--language=${WITH_LANG}
#On i386, gcc runs out of general purpose registers when #On i386, gcc runs out of general purpose registers when
#trying to compile a debug version with the default flags. #trying to compile a debug version with the default flags.
.if defined(WITH_DEBUG) .if ${PORT_OPTIONS:MDEBUG}
.if ${ARCH} == "i386" .if ${ARCH} == "i386"
DEBUG_FLAGS= -g -O -fomit-frame-pointer DEBUG_FLAGS= -g -O -fomit-frame-pointer
.endif .endif
.else .else
.if defined(WITHOUT_OCFLAGS) .if ${PORT_OPTIONS:MOCFLAGS}
CFLAGS+= -O -fomit-frame-pointer
.else
CFLAGS+= -O3 -fomit-frame-pointer -ffast-math CFLAGS+= -O3 -fomit-frame-pointer -ffast-math
.endif .else
.endif #WITH_DEBUG CFLAGS+= -O -fomit-frame-pointer
.endif #OCFLAGS
.endif #DEBUG
#Supported architectures for clang #Supported architectures for clang
.if ${ARCH} == "i386" || ${ARCH} == "amd64" .if ${ARCH} == "amd64"
MPLAYER_CLANG_SUPPORTED_ARCH= yes MPLAYER_CLANG_SUPPORTED_ARCH= yes
.endif .endif
.if !defined(WITHOUT_RTCPU) .if ${PORT_OPTIONS:MRTCPU}
CONFIGURE_ARGS+=--enable-runtime-cpudetection CONFIGURE_ARGS+=--enable-runtime-cpudetection
.endif .endif
@ -70,8 +68,9 @@ WITH_BASE_CLANG=yes
CC= clang CC= clang
CXX= clang++ CXX= clang++
CPP= clang-cpp CPP= clang-cpp
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang-version
.else .else
.if defined(WITH_OTCHAIN) .if ${PORT_OPTIONS:MOTCHAIN}
USE_GCC?= 4.6+ USE_GCC?= 4.6+
BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
.else .else
@ -85,61 +84,55 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin
.endif .endif
.endif .endif
.if defined(WITHOUT_IPV6) .if ${PORT_OPTIONS:MIPV6}
CONFIGURE_ARGS+= --disable-inet6
.else
CATEGORIES+= ipv6 CATEGORIES+= ipv6
.else
CONFIGURE_ARGS+= --disable-inet6
.endif .endif
.if !defined(WITHOUT_LIBUNGIF) .if ${PORT_OPTIONS:MGIF}
LIB_DEPENDS+= gif:${PORTSDIR}/graphics/giflib LIB_DEPENDS+= gif:${PORTSDIR}/graphics/giflib
.else .else
CONFIGURE_ARGS+= --disable-gif CONFIGURE_ARGS+= --disable-gif
.endif .endif
.if defined(WITH_OPENJPEG) .if ${PORT_OPTIONS:MOPENJPEG}
LIB_DEPENDS+= openjpeg:${PORTSDIR}/graphics/openjpeg LIB_DEPENDS+= openjpeg:${PORTSDIR}/graphics/openjpeg
.else .else
CONFIGURE_ARGS+= --disable-libopenjpeg CONFIGURE_ARGS+= --disable-libopenjpeg
.endif .endif
.if defined(WITH_MAD) .if ${PORT_OPTIONS:MMAD}
LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad
.else .else
CONFIGURE_ARGS+= --disable-mad CONFIGURE_ARGS+= --disable-mad
.endif .endif
.if defined(WITH_LIBDV) .if ${PORT_OPTIONS:MDV}
LIB_DEPENDS+= dv:${PORTSDIR}/multimedia/libdv LIB_DEPENDS+= dv:${PORTSDIR}/multimedia/libdv
.else .else
CONFIGURE_ARGS+= --disable-libdv CONFIGURE_ARGS+= --disable-libdv
.endif .endif
.if defined(WITH_THEORA) .if ${PORT_OPTIONS:MTHEORA}
LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora
.else .else
CONFIGURE_ARGS+= --disable-theora CONFIGURE_ARGS+= --disable-theora
.endif .endif
.if defined(WITH_VPX) .if ${PORT_OPTIONS:MVPX}
LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx
.else .else
CONFIGURE_ARGS+= --disable-libvpx-lavc CONFIGURE_ARGS+= --disable-libvpx-lavc
.endif .endif
.if defined(WITH_SCHROEDINGER) .if ${PORT_OPTIONS:MSCHROEDINGER}
LIB_DEPENDS+= schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger LIB_DEPENDS+= schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
.else .else
CONFIGURE_ARGS+= --disable-libschroedinger-lavc CONFIGURE_ARGS+= --disable-libschroedinger-lavc
.endif .endif
.if !defined(WITHOUT_SPEEX) .if ${PORT_OPTIONS:MLIVEMEDIA}
LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex
.else
CONFIGURE_ARGS+= --disable-speex
.endif
.if defined(WITH_LIVEMEDIA)
CONFIGURE_ARGS+= --enable-live CONFIGURE_ARGS+= --enable-live
BUILD_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia BUILD_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
CFLAGS+= -I${LOCALBASE}/live/liveMedia/include \ CFLAGS+= -I${LOCALBASE}/live/liveMedia/include \
@ -159,67 +152,67 @@ LDFLAGS+= -L${LOCALBASE}/live/liveMedia \
CONFIGURE_ARGS+= --disable-live CONFIGURE_ARGS+= --disable-live
.endif .endif
.if defined(WITH_JACK) .if ${PORT_OPTIONS:MJACK}
LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack
.else .else
CONFIGURE_ARGS+= --disable-jack CONFIGURE_ARGS+= --disable-jack
.endif .endif
.if defined(WITH_NAS) .if ${PORT_OPTIONS:MNAS}
LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas
.else .else
CONFIGURE_ARGS+= --disable-nas CONFIGURE_ARGS+= --disable-nas
.endif .endif
.if defined(WITH_OPENAL) .if ${PORT_OPTIONS:MOPENAL}
USE_OPENAL= soft USE_OPENAL= soft
.else .else
CONFIGURE_ARGS+= --disable-openal CONFIGURE_ARGS+= --disable-openal
.endif .endif
.if defined(WITH_PULSE) .if ${PORT_OPTIONS:MPULSEAUDIO}
LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio
.else .else
CONFIGURE_ARGS+= --disable-pulse CONFIGURE_ARGS+= --disable-pulse
.endif .endif
.if defined(WITH_BLURAY) .if ${PORT_OPTIONS:MBLURAY}
LIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray LIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray
.else .else
CONFIGURE_ARGS+= --disable-bluray CONFIGURE_ARGS+= --disable-bluray
.endif .endif
.if defined(WITH_SMB) .if ${PORT_OPTIONS:MSMB}
LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient
.else .else
CONFIGURE_ARGS+= --disable-smb CONFIGURE_ARGS+= --disable-smb
.endif .endif
.if defined(WITH_FRIBIDI) .if ${PORT_OPTIONS:MFRIBIDI}
LIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi LIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi
.else .else
CONFIGURE_ARGS+= --disable-fribidi CONFIGURE_ARGS+= --disable-fribidi
.endif .endif
.if defined(WITH_CDPARANOIA) .if ${PORT_OPTIONS:MCDPARANOIA}
LIB_DEPENDS+= cdda_paranoia:${PORTSDIR}/audio/cdparanoia LIB_DEPENDS+= cdda_paranoia:${PORTSDIR}/audio/cdparanoia
.else .else
CONFIGURE_ARGS+= --disable-cdparanoia CONFIGURE_ARGS+= --disable-cdparanoia
.endif .endif
.if defined(WITH_LIBCDIO) && !defined(WITH_CDPARANOIA) .if ${PORT_OPTIONS:MCDIO}
LIB_DEPENDS+= cdio:${PORTSDIR}/sysutils/libcdio LIB_DEPENDS+= cdio:${PORTSDIR}/sysutils/libcdio
.else .else
CONFIGURE_ARGS+= --disable-libcdio CONFIGURE_ARGS+= --disable-libcdio
.endif .endif
.if defined(WITH_LADSPA) .if ${PORT_OPTIONS:MLADSPA}
RUN_DEPENDS+= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa RUN_DEPENDS+= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
.else .else
CONFIGURE_ARGS+= --disable-ladspa CONFIGURE_ARGS+= --disable-ladspa
.endif .endif
.if defined(WITH_LIBLZO) .if ${PORT_OPTIONS:MLZO}
LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2 LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2
.else .else
CONFIGURE_ARGS+= --disable-liblzo CONFIGURE_ARGS+= --disable-liblzo
@ -228,17 +221,17 @@ CONFIGURE_ARGS+= --disable-liblzo
.if defined(WITH_DVD_DEVICE) .if defined(WITH_DVD_DEVICE)
DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
.else .else
DEFAULT_DVD_DEVICE=/dev/acd0 DEFAULT_DVD_DEVICE=/dev/cd0
.endif .endif
.if defined(WITH_CDROM_DEVICE) .if defined(WITH_CDROM_DEVICE)
DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE} DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
.else .else
DEFAULT_CDROM_DEVICE=/dev/acd0 DEFAULT_CDROM_DEVICE=/dev/cd0
.endif .endif
.if ${ARCH} == "i386" || ${ARCH} == "amd64" .if ${ARCH} == "i386" || ${ARCH} == "amd64"
.if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386" .if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT} RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
CONFIGURE_ARGS+= --codecsdir=${LOCALBASE}/lib/win32 CONFIGURE_ARGS+= --codecsdir=${LOCALBASE}/lib/win32
CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs
@ -249,32 +242,32 @@ CONFIGURE_ARGS+= --disable-win32dll \
.endif .endif
.endif # ARCH == i386/amd64 .endif # ARCH == i386/amd64
.if defined(WITH_REALPLAYER) .if ${PORT_OPTIONS:MREAL}
RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
.else .else
CONFIGURE_ARGS+= --disable-real CONFIGURE_ARGS+= --disable-real
.endif .endif
.if defined(WITH_AMR_NB) || defined (WITH_AMR_WB) .if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB}
LIB_DEPENDS+= opencore-amrnb:${PORTSDIR}/audio/opencore-amr LIB_DEPENDS+= opencore-amrnb:${PORTSDIR}/audio/opencore-amr
.endif .endif
.ifdef(WITHOUT_AMR_NB) .if !${PORT_OPTIONS:MAMR_NB}
CONFIGURE_ARGS+= --disable-libopencore_amrnb CONFIGURE_ARGS+= --disable-libopencore_amrnb
.endif .endif
.ifdef(WITHOUT_AMR_WB) .if !${PORT_OPTIONS:MAMR_WB}
CONFIGURE_ARGS+= --disable-libopencore_amrwb CONFIGURE_ARGS+= --disable-libopencore_amrwb
.endif .endif
.ifdef(WITH_GSM) .if ${PORT_OPTIONS:MGSM}
LIB_DEPENDS+= gsm:${PORTSDIR}/audio/gsm LIB_DEPENDS+= gsm:${PORTSDIR}/audio/gsm
.else .else
CONFIGURE_ARGS+= --disable-libgsm CONFIGURE_ARGS+= --disable-libgsm
.endif .endif
.if defined(WITH_V4L) .if ${PORT_OPTIONS:MV4L}
BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
LIB_DEPENDS+= v4l2.0:${PORTSDIR}/multimedia/libv4l LIB_DEPENDS+= v4l2.0:${PORTSDIR}/multimedia/libv4l
CONFIGURE_ARGS+= --enable-tv-v4l1 \ CONFIGURE_ARGS+= --enable-tv-v4l1 \
@ -285,7 +278,7 @@ CONFIGURE_ARGS+= --disable-tv-v4l1 \
--disable-tv-v4l2 --disable-tv-v4l2
.endif .endif
.if defined(WITH_LIBRTMP) .if ${PORT_OPTIONS:MRTMP}
LIB_DEPENDS+= rtmp:${PORTSDIR}/multimedia/rtmpdump LIB_DEPENDS+= rtmp:${PORTSDIR}/multimedia/rtmpdump
CONFIGURE_ARGS+= --enable-librtmp CONFIGURE_ARGS+= --enable-librtmp
EXTRA_LIBS+= -lrtmp EXTRA_LIBS+= -lrtmp
@ -293,7 +286,7 @@ EXTRA_LIBS+= -lrtmp
CONFIGURE_ARGS+= --disable-librtmp CONFIGURE_ARGS+= --disable-librtmp
.endif .endif
.if defined(WITH_MNG) .if ${PORT_OPTIONS:MLIBMNG}
LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng
.else .else
CONFIGURE_ARGS+= --disable-mng CONFIGURE_ARGS+= --disable-mng

8
multimedia/mplayer/Makefile.shared
View file

@ -4,7 +4,7 @@
# #
# $FreeBSD$ # $FreeBSD$
MPLAYER_SNAPSHOT_DATE= 2012-07-21 MPLAYER_SNAPSHOT_DATE= 2013-03-08
MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g} MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
CATEGORIES?= multimedia audio CATEGORIES?= multimedia audio
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
@ -40,7 +40,11 @@ CONFIGURE_ARGS= --cc="${CC}" \
--disable-alsa \ --disable-alsa \
--disable-libbs2b \ --disable-libbs2b \
--disable-mp3lib \ --disable-mp3lib \
--enable-ass-internal --enable-ass-internal \
--disable-libvorbis \
--disable-speex \
--disable-libopus \
--disable-libilbc
WANT_GNOME= yes WANT_GNOME= yes
WANT_SDL= yes WANT_SDL= yes

4
multimedia/mplayer/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (mplayer-1.1.20120721.tar.xz) = 30b120bf8543b7cfad36272e3ae29a017282caa90f4d635fe157f29036393787 SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258
SIZE (mplayer-1.1.20120721.tar.xz) = 10480368 SIZE (mplayer-1.1.20130308.tar.xz) = 10326840

30
multimedia/mplayer/files/extra-patch-base_system_gcc
View file

@ -1,5 +1,18 @@
--- ffmpeg/libavutil/x86_cpu.h.orig 2010-10-06 03:26:13.000000000 +0200 --- configure.orig 2013-03-03 11:29:18.000000000 +0100
+++ ffmpeg/libavutil/x86_cpu.h 2010-11-04 21:01:40.581647958 +0100 +++ configure 2013-03-08 18:41:56.973900357 +0100
@@ -2834,10 +2834,6 @@
def_ebx_available='#define HAVE_EBX_AVAILABLE 0'
def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'
-if x86_64 ; then
-inline_asm_check '"mov (%eax), %eax"' || die "Your binutils version is too old to compile for 64-bit (on OSX try --cc=clang)"
-fi
-
if x86 ; then
echocheck ".align is a power of two"
--- ffmpeg/libavutil/x86/asm.h.orig 2012-10-26 02:48:45.000000000 +0200
+++ ffmpeg/libavutil/x86/asm.h 2013-03-08 18:45:58.593916599 +0100
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE)) #define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE)) #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
@ -9,16 +22,3 @@
# define BROKEN_RELOCATIONS 1 # define BROKEN_RELOCATIONS 1
#endif #endif
--- configure.orig 2011-12-31 00:40:03.990976000 +0100
+++ configure 2011-12-31 01:33:51.407685009 +0100
@@ -2683,10 +2683,6 @@
def_ebx_available='#define HAVE_EBX_AVAILABLE 0'
def_xmm_clobbers='#define HAVE_XMM_CLOBBERS 0'
-if x86_64 ; then
-inline_asm_check '"mov (%eax), %eax"' || die "Your binutils version is too old to compile for 64-bit"
-fi
-
if x86 ; then
echocheck ".align is a power of two"

21
multimedia/mplayer/files/extra-patch-base_system_log2f
View file

@ -1,22 +1,21 @@
--- configure.orig 2012-07-24 20:47:24.721531229 +0200 --- configure.orig 2013-03-03 11:29:18.000000000 +0100
+++ configure 2012-07-24 20:49:56.207569906 +0200 +++ configure 2013-03-08 19:04:01.903917043 +0100
@@ -3130,7 +3130,7 @@ @@ -3265,7 +3265,7 @@
echores "$_kstat" echores "$_kstat"
-for func in cbrtf exp2 exp2f isnan isinf llrint llrintf log2 log2f lrint lrintf rint round roundf trunc truncf; do -for func in atanf cbrt cbrtf cosf expf exp2 exp2f isnan isinf llrint llrintf log2 log2f log10f lrint lrintf rint round roundf sinf trunc truncf; do
+for func in cbrtf exp2 exp2f isnan isinf llrint llrintf lrint lrintf rint round roundf trunc truncf; do +for func in atanf cbrt cbrtf cosf expf exp2 exp2f isnan isinf llrint llrintf lrint lrintf rint round roundf sinf trunc truncf; do
echocheck $func echocheck $func
eval _$func=no eval _$func=no
statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE && eval _$func=yes statement_check math.h "${func}(2.0)" -D_ISOC99_SOURCE && eval _$func=yes
@@ -3142,7 +3142,9 @@ @@ -3278,6 +3278,9 @@
echores no
fi fi
done done
-
+for func in log2 log2f; do +for func in log2 log2f log10f; do
+ eval def_$func="\"#define HAVE_$(echo $func | tr '[a-z]' '[A-Z]') 0\"" + eval def_$func="\"#define HAVE_$(echo $func | tr '[a-z]' '[A-Z]') 0\""
+done +done
echocheck "mkstemp" for func in atan2f ldexpf powf; do
_mkstemp=no echocheck $func

22
multimedia/mplayer/files/extra-patch-clang-version Normal file
View file

@ -0,0 +1,22 @@
--- configure.orig 2013-03-10 17:43:53.684182000 +0100
+++ configure 2013-03-10 17:47:47.157190568 +0100
@@ -1614,7 +1614,7 @@
if $_cc -v 2>&1 | grep -q "clang"; then
echocheck "$_cc version"
cc_vendor=clang
- cc_version=$($_cc -dumpversion 2>&1)
+ cc_version=$($_cc -v 2>&1 | head -n 1 | cut -d ' ' -f 4)
res_comment="experimental support only"
echores "clang $cc_version"
break
--- Makefile.orig 2013-03-10 17:44:21.865184000 +0100
+++ Makefile 2013-03-10 17:47:47.248184374 +0100
@@ -792,7 +792,7 @@
# rebuild version.h each time the working copy is updated
version.h: version.sh $(wildcard .svn/entries .git/logs/HEAD)
- ./$< `$(CC) -dumpversion`
+ ./$< `$(CC) -v 2>&1 | head -n 1 | cut -d ' ' -f 4`
%$(EXESUF): %.c
$(CC) $(CC_DEPFLAGS) $(CFLAGS) -o $@ $^

47
multimedia/mplayer/files/patch-configure
View file

@ -1,6 +1,6 @@
--- configure.orig 2012-07-20 15:11:42.000000000 +0200 --- configure.orig 2013-03-03 11:29:18.000000000 +0100
+++ configure 2012-10-08 19:16:19.637797462 +0200 +++ configure 2013-03-22 17:20:44.452775673 +0100
@@ -645,7 +645,7 @@ @@ -668,7 +668,7 @@
_iwmmxt=auto _iwmmxt=auto
_mtrr=auto _mtrr=auto
_altivec=auto _altivec=auto
@ -9,7 +9,7 @@
_ranlib=ranlib _ranlib=ranlib
_windres=windres _windres=windres
_cc=cc _cc=cc
@@ -1467,7 +1467,6 @@ @@ -1534,7 +1534,6 @@
*) *)
echo "Unknown parameter: $ac_option" echo "Unknown parameter: $ac_option"
@ -17,7 +17,7 @@
;; ;;
esac esac
@@ -1515,7 +1514,7 @@ @@ -1669,7 +1668,7 @@
case "$(uname -m 2>&1)" in case "$(uname -m 2>&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 ;; 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 ;; ia64) host_arch=ia64 ;;
@ -26,16 +26,15 @@
alpha) host_arch=alpha ;; alpha) host_arch=alpha ;;
sun4*|sparc*) host_arch=sparc ;; sun4*|sparc*) host_arch=sparc ;;
parisc*|hppa*|9000*) host_arch=hppa ;; parisc*|hppa*|9000*) host_arch=hppa ;;
@@ -1555,7 +1554,7 @@ @@ -1709,6 +1708,7 @@
fi fi
extra_cflags="-I. -Iffmpeg $extra_cflags" extra_cflags="-I. -Iffmpeg $extra_cflags"
-extra_ldflags="-lm $extra_ldflags" +extra_ldflags="$extra_ldflags -L$_prefix/lib"
+extra_ldflags="-lm $extra_ldflags -L$_prefix/lib"
_timer=timer-linux.c _timer=timer-linux.c
_getch=getch2.c _getch=getch2.c
@@ -3601,7 +3600,7 @@ @@ -3765,7 +3765,7 @@
if linux ; then if linux ; then
THREAD_CFLAGS=-D_REENTRANT THREAD_CFLAGS=-D_REENTRANT
elif freebsd || netbsd || openbsd || bsdos ; then elif freebsd || netbsd || openbsd || bsdos ; then
@ -44,7 +43,7 @@
fi fi
if test "$_pthreads" = auto ; then if test "$_pthreads" = auto ; then
cat > $TMPC << EOF cat > $TMPC << EOF
@@ -3611,7 +3610,7 @@ @@ -3775,7 +3775,7 @@
EOF EOF
_pthreads=no _pthreads=no
if ! hpux ; then if ! hpux ; then
@ -53,7 +52,25 @@
# for crosscompilation, we cannot execute the program, be happy if we can link statically # 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 cc_check $THREAD_CFLAGS $ld_tmp && (tmp_run || test "$ld_static") && ld_pthread="$ld_tmp" && _pthreads=yes && break
done done
@@ -6271,7 +6270,7 @@ @@ -5904,7 +5904,7 @@
elif dragonfly ; then
default_cdrom_device="/dev/cd0"
elif freebsd ; then
- default_cdrom_device="/dev/acd0"
+ default_cdrom_device="/dev/cdrom"
elif openbsd ; then
default_cdrom_device="/dev/rcd0c"
elif sunos ; then
@@ -5917,7 +5917,7 @@
default_cdrom_device="/dev/cdrom"
fi
-if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then
+if win32 || os2 || dragonfly || openbsd || sunos || amigaos ; then
default_dvd_device=$default_cdrom_device
elif darwin ; then
default_dvd_device="/dev/rdiskN"
@@ -6470,7 +6470,7 @@
echocheck "libgsm" echocheck "libgsm"
if test "$_libgsm" = auto ; then if test "$_libgsm" = auto ; then
_libgsm=no _libgsm=no
@ -62,7 +79,7 @@
fi fi
if test "$_libgsm" = yes ; then if test "$_libgsm" = yes ; then
def_libgsm='#define CONFIG_LIBGSM 1' def_libgsm='#define CONFIG_LIBGSM 1'
@@ -6733,6 +6732,16 @@ @@ -6954,6 +6954,16 @@
nolibrtmp=no nolibrtmp=no
def_librtmp='#define CONFIG_LIBRTMP 1' def_librtmp='#define CONFIG_LIBRTMP 1'
inputmodules="librtmp $inputmodules" inputmodules="librtmp $inputmodules"
@ -79,7 +96,7 @@
else else
nolibrtmp=yes nolibrtmp=yes
_librtmp=no _librtmp=no
@@ -7125,7 +7134,7 @@ @@ -7346,7 +7356,7 @@
echocheck "mencoder" echocheck "mencoder"
if test "$_mencoder" = no ; then if test "$_mencoder" = no ; then
# mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint, # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
@ -88,7 +105,7 @@
fi fi
echores "$_mencoder" echores "$_mencoder"
@@ -7463,8 +7472,11 @@ @@ -7684,8 +7694,11 @@
if test "$_gui" = yes ; then if test "$_gui" = yes ; then
# Required libraries # Required libraries
@ -102,7 +119,7 @@
die "The GUI requires libavcodec with PNG support (needs zlib)." die "The GUI requires libavcodec with PNG support (needs zlib)."
fi fi
test "$_freetype" = no && test "$_bitmap_font" = no && test "$_freetype" = no && test "$_bitmap_font" = no &&
@@ -8029,7 +8041,7 @@ @@ -8271,7 +8284,7 @@
EXESUF = $_exesuf EXESUF = $_exesuf
EXESUFS_ALL = .exe EXESUFS_ALL = .exe

17
multimedia/mplayer/files/patch-libavcodec-libgsm.c
View file

@ -1,11 +1,14 @@
--- ffmpeg/libavcodec/libgsm.c.orig 2012-01-29 19:20:05.000000000 +0100 --- ffmpeg/libavcodec/libgsm.c.orig 2013-03-07 19:20:04.000000000 +0100
+++ ffmpeg/libavcodec/libgsm.c 2012-03-22 18:07:58.682722034 +0100 +++ ffmpeg/libavcodec/libgsm.c 2013-03-22 16:31:14.983780842 +0100
@@ -27,7 +27,7 @@ @@ -28,11 +28,7 @@
// The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
#include "config.h"
-#if HAVE_GSM_H
#include <gsm.h>
-#else
-#include <gsm/gsm.h> -#include <gsm/gsm.h>
+#include <gsm.h> -#endif
#include "avcodec.h" #include "libavutil/channel_layout.h"
#include "gsm.h" #include "libavutil/common.h"

15
multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c
View file

@ -1,11 +1,10 @@
--- ffmpeg/libavcodec/mpegaudio_parser.c.orig 2012-03-04 19:20:05.000000000 +0100 --- ffmpeg/libavcodec/mpegaudio_parser.c.orig 2013-03-05 19:20:04.000000000 +0100
+++ ffmpeg/libavcodec/mpegaudio_parser.c 2012-05-01 14:57:54.645626270 +0200 +++ ffmpeg/libavcodec/mpegaudio_parser.c 2013-03-08 18:28:59.428478324 +0100
@@ -78,7 +78,7 @@ @@ -81,6 +81,7 @@
if (s->header_count > 1) {
avctx->sample_rate= sr; avctx->sample_rate= sr;
avctx->channels = channels; avctx->channels = channels;
- s1->duration = frame_size; s1->duration = frame_size;
+ avctx->frame_size = frame_size; + avctx->frame_size = frame_size;
avctx->bit_rate = bit_rate; if (s->no_bitrate || !avctx->bit_rate) {
} s->no_bitrate = 1;
break; avctx->bit_rate += (bit_rate - avctx->bit_rate) / s->header_count;