[Midnightbsd-cvs] mports [18315] trunk/multimedia/mplayer/pkg-plist: update mplayer to 1.1.20141223.
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Wed Mar 25 15:18:52 EDT 2015
Revision: 18315
http://svnweb.midnightbsd.org/mports/?rev=18315
Author: laffer1
Date: 2015-03-25 15:18:51 -0400 (Wed, 25 Mar 2015)
Log Message:
-----------
update mplayer to 1.1.20141223. based on freebsd port
Modified Paths:
--------------
trunk/multimedia/mplayer/Makefile
trunk/multimedia/mplayer/distinfo
trunk/multimedia/mplayer/files/patch-libao2-ao_arts.c
trunk/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
trunk/multimedia/mplayer/files/pkg-message.in
trunk/multimedia/mplayer/pkg-plist
Added Paths:
-----------
trunk/multimedia/mplayer/Makefile.options
trunk/multimedia/mplayer/Makefile.optvars
trunk/multimedia/mplayer/Makefile.shared
trunk/multimedia/mplayer/files/extra-patch-clang-version
trunk/multimedia/mplayer/files/patch-Makefile
trunk/multimedia/mplayer/files/patch-configure
trunk/multimedia/mplayer/files/patch-ffmpeg-Makefile
trunk/multimedia/mplayer/files/patch-gui_ws_ws.c
trunk/multimedia/mplayer/files/patch-libao2-ao_oss.c
trunk/multimedia/mplayer/files/patch-libavcodec-Makefile
trunk/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S
trunk/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c
trunk/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c
trunk/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c
trunk/multimedia/mplayer/files/patch-libavfilter-Makefile
trunk/multimedia/mplayer/files/patch-libavformat-udp.c
trunk/multimedia/mplayer/files/patch-libavutil-x86-asm.h
trunk/multimedia/mplayer/files/patch-libvo-x11_common.c
trunk/multimedia/mplayer/files/patch-mplayer.c
trunk/multimedia/mplayer/files/patch-stream-stream_cdda.c
trunk/multimedia/mplayer/files/patch-stream-tvi_v4l.c
trunk/multimedia/mplayer/files/patch-stream-tvi_v4l2.c
trunk/multimedia/mplayer/files/patch-vidix-mga_vid.c
Removed Paths:
-------------
trunk/multimedia/mplayer/files/install-user
trunk/multimedia/mplayer/files/patch-DMO_VideoDecoder.c
trunk/multimedia/mplayer/files/patch-ad
trunk/multimedia/mplayer/files/patch-ae
trunk/multimedia/mplayer/files/patch-bswap.h
trunk/multimedia/mplayer/files/patch-cpudetect.h
trunk/multimedia/mplayer/files/patch-libavcodec-h264.c
trunk/multimedia/mplayer/files/patch-libavcodec-vp56.h
trunk/multimedia/mplayer/files/patch-libdha-Makefile
trunk/multimedia/mplayer/files/patch-libfaad2-common.h
trunk/multimedia/mplayer/files/patch-libmpcodecs-vf_ass.c
trunk/multimedia/mplayer/files/patch-stream-cookies.c
trunk/multimedia/mplayer/files/patch-tremor-codec_internal.h
trunk/multimedia/mplayer/files/patch-vidix-drivers-Makefile
trunk/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c
trunk/multimedia/mplayer/files/patch-vidix-drivers-radeon_vid.c
Property Changed:
----------------
trunk/multimedia/mplayer/files/patch-libao2-ao_arts.c
trunk/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
trunk/multimedia/mplayer/files/pkg-message.in
Modified: trunk/multimedia/mplayer/Makefile
===================================================================
--- trunk/multimedia/mplayer/Makefile 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/Makefile 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,607 +1,140 @@
-# New ports collection makefile for: mplayer
-# Date created: 10 August 2001
-# Whom: Thomas E. Zander
-# with lots of help from Vladimir Kushnir
-#
# $MidnightBSD$
-# $FreeBSD: ports/multimedia/mplayer/Makefile,v 1.157 2007/03/13 13:40:15 miwi Exp $
-#
-#
-# Some of the knobs are not tunable by the OPTIONS framework. These are
-# explained here in detail.
-#
-# Core funcionality:
-#
-# MPLAYER_GENERIC_BUILD
-# default: undefined
-# By default, the mplayer port creates a custom build based on personal
-# preferences.
-# If you want to build a generic package with certain fixed options,
-# suitable for any CPU within ${ARCH}, define this knob.
-# Note: Other knobs and especially OPTIONS
-#
-# CPU features:
-#
-# The following is only of interest if you haven't enabled
-# RTCPU in your OPTIONS selection.
-# The correct instruction set of your processor is normally
-# auto-detected, so there is probably no necessity to change them.
-# Note that disabling SIMD via the OPTIONS framework completely
-# disables utilization of vector engines, i.e. it implies
-# WITHOUT_MMX, WITHOUT_3DNOW and WITHOUT_SSE
-#
-# WITHOUT_MMX
-# default: autodetected
-# disables using of mmx code
-#
-# WITHOUT_3DNOW
-# default: autodetected
-# disables using of 3dNow! instructions on AMD CPUs
-#
-# WITHOUT_SSE
-# default: autodetected
-# disables all mmx2 and sse/sse2 code
-# CAUTION: There are some Athlon CPUs which claim to be sse-able but
-# aren't. If you encounter strange problems on such a CPU, try
-# to build mplayer with this knob and report the problem
-# NOTE: SSE is available only if "options CPU_ENABLE_SSE" in your
-# kernel config. This is standard for 5.x and newer systems on I686_CPU
-# and later. 4.x users will have to define this explicitly.
-#
-# WITH_KERN_HZ=<frequency>
-# default: 1024
-# This option allows you to control the default kern.hz when using RTC support.
-# If you have a older/slower processor you may want to lower the default level.
-# ie. 512 seems to produce better quality video on a PII 400MHz than 1024 does
-# CAUTION: lower than 512 may produce jerky video.
-#
-# Feature options:
-# These options influence some general behaviour of mplayer. Most of the featues,
-# for example all the codecs, are selected via the OPTIONS framework.
-#
-# WITH_DVD_DEVICE=/path/to/desired/device
-# default 5.x: /dev/acd0
-# default 4.x: /dev/acd0c
-# This option changes the default device where mplayer looks for
-# a DVD medium
-#
-# WITH_CDROM_DEVICE=/path/to/desired/device
-# default 5.x: /dev/acd0
-# default 4.x: /dev/acd0c
-# This option changes the default cdrom device, maybe useful for VCDs
-#
-# WITH_LANG=<your choice>
-# default: en
-# 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
-#
-# Additional knobs:
-#
-# NOPORTDOCS
-# default: undefined
-# This knob prevents the ports system from installing additional
-# documentation. If you define this, only the manpage is going
-# to be installed.
-#
PORTNAME= mplayer
-PORTVERSION= 0.99.10
-PORTREVISION= 8
-CATEGORIES= multimedia audio
-MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
- http://www2.mplayerhq.hu/MPlayer/releases/ \
- http://ftp.lug.udel.edu/MPlayer/releases/ \
- http://www4.mplayerhq.hu/MPlayer/releases/ \
- http://mirrors.xmission.com/MPlayer/releases/ \
- ftp://ftp1.mplayerhq.hu/MPlayer/releases/ \
- ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \
- ftp://ftp.lug.udel.edu/MPlayer/releases/ \
- ftp://mirrors.xmission.com/MPlayer/releases/ \
- http://www.rrr.de/~riggs/mplayer/
-DISTNAME= MPlayer-1.0rc1
+PORTVERSION= ${MPLAYER_PORT_VERSION}
-MAINTAINER= ports at MidnightBSD.org
-COMMENT= High performance media player/encoder supporting many formats
-LICENSE= lgpl
-PATCH_SITES= http://www.mplayerhq.hu/MPlayer/patches/
-PATCHFILES+= asmrules_fix_20061231.diff
+COMMENT= High performance media player supporting many formats
-LIB_DEPENDS= png.6:${PORTSDIR}/graphics/png
+.include "${.CURDIR}/Makefile.shared"
-USE_BZIP2= yes
-USE_GMAKE= yes
-USE_ICONV= yes
-GNU_CONFIGURE= yes
-CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
- PTHREAD_LIBS=${PTHREAD_LIBS} \
- TMPDIR="${WRKSRC}"
-CONFIGURE_ARGS= --with-extralibdir=${LOCALBASE}/lib \
- --with-extraincdir=${LOCALBASE}/include \
- --cc=${CC} \
- --as=${AS} \
- --enable-png \
- --enable-menu \
- --disable-libfame \
- --disable-faad-external \
- --disable-vidix-external \
- --disable-tv-v4l1 \
- --disable-tv-v4l2
+OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV \
+ ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
+ LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \
+ OPENJPEG OPUS PULSEAUDIO REAL RTC RTCPU RTMP \
+ SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \
+ WIN32 X11 X11DGA X11VM XINERAMA XVIDEO XVMC
-OPTIONS= DEBUG "Include debug symbols in mplayer's binary files" off
+OPTIONS_DEFAULT=FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL RTCPU \
+ SKINS WIN32 X11 X11DGA X11VM XINERAMA XVIDEO
-#Collect OPTIONS menu
-.if !defined(MPLAYER_GENERIC_BUILD)
-OPTIONS+= RTCPU "Let mplayer dynamically check for CPU features" on
-OPTIONS+= OCFLAGS "Use optimized compiler flags" on
-OPTIONS+= SIMD "Allow mplayer to use vector engines (MMX...)" on
-OPTIONS+= MENCODER "Support encoding of multimedia files" on
-OPTIONS+= IPV6 "Include inet6 network support" on
-OPTIONS+= X11 "Enable X11 support for mplayer's video output" on
-OPTIONS+= GUI "Enable GTK2 graphical user interface with X11" on
-OPTIONS+= SDL "Enable SDL video output" off
-OPTIONS+= VIDIX "Enable VIDIX video output on supported archs" on
-OPTIONS+= NVIDIA "Enable experimental nvidia xvmc driver" off
-OPTIONS+= SKINS "Force dependency on mplayer-skins" on
-OPTIONS+= FREETYPE "Use freetype for OSD fonts (TrueType!)" on
-OPTIONS+= RTC "Add support for kernel real time clock timing" off
-OPTIONS+= ARTS "Enable KDE sound system support" off
-OPTIONS+= ESOUND "Enable GNOME esound support" off
-OPTIONS+= JACK "Enable JackIt audio server support" off
-OPTIONS+= POLYP "Enable polyp sound server support" off
-OPTIONS+= NAS "Enable NAS sound server support" off
-OPTIONS+= OPENAL "Enable OpenAL sound support" off
-OPTIONS+= LIBUNGIF "Enable gif support" on
-OPTIONS+= AALIB "Enable aalib support" off
-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+= TWOLAME "Enable twolame MPEG audio codec support" off
-OPTIONS+= DTS "Enable DTS audio codec support" on
-OPTIONS+= LIBMPCDEC "Enable libmpcdec 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+= TREMOR "Use built-in tremor instead of libvorbis" off
-OPTIONS+= XMMS "Enable XMMS plugin support" off
-OPTIONS+= THEORA "Enable ogg theora video support" off
-OPTIONS+= WIN32 "Enable win32 codec set on the IA32 arch" on
-OPTIONS+= XANIM "Enable xanim DLL support" off
-OPTIONS+= XVID "Enable XVID video codec support" on
-OPTIONS+= REALPLAYER "Enable real player plugin" off
-OPTIONS+= LIVEMEDIA "Enable LIVE555 streaming support" off
-OPTIONS+= SMB "Enable Samba input 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
-.endif
+BLURAY_DESC?= BluRay support
+ENCA_DESC?= Charset conversion via enca
+LZO_DESC?= External liblzo support
+OCFLAGS_DESC?= Use optimized compiler flags
+REAL_DESC?= Enable realplayer plugin
+RTC_DESC?= Add support for kernel real time clock
+RTCPU_DESC?= Use runtime CPU detection on supported archs
+SKINS_DESC?= Install skins for GUI
+WIN32_DESC?= Install win32 binary codecs
+X11DGA_DESC?= X11 DGA video driver support
+X11VM_DESC?= X11 VidMode support
-WANT_GNOME= yes
-WANT_SDL= yes
-MAN1= mplayer.1
-MANCOMPRESSED= no
-
SUB_FILES= pkg-message
+CONFLICTS= mplayer2-2.*
+
CONFFILES= example.conf input.conf menu.conf dvb-menu.conf
-TOOLFILES= calcbpp.pl countquant.pl dvd2divxscript.pl \
- menc2pass mencvcd mp.pl subedit.pl subsearch.sh \
- sws-test w32codec_dl.pl wma2ogg.pl x2mpsub.sh
+USES+= iconv pkgconfig
+.include "${.CURDIR}/Makefile.optvars"
.include <bsd.port.pre.mk>
-#Building of vidix dependent shared libs is only possible
-#on i386 and amd64 at the moment.
-.if !defined(WITHOUT_VIDIX)
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
-USE_LDCONFIG= ${PREFIX}/lib ${PREFIX}/lib/mplayer/vidix
-PLIST_SUB+= VIDIX=""
-.else
-CONFIGURE_ARGS+=--disable-vidix-internal
-PLIST_SUB+= VIDIX="@comment "
-.endif
-.else
-CONFIGURE_ARGS+=--disable-vidix-internal
-PLIST_SUB+= VIDIX="@comment "
-.endif
+CONFIGURE_ARGS+= --disable-arts \
+ --disable-directfb \
+ --disable-faac \
+ --disable-libdca \
+ --disable-toolame \
+ --disable-twolame \
+ --disable-x264 \
+ --disable-xvid \
+ --disable-libdirac-lavc \
+ --disable-mencoder \
+ --disable-mpg123 \
+ --disable-musepack \
+ --disable-theora
-# Esablish de-facto dependencies for either building generic mplayer
-# binary-suitable package or custom build
+.include "${.CURDIR}/Makefile.options"
-.if defined(MPLAYER_GENERIC_BUILD)
-#Compiler flags
-CFLAGS= #let mplayer decide the flags
-
-#Defaults for generic build
-INCL_MODULES= RTCPU IPV6 X11 GUI SDL SKINS FREETYPE AALIB TREMOR \
- WIN32 XVID
-EXCL_MODULES= OCFLAGS MENCODER VIDIX NVIDIA RTC ARTS ESOUND \
- JACK POLYP NAS OPENAL LIBUNGIF LIBCACA SVGALIB \
- LIBDV MAD TWOLAME DTS LIBMPCDEC FAAC LADSPA SPEEX \
- XMMS THEORA X264 XANIM REALPLAYER LIVEMEDIA SMB \
- FRIBIDI LIRC LIBCDIO CDPARANOIA LIBLZO
-
-.for module in ${EXCL_MODULES}
-WITHOUT_${module}=yes
-.undef(WITH_${module})
-.endfor
-
-.for module in ${INCL_MODULES}
-WITH_${module}=yes
-.undef(WITHOUT_${module})
-.endfor
-
-.undef(WITH_DVD_DEVICE)
-.undef(WITH_CDROM_DEVICE)
-.undef(WITH_LANG)
-
-#Kernel granularity
-DEFAULT_KERN_HZ=1024
-CFLAGS+= -fno-force-addr
-.endif #MPLAYER_GENERIC_BUILD
-
-.if !defined(WITHOUT_X11)
-USE_XLIB= yes
-CONFIGURE_ARGS+=--with-x11libdir="${LOCALBASE}/lib"
-.else
-WITHOUT_GUI= yes
-CONFIGURE_ARGS+=--disable-x11 \
- --disable-fontconfig
-.endif
-
-.if defined(WITH_LANG)
-CONFIGURE_ARGS+=--language=${WITH_LANG}
-.endif
-
-.if !defined(WITHOUT_OCFLAGS)
-CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
-.endif
-
-.if defined(WITHOUT_IPV6)
-CONFIGURE_ARGS+= --disable-inet6
-.else
-CATEGORIES+= ipv6
-.endif
-
-.if !defined(WITHOUT_GUI)
+.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
PLIST_SUB+= GMPLAYER=""
-DESKTOP_ENTRIES= "MPlayer" "High performance media player" "" "gmplayer" "" false
-.if !defined(WITHOUT_SKINS)
-RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/skins:${PORTSDIR}/multimedia/mplayer-skins
+DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
+.if ${PORT_OPTIONS:MSKINS}
+RUN_DEPENDS+= mplayer-skins>=0:${PORTSDIR}/multimedia/mplayer-skins
.endif
USE_GNOME+= gtk20
CONFIGURE_ARGS+= --enable-gui
-.if defined(WITH_LANG)
-WITH_LANG= ""
-.endif
-
.else
PLIST_SUB+= GMPLAYER="@comment "
-.endif #WITHOUT_GUI
+.endif #GUI && X11
-.if defined(WITH_RTC)
-BUILD_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
-RUN_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
-CONFIGURE_ARGS+= --enable-rtc
-CONFIGURE_ENV+= CFLAGS+="-I/${LOCALBASE}/include"
+.if ${PORT_OPTIONS:MX11}
+USE_XORG= x11 xproto xscrnsaver
+.if ${PORT_OPTIONS:MXVIDEO}
+USE_XORG+= xv
.else
-CONFIGURE_ARGS+= --disable-rtc
+CONFIGURE_ARGS+=--disable-xv
.endif
-
-.if !defined(WITHOUT_MENCODER)
-LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame
-MLINKS+= mplayer.1 mencoder.1
-PLIST_SUB+= MENCODER=""
+.if ${PORT_OPTIONS:MX11DGA}
+USE_XORG+= xxf86dga
.else
-CONFIGURE_ARGS+= --disable-mencoder
-PLIST_SUB+= MENCODER="@comment "
+CONFIGURE_ARGS+=--disable-dga1 --disable-dga2
.endif
-
-.if defined(WITH_ARTS)
-LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
-CONFIGURE_ARGS+= --enable-arts
+.if ${PORT_OPTIONS:MOPENGL}
+USE_GL+= gl
.else
-CONFIGURE_ARGS+= --disable-arts
+CONFIGURE_ARGS+=--disable-gl
.endif
-
-.if defined(WITH_FRIBIDI)
-LIB_DEPENDS+= fribidi.0:${PORTSDIR}/converters/fribidi
-CONFIGURE_ARGS+= --enable-fribidi
+.if ${PORT_OPTIONS:MXINERAMA}
+USE_XORG+= xinerama xineramaproto
.else
-CONFIGURE_ARGS+= --disable-fribidi
+CONFIGURE_ARGS+=--disable-xinerama
.endif
-
-.if defined(WITH_LIBCDIO) && !defined(WITH_CDPARANOIA)
-BUILD_DEPENDS+= ${LOCALBASE}/include/cdio/cdio.h:${PORTSDIR}/sysutils/libcdio
+.if ${PORT_OPTIONS:MX11VM}
+USE_XORG+= xxf86vm
.else
-CONFIGURE_ARGS+= --disable-libcdio
+CONFIGURE_ARGS+=--disable-vm
.endif
-
-.if defined(WITH_CDPARANOIA)
-LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
-.else
-CONFIGURE_ARGS+= --disable-cdparanoia
+.if ${PORT_OPTIONS:MXVMC}
+USE_XORG+= xvmc
+CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW
.endif
-
-.if defined(WITH_LIBCACA)
-BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
-.else
-CONFIGURE_ARGS+= --disable-caca
+.else #X11
+CONFIGURE_ARGS+=--disable-x11
.endif
-.if !defined(WITHOUT_LIBUNGIF)
-LIB_DEPENDS+= ungif.5:${PORTSDIR}/graphics/libungif
-#CONFIGURE_ARGS+= --enable-gif
-.else
-CONFIGURE_ARGS+= --disable-gif
-.endif
-
-.if defined(WITH_LIBDV)
-LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv
-CONFIGURE_ARGS+= --enable-libdv
-.else
-CONFIGURE_ARGS+= --disable-libdv
-.endif
-
-.if defined(WITH_LIRC)
-LIB_DEPENDS+= lirc_client.1:${PORTSDIR}/comms/lirc
-CONFIGURE_ARGS+= --enable-lirc
-.else
-CONFIGURE_ARGS+= --disable-lirc
-.endif
-
-.if defined(WITH_TWOLAME)
-LIB_DEPENDS+= twolame.0:${PORTSDIR}/audio/twolame
-.else
-CONFIGURE_ARGS+= --disable-twolame
-.endif
-
-.if defined(WITH_MAD)
-LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad
-
-CONFIGURE_ARGS+= --enable-mad \
- --with-madlibdir=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+= --disable-mad
-.endif
-
-.if defined(WITH_SDL)
-USE_SDL= sdl
-WITH_AALIB= yes
-.undef(WITHOUT_AALIB)
-.else
-CONFIGURE_ARGS+= --disable-sdl
-.endif
-
-.if defined(WITH_SVGALIB)
-LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
-.else
-CONFIGURE_ARGS+= --disable-svga
-.endif
-
-.if defined(WITH_AALIB)
-LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
-.else
-CONFIGURE_ARGS+= --disable-aa
-.endif
-
-.if defined(WITH_THEORA)
-LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora
-.else
-CONFIGURE_ARGS+= --disable-theora
-.endif
-
-# until we get x264 working
-CONFIGURE_ARGS+= --disable-x264
-
-.if defined(WITH_ESOUND)
-USE_GNOME+= esound
-.else
-CONFIGURE_ARGS+= --disable-esd
-.endif
-
-.if defined(WITH_JACK)
-LIB_DEPENDS+= jack.0:${PORTSDIR}/audio/jack
-.else
-CONFIGURE_ARGS+= --disable-jack
-.endif
-
-.if defined(WITH_POLYP)
-CONFIGURE_ARGS+= --enable-polyp
-LIB_DEPENDS+= polyp-0.7.0:${PORTSDIR}/audio/polypaudio
-.else
-CONFIGURE_ARGS+= --disable-polyp
-.endif
-
-.if defined(WITH_NAS)
-CONFIGURE_ARGS+= --enable-nas
-LIB_DEPENDS+= audio.2:${PORTSDIR}/audio/nas
-.else
-CONFIGURE_ARGS+= --disable-nas
-.endif
-
-.if defined(WITH_OPENAL)
-LIB_DEPENDS+= openal.0:${PORTSDIR}/audio/openal
-.else
-CONFIGURE_ARGS+= --disable-openal
-.endif
-
-.if !defined(WITH_TREMOR)
-CONFIGURE_ARGS+= --disable-tremor-internal
-LIB_DEPENDS+= vorbis.4:${PORTSDIR}/audio/libvorbis
-.endif
-
-.if defined(WITH_REALPLAYER)
-CONFIGURE_ARGS+= --enable-real \
- --with-reallibdir=${X11BASE}/lib/RealPlayer/codecs
-RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
-BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
-.else
-.if !defined(WITHOUT_WIN32)
-CONFIGURE_ARGS+= --enable-real \
- --with-reallibdir=${LOCALBASE}/lib/win32
-.else
-CONFIGURE_ARGS+= --disable-real
-.endif
-.endif
-
-.if defined(WITH_LIVEMEDIA)
-CONFIGURE_ARGS+= --enable-live \
- --with-livelibdir=${LOCALBASE}/live
-RUN_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
-BUILD_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
-.else
-CONFIGURE_ARGS+= --disable-live
-.endif
-
-.if defined(WITH_SMB)
-CONFIGURE_ARGS+= --enable-smb
-LIB_DEPENDS+= smbclient.0:${PORTSDIR}/net/samba-libsmbclient
-.else
-CONFIGURE_ARGS+= --disable-smb
-.endif
-
-.if !defined(WITHOUT_XVID)
-CONFIGURE_ARGS+= --enable-xvid
-LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
-.else
-CONFIGURE_ARGS+= --disable-xvid
-.endif
-
-.if defined(WITH_XMMS)
-CONFIGURE_ARGS+= --enable-xmms
-LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
-.else
-CONFIGURE_ARGS+= --disable-xmms
-.endif
-
-.if !defined(WITHOUT_DTS)
-CFLAGS+= -I${LOCALBASE}/include
-CONFIGURE_ARGS+= --enable-libdts
-BUILD_DEPENDS+= dca.0:${PORTSDIR}/multimedia/libdca
-.else
-CONFIGURE_ARGS+= --disable-libdts
-.endif
-
-.if defined(WITH_LIBMPCDEC)
-LIB_DEPENDS+= mpcdec.5:${PORTSDIR}/audio/libmpcdec
-.else
-CONFIGURE_ARGS+= --disable-musepack
-.endif
-
-.if defined(WITH_FAAC)
-LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac
-.else
-CONFIGURE_ARGS+= --disable-faac
-.endif
-
-.if defined(WITH_LADSPA)
-RUN_DEPENDS+= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
-.else
-CONFIGURE_ARGS+= --disable-ladspa
-.endif
-
-.if !defined(WITHOUT_SPEEX)
-CONFIGURE_ARGS+= --enable-speex
-LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex
-.else
-CONFIGURE_ARGS+= --disable-speex
-.endif
-
-.if !defined(WITHOUT_FREETYPE)
-CONFIGURE_ARGS+= --with-extraincdir=${LOCALBASE}/include/freetype2 \
- --enable-freetype
-LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
-.else
-.if !defined(WITHOUT_X11)
-RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts
-.endif
-CONFIGURE_ARGS+= --disable-freetype
-.endif
-
-.if defined(WITH_XANIM)
-BUILD_DEPENDS+= xanim:${PORTSDIR}/multimedia/xanim
-CONFIGURE_ARGS+=--enable-xanim --with-xanimlibdir=${X11BASE}/lib/X11/xanim
-.else
-CONFIGURE_ARGS+=--disable-xanim
-.endif
-
-.if defined(WITH_LIBLZO)
-LIB_DEPENDS+= lzo.1:${PORTSDIR}/archivers/lzo
-.else
-CONFIGURE_ARGS+= --disable-liblzo
-.endif
-
-.if defined(WITH_DVD_DEVICE)
-DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
-.else
-DEFAULT_DVD_DEVICE=/dev/acd0
-.endif
-
-.if defined(WITH_CDROM_DEVICE)
-DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
-.else
-DEFAULT_CDROM_DEVICE=/dev/acd0
-.endif
-
-.if defined(WITH_KERN_HZ)
-DEFAULT_KERN_HZ=${WITH_KERN_HZ}
-.else
-DEFAULT_KERN_HZ=1024
-.endif
-
-# "enable" build for other archs
-.if ${ARCH} == "i386" || ${ARCH} == "amd64"
-.if !defined(WITHOUT_RTCPU)
-CONFIGURE_ARGS+=--enable-runtime-cpudetection
-.else #WITH_RTCPU
-.if defined(WITHOUT_MMX) || defined(WITHOUT_SIMD)
-CONFIGURE_ARGS+=--disable-mmx
-.endif
-.if defined(WITHOUT_3DNOW) || defined(WITHOUT_SIMD)
-CONFIGURE_ARGS+=--disable-3dnow --disable-3dnowext
-.endif
-.if defined(WITHOUT_SSE) || defined(WITHOUT_SIMD)
-CONFIGURE_ARGS+=--disable-mmxext --disable-sse --disable-sse2
-.endif
-.endif #WITH_RTCPU
-.if !defined(WITHOUT_WIN32)
-RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
-CONFIGURE_ARGS+= --with-win32libdir=${LOCALBASE}/lib/win32
-CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs
-CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
-.else
-CONFIGURE_ARGS+= --disable-win32 \
- --disable-qtx-codecs
-.endif
-.endif # ARCH == i386/amd64
-
pre-everything::
@${ECHO_MSG} "N - O - T - E"
@${ECHO_MSG} ""
@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
- @${ECHO_MSG} "OPTIONS framework. You might want to check the Makefile in"
- @${ECHO_MSG} "order to learn more about them."
+ @${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
+ @${ECHO_MSG} "WITH_KERN_HZ=${DEFAULT_KERN_HZ}"
+ @${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
+ @${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
-.if !defined(WITHOUT_GUI)
- @${ECHO_MSG} "If you want to use the GUI, you can either install"
+.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
+ @${ECHO_MSG} "If you want to use the GUI, you can use the skins from"
@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
- @${ECHO_MSG} "or download official skin collections from"
- @${ECHO_MSG} "http://www.mplayerhq.hu/homepage/dload.html"
+ @${ECHO_MSG} "or download them from"
+ @${ECHO_MSG} "http://www.mplayerhq.hu/"
.endif
post-patch:
+.if ${OSVERSION} >= 900010
@${REINPLACE_CMD} -e \
- 's|libxmms.so.1|libxmms.so|' \
+ '/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \
${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
- @${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
+.endif
+ @${REINPLACE_CMD} \
+ -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
- ${WRKSRC}/${CONFIGURE_SCRIPT}
- @${REINPLACE_CMD} -e 's!/usr/local!${PREFIX}!' \
- ${WRKSRC}/${CONFIGURE_SCRIPT}
+ -e 's|/usr/local|${LOCALBASE}|' \
+ -e 's|%%LOCALBASE%%|${LOCALBASE}|' \
+ -e 's|-lbz2|/usr/lib/libbz2.so|' \
+ -e 's|-lncurses|/usr/lib/libncurses.so|' \
+ -e 's|-liconv|${ICONV_LIB}|' \
+ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@${FIND} -E ${WRKSRC} -type f \
-iregex ".*(configure|.sh|Makefile)" -print0 | \
${XARGS} -x -0 -n 10 \
@@ -609,54 +142,29 @@
-e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
-e 's|[[:space:]]gcc| ${CC}|' \
-e 's|\$$\(CC\)|${CC}|' \
- -e 's|/usr/X11R6|${X11BASE}|'
+ -e 's|/usr/X11R6|${LOCALBASE}|'
@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_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 \
's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
${WRKSRC}/mplayer.c
.endif
-.if defined(MPLAYER_GENERIC_BUILD) && defined(WITH_DEBUG)
- @${REINPLACE_CMD} -e \
- 's|1.0pre8|1.0pre8-FreeBSD-generic-debug|' \
- ${WRKSRC}/version.sh
-.elif defined(MPLAYER_GENERIC_BUILD)
- @${REINPLACE_CMD} -e \
- 's|1.0pre8|1.0pre8-FreeBSD-generic|' \
- ${WRKSRC}/version.sh
-.endif
-post-configure:
- @${REINPLACE_CMD} -e 's#-pthread#${PTHREAD_LIBS}#g' \
- ${WRKSRC}/config.mak
-
post-install:
- @${MKDIR} ${DATADIR}
- @${CHMOD} 755 ${DATADIR}
- @${MKDIR} ${DATADIR}/tools
- @${CHMOD} 755 ${DATADIR}/tools
- @${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
-.for tool in ${TOOLFILES}
- ${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${DATADIR}/tools
-.endfor
-.if !defined(NOPORTDOCS)
- @${MKDIR} ${DOCSDIR}
- @${CHMOD} 755 ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/DOCS/HTML/en/* ${DOCSDIR}
+.if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
+ @${LN} -sf ${PREFIX}/bin/mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer
+ @(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
+ ${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${PREFIX}/share/pixmaps/mplayer.png
.endif
-.if !defined(WITHOUT_GUI)
- @${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer
-.endif
- @${CAT} ${PKGMESSAGE}
-install-user:
- @${PERL} ${FILESDIR}/install-user
-
.include <bsd.port.post.mk>
Added: trunk/multimedia/mplayer/Makefile.options
===================================================================
--- trunk/multimedia/mplayer/Makefile.options (rev 0)
+++ trunk/multimedia/mplayer/Makefile.options 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,153 @@
+# 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.
+#
+# $FreeBSD: head/multimedia/mplayer/Makefile.options 377337 2015-01-18 17:00:48Z riggs $
+#
+# Feature options:
+# These options influence some general behaviour of mplayer. Almost all of the featues,
+# for example all the codecs, are selected via the OPTIONS framework.
+# The following options WITH_DVD_DEVICE, WITH_CDROM_DEVICE, are *not*
+# selected via the options framework and must be set via make.conf or by passing
+# the variable to make during build, e.g. make WITH_DVD_DEVICE=/dev/cd0
+#
+# WITH_DVD_DEVICE=/path/to/desired/device
+# default: /dev/cd0
+# This option changes the default device where mplayer looks for
+# a DVD medium
+#
+# WITH_CDROM_DEVICE=/path/to/desired/device
+# default: /dev/cd0
+# This option changes the default cdrom device, maybe useful for VCDs
+
+# Non-OPTIONS knob handling
+# =========================
+
+.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:MIPV6}
+CATEGORIES+= ipv6
+.else
+CONFIGURE_ARGS+= --disable-inet6
+.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)
+# =========================================
+
+# Supported architectures for runtime CPU detection
+.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ppc"
+MPLAYER_RTCPU_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 ${PORT_OPTIONS:MRTCPU} \
+ && defined(MPLAYER_RTCPU_SUPPORTED_ARCH)
+CONFIGURE_ARGS+=--enable-runtime-cpudetection
+.endif
+
+.if ${CHOSEN_COMPILER_TYPE} == clang
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang-version
+# Require 16 byte stack realignment on i386 to interface
+# properly with hand crafted assembler code in ffmpeg
+.if ${ARCH} == "i386"
+CFLAGS+= -mstack-alignment=16 -mstackrealign
+.endif # ${ARCH} == "i386"
+.endif # ${CHOSEN_COMPILER_TYPE} == clang
+
+.if ${ARCH} == "armv6"
+CFLAGS_armv6+= -no-integrated-as
+.endif
+
+# Extra build options for debugging and optimised CFLAGS
+# ======================================================
+
+.if ${PORT_OPTIONS:MDEBUG}
+WITH_DEBUG= yes
+CONFIGURE_ARGS+= --enable-debug=3
+.else
+.if ${PORT_OPTIONS:MOCFLAGS}
+CFLAGS+= -O3 -fomit-frame-pointer -ffast-math
+.endif #OCFLAGS
+.endif #DEBUG
+
+# Edge case: binary codecs on i386, mostly superseded by internal ffmpeg
+# ======================================================================
+
+.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+.if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
+RUN_DEPENDS+= ${CODEC_DETECTION_FILE}:${CODEC_PORT}
+CONFIGURE_ARGS+= --codecsdir=${LOCALBASE}/lib/win32
+CODEC_PORT= ${PORTSDIR}/multimedia/win32-codecs
+CODEC_DETECTION_FILE!= ${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
+.else
+CONFIGURE_ARGS+= --disable-win32dll \
+ --disable-qtx
+.endif
+.endif # ARCH == i386/amd64
+
+
+# Additional extra libraries handling
+# ===================================
+
+.if defined(EXTRA_LIBS)
+CONFIGURE_ARGS+= --extra-libs="${EXTRA_LIBS}"
+.endif
Property changes on: trunk/multimedia/mplayer/Makefile.options
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/mplayer/Makefile.optvars
===================================================================
--- trunk/multimedia/mplayer/Makefile.optvars (rev 0)
+++ trunk/multimedia/mplayer/Makefile.optvars 2015-03-25 19:18:51 UTC (rev 18315)
@@ -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_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia
+CDIO_CONFIGURE_OFF= --disable-libcdio
+
+DV_LIB_DEPENDS= libdv.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
+
+GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
+GNUTLS_CONFIGURE_OFF= --disable-gnutls
+
+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
+
+OPENAL_USES= openal:soft
+OPENAL_CONFIGURE_OFF= --disable-openal
+
+OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
+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/libx264
+X264_CONFIGURE_OFF= --disable-x264
+
+XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid
+XVID_CONFIGURE_OFF= --disable-xvid
Property changes on: trunk/multimedia/mplayer/Makefile.optvars
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/mplayer/Makefile.shared
===================================================================
--- trunk/multimedia/mplayer/Makefile.shared (rev 0)
+++ trunk/multimedia/mplayer/Makefile.shared 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,57 @@
+# Contains the build infrastructural definitions for both
+# mplayer and mencoder....the variables that we need to set
+# before we include bsd.port.pre.mk
+#
+# $MidnightBSD$
+
+MPLAYER_SNAPSHOT_DATE= 2014-12-23
+MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
+CATEGORIES?= multimedia audio
+MASTER_SITES= ${MASTER_SITE_FREEBSD_LOCAL}
+MASTER_SITE_SUBDIR= riggs/mplayer
+DISTNAME= mplayer-${MPLAYER_PORT_VERSION:S/.r/./g}
+WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
+
+MAINTAINER?= ports at MidnightBSD.org
+
+LICENSE= gpl2
+
+LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png \
+ libfreetype.so:${PORTSDIR}/print/freetype2 \
+ libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
+
+BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
+
+USES= compiler:c11 gmake iconv ncurses tar:xz
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+ PTHREAD_LIBS="${PTHREAD_LIBS}" \
+ TMPDIR="${WRKSRC}"
+CONFIGURE_ARGS= --cc="${CC}" \
+ --host-cc="${CC}" \
+ --as="${AS}" \
+ --extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \
+ --extra-libs="-L${PREFIX}/lib" \
+ --disable-alsa \
+ --disable-bitmap-font \
+ --disable-crystalhd \
+ --disable-esd \
+ --disable-faad \
+ --disable-ggi \
+ --disable-ggiwmh \
+ --disable-liba52 \
+ --disable-libbs2b \
+ --disable-libdirac-lavc \
+ --disable-libilbc \
+ --disable-libnut \
+ --disable-libvorbis \
+ --disable-live \
+ --disable-joystick \
+ --disable-mad \
+ --disable-libmpeg2 \
+ --disable-nemesi \
+ --disable-speex \
+ --enable-ass-internal
+
+WANT_GNOME= yes
+WANT_SDL= yes
Property changes on: trunk/multimedia/mplayer/Makefile.shared
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/multimedia/mplayer/distinfo
===================================================================
--- trunk/multimedia/mplayer/distinfo 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/distinfo 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,6 +1,2 @@
-MD5 (MPlayer-1.0rc1.tar.bz2) = 18c05d88e22c3b815a43ca8d7152ccdc
-SHA256 (MPlayer-1.0rc1.tar.bz2) = 8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063
-SIZE (MPlayer-1.0rc1.tar.bz2) = 8414213
-MD5 (asmrules_fix_20061231.diff) = f0b71c38b1207c1d604be091876ac051
-SHA256 (asmrules_fix_20061231.diff) = 3f71e6f4e07940d4d55084d0df12404371bc4e534a3a6b0756ca73e44ddbc3c4
-SIZE (asmrules_fix_20061231.diff) = 1450
+SHA256 (mplayer-1.1.20141223.tar.xz) = 8d5ae2b77cdb6b86670a3741ea024b0ba8f7e4515221b224a10b690ee841d909
+SIZE (mplayer-1.1.20141223.tar.xz) = 11408272
Added: trunk/multimedia/mplayer/files/extra-patch-clang-version
===================================================================
--- trunk/multimedia/mplayer/files/extra-patch-clang-version (rev 0)
+++ trunk/multimedia/mplayer/files/extra-patch-clang-version 2015-03-25 19:18:51 UTC (rev 18315)
@@ -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 $@ $^
Property changes on: trunk/multimedia/mplayer/files/extra-patch-clang-version
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/mplayer/files/install-user
===================================================================
--- trunk/multimedia/mplayer/files/install-user 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/install-user 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,57 +0,0 @@
-#This perl script links the codec config file
-#and the fonts dir to the user's home dir.
-#Last touched: 2002-12-16 riggs
-
-if (-e "$ENV{HOME}/.mplayer/font")
-{
- print "Sorry, font link is already existing.\n";
- exit 1;
-}
-
-#Determining location of fonts:
-
- at pkg=`pkg_info -Lx mplayer-fonts`;
-print "$prefix[3]";
-$prefix=$pkg[3];
-$prefix=~ s/(.+mplayer).*/$1/;
-chop $prefix;
-
-if ($1 eq "")
-{
- print "You have no mplayer-fonts installed.\n";
- exit 1;
-}
-
-print "You may choose any of the available language sets:\n\n";
-print "ISO-8859-1 Font : 1\n";
-print "ISO-8859-2 Font : 2\n";
-print "(old) Cyrillic fonts : c\n";
-print "Russian fonts : r\n";
-
-print "Your decision? ";
-chomp ($lang=<STDIN>);
-print "\n";
-
-if ($lang eq "1" || $lang eq "2")
-{
- print "The available sizes for this font are 14,18,24,28.\n";
- print "Please enter the wanted size: \n";
- chomp ($size=<STDIN>);
- if ($size ne "14" && $size ne "18" && $size ne "24" && $size ne "28") {$size=14;}
-}
-
-unless (-e "$ENV{HOME}/.mplayer") {system "mkdir $ENV{HOME}/.mplayer";}
-
-if ($lang eq "c")
-{
- system "ln -sv $prefix/fonts/cyrillic/ $ENV{HOME}/.mplayer/font";
-}
-elsif ($lang eq "r")
-{
- system "ln -sv $prefix/fonts/koi8r-font/ $ENV{HOME}/.mplayer/font";
-}
-elsif ($lang eq "2")
-{
- system "ln -sv $prefix/fonts/iso-8859-2/arial-$size/ $ENV{HOME}/.mplayer/font";
-}
-else {system "ln -sv $prefix/fonts/iso-8859-1/arial-$size/ $ENV{HOME}/.mplayer/font"};
Deleted: trunk/multimedia/mplayer/files/patch-DMO_VideoDecoder.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-DMO_VideoDecoder.c 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-DMO_VideoDecoder.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,10 +0,0 @@
---- loader/dmo/DMO_VideoDecoder.c 2007/01/26 09:21:22 22019
-+++ loader/dmo/DMO_VideoDecoder.c 2007/02/11 17:55:49 22204
-@@ -119,6 +119,7 @@
-
- this->iv.m_bh = malloc(bihs);
- memcpy(this->iv.m_bh, format, bihs);
-+ this->iv.m_bh->biSize = bihs;
-
- this->iv.m_State = STOP;
- //this->iv.m_pFrame = 0;
Added: trunk/multimedia/mplayer/files/patch-Makefile
===================================================================
--- trunk/multimedia/mplayer/files/patch-Makefile (rev 0)
+++ trunk/multimedia/mplayer/files/patch-Makefile 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,28 @@
+--- Makefile.orig 2012-03-03 17:45:15.000000000 +0100
++++ Makefile 2012-03-22 15:26:08.719328325 +0100
+@@ -904,20 +904,17 @@
+ install: $(INSTALL_TARGETS-yes)
+
+ install-dirs:
+- $(INSTALL) -d $(BINDIR) $(CONFDIR) $(LIBDIR)
+
+-install-%: %$(EXESUF) install-dirs
+- $(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
++install-mplayer: mplayer$(EXESUF) install-dirs
++ @${BSD_INSTALL_PROGRAM} mplayer$(EXESUF) $(BINDIR)
+
+-install-gui: install-mplayer install-gui-icons
+- -ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
+- $(INSTALL) -d $(DATADIR)/skins $(prefix)/share/applications
+- $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
++install-gui: install-mplayer
+
+ install-gui-icons: $(foreach size,$(GUI_ICONSIZES),install-gui-icon-$(size))
+ install-gui-man: $(foreach lang,$(MAN_LANGS),install-gui-man-$(lang))
+ install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
+-install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
++install-mplayer-man:
++ @${BSD_INSTALL_MAN} DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1
+
+ install-gui-man-en: install-mplayer-man-en
+ cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
Property changes on: trunk/multimedia/mplayer/files/patch-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/mplayer/files/patch-ad
===================================================================
--- trunk/multimedia/mplayer/files/patch-ad 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-ad 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,152 +0,0 @@
---- configure.orig Mon Oct 23 00:32:31 2006
-+++ configure Tue Oct 24 22:19:10 2006
-@@ -59,9 +59,9 @@
- echo >> "$TMPLOG"
- cat "$1" >> "$TMPLOG"
- echo >> "$TMPLOG"
-- echo "$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra -o $TMPO $@" >> "$TMPLOG"
-+ echo "$_cc $CFLAGS -fno-fast-math $_inc_extra $_ld_static $_ld_extra -o $TMPO $@" >> "$TMPLOG"
- rm -f "$TMPO"
-- $_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra -o "$TMPO" "$@" >> "$TMPLOG" 2>&1
-+ $_cc $CFLAGS -fno-fast-math $_inc_extra $_ld_static $_ld_extra -o "$TMPO" "$@" >> "$TMPLOG" 2>&1
- TMP="$?"
- echo >> "$TMPLOG"
- echo "ldd $TMPO" >> "$TMPLOG"
-@@ -474,7 +474,7 @@
- _armv5te=auto
- _iwmmxt=auto
- _mtrr=auto
--_install=install
-+_install=@${BSD_INSTALL_PROGRAM}
- _ranlib=ranlib
- _cc=cc
- test "$CC" && _cc="$CC"
-@@ -599,14 +599,7 @@
- case "`uname -m 2>&1`" in
- i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;;
- ia64) host_arch=ia64 ;;
-- x86_64|amd64)
-- if [ -n "`$_cc -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p'`" -a \
-- -z "`echo $CFLAGS | grep -- -m32`" ]; then
-- host_arch=x86_64
-- else
-- host_arch=i386
-- fi
-- ;;
-+ x86_64|amd64) host_arch=x86_64 ;;
- macppc|ppc|ppc64) host_arch=ppc ;;
- alpha) host_arch=alpha ;;
- sparc) host_arch=sparc ;;
-@@ -831,25 +824,10 @@
- _cpuinfo="echo"
- # Cygwin has /proc/cpuinfo, but only supports Intel CPUs
- # FIXME: Remove the cygwin check once AMD CPUs are supported
--if test -r /proc/cpuinfo && not cygwin; then
-- # Linux with /proc mounted, extract CPU information from it
-- _cpuinfo="cat /proc/cpuinfo"
--elif test -r /compat/linux/proc/cpuinfo && not x86 ; then
-- # FreeBSD with Linux emulation /proc mounted,
-- # extract CPU information from it
-- _cpuinfo="cat /compat/linux/proc/cpuinfo"
--elif darwin && not x86 ; then
-- # use hostinfo on Darwin
-- _cpuinfo="hostinfo"
--elif aix; then
-- # use 'lsattr' on AIX
-- _cpuinfo="lsattr -E -l proc0 -a type"
--elif x86 || x86_64; then
- # all other OSes try to extract CPU information from a small helper
- # program TOOLS/cpuinfo instead
- $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
- _cpuinfo="TOOLS/cpuinfo"
--fi
-
- if x86 || x86_64 ; then
- # gather more CPU information
-@@ -1539,7 +1517,7 @@
- fi
- _stripbinaries=no
- elif test -z "$CFLAGS" ; then
-- CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
-+ CFLAGS="-O $_pipe"
- else
- _warn_CFLAGS=yes
- fi
-@@ -2204,8 +2182,7 @@
- ;;
-
- *)
-- echo "Unknown parameter: $ac_option"
-- exit 1
-+ echo "Unknown parameter: $ac_option (ignoring)..."
- ;;
-
- esac
-@@ -2898,13 +2875,7 @@
-
-
- echocheck "memalign()"
--# XXX restrict to x86 ? extend to other CPUs/cacheline sizes ?
--cat > $TMPC << EOF
--#include <malloc.h>
--int main (void) { (void) memalign(64, sizeof(char)); return 0; }
--EOF
- _memalign=no
--cc_check && _memalign=yes
- if test "$_memalign" = yes ; then
- _def_memalign='#define HAVE_MEMALIGN 1'
- else
-@@ -3005,20 +2976,8 @@
- _def_threads='#undef HAVE_THREADS'
-
- echocheck "pthread"
--if test "$_pthreads" = auto ; then
--cat > $TMPC << EOF
--#include <pthread.h>
--void* func(void *arg) { return arg; }
--int main(void) { pthread_t tid; return pthread_create (&tid, 0, func, 0) == 0 ? 0 : 1; }
--EOF
--_pthreads=no
--if not hpux ; then
-- for _ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
-- # for crosscompilation, we cannot execute the program, be happy if we can link statically
-- cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break
-- done
--fi
--fi
-+_pthreads=yes
-+_ld_pthread="${PTHREAD_LIBS}"
- if test "$_pthreads" = yes ; then
- _res_comment="using $_ld_pthread"
- _def_pthreads='#define HAVE_PTHREADS 1'
-@@ -6555,7 +6514,8 @@
- #endif
- int main(void) { x264_encoder_open((void*)0); return 0; }
- EOF
-- _ld_x264="$_ld_x264 -lx264 $_ld_pthread"
-+ _ld_x264pc=`pkg-config x264 --libs 2>/dev/null`
-+ _ld_x264="$_ld_x264 $_ld_x264pc $_ld_pthread"
- _x264=no
- if cc_check $_ld_x264 $_ld_lm ; then
- _x264=yes
-@@ -6685,8 +6645,11 @@
- if test "$_tv" = yes ; then
- cat > $TMPC <<EOF
- #include <sys/types.h>
-+#include <sys/param.h>
- #if defined(__NetBSD__)
- #include <dev/ic/bt8xx.h>
-+#elif(__FreeBSD_version >= 502100)
-+#include <dev/bktr/ioctl_bt848.h>
- #else
- #include <machine/ioctl_bt848.h>
- #endif
-@@ -7218,7 +7181,7 @@
- CFLAGS="$CFLAGS -D_REENTRANT"
- elif bsd ; then
- # FIXME bsd needs this so maybe other OS'es
-- CFLAGS="$CFLAGS -D_THREAD_SAFE"
-+ CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}"
- fi
- # 64 bit file offsets?
- if test "$_largefiles" = yes || freebsd ; then
Deleted: trunk/multimedia/mplayer/files/patch-ae
===================================================================
--- trunk/multimedia/mplayer/files/patch-ae 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-ae 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,49 +0,0 @@
---- Makefile.orig Mon Oct 23 00:32:31 2006
-+++ Makefile Tue Oct 24 21:35:42 2006
-@@ -414,43 +414,11 @@
- $(MAKE) -C libdha install
- $(MAKE) -C vidix install
- endif
-- $(INSTALL) -d $(BINDIR)
-- $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
--ifeq ($(GUI),yes)
-- -ln -sf $(PRG) $(BINDIR)/gmplayer
--endif
-- $(INSTALL) -d $(MANDIR)/man1
-- for i in $(MAN_LANG); do \
-- if test "$$i" = en ; then \
-- $(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1 ; \
-- else \
-- $(INSTALL) -d $(MANDIR)/$$i/man1 ; \
-- $(INSTALL) -c -m 644 DOCS/man/$$i/mplayer.1 $(MANDIR)/$$i/man1/mplayer.1 ; \
-- fi ; \
-- done
-+ @${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)/$(PRG)
-+ @${BSD_INSTALL_MAN} DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1
- ifeq ($(MENCODER),yes)
-- $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
-- for i in $(MAN_LANG); do \
-- if test "$$i" = en ; then \
-- cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
-- else \
-- cd $(MANDIR)/$$i/man1 && ln -sf mplayer.1 mencoder.1 ; \
-- fi ; \
-- done
--endif
-- @$(INSTALL) -d $(DATADIR)
-- @$(INSTALL) -d $(DATADIR)/font
--ifeq ($(GUI),yes)
-- @$(INSTALL) -d $(DATADIR)/skins
-- @echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html"
-- @echo "*** for GUI, and extract to $(DATADIR)/skins/"
-- @$(INSTALL) -d $(prefix)/share/pixmaps
-- $(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/mplayer.xpm
-- @$(INSTALL) -d $(prefix)/share/applications
-- $(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/mplayer.desktop
-+ @${BSD_INSTALL_PROGRAM} $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
- endif
-- @$(INSTALL) -d $(CONFDIR)
-- @if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
-
- uninstall:
- -rm -f $(BINDIR)/$(PRG) $(BINDIR)/gmplayer $(MANDIR)/man1/mplayer.1
Deleted: trunk/multimedia/mplayer/files/patch-bswap.h
===================================================================
--- trunk/multimedia/mplayer/files/patch-bswap.h 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-bswap.h 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,20 +0,0 @@
---- bswap.h.orig Sun Jun 11 20:35:47 2006
-+++ bswap.h Thu Jun 15 10:31:42 2006
-@@ -1,8 +1,17 @@
- #ifndef __BSWAP_H__
- #define __BSWAP_H__
-
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #ifdef HAVE_BYTESWAP_H
- #include <byteswap.h>
-+#elif (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
-+#include <sys/endian.h>
-+#define bswap_16(x) bswap16(x)
-+#define bswap_32(x) bswap32(x)
-+#define bswap_64(x) bswap64(x)
- #else
-
- #include <inttypes.h>
Added: trunk/multimedia/mplayer/files/patch-configure
===================================================================
--- trunk/multimedia/mplayer/files/patch-configure (rev 0)
+++ trunk/multimedia/mplayer/files/patch-configure 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,188 @@
+--- configure.orig 2014-12-17 22:02:44.000000000 +0100
++++ configure 2015-01-24 17:13:38.903362604 +0100
+@@ -646,7 +646,7 @@
+ _iwmmxt=auto
+ _mtrr=auto
+ _altivec=auto
+-_install=install
++_install=@${BSD_INSTALL_PROGRAM}
+ _ranlib=ranlib
+ _windres=windres
+ _cc=cc
+@@ -988,7 +988,7 @@
+ ld_static=''
+ ;;
+ --enable-profile)
+- _profile='-p'
++ _profile='-pg'
+ ;;
+ --disable-profile)
+ _profile=
+@@ -1459,7 +1459,6 @@
+
+ *)
+ echo "Unknown parameter: $ac_option"
+- exit 1
+ ;;
+
+ esac
+@@ -1712,7 +1711,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 ;;
++ macppc|powerpc|ppc*|Power*) host_arch=ppc ;;
+ alpha) host_arch=alpha ;;
+ sun4*|sparc*) host_arch=sparc ;;
+ parisc*|hppa*|9000*) host_arch=hppa ;;
+@@ -1834,7 +1833,11 @@
+ cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
+ echo "yes"
+
+-cflag_check "-lm" && libm="-lm"
++if test -z "$_profile" ; then
++ cflag_check "-lm" && libm="-lm"
++else
++ cflag_check "-lm_p" && libm="-lm_p"
++fi
+
+ if test -z "$_target" ; then
+ cat > $TMPC << EOF
+@@ -3164,6 +3167,13 @@
+ fi
+ echores "$setend"
+
++ echocheck "ARM setend"
++ if test $setend = "auto" ; then
++ setend=no
++ inline_asm_check '"setend be"' && setend=yes
++ fi
++ echores "$setend"
++
+ echocheck "softfloat ABI"
+ softfloat=yes
+ cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
+@@ -3798,17 +3808,17 @@
+ echores "$aligned_malloc"
+
+
+-echocheck "memalign()"
++echocheck "aligned_alloc()"
+ # XXX restrict to x86 ? extend to other CPUs/cacheline sizes ?
+-def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0'
++def_memalign='#define HAVE_MEMALIGN 0'
+ _memalign=no
+-statement_check malloc.h 'memalign(64, sizeof(char))' && _memalign=yes
++statement_check stdlib.h 'aligned_alloc(32, 32*sizeof(char))' && _memalign=yes
+ if test "$_memalign" = yes ; then
+- def_memalign='#define HAVE_MEMALIGN 1'
++ def_map_memalign='#define memalign(a, b) aligned_alloc(a, b)'
++ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0'
+ else
+- def_memalign='#define HAVE_MEMALIGN 0'
+ def_map_memalign='#define memalign(a, b) malloc(b)'
+- darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1'
++ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1'
+ fi
+ echores "$_memalign"
+
+@@ -3914,7 +3924,7 @@
+ if linux ; then
+ THREAD_CFLAGS=-D_REENTRANT
+ elif freebsd || netbsd || openbsd || bsdos ; then
+- THREAD_CFLAGS=-D_THREAD_SAFE
++ THREAD_CFLAGS=${PTHREAD_CFLAGS}
+ fi
+ if test "$_pthreads" = auto ; then
+ cat > $TMPC << EOF
+@@ -3924,7 +3934,7 @@
+ EOF
+ _pthreads=no
+ if ! hpux ; then
+- for ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
++ for ld_tmp in ${PTHREAD_LIBS} ; do
+ # 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
+@@ -4076,7 +4086,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" "-L%%LOCALBASE%%/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
+@@ -6046,7 +6056,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
+@@ -6059,7 +6069,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"
+@@ -6133,8 +6143,8 @@
+ cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <cdio/version.h>
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ int main(void) {
+ void *test = cdda_verbose_set;
+ printf("%s\n", CDIO_VERSION);
+@@ -6566,7 +6576,7 @@
+ echocheck "libgsm"
+ if test "$_libgsm" = auto ; then
+ _libgsm=no
+- statement_check gsm/gsm.h 'gsm_create()' -lgsm && _libgsm=yes
++ statement_check gsm.h 'gsm_create()' -lgsm && _libgsm=yes
+ fi
+ if test "$_libgsm" = yes ; then
+ def_libgsm='#define CONFIG_LIBGSM 1'
+@@ -7051,6 +7061,16 @@
+ nolibrtmp=no
+ def_librtmp='#define CONFIG_LIBRTMP 1'
+ inputmodules="librtmp $inputmodules"
++
++ if $_pkg_config --exists librtmp; then
++ _inc_tmp=$($_pkg_config --cflags librtmp)
++ _ld_tmp=$($_pkg_config --libs librtmp)
++ else
++ _inc_tmp="-I${LOCALBASE}/include"
++ _ld_tmp="-L${LOCALBASE}/lib -lrtmp -lz -lssl -lcrypto"
++ fi
++ extra_ldflags="$extra_ldflags $_ld_tmp"
++ extra_cflags="$extra_cflags $_inc_tmp"
+ else
+ nolibrtmp=yes
+ _librtmp=no
+@@ -7450,7 +7470,7 @@
+ echocheck "mencoder"
+ if test "$_mencoder" = no ; then
+ # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
+- libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
++ libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
+ fi
+ echores "$_mencoder"
+
+@@ -8329,7 +8349,7 @@
+ EXESUF = $_exesuf
+ EXESUFS_ALL = .exe
+
+-ARCH = $arch
++MPLAYER_ARCH = $arch
+ $(mak_enable "$arch_all" "$arch" ARCH)
+ $(mak_enable "$subarch_all" "$subarch" ARCH)
+ $(mak_enable "$cpuexts_all" "$cpuexts" HAVE)
Property changes on: trunk/multimedia/mplayer/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/mplayer/files/patch-cpudetect.h
===================================================================
--- trunk/multimedia/mplayer/files/patch-cpudetect.h 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-cpudetect.h 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,11 +0,0 @@
---- cpudetect.h.orig Sun Apr 6 01:28:52 2003
-+++ cpudetect.h Sun Apr 6 01:29:06 2003
-@@ -5,6 +5,8 @@
- #define CPUTYPE_I486 4
- #define CPUTYPE_I586 5
- #define CPUTYPE_I686 6
-+#define CPUTYPE_I686_7 7
-+#define CPUTYPE_I686_8 8
-
- typedef struct cpucaps_s {
- int cpuType;
Added: trunk/multimedia/mplayer/files/patch-ffmpeg-Makefile
===================================================================
--- trunk/multimedia/mplayer/files/patch-ffmpeg-Makefile (rev 0)
+++ trunk/multimedia/mplayer/files/patch-ffmpeg-Makefile 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,11 @@
+--- ffmpeg/Makefile.orig 2014-07-22 19:20:06.000000000 +0200
++++ ffmpeg/Makefile 2014-08-11 20:49:48.038911362 +0200
+@@ -91,7 +91,7 @@
+ $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
+ SUBDIR := $(1)/
+ include $(SRC_PATH)/$(1)/Makefile
+--include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
++-include $(SRC_PATH)/$(1)/$(MPLAYER_ARCH)/Makefile
+ -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
+ include $(SRC_PATH)/library.mak
+ endef
Property changes on: trunk/multimedia/mplayer/files/patch-ffmpeg-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/mplayer/files/patch-gui_ws_ws.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-gui_ws_ws.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-gui_ws_ws.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,10 @@
+--- gui/wm/ws.c.orig 2013-08-03 00:42:05.000000000 +0200
++++ gui/wm/ws.c 2013-12-16 10:13:26.000000000 +0100
+@@ -1322,6 +1322,7 @@
+ win->xImage->data = win->Shminfo.shmaddr;
+ win->Shminfo.readOnly = False;
+ XShmAttach(wsDisplay, &win->Shminfo);
++ XSync(wsDisplay, False);
+ shmctl(win->Shminfo.shmid, IPC_RMID, 0);
+ } else
+ #endif
Property changes on: trunk/multimedia/mplayer/files/patch-gui_ws_ws.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/multimedia/mplayer/files/patch-libao2-ao_arts.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-libao2-ao_arts.c 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-libao2-ao_arts.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,18 +1,15 @@
---- libao2/ao_arts.c.orig Fri Dec 27 14:35:07 2002
-+++ libao2/ao_arts.c Mon Mar 3 17:10:38 2003
-@@ -102,8 +102,14 @@
+--- libao2/ao_arts.c.orig 2009-03-06 13:43:12.000000000 -0600
++++ libao2/ao_arts.c 2009-07-23 19:57:44.090958744 -0500
+@@ -116,8 +116,10 @@
- static void uninit()
+ static void uninit(int immed)
{
- arts_close_stream(stream);
+- arts_free();
+ if (stream != NULL) {
-+ arts_close_stream(stream);
-+ stream = NULL;
-+ }
-+/* XXX - we get "MPlayer interrupted by signal 11 in module:
-+ exit_player" unless commented :(
- arts_free();
-+*/
++ arts_close_stream(stream);
++ stream = NULL;
++ }
}
static int play(void* data,int len,int flags)
Property changes on: trunk/multimedia/mplayer/files/patch-libao2-ao_arts.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/multimedia/mplayer/files/patch-libao2-ao_oss.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-libao2-ao_oss.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-libao2-ao_oss.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,89 @@
+--- libao2/ao_oss.c.orig 2010-01-11 21:27:52.000000000 +0100
++++ libao2/ao_oss.c 2011-12-29 01:06:49.227522915 +0100
+@@ -56,6 +56,8 @@
+ ""
+ };
+
++static int volume = -1;
++
+ /* Support for >2 output channels added 2001-11-25 - Steve Davies <steve at daviesfam.org> */
+
+ LIBAO_EXTERN(oss)
+@@ -72,6 +74,11 @@
+ case AF_FORMAT_S16_BE: return AFMT_S16_BE;
+ #ifdef AFMT_S24_PACKED
+ case AF_FORMAT_S24_LE: return AFMT_S24_PACKED;
++#elif defined(__FreeBSD__) && defined(AFMT_S24_LE)
++ case AF_FORMAT_U24_LE: return AFMT_U24_LE;
++ case AF_FORMAT_U24_BE: return AFMT_U24_BE;
++ case AF_FORMAT_S24_LE: return AFMT_S24_LE;
++ case AF_FORMAT_S24_BE: return AFMT_S24_BE;
+ #endif
+ #ifdef AFMT_U32_LE
+ case AF_FORMAT_U32_LE: return AFMT_U32_LE;
+@@ -115,6 +122,11 @@
+ case AFMT_S16_BE: return AF_FORMAT_S16_BE;
+ #ifdef AFMT_S24_PACKED
+ case AFMT_S24_PACKED: return AF_FORMAT_S24_LE;
++#elif defined(__FreeBSD__) && defined(AFMT_S24_LE)
++ case AFMT_U24_LE: return AF_FORMAT_U24_LE;
++ case AFMT_U24_BE: return AF_FORMAT_U24_BE;
++ case AFMT_S24_LE: return AF_FORMAT_S24_LE;
++ case AFMT_S24_BE: return AF_FORMAT_S24_BE;
+ #endif
+ #ifdef AFMT_U32_LE
+ case AFMT_U32_LE: return AF_FORMAT_U32_LE;
+@@ -434,9 +446,29 @@
+ audio_fd = -1;
+ }
+
++static void savevol(void){
++ int fd;
++ if (volume < 0) {
++ if ((fd = open(oss_mixer_device, O_RDONLY)) >= 0) {
++ ioctl(fd, MIXER_READ(oss_mixer_channel), &volume);
++ close(fd);
++ }
++ }
++}
++
++static void restorevol(void){
++ int fd;
++ if ((fd = open(oss_mixer_device, O_RDONLY)) >= 0) {
++ ioctl(fd, MIXER_WRITE(oss_mixer_channel), &volume);
++ close(fd);
++ }
++ volume = -1;
++}
++
+ // stop playing and empty buffers (for seeking/pause)
+ static void reset(void){
+ int oss_format;
++ savevol();
+ uninit(1);
+ audio_fd=open(dsp, O_WRONLY);
+ if(audio_fd < 0){
+@@ -448,6 +480,7 @@
+ fcntl(audio_fd, F_SETFD, FD_CLOEXEC);
+ #endif
+
++ ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
+ oss_format = format2oss(ao_data.format);
+ if(AF_FORMAT_IS_AC3(ao_data.format))
+ ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
+@@ -459,13 +492,14 @@
+ int c = ao_data.channels-1;
+ ioctl (audio_fd, SNDCTL_DSP_STEREO, &c);
+ }
+- ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
+ }
++ restorevol();
+ }
+
+ // stop playing, keep buffers (for pause)
+ static void audio_pause(void)
+ {
++ savevol();
+ prepause_space = get_space();
+ uninit(1);
+ }
Property changes on: trunk/multimedia/mplayer/files/patch-libao2-ao_oss.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/mplayer/files/patch-libavcodec-Makefile
===================================================================
--- trunk/multimedia/mplayer/files/patch-libavcodec-Makefile (rev 0)
+++ trunk/multimedia/mplayer/files/patch-libavcodec-Makefile 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,11 @@
+--- ffmpeg/libavcodec/Makefile.orig 2012-07-20 19:20:04.000000000 +0200
++++ ffmpeg/libavcodec/Makefile 2012-07-21 18:25:12.582670118 +0200
+@@ -788,7 +788,7 @@
+ codec_names.h \
+ fft-internal.h \
+ tableprint.h \
+- $(ARCH)/vp56_arith.h \
++ $(MPLAYER_ARCH)/vp56_arith.h \
+
+ SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h
+ SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h
Property changes on: trunk/multimedia/mplayer/files/patch-libavcodec-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S
===================================================================
--- trunk/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S (rev 0)
+++ trunk/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,11 @@
+--- ffmpeg/libavcodec/arm/fft_vfp.S.orig 2014-12-09 19:20:07.000000000 +0100
++++ ffmpeg/libavcodec/arm/fft_vfp.S 2014-12-24 15:48:09.494735677 +0100
+@@ -33,7 +33,7 @@
+ movrel a2, (fft_tab_vfp - 8)
+ ldr pc, [a2, ip, lsl #2]
+ endfunc
+-const fft_tab_vfp, relocate=1
++const fft_tab_vfp
+ .word fft4_vfp
+ .word fft8_vfp
+ .word X(ff_fft16_vfp) @ this one alone is exported
Property changes on: trunk/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/mplayer/files/patch-libavcodec-h264.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-libavcodec-h264.c 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-libavcodec-h264.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,11 +0,0 @@
---- libavcodec/h264.c.orig Thu Dec 21 14:57:54 2006
-+++ libavcodec/h264.c Thu Dec 21 15:00:14 2006
-@@ -6034,7 +6034,7 @@
- return ctx + 4 * cat;
- }
-
--static const __attribute((used)) uint8_t last_coeff_flag_offset_8x8[63] = {
-+const __attribute((used)) uint8_t last_coeff_flag_offset_8x8[63] = {
- 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
- 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
Added: trunk/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,14 @@
+--- ffmpeg/libavcodec/libgsmdec.c.orig 2014-07-21 19:20:03.000000000 +0200
++++ ffmpeg/libavcodec/libgsmdec.c 2014-08-15 11:02:55.987422815 +0200
+@@ -28,11 +28,7 @@
+ // 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>
+-#endif
+
+ #include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"
Property changes on: trunk/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,14 @@
+--- ffmpeg/libavcodec/libgsmenc.c.orig 2014-08-15 11:02:02.619426519 +0200
++++ ffmpeg/libavcodec/libgsmenc.c 2014-08-15 11:02:28.587424476 +0200
+@@ -28,11 +28,7 @@
+ // 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>
+-#endif
+
+ #include "libavutil/common.h"
+
Property changes on: trunk/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,10 @@
+--- ffmpeg/libavcodec/mpegaudio_parser.c.orig 2014-02-12 19:20:06.000000000 +0100
++++ ffmpeg/libavcodec/mpegaudio_parser.c 2014-04-19 14:39:15.514132783 +0200
+@@ -83,6 +83,7 @@
+ avctx->sample_rate= sr;
+ avctx->channels = channels;
+ s1->duration = frame_size;
++ avctx->frame_size = frame_size;
+ avctx->codec_id = codec_id;
+ if (s->no_bitrate || !avctx->bit_rate) {
+ s->no_bitrate = 1;
Property changes on: trunk/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/mplayer/files/patch-libavcodec-vp56.h
===================================================================
--- trunk/multimedia/mplayer/files/patch-libavcodec-vp56.h 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-libavcodec-vp56.h 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,11 +0,0 @@
---- libavcodec/vp56.h.orig Mon Oct 23 07:32:34 2006
-+++ libavcodec/vp56.h Wed Dec 13 03:03:41 2006
-@@ -24,7 +24,7 @@
- #ifndef VP56_H
- #define VP56_H
-
--#include <stdint.h>
-+#include <inttypes.h>
-
- #include "vp56data.h"
- #include "dsputil.h"
Added: trunk/multimedia/mplayer/files/patch-libavfilter-Makefile
===================================================================
--- trunk/multimedia/mplayer/files/patch-libavfilter-Makefile (rev 0)
+++ trunk/multimedia/mplayer/files/patch-libavfilter-Makefile 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,10 @@
+--- ffmpeg/libavfilter/Makefile.orig 2012-03-21 19:20:05.000000000 +0100
++++ ffmpeg/libavfilter/Makefile 2012-03-22 16:09:31.826872990 +0100
+@@ -167,6 +167,7 @@
+ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o
+ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
+
++-include $(SRC_PATH)/$(SUBDIR)$(MPLAYER_ARCH)/Makefile
+
+ DIRS = x86 libmpcodecs
+
Property changes on: trunk/multimedia/mplayer/files/patch-libavfilter-Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/mplayer/files/patch-libavformat-udp.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-libavformat-udp.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-libavformat-udp.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,11 @@
+--- ffmpeg/libavformat/udp.c.orig 2011-03-16 13:49:21.000000000 +0100
++++ ffmpeg/libavformat/udp.c 2011-03-18 17:18:12.884305376 +0100
+@@ -42,6 +42,8 @@
+ #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
+ #endif
+
++#define IPPROTO_IPV6 41
++
+ typedef struct {
+ int udp_fd;
+ int ttl;
Property changes on: trunk/multimedia/mplayer/files/patch-libavformat-udp.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/mplayer/files/patch-libavutil-x86-asm.h
===================================================================
--- trunk/multimedia/mplayer/files/patch-libavutil-x86-asm.h (rev 0)
+++ trunk/multimedia/mplayer/files/patch-libavutil-x86-asm.h 2015-03-25 19:18:51 UTC (rev 18315)
@@ -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)
Property changes on: trunk/multimedia/mplayer/files/patch-libavutil-x86-asm.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/mplayer/files/patch-libdha-Makefile
===================================================================
--- trunk/multimedia/mplayer/files/patch-libdha-Makefile 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-libdha-Makefile 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,20 +0,0 @@
---- libdha/Makefile.orig Mon Jul 12 12:54:10 2004
-+++ libdha/Makefile Thu Jul 22 22:18:21 2004
-@@ -4,8 +4,6 @@
-
- MAJOR_VERSION = 1
- MINOR_VERSION = 0
--VERSION = $(MAJOR_VERSION).$(MINOR_VERSION)
--
-
- ifeq ($(TARGET_OS),CYGWIN)
- SHORTNAME = libdha.dll
-@@ -19,7 +17,7 @@
- LIBNAME = libdha.a
- SHORTNAME = libdha.a
- else
--LIBNAME = libdha.so.$(VERSION)
-+LIBNAME = libdha-$(MAJOR_VERSION).so.$(MINOR_VERSION)
- endif
-
- SRCS=libdha.c mtrr.c pci.c pci_names.c
Deleted: trunk/multimedia/mplayer/files/patch-libfaad2-common.h
===================================================================
--- trunk/multimedia/mplayer/files/patch-libfaad2-common.h 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-libfaad2-common.h 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,14 +0,0 @@
---- libfaad2/common.h.orig Thu Jun 15 10:39:27 2006
-+++ libfaad2/common.h Thu Jun 15 10:40:18 2006
-@@ -318,8 +318,9 @@
- *y2 = MUL_F(x2, c1) - MUL_F(x1, c2);
- }
-
--
-- #if defined(_WIN32) && !defined(__MINGW32__) && !defined(HAVE_LRINTF)
-+ #if defined(HAVE_LRINTF)
-+ #define HAS_LRINTF
-+ #elif defined(_WIN32) && !defined(__MINGW32__) && !defined(HAVE_LRINTF)
- #define HAS_LRINTF
- static INLINE int lrintf(float f)
- {
Deleted: trunk/multimedia/mplayer/files/patch-libmpcodecs-vf_ass.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-libmpcodecs-vf_ass.c 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-libmpcodecs-vf_ass.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,11 +0,0 @@
---- libmpcodecs/vf_ass.c.orig Mon Oct 23 07:32:24 2006
-+++ libmpcodecs/vf_ass.c Wed Dec 13 03:04:26 2006
-@@ -23,7 +23,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <stdint.h>
-+#include <inttypes.h>
- #include <assert.h>
-
- #include "config.h"
Added: trunk/multimedia/mplayer/files/patch-libvo-x11_common.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-libvo-x11_common.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-libvo-x11_common.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,11 @@
+--- libvo/x11_common.c.orig 2014-02-08 21:39:02.000000000 +0100
++++ libvo/x11_common.c 2014-04-19 14:43:53.715749607 +0200
+@@ -430,7 +430,7 @@
+ }
+
+ // Required so that XLookupString returns UTF-8
+- if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8"))
++ if (!setlocale(LC_CTYPE, "en_US.UTF-8"))
+ mp_msg(MSGT_VO, MSGL_WARN, MSGTR_CouldntFindUTF8Locale);
+ XSetErrorHandler(x11_errorhandler);
+
Property changes on: trunk/multimedia/mplayer/files/patch-libvo-x11_common.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/mplayer/files/patch-mplayer.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-mplayer.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-mplayer.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,12 @@
+--- mplayer.c.orig 2014-04-06 20:46:45.000000000 +0200
++++ mplayer.c 2014-06-07 14:40:43.756655422 +0200
+@@ -3707,7 +3707,8 @@
+ if (use_gui) {
+ if (!gui(GUI_SET_VIDEO, mpctx->sh_video))
+ goto goto_next_file;
+- gui(GUI_SET_AUDIO, mpctx->sh_audio);
++ if (mpctx->sh_audio)
++ gui(GUI_SET_AUDIO, mpctx->sh_audio);
+ }
+ #endif
+
Property changes on: trunk/multimedia/mplayer/files/patch-mplayer.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/mplayer/files/patch-stream-cookies.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-stream-cookies.c 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-stream-cookies.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,13 +0,0 @@
---- stream/cookies.c.orig Mon Oct 23 00:32:25 2006
-+++ stream/cookies.c Tue Oct 24 21:52:00 2006
-@@ -21,6 +21,10 @@
-
- #define MAX_COOKIES 20
-
-+#ifndef SIZE_MAX
-+#define SIZE_MAX ((size_t)-1)
-+#endif
-+
- char *cookies_file = NULL;
-
- typedef struct cookie_list_type {
Added: trunk/multimedia/mplayer/files/patch-stream-stream_cdda.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-stream-stream_cdda.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-stream-stream_cdda.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,13 @@
+--- stream/stream_cdda.c.orig 2013-12-02 15:30:21.000000000 +0100
++++ stream/stream_cdda.c 2015-01-24 15:44:33.095742583 +0100
+@@ -21,8 +21,8 @@
+ #include <cdda_interface.h>
+ #include <cdda_paranoia.h>
+ #else
+-#include <cdio/cdda.h>
+-#include <cdio/paranoia.h>
++#include <cdio/paranoia/cdda.h>
++#include <cdio/paranoia/paranoia.h>
+ #endif
+ #include <stdio.h>
+ #include <stdlib.h>
Property changes on: trunk/multimedia/mplayer/files/patch-stream-stream_cdda.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,6 +1,6 @@
---- stream/tvi_bsdbt848.c.orig Mon Oct 23 00:32:25 2006
-+++ stream/tvi_bsdbt848.c Tue Oct 24 21:54:45 2006
-@@ -297,11 +297,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;
@@ -7,7 +7,7 @@
- priv->iformat = METEOR_FMT_AUTOMODE;
+ priv->iformat = BT848_IFORM_F_AUTO;
- if(req_mode == TV_NORM_PAL)
+ if(req_mode == TV_NORM_PAL)
{
- priv->iformat = METEOR_FMT_PAL;
+ priv->iformat = BT848_IFORM_F_PALBDGHI;
@@ -14,9 +14,9 @@
priv->maxheight = PAL_HEIGHT;
priv->maxwidth = PAL_WIDTH;
priv->maxfps = PAL_FPS;
-@@ -322,7 +322,7 @@
+@@ -391,7 +391,7 @@
- if(req_mode == TV_NORM_NTSC)
+ if(req_mode == TV_NORM_NTSC)
{
- priv->iformat = METEOR_FMT_NTSC;
+ priv->iformat = BT848_IFORM_F_NTSCM;
@@ -23,7 +23,7 @@
priv->maxheight = NTSC_HEIGHT;
priv->maxwidth = NTSC_WIDTH;
priv->maxfps = NTSC_FPS;
-@@ -346,9 +346,28 @@
+@@ -415,9 +415,28 @@
}
}
@@ -49,26 +49,28 @@
+ }
+ }
-- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
-+ if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
+- if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
++ if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
{
- perror("format:ioctl");
- return(TVI_CONTROL_FALSE);
-@@ -479,7 +498,7 @@
- priv->videoready = TRUE;
- priv->btdev = strdup("/dev/bktr0");
- priv->immediatemode = FALSE;
+ mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno));
+ return TVI_CONTROL_FALSE;
+@@ -546,8 +565,9 @@
+ /* Video Configuration */
+
+ priv->videoready = 1;
++priv->btdev = strdup("/dev/bktr0");
+ priv->immediatemode = 0;
-priv->iformat = METEOR_FMT_PAL;
+priv->iformat = BT848_IFORM_F_PALBDGHI;
priv->maxheight = PAL_HEIGHT;
priv->maxwidth = PAL_WIDTH;
priv->maxfps = PAL_FPS;
-@@ -504,7 +523,7 @@
+@@ -572,7 +592,7 @@
}
- if(priv->videoready == TRUE &&
-- ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
-+ ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
+ if(priv->videoready &&
+- ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
++ ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
{
- perror("FMT:ioctl");
+ mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "SETEORSFMT", strerror(errno));
}
Property changes on: trunk/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Added: trunk/multimedia/mplayer/files/patch-stream-tvi_v4l.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-stream-tvi_v4l.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-stream-tvi_v4l.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,17 @@
+--- stream/tvi_v4l.c 2007-10-07 23:49:26.000000000 +0400
++++ stream/tvi_v4l.c 2010-01-27 13:42:17.781746063 +0300
+@@ -48,6 +48,14 @@
+
+ #include "audio_in.h"
+
++#include <libv4l1.h>
++#define open v4l1_open
++#define close v4l1_close
++#define dup v4l1_dup
++#define ioctl v4l1_ioctl
++#define mmap v4l1_mmap
++#define munmap v4l1_munmap
++
+ static tvi_handle_t *tvi_init_v4l(tv_param_t* tv_param);
+
+ tvi_info_t tvi_info_v4l = {
Property changes on: trunk/multimedia/mplayer/files/patch-stream-tvi_v4l.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/multimedia/mplayer/files/patch-stream-tvi_v4l2.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-stream-tvi_v4l2.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-stream-tvi_v4l2.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,25 @@
+--- stream/tvi_v4l2.c.orig 2011-06-26 16:42:35.000000000 +0200
++++ stream/tvi_v4l2.c 2011-11-26 20:09:03.369654854 +0100
+@@ -52,7 +52,6 @@
+ #ifdef HAVE_SYS_VIDEOIO_H
+ #include <sys/videoio.h>
+ #else
+-#include <linux/types.h>
+ #include <linux/videodev2.h>
+ #endif
+ #include "mp_msg.h"
+@@ -62,6 +61,14 @@
+ #include "tv.h"
+ #include "audio_in.h"
+
++#include <libv4l2.h>
++#define open v4l2_open
++#define close v4l2_close
++#define dup v4l2_dup
++#define ioctl v4l2_ioctl
++#define mmap v4l2_mmap
++#define munmap v4l2_munmap
++
+ #define info tvi_info_v4l2
+ static tvi_handle_t *tvi_init_v4l2(tv_param_t* tv_param);
+ /* information about this file */
Property changes on: trunk/multimedia/mplayer/files/patch-stream-tvi_v4l2.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Deleted: trunk/multimedia/mplayer/files/patch-tremor-codec_internal.h
===================================================================
--- trunk/multimedia/mplayer/files/patch-tremor-codec_internal.h 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-tremor-codec_internal.h 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,11 +0,0 @@
---- tremor/codec_internal.h.orig Sun Aug 20 11:04:15 2006
-+++ tremor/codec_internal.h Sun Aug 20 11:06:05 2006
-@@ -17,6 +17,8 @@
-
- #include "codebook.h"
-
-+void *_vorbis_block_alloc(vorbis_block *vb, long bytes);
-+
- typedef void vorbis_look_mapping;
- typedef void vorbis_look_floor;
- typedef void vorbis_look_residue;
Deleted: trunk/multimedia/mplayer/files/patch-vidix-drivers-Makefile
===================================================================
--- trunk/multimedia/mplayer/files/patch-vidix-drivers-Makefile 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-vidix-drivers-Makefile 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,11 +0,0 @@
---- vidix/drivers/Makefile.orig Mon Oct 23 00:32:26 2006
-+++ vidix/drivers/Makefile Tue Oct 24 22:04:38 2006
-@@ -6,7 +6,7 @@
- VIDIX_LIBS = -L../../libdha -ldha
- VIDIX_LIBS_M = $(VIDIX_LIBS) -lm
- VIDIX_LIBS_X = $(VIDIX_LIBS_M) $(X_LIB)
--VIDIX_CFLAGS= -I. -I.. $(OPTFLAGS) -fPIC
-+VIDIX_CFLAGS= -I. -I.. $(OPTFLAGS) $(X11_INC) -fPIC
-
- RAGE128_CFLAGS=$(VIDIX_CFLAGS) -DRAGE128
- MGA_CRTC2_CFLAGS=$(VIDIX_CFLAGS) -DCRTC2
Deleted: trunk/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,21 +0,0 @@
---- vidix/drivers/mga_vid.c.orig Sun Jun 11 20:35:43 2006
-+++ vidix/drivers/mga_vid.c Mon Jul 31 22:48:55 2006
-@@ -43,7 +43,7 @@
-
- #define MGA_VSYNC_POS 2
-
--#undef MGA_PCICONFIG_MEMDETECT
-+#define MGA_PCICONFIG_MEMDETECT
-
- #define MGA_DEFAULT_FRAMES 4
-
-@@ -1218,8 +1218,7 @@
- {
- if ((lst[i].command & PCI_COMMAND_IO) == 0)
- {
-- printf("[mga] Device is disabled, ignoring\n");
-- continue;
-+ printf("[mga] Device is disabled, trying anyways.\n");
- }
- switch(lst[i].device)
- {
Deleted: trunk/multimedia/mplayer/files/patch-vidix-drivers-radeon_vid.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-vidix-drivers-radeon_vid.c 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/patch-vidix-drivers-radeon_vid.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,11 +0,0 @@
---- vidix/drivers/radeon_vid.c.orig Tue Dec 21 00:43:54 2004
-+++ vidix/drivers/radeon_vid.c Tue Apr 12 17:49:46 2005
-@@ -852,6 +852,8 @@
- DEVICE_ATI_RAGE_128_PRO2,
- DEVICE_ATI_RAGE_128_PRO3,
- /* these seem to be based on rage 128 instead of mach64 */
-+ DEVICE_ATI_RAGE_MOBILITY_M4,
-+ DEVICE_ATI_RAGE_MOBILITY_M42,
- DEVICE_ATI_RAGE_MOBILITY_M3,
- DEVICE_ATI_RAGE_MOBILITY_M32
- #else
Added: trunk/multimedia/mplayer/files/patch-vidix-mga_vid.c
===================================================================
--- trunk/multimedia/mplayer/files/patch-vidix-mga_vid.c (rev 0)
+++ trunk/multimedia/mplayer/files/patch-vidix-mga_vid.c 2015-03-25 19:18:51 UTC (rev 18315)
@@ -0,0 +1,17 @@
+--- vidix/mga_vid.c.orig 2014-05-17 03:38:00.000000000 +0200
++++ vidix/mga_vid.c 2014-08-11 20:58:07.109876980 +0200
+@@ -1110,13 +1110,10 @@
+ i, lst[i].vendor, lst[i].device);
+ if (lst[i].vendor == VENDOR_MATROX)
+ {
+-#if 0
+ if ((lst[i].command & PCI_COMMAND_IO) == 0)
+ {
+- mp_msg(MSGT_VO, MSGL_STATUS, "[mga] Device is disabled, ignoring\n");
+- continue;
++ mp_msg(MSGT_VO, MSGL_STATUS, "[mga] Device seems disabled, trying anyway\n");
+ }
+-#endif
+ switch(lst[i].device)
+ {
+ case DEVICE_MATROX_MGA_G550_AGP:
Property changes on: trunk/multimedia/mplayer/files/patch-vidix-mga_vid.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/multimedia/mplayer/files/pkg-message.in
===================================================================
--- trunk/multimedia/mplayer/files/pkg-message.in 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/files/pkg-message.in 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,12 +1,11 @@
===================================================================
-MPlayer comes with useful documentation covering many topics like
+MPlayer's comprehensive documentation covers many topics like
output devices, video encoding, repairing broken files etc.
-They are installed in
+It is auto-generated daily and can be found on the project
+homepage in the documentation section:
-%%DOCSDIR%%
-
-for references.
+http://www.mplayerhq.hu/design7/documentation.html
===================================================================
MPlayer's system-wide configuration dir is
@@ -18,15 +17,4 @@
%%DATADIR%%/examples/etc
===================================================================
-This port provides a simple and easy to use
-tool to provide bitmap fonts in OSD.
-Just cd to the ports directory and type
-make install-user
-
-Note: This is only for the bitmap fonts! If you've compiled
-mplayer with truetype support, i.e. it is linked to freetype,
-which is the preferred and supported default setting, this won't
-work as expected.
-===================================================================
-
Property changes on: trunk/multimedia/mplayer/files/pkg-message.in
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/multimedia/mplayer/pkg-plist
===================================================================
--- trunk/multimedia/mplayer/pkg-plist 2015-03-25 19:12:39 UTC (rev 18314)
+++ trunk/multimedia/mplayer/pkg-plist 2015-03-25 19:18:51 UTC (rev 18315)
@@ -1,128 +1,9 @@
bin/mplayer
-%%MENCODER%%bin/mencoder
+man/man1/mplayer.1.gz
%%GMPLAYER%%bin/gmplayer
-%%PORTDOCS%%%%DOCSDIR%%/advaudio.html
-%%PORTDOCS%%%%DOCSDIR%%/aspect.html
-%%PORTDOCS%%%%DOCSDIR%%/audio-codecs.html
-%%PORTDOCS%%%%DOCSDIR%%/audio-formats.html
-%%PORTDOCS%%%%DOCSDIR%%/audio.html
-%%PORTDOCS%%%%DOCSDIR%%/bsd.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_advusers.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_fix.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_regression_test.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_report.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_security.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_what.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_where.html
-%%PORTDOCS%%%%DOCSDIR%%/bugs-audio.html
-%%PORTDOCS%%%%DOCSDIR%%/bugs-special.html
-%%PORTDOCS%%%%DOCSDIR%%/bugs.html
-%%PORTDOCS%%%%DOCSDIR%%/cd-dvd.html
-%%PORTDOCS%%%%DOCSDIR%%/codec-importing.html
-%%PORTDOCS%%%%DOCSDIR%%/codecs.html
-%%PORTDOCS%%%%DOCSDIR%%/commandline.html
-%%PORTDOCS%%%%DOCSDIR%%/containers.html
-%%PORTDOCS%%%%DOCSDIR%%/control.html
-%%PORTDOCS%%%%DOCSDIR%%/default.css
-%%PORTDOCS%%%%DOCSDIR%%/drives.html
-%%PORTDOCS%%%%DOCSDIR%%/dvd.html
-%%PORTDOCS%%%%DOCSDIR%%/edl.html
-%%PORTDOCS%%%%DOCSDIR%%/encoding-guide.html
-%%PORTDOCS%%%%DOCSDIR%%/exotic_platforms.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/features.html
-%%PORTDOCS%%%%DOCSDIR%%/fonts-osd.html
-%%PORTDOCS%%%%DOCSDIR%%/gui.html
-%%PORTDOCS%%%%DOCSDIR%%/history.html
-%%PORTDOCS%%%%DOCSDIR%%/howtoread.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/linux.html
-%%PORTDOCS%%%%DOCSDIR%%/macos.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-dvd-mpeg4.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-enc-images.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-enc-libavcodec.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-extractsub.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-handheld-psp.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-mpeg.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-mpeg4.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-rescale.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-selecting-codec.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-selecting-input.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-streamcopy.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-telecine.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-vcd-dvd.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-video-for-windows.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-x264.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-xvid.html
-%%PORTDOCS%%%%DOCSDIR%%/mencoder.html
-%%PORTDOCS%%%%DOCSDIR%%/mpeg_decoders.html
-%%PORTDOCS%%%%DOCSDIR%%/mpst.html
-%%PORTDOCS%%%%DOCSDIR%%/mtrr.html
-%%PORTDOCS%%%%DOCSDIR%%/other.html
-%%PORTDOCS%%%%DOCSDIR%%/output-trad.html
-%%PORTDOCS%%%%DOCSDIR%%/ports.html
-%%PORTDOCS%%%%DOCSDIR%%/radio-input.html
-%%PORTDOCS%%%%DOCSDIR%%/radio.html
-%%PORTDOCS%%%%DOCSDIR%%/rtc.html
-%%PORTDOCS%%%%DOCSDIR%%/skin-file.html
-%%PORTDOCS%%%%DOCSDIR%%/skin-fonts.html
-%%PORTDOCS%%%%DOCSDIR%%/skin-gui.html
-%%PORTDOCS%%%%DOCSDIR%%/skin-overview.html
-%%PORTDOCS%%%%DOCSDIR%%/skin-quality.html
-%%PORTDOCS%%%%DOCSDIR%%/skin.html
-%%PORTDOCS%%%%DOCSDIR%%/softreq.html
-%%PORTDOCS%%%%DOCSDIR%%/sound-cards.html
-%%PORTDOCS%%%%DOCSDIR%%/streaming.html
-%%PORTDOCS%%%%DOCSDIR%%/subosd.html
-%%PORTDOCS%%%%DOCSDIR%%/sync.html
-%%PORTDOCS%%%%DOCSDIR%%/troubleshooting.html
-%%PORTDOCS%%%%DOCSDIR%%/tv-input.html
-%%PORTDOCS%%%%DOCSDIR%%/tv.html
-%%PORTDOCS%%%%DOCSDIR%%/tvout.html
-%%PORTDOCS%%%%DOCSDIR%%/unix.html
-%%PORTDOCS%%%%DOCSDIR%%/usage.html
-%%PORTDOCS%%%%DOCSDIR%%/vcd.html
-%%PORTDOCS%%%%DOCSDIR%%/video-cards.html
-%%PORTDOCS%%%%DOCSDIR%%/video-codecs.html
-%%PORTDOCS%%%%DOCSDIR%%/video-formats.html
-%%PORTDOCS%%%%DOCSDIR%%/video.html
-%%PORTDOCS%%%%DOCSDIR%%/windows.html
-%%VIDIX%%lib/libdha.so.1
-%%VIDIX%%lib/libdha-1.so.0
-%%VIDIX%%lib/mplayer/vidix/cyberblade_vid.so
-%%VIDIX%%lib/mplayer/vidix/mach64_vid.so
-%%VIDIX%%lib/mplayer/vidix/mga_crtc2_vid.so
-%%VIDIX%%lib/mplayer/vidix/mga_vid.so
-%%VIDIX%%lib/mplayer/vidix/nvidia_vid.so
-%%VIDIX%%lib/mplayer/vidix/pm3_vid.so
-%%VIDIX%%lib/mplayer/vidix/radeon_vid.so
-%%VIDIX%%lib/mplayer/vidix/rage128_vid.so
-%%VIDIX%%lib/mplayer/vidix/savage_vid.so
-%%VIDIX%%lib/mplayer/vidix/sis_vid.so
-%%VIDIX%%lib/mplayer/vidix/unichrome_vid.so
-%%DATADIR%%/tools/calcbpp.pl
-%%DATADIR%%/tools/countquant.pl
-%%DATADIR%%/tools/dvd2divxscript.pl
-%%DATADIR%%/tools/menc2pass
-%%DATADIR%%/tools/mencvcd
-%%DATADIR%%/tools/mp.pl
-%%DATADIR%%/tools/subedit.pl
-%%DATADIR%%/tools/subsearch.sh
-%%DATADIR%%/tools/sws-test
-%%DATADIR%%/tools/w32codec_dl.pl
-%%DATADIR%%/tools/wma2ogg.pl
-%%DATADIR%%/tools/x2mpsub.sh
+%%GMPLAYER%%man/man1/gmplayer.1.gz
+%%GMPLAYER%%share/pixmaps/mplayer.png
%%DATADIR%%/examples/etc/example.conf
%%DATADIR%%/examples/etc/input.conf
%%DATADIR%%/examples/etc/menu.conf
%%DATADIR%%/examples/etc/dvb-menu.conf
- at dirrm %%DATADIR%%/tools
- at dirrm %%DATADIR%%/examples/etc
- at dirrm %%DATADIR%%/examples
- at dirrmtry %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%VIDIX%%@dirrm lib/mplayer/vidix
-%%VIDIX%%@dirrm lib/mplayer
More information about the Midnightbsd-cvs
mailing list