Date: Fri, 7 Jul 2006 09:53:21 +0200 (CEST) From: "Thomas E. Zander" <riggs@rrr.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/99871: [Maintainer-update] Update of ports/mplayer to the current release Message-ID: <200607070753.k677rL1B042124@marvin.riggiland.au> Resent-Message-ID: <200607070800.k6780dZZ064016@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 99871
>Category: ports
>Synopsis: [Maintainer-update] Update of ports/mplayer to the current release
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 07 08:00:38 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Thomas E. Zander
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD 6.1-STABLE
>Description:
The attached patch updates our port to the latest mplayer release,
1.0pre8. Also it introduces this port to the OPTIONS framework.
Due to some changes in the official developent tree, some of our local
patches became obsolete:
files/patch-CVE-2006-1502
files/patch-TOOLS-cpuinfo.c
files/patch-libavcodec-bswap.h
files/patch-libdha-pci_freebsd.c
files/patch-libmpcodecs_ve_x264.c
files/patch-libmpdemux_demux_mov.c
files/patch-libmpdemux_demuxer.h
files/patch-libmpdvdkit2-dvd_reader.c
>How-To-Repeat:
>Fix:
cvs diff of multimedia/mplayer:
Index: Makefile
===================================================================
RCS file: /var/ncvs/freebsd/ports/multimedia/mplayer/Makefile,v
retrieving revision 1.137
diff -u -r1.137 Makefile
--- Makefile 12 Jun 2006 06:36:46 -0000 1.137
+++ Makefile 6 Jul 2006 20:55:12 -0000
@@ -4,12 +4,9 @@
# with lots of help from Vladimir Kushnir
# $FreeBSD: ports/multimedia/mplayer/Makefile,v 1.137 2006/06/12 06:36:46 itetcu Exp $
#
-# There are many knobs to tune mplayer towards your specific wishes
-# and preferences.
-# You can activate a knob by typing something like
-# "make -DKNOB" or "make KNOB=yes" instead of just "make"
#
-# A description of the several possibilities is available here:
+# Some of the knobs are not tunable by the OPTIONS framework. These are
+# explained here in detail.
#
# Core funcionality:
#
@@ -19,75 +16,13 @@
# preferences.
# If you want to build a generic package with certain fixed options,
# suitable for any CPU within ${ARCH}, define this knob.
-# Note: The following knobs will have no effect in this case!
-#
-# WITH_OPTIMIZED_CFLAGS
-# default: undefined
-# define if you want to enable -O3 -ffast-math -fomit-frame-pointer
-# on gcc build commands. This will improve speed on most machines.
-#
-# WITHOUT_RUNTIME_CPUDETECTION
-# default: undefined
-# by default, mplayer is built with support for changing the used cpu
-# instruction set while playing. This is necessary for package building.
-# If you want to compile a specific version of mplayer working faster
-# but only on your cpu type, then define this knob.
-# If you define this, there are several additional knobs to explicitly
-# disable some possible CPU features. See below.
-#
-# WITH_NVIDIA
-# default: disabled
-# Enable nvidia XVMC support for nvidia video cards
-# Note: This is highly experimental at the moment and works only for
-# MPEG1/2 using -vo xvmc -vc ffmpeg12mc on FreeBSD-5
-#
-# WITHOUT_MENCODER
-# default: undefined
-# the default is to build mplayer with mencoder. If you're sure that you
-# don't want to encode or recode any media file, then define this.
-#
-# WITHOUT_X11
-# default: undefined
-# the default is to build mplayer with X11 support because of its capabilities
-# as a video player. If you don't want to install any X11 environment and use
-# mplayer as a multi-format audio-only player, this one is for you.
-#
-# WITH_GTK1|WITH_GTK2
-# default: autodetect GTK1
-# if you want mplayer to have gui abilities, you can use this knob to define
-# which graphical toolkit set mplayer is built with.
-# It defaults to detect and use GTK1 if it finds a working installation on the
-# system. This can be overridden by choosing WITH_GTK2 or disable graphical
-# user interface by defining WITHOUT_GUI
-# Note: If you define WITH_GTK* *and* WITHOUT_GUI, mplayer will be built without
-# gui capabilities.
-# The GTK2 patches are not official ones, so they should be considered
-# as experimental.
-#
-# WITHOUT_GUI
-# default: undefined
-# normally mplayer comes with gmplayer if gtk is installed on the system.
-# If you want to force mplayer to disable the graphical user interface and
-# build without gui ability, define this.
-#
-# WITHOUT_SKINS
-# default: undefined
-# removes the run dependency on the mplayer-skins port, _even if_ built with
-# GUI. This is useful e.g. if you don't want the skins installed system-wide.
-# Please note that 'gmplayer' *must* have at least one default skin to run.
-#
-# WITHOUT_FREETYPE
-# default: undefined
-# since freetype is installed on almost any system people might want
-# to run mplayer on, this port now defaults to freetype unless not
-# defined otherwise
-#
+# Note: Other knobs and especially OPTIONS
#
# CPU features:
#
-# The following is only of interest if you have enabled
-# WITHOUT_RUNTIME_CPUDETECTION
-# Further, the correct instruction set of your processor is normally
+# 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.
#
# WITHOUT_MMX
@@ -106,19 +41,13 @@
# default: autodetected
# disables all mmx2 and sse/sse2 code
# CAUTION: There are some Athlon CPUs which claim to be sse-able but
-# they aren't. If you have strange problems on this subject, try
+# 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 systems on I686_CPU and above.
-# 4.x users will have to define this explicitly.
-#
-# WITH_RTC
-# default: undefined
-# This option enables support for real time clock timing instead of
-# defaulting to usleep() timing. This can improve cpu load as well
-# as run-time accuracy.
+# 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
+# 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.
@@ -126,12 +55,8 @@
# CAUTION: lower than 512 may produce jerky video.
#
# Feature options:
-# These options influence, which libraries mplayer is linked to.
-# Note: The libraries are needed to play the particular files under
-# particular circumstances.
-# ("autodetect" in this sections means: If the ports system finds
-# the libary on your system, it is used, otherwise not.
-# If you define it, it will be built and installed as dependency.)
+# 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
@@ -144,122 +69,10 @@
# default 4.x: /dev/acd0c
# This option changes the default cdrom device, maybe useful for VCDs
#
-# WITH_LIBDVDNAV
-# default: autodetect
-# NOTE: This is disabled in the development tree at the moment
-# because it simply doesn't work, so defining it has no
-# effect until it works again.
-#
-# WITH_LIBUNGIF
-# default: autodetect
-#
-# WITH_ARTS
-# default: autodetect
-# Note: arts audio output cannot work together with mplayer's gtk1-gui
-# because of conflicting glib versions, so it it is disabled if
-# mplayer is built with gtk1 graphical user interface
-#
-# WITHOUT_ARTS
-# default: undefined
-# By setting this option you can explicitly override WITH_ARTS or
-# autodetection if arts is found. Some configurations experienced
-# problems with arts, so this knob is provided to manually exclude
-# it from build.
-#
-# WITH_FRIBIDI
-# default: autodetect
-#
-# WITH_CDPARANOIA
-# default: autodetect
-#
-# WITH_LIBCACA
-# default: autodetect
-#
-# WITH_LIBDV
-# default: autodetect
-#
-# WITH_LIRC
-# default: autodetect
-#
-# WITH_MAD
-# default: autodetect
-#
-# WITH_SVGALIB
-# default: autodetect
-#
-# WITH_AALIB
-# default: autodetect
-#
-# WITH_THEORA
-# default: autodetect
-#
-# WITH_X264
-# default: autodetect
-#
-# WITH_TREMOR
-# default: autodetect
-# By setting this option mplayer will use libtremor (integer only vorbis
-# decoding lib) instead of libvorbis even if libvorbis is installed.
-# Note: This is disabled at the moment due to unresolved build problems
-#
-# WITH_SDL
-# default: autodetect
-# (implies WITH_AALIB)
-#
-# WITH_ESOUND
-# default: autodetect
-#
-# WITHOUT_ESOUND
-# default: undefined
-# By setting this option you can explicitly override WITH_ESOUND or
-# autodetection if esound is found. Some configurations experienced
-# problems with esound, so this knob is provided to manually exclude
-# it from build.
-#
-# WITH_VORBIS
-# default: autodetect
-# If vorbis libs are not available on the system, mplayer includes
-# an internal vorbis codec based on tremor. If the libs are present
-# or this knob is defined, mplayer links to the shared system-wide
-# installation of ogg/vorbis.
-#
-# WITH_XANIM
-# default: autodetect
-#
-# WITH_REALPLAYER
-# default: autodetect
-#
-# WITH_LIVEMEDIA
-# default: autodetect
-#
-# WITH_MATROSKA
-# default: autodetect
-#
-# WITH_XVID
-# default: autodetect
-#
-# WITH_LZO
-# default: autodetect
-#
-# WITH_XMMS
-# default: autodetect
-#
-# WITH_DTS
-# default: autodetect
-#
-# WITH_LANG
+# 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
#
-# WITHOUT_WIN32_CODECS
-# default: undefined
-# By default, mplayer depends on and uses the win32-codecs collection.
-# Of course, thanks to Microsoft's very cool hyper-super-multi-platform
-# support, this is only available on x86 architecture.
-# If you're working on x86 and want to disable using of the windows codecs,
-# define this knob.
-#
-#
# Additional knobs:
#
# NOPORTDOCS
@@ -268,13 +81,10 @@
# documentation. If you define this, only the manpage is going
# to be installed.
#
-# WITHOUT_IPV6
-# default: undefined
-# This knob disables mplayer's ipv6 protocol family capabilities.
PORTNAME= mplayer
-PORTVERSION= 0.99.7
-PORTREVISION= 14
+PORTVERSION= 0.99.8
+PORTREVISION= 0
CATEGORIES= multimedia audio
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -286,15 +96,11 @@
ftp://ftp.lug.udel.edu/MPlayer/releases/ \
ftp://mirrors.xmission.com/MPlayer/releases/ \
http://www.rrr.de/~riggs/mplayer/
-DISTNAME= MPlayer-1.0pre7try2
+DISTNAME= MPlayer-1.0pre8
MAINTAINER= riggs@rrr.de
COMMENT= High performance media player/encoder supporting many formats
-PATCH_SITES= ${MASTER_SITE_LOCAL}
-PATCH_SITE_SUBDIR= tmclaugh
-PATCH_DIST_STRIP= -p1
-
LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png
USE_BZIP2= yes
@@ -312,50 +118,64 @@
--enable-menu \
--disable-libfame \
--disable-external-faad \
- --disable-tv-v4l
+ --disable-tv-v4l \
+ --disable-liblzo \
+ --disable-libcdio
-.if !defined(MPLAYER_GENERIC_BUILD)
-.if defined(WITHOUT_X11)
-WITHOUT_GUI= yes
-BUILD_DEPENDS+= imake:${X_IMAKE_PORT}
-CONFIGURE_ARGS+=--disable-x11
-.else
-USE_XLIB= yes
-CONFIGURE_ARGS+=--with-x11libdir=${X11BASE}/lib \
- --with-x11incdir=${X11BASE}/include
-.endif
+OPTIONS= DEBUG "Include debug symbols in mplayer's binary files" off
-.if defined(WITH_LANG)
-CONFIGURE_ARGS+=--language=${WITH_LANG}
+#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+= 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+= 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+= 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+= DTS "Enable DTS audio codec support" on
+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+= X264 "Enable x264 (H.264) video codec support" off
+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+= FRIBIDI "Enable FriBiDi support" off
+OPTIONS+= LIRC "Enable lirc support" off
+OPTIONS+= CDPARANOIA "Enable cdparanoia support" off
.endif
-.else
-USE_XLIB= yes
-CONFIGURE_ARGS+=--with-x11libdir=${X11BASE}/lib \
- --with-x11incdir=${X11BASE}/include
-.endif #MPLAYER_GENERIC_BUILD
WANT_GNOME= yes
WANT_SDL= yes
MAN1= mplayer.1
MANCOMPRESSED= no
-CONFFILES= example.conf input.conf menu.conf
-TOOLFILES= calcbpp.pl countquant.pl \
- dvd2divxscript.pl menc2pass \
- mencvcd mp.pl sws-test w32codec_dl.pl \
- x2mpsub.sh
+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
.include <bsd.port.pre.mk>
-# Can't run mplayer/nvidia-driver WITH_NVIDIA on FreeBSD 4.X now
-.if ${OSVERSION} < 500000 && defined(WITH_NVIDIA)
-IGNORE= does not run on 4.x when WITH_NVIDIA is defined
-.endif
-
#Building of vidix dependent shared libs is only possible
#on i386 at the moment.
.if ${ARCH} == "i386"
-INSTALLS_SHLIB= yes
+USE_LDCONFIG= yes
LDCONFIG_DIRS= %%PREFIX%%/lib %%PREFIX%%/lib/mplayer/vidix
PLIST_SUB+= VIDIX=""
.else
@@ -363,111 +183,6 @@
PLIST_SUB+= VIDIX="@comment "
.endif
-#.if exists(${LOCALBASE}/modules/rtc.ko)
-#WITH_RTC= yes
-#.endif
-
-#.if exists(${X11BASE}/lib/libXvMCNVIDIA.so.1)
-#WITH_NVIDIA= yes
-#.endif
-
-.if exists(${LOCALBASE}/lib/libfribidi.so.0)
-WITH_FRIBIDI= yes
-.endif
-
-.if !defined(WITHOUT_ARTS) && exists(${LOCALBASE}/lib/libartsc.so.0)
-WITH_ARTS= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libcdda_paranoia.so)
-WITH_CDPARANOIA= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libcaca.a)
-WITH_LIBCACA= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libdv.so.4)
-WITH_LIBDV= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libungif.so.5)
-WITH_LIBUNGIF= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/liblirc_client.so.0)
-WITH_LIRC= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libmad.so.2)
-WITH_MAD= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libvga.so.1)
-WITH_SVGALIB= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libtheora.so.2)
-WITH_THEORA= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libx264.so.47)
-WITH_X264= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libaa.so.1)
-WITH_AALIB= yes
-.endif
-
-.if ${HAVE_SDL:Msdl}!=""
-WITH_SDL= yes
-WITH_AALIB= yes
-.endif
-
-.if !defined(WITHOUT_ESOUND) && ${HAVE_GNOME:Mesound}!=""
-WITH_ESOUND= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libvorbis.so.3)
-WITH_VORBIS= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libjpeg.so.9)
-LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
-.endif
-
-.if exists(${X11BASE}/bin/xanim)
-WITH_XANIM= yes
-.endif
-
-.if exists(${X11BASE}/lib/RealPlayer/realplay.bin)
-WITH_REALPLAYER= yes
-.endif
-
-.if exists(${LOCALBASE}/live/liveMedia/libliveMedia.a)
-WITH_LIVEMEDIA= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libxvidcore.so)
-WITH_XVID= yes
-.endif
-
-.if exists(${X11BASE}/lib/libxmms.so)
-WITH_XMMS= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libdts.a)
-WITH_DTS= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/liblzo.so)
-WITH_LZO= yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libfreetype.so.9) && !defined(WITHOUT_FREETYPE)
-WITH_FREETYPE= yes
-.endif
-
# Esablish de-facto dependencies for either building generic mplayer
# binary-suitable package or custom build
@@ -478,12 +193,9 @@
CFLAGS= #let mplayer decide on this
CONFIGURE_ARGS+=--enable-runtime-cpudetection
#GUI
-USE_GNOME+= gtk12
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk
-.else
-PKGNAMESUFFIX= -gtk
-.endif
+USE_GNOME+= gtk20
+PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk2
+
CONFIGURE_ARGS+= --enable-gui
PLIST_SUB+= GMPLAYER=""
RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/Skin:${PORTSDIR}/multimedia/mplayer-skins
@@ -495,65 +207,41 @@
MLINKS+= mplayer.1 mencoder.1
PLIST_SUB+= MENCODER=""
#ARTS
-CONFIGURE_ARGS+= --disable-arts
-#Fribidi
-CONFIGURE_ARGS+= --disable-fribidi
-#Cdparanoia
-CONFIGURE_ARGS+= --disable-cdparanoia
-#Caca
-CONFIGURE_ARGS+= --disable-caca
-#Libungif
-CONFIGURE_ARGS+= --disable-gif
-#Libdv
-CONFIGURE_ARGS+= --disable-libdv
-#Mad
-CONFIGURE_ARGS+= --disable-mad
-#Theora
-CONFIGURE_ARGS+= --disable-theora
-#x264
-CONFIGURE_ARGS+= --disable-x264
-#Svgalib
-LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
-#Aalib
-LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
-#SDL
-USE_SDL= sdl
-#Esound
-CONFIGURE_ARGS+= --disable-esd
-#Vorbis
-LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
-#Live media
-CONFIGURE_ARGS+= --disable-live
-#XviD
-CONFIGURE_ARGS+= --enable-xvid
-LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
-#LZO
-CONFIGURE_ARGS+= --disable-liblzo
-#Freetype
-CONFIGURE_ARGS+= --with-extraincdir=${LOCALBASE}/include/freetype2 \
- --enable-freetype
-LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
-#XAnim codecs
-BUILD_DEPENDS+= xanim:${PORTSDIR}/multimedia/xanim
-CONFIGURE_ARGS+= --enable-xanim \
- --with-xanimlibdir=${X11BASE}/lib/X11/xanim
-#Optical drive descriptors
-.if ${OSVERSION} < 500000
-DEFAULT_DVD_DEVICE=/dev/acd0c
-DEFAULT_CDROM_DEVICE=/dev/acd0c
-.else
-DEFAULT_DVD_DEVICE=/dev/acd0
-DEFAULT_CDROM_DEVICE=/dev/acd0
-.endif
+
+.for module in ARTS FRIBIDI CDPARANOIA LIBCACA LIBUNGIF LIBDV MAD THEORA X264 FRIBIDI LIVEMEDIA ESOUND OCFLAGS RTC MENCODER NVIDIA LIRC XMMS
+WITHOUT_${module}=yes
+.undef(WITH_${module})
+.endfor
+
+.for module in GUI SVGALIB AALIB SDL XVID FREETYPE XANIM WITH_RTCPU WIN32 X11
+WITH_${module}=yes
+.undef(WITHOUT_${module})
+.endfor
+
+.undef(WITH_DVD_DEVICE)
+.undef(WITH_CDROM_DEVICE)
+.undef(WITH_LANG)
+
#Kernel granularity
DEFAULT_KERN_HZ=1024
-.else #MPLAYER_GENERIC_BUILD
CFLAGS+= -fno-force-addr
-.if defined(DEBUG)
-CONFIGURE_ARGS+= --enable-debug
+.endif #MPLAYER_GENERIC_BUILD
+
+.if defined(WITHOUT_X11)
+WITHOUT_GUI= yes
+BUILD_DEPENDS+= imake:${X_IMAKE_PORT}
+CONFIGURE_ARGS+=--disable-x11
+.else
+USE_XLIB= yes
+CONFIGURE_ARGS+=--with-x11libdir=${X11BASE}/lib \
+ --with-x11incdir=${X11BASE}/include
.endif
-.if defined(WITH_OPTIMIZED_CFLAGS)
+.if defined(WITH_LANG)
+CONFIGURE_ARGS+=--language=${WITH_LANG}
+.endif
+
+.if !defined(WITHOUT_OCFLAGS)
CFLAGS+= -O3 -ffast-math -fomit-frame-pointer
.endif
@@ -563,51 +251,32 @@
CATEGORIES+= ipv6
.endif
-.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITH_GTK2) && !defined(WITHOUT_GUI)
-WITH_GTK1= yes
-.endif
-
-.if !defined(WITHOUT_GUI)
+.if !defined(WITHOUT_GUI)
PLIST_SUB+= GMPLAYER=""
.if !defined(WITHOUT_SKINS)
RUN_DEPENDS+= ${LOCALBASE}/share/mplayer/Skin:${PORTSDIR}/multimedia/mplayer-skins
.endif
-.else
-PLIST_SUB+= GMPLAYER="@comment "
-.endif
-.if defined(WITH_GTK2) && !defined(WITH_GTK1) && !defined(WITHOUT_GUI)
.if ( ${OSVERSION} < 500000 )
USE_GCC= 3.4
.endif
+
USE_GNOME+= gtk20
-PATCHFILES+= MPlayer-1.0pre7try2-gtk2.patch
-.if defined(PKGNAMESUFFIX)
+CONFIGURE_ARGS+= --enable-gui
+
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk2
-.else
-PKGNAMESUFFIX= -gtk2
-.endif
-CONFIGURE_ARGS+= --enable-gui --enable-gtk2
+
+
.if defined(WITH_LANG)
WITH_LANG= ""
.endif
-.endif
-.if defined(WITH_GTK1) && !defined(WITH_GTK2) && !defined(WITHOUT_GUI)
-USE_GNOME+= gtk12
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-gtk
.else
-PKGNAMESUFFIX= -gtk
-.endif
-CONFIGURE_ARGS+= --enable-gui
-.endif
-
-.if defined(WITHOUT_GUI)
-CONFIGURE_ARGS+= --disable-gui
+PLIST_SUB+= GMPLAYER="@comment "
+#GUI building?!!
.endif
-.if defined(WITH_RTC)
+.if !defined(WITHOUT_RTC)
BUILD_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
RUN_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
CONFIGURE_ARGS+= --enable-rtc
@@ -625,47 +294,46 @@
PLIST_SUB+= MENCODER="@comment "
.endif
-.if defined(WITH_NVIDIA)
+.if !defined(WITHOUT_NVIDIA)
LIB_DEPENDS+= XvMCNVIDIA.1:${PORTSDIR}/x11/nvidia-driver
CONFIGURE_ARGS+= --enable-xvmc \
--enable-xvmclib=XvMCNVIDIA
.endif
-.if defined(WITH_ARTS) && !defined(WITHOUT_ARTS) && !defined(WITH_GTK1)
+.if !defined(WITHOUT_ARTS)
LIB_DEPENDS+= artsc.0:${PORTSDIR}/audio/arts
-
CONFIGURE_ARGS+= --enable-arts
.else
CONFIGURE_ARGS+= --disable-arts
.endif
-.if defined(WITH_FRIBIDI)
+.if !defined(WITHOUT_FRIBIDI)
LIB_DEPENDS+= fribidi.0:${PORTSDIR}/converters/fribidi
CONFIGURE_ARGS+= --enable-fribidi
.else
CONFIGURE_ARGS+= --disable-fribidi
.endif
-.if defined(WITH_CDPARANOIA)
+.if !defined(WITHOUT_CDPARANOIA)
LIB_DEPENDS+= cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
.else
CONFIGURE_ARGS+= --disable-cdparanoia
.endif
-.if defined(WITH_LIBCACA)
+.if !defined(WITHOUT_LIBCACA)
BUILD_DEPENDS+= ${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
.else
CONFIGURE_ARGS+= --disable-caca
.endif
-.if defined(WITH_LIBUNGIF)
+.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)
+.if !defined(WITHOUT_LIBDV)
LIB_DEPENDS+= dv.4:${PORTSDIR}/multimedia/libdv
CONFIGURE_ARGS+= --enable-libdv
@@ -673,14 +341,14 @@
CONFIGURE_ARGS+= --disable-libdv
.endif
-.if defined(WITH_LIRC)
+.if !defined(WITHOUT_LIRC)
LIB_DEPENDS+= lirc_client.0:${PORTSDIR}/comms/lirc
CONFIGURE_ARGS+= --enable-lirc
.else
CONFIGURE_ARGS+= --disable-lirc
.endif
-.if defined(WITH_MAD)
+.if !defined(WITHOUT_MAD)
LIB_DEPENDS+= mad.2:${PORTSDIR}/audio/libmad
CONFIGURE_ARGS+= --enable-mad \
@@ -689,38 +357,41 @@
CONFIGURE_ARGS+= --disable-mad
.endif
-.if defined(WITH_SVGALIB)
+.if !defined(WITHOUT_SDL)
+USE_SDL= sdl
+WITH_AALIB= yes
+.undef(WITHOUT_AALIB)
+WITH_SVGALIB= yes
+.undef(WITHOUT_SVGALIB)
+.else
+CONFIGURE_ARGS+= --disable-sdl
+.endif
+
+.if !defined(WITHOUT_SVGALIB)
LIB_DEPENDS+= vga.1:${PORTSDIR}/graphics/svgalib
+.else
+CONFIGURE_ARGS+= --disable-svga
.endif
-.if defined(WITH_AALIB)
+.if !defined(WITHOUT_AALIB)
LIB_DEPENDS+= aa.1:${PORTSDIR}/graphics/aalib
+.else
+CONFIGURE_ARGS+= --disable-aa
.endif
-.if defined(WITH_THEORA)
+.if !defined(WITHOUT_THEORA)
LIB_DEPENDS+= theora.2:${PORTSDIR}/multimedia/libtheora
.else
CONFIGURE_ARGS+= --disable-theora
.endif
-.if defined(WITH_X264)
+.if !defined(WITHOUT_X264)
LIB_DEPENDS+= x264.47:${PORTSDIR}/multimedia/x264
.else
CONFIGURE_ARGS+= --disable-x264
.endif
-#.if defined(WITH_TREMOR)
-#LIB_DEPENDS+= vorbisidec.1:${PORTSDIR}/audio/libtremor
-#CONFIGURE_ARGS+= --enable-tremor
-#.else
-#CONFIGURE_ARGS+= --disable-tremor
-#.endif
-
-.if defined(WITH_SDL)
-USE_SDL= sdl
-.endif
-
-.if defined(WITH_ESOUND) && !defined(WITHOUT_ESOUND)
+.if !defined(WITHOUT_ESOUND)
USE_GNOME+= esound
.if defined(PKGNAMESUFFIX)
PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-esound
@@ -731,19 +402,21 @@
CONFIGURE_ARGS+= --disable-esd
.endif
-.if defined(WITH_VORBIS)
+.if defined(WITHOUT_TREMOR)
CONFIGURE_ARGS+= --disable-internal-tremor
LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
.endif
-.if defined(WITH_REALPLAYER)
+.if !defined(WITHOUT_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
+CONFIGURE_ARGS+= --disable-real
.endif
-.if defined(WITH_LIVEMEDIA)
+.if !defined(WITHOUT_LIVEMEDIA)
CONFIGURE_ARGS+= --enable-live \
--with-livelibdir=${LOCALBASE}/live
RUN_DEPENDS+= ${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
@@ -752,28 +425,28 @@
CONFIGURE_ARGS+= --disable-live
.endif
-.if defined(WITH_XVID)
+.if !defined(WITHOUT_XVID)
CONFIGURE_ARGS+= --enable-xvid
LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid
-.endif
-
-.if defined(WITH_LZO)
-LIB_DEPENDS+= lzo.1:${PORTSDIR}/archivers/lzo
.else
-CONFIGURE_ARGS+= --disable-liblzo
+CONFIGURE_ARGS+= --disable-xvid
.endif
-.if defined(WITH_XMMS)
+.if !defined(WITHOUT_XMMS)
CONFIGURE_ARGS+= --enable-xmms
LIB_DEPENDS+= xmms.4:${PORTSDIR}/multimedia/xmms
+.else
+CONFIGURE_ARGS+= --disable-xmms
.endif
-.if defined(WITH_DTS)
+.if !defined(WITHOUT_DTS)
CONFIGURE_ARGS+= --enable-libdts
BUILD_DEPENDS+= ${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
+.else
+CONFIGURE_ARGS+= --disable-libdts
.endif
-.if defined(WITH_FREETYPE)
+.if !defined(WITHOUT_FREETYPE)
CONFIGURE_ARGS+= --with-extraincdir=${LOCALBASE}/include/freetype2 \
--enable-freetype
LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2
@@ -782,14 +455,14 @@
CONFIGURE_ARGS+= --disable-freetype
.endif
-.if defined(WITH_XANIM)
+.if !defined(WITHOUT_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_DVD_DEVICE)
+.if defined(WITH_DVD_DEVICE)
DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
.else
.if ${OSVERSION} < 500000
@@ -817,9 +490,9 @@
# "enable" build for other archs
.if ${ARCH} == "i386"
-.if !defined(WITHOUT_RUNTIME_CPUDETECTION)
+.if !defined(WITHOUT_RTCPU)
CONFIGURE_ARGS+=--enable-runtime-cpudetection
-.else #WITHOUT_RUNTIME_CPUDETECTION
+.else #WITH_RTCPU
.if defined(WITHOUT_MMX)
CONFIGURE_ARGS+=--disable-mmx
.endif
@@ -830,26 +503,12 @@
CONFIGURE_ARGS+=--disable-3dnowex
.endif
.if defined(WITHOUT_SSE)
-CONFIGURE_ARGS+=--disable-mmx2 --disable-sse
-.endif
-.endif #WITHOUT_RUNTIME_CPUDETECTION
-.if !defined(WITH_SVGALIB)
-CONFIGURE_ARGS+=--disable-svga
-.endif
-.if !defined(WITH_AALIB)
-CONFIGURE_ARGS+=--disable-aa
-.endif
-.if !defined(WITH_SDL)
-CONFIGURE_ARGS+=--disable-sdl
+CONFIGURE_ARGS+=--disable-mmx2 --disable-sse --disable-sse2
.endif
-.if !defined(WITH_VORBIS)
-CONFIGURE_ARGS+=--disable-vorbis
-.endif
-.if !defined(WITHOUT_WIN32_CODECS)
+.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
@@ -857,16 +516,13 @@
--disable-qtx-codecs
.endif
.endif # ARCH == i386
-.endif #MPLAYER_GENERIC_BUILD
pre-everything::
@${ECHO_MSG} "N - O - T - E"
@${ECHO_MSG} ""
- @${ECHO_MSG} "Take a careful look into the Makefile in order"
- @${ECHO_MSG} "to learn how to tune mplayer towards you personal preferences!"
- @${ECHO_MSG} "For example,"
- @${ECHO_MSG} "make WITH_GTK1"
- @${ECHO_MSG} "builds MPlayer with GTK1-GUI support."
+ @${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."
.if !defined(WITHOUT_GUI)
@${ECHO_MSG} "If you want to use the GUI, you can either install"
@@ -875,14 +531,6 @@
@${ECHO_MSG} "http://www.mplayerhq.hu/homepage/dload.html"
.endif
-#.if defined(WITH_GTK2) && !defined(WITHOUT_GUI)
-# @${ECHO_MSG} "=====================> <Caution> <======================"
-# @${ECHO_MSG} "GTK2 and UTF8 language options cannot peacefully coexist"
-# @${ECHO_MSG} "If you have defined WITH_LANG=<something> and WITH_GTK2"
-# @${ECHO_MSG} "your language options are ignored."
-# @${ECHO_MSG} "====================> </Caution> <======================"
-#.endif
-
post-patch:
@${REINPLACE_CMD} -e \
's|libxmms.so.1|libxmms.so|' \
@@ -910,7 +558,11 @@
.endif
.if defined(MPLAYER_GENERIC_BUILD)
@${REINPLACE_CMD} -e \
- 's|1.0pre7|1.0pre7-FreeBSD-generic|' \
+.if defined(WITH_DEBUG)
+ 's|1.0pre8|1.0pre8-FreeBSD-generic-debug|' \
+.else
+ 's|1.0pre8|1.0pre8-FreeBSD-generic|' \
+.endif
${WRKSRC}/version.sh
.endif
Index: distinfo
===================================================================
RCS file: /var/ncvs/freebsd/ports/multimedia/mplayer/distinfo,v
retrieving revision 1.32
diff -u -r1.32 distinfo
--- distinfo 17 Apr 2006 03:10:41 -0000 1.32
+++ distinfo 13 Jun 2006 16:23:14 -0000
@@ -1,6 +1,3 @@
-MD5 (MPlayer-1.0pre7try2.tar.bz2) = aaca4fd327176c1afb463f0f047ef6f4
-SHA256 (MPlayer-1.0pre7try2.tar.bz2) = 006da26e16bd1b1a8aec5d59b72b0b2ae7716f4e7634859a3e88b6fbbec4d89a
-SIZE (MPlayer-1.0pre7try2.tar.bz2) = 6868786
-MD5 (MPlayer-1.0pre7try2-gtk2.patch) = aa7ae259b66f3a88d4dff39faeea7354
-SHA256 (MPlayer-1.0pre7try2-gtk2.patch) = 15f13b741b0ed8ec5726e5c68d03d559c32582a3e2d1e3014685531c69a47ab2
-SIZE (MPlayer-1.0pre7try2-gtk2.patch) = 6177
+MD5 (MPlayer-1.0pre8.tar.bz2) = f82bb2bc51b6cd5e5dd96f88f6f98582
+SHA256 (MPlayer-1.0pre8.tar.bz2) = 4e611138efb3709e650e3770bb3f33609f3fd04047932c830e52a02e0e97efcc
+SIZE (MPlayer-1.0pre8.tar.bz2) = 8166628
Index: pkg-descr
===================================================================
RCS file: /var/ncvs/freebsd/ports/multimedia/mplayer/pkg-descr,v
retrieving revision 1.4
diff -u -r1.4 pkg-descr
--- pkg-descr 22 Jan 2003 16:53:06 -0000 1.4
+++ pkg-descr 15 Jun 2006 12:14:35 -0000
@@ -1,10 +1,8 @@
-This is the port of mplayer, a project which has the effort
-to become a very stable and useful movie player and encoder.
-
-It is based on the windows codec compilation and
-provides the ability to play many formats
-in a very good quality without much CPU comsumption.
-
-Support for ffmpeg, quicktime and DVD are also included.
+MPlayer is a multimedia player and encoder suite which runs on many
+platforms. It plays a terrific number of different file formats
+and codecs including popular DivX, XviD, H.264 streams as well as
+DVD and SVCDs along with many popular audio codecs.
+On the i386 platform it also supports some Windows DLL codec
+families which allow playing of e.g. QuickTime movies.
WWW: http://www.mplayerhq.hu/
Index: pkg-message
===================================================================
RCS file: /var/ncvs/freebsd/ports/multimedia/mplayer/pkg-message,v
retrieving revision 1.9
diff -u -r1.9 pkg-message
--- pkg-message 11 Jun 2004 18:08:50 -0000 1.9
+++ pkg-message 15 Jun 2006 12:05:44 -0000
@@ -9,7 +9,3 @@
Please take a look at docs in
/usr/local/share/doc/mplayer
-
-If you encounter strange problems, please have a look at
-http://www.rrr.de/~riggs/mplayer/faq_en.html
-before throwing stones at me :-)
Index: pkg-plist
===================================================================
RCS file: /var/ncvs/freebsd/ports/multimedia/mplayer/pkg-plist,v
retrieving revision 1.19
diff -u -r1.19 pkg-plist
--- pkg-plist 22 Jan 2006 02:29:58 -0000 1.19
+++ pkg-plist 6 Jul 2006 20:54:28 -0000
@@ -1,40 +1,45 @@
bin/mplayer
%%MENCODER%%bin/mencoder
%%GMPLAYER%%bin/gmplayer
-%%PORTDOCS%%%%DOCSDIR%%/amiga.html
+%%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%%/custommatrices.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%%/formats.html
%%PORTDOCS%%%%DOCSDIR%%/gcc-296.html
%%PORTDOCS%%%%DOCSDIR%%/gui.html
%%PORTDOCS%%%%DOCSDIR%%/history.html
%%PORTDOCS%%%%DOCSDIR%%/howtoread.html
-%%PORTDOCS%%%%DOCSDIR%%/hp-ux.html
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/install.html
+%%PORTDOCS%%%%DOCSDIR%%/installation_codecs.html
%%PORTDOCS%%%%DOCSDIR%%/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/irix.html
%%PORTDOCS%%%%DOCSDIR%%/joe-barr.html
%%PORTDOCS%%%%DOCSDIR%%/linux.html
%%PORTDOCS%%%%DOCSDIR%%/macos.html
@@ -42,32 +47,50 @@
%%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-telecine.html
+%%PORTDOCS%%%%DOCSDIR%%/menc-feat-extractsub.html
%%PORTDOCS%%%%DOCSDIR%%/menc-feat-mpeg.html
%%PORTDOCS%%%%DOCSDIR%%/menc-feat-mpeg4.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-extractsub.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%%/mplayer-binary.html
%%PORTDOCS%%%%DOCSDIR%%/mpst.html
+%%PORTDOCS%%%%DOCSDIR%%/mtrr.html
%%PORTDOCS%%%%DOCSDIR%%/nvidia-opinions.html
-%%PORTDOCS%%%%DOCSDIR%%/patches.html
+%%PORTDOCS%%%%DOCSDIR%%/other.html
+%%PORTDOCS%%%%DOCSDIR%%/output-trad.html
%%PORTDOCS%%%%DOCSDIR%%/ports.html
-%%PORTDOCS%%%%DOCSDIR%%/qnx.html
%%PORTDOCS%%%%DOCSDIR%%/rtc.html
-%%PORTDOCS%%%%DOCSDIR%%/skin.html
%%PORTDOCS%%%%DOCSDIR%%/skin-file.html
%%PORTDOCS%%%%DOCSDIR%%/skin-fonts.html
%%PORTDOCS%%%%DOCSDIR%%/skin-gui.html
%%PORTDOCS%%%%DOCSDIR%%/skin-overview.html
-%%PORTDOCS%%%%DOCSDIR%%/solaris.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%%/users-vs-dev.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
@@ -89,12 +112,16 @@
%%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
%%DATADIR%%/example.conf
%%DATADIR%%/input.conf
%%DATADIR%%/menu.conf
+%%DATADIR%%/dvb-menu.conf
@dirrm %%DATADIR%%/tools
@dirrmtry %%DATADIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: files/patch-ad
===================================================================
RCS file: /var/ncvs/freebsd/ports/multimedia/mplayer/files/patch-ad,v
retrieving revision 1.27
diff -u -r1.27 patch-ad
--- files/patch-ad 9 Nov 2005 20:17:44 -0000 1.27
+++ files/patch-ad 15 Jun 2006 08:18:59 -0000
@@ -1,32 +1,41 @@
---- configure.orig Wed Apr 13 13:46:35 2005
-+++ configure Wed Nov 9 19:52:06 2005
-@@ -29,9 +29,9 @@
+--- configure.orig Thu Jun 15 09:35:04 2006
++++ configure Thu Jun 15 10:18:55 2006
+@@ -35,7 +35,7 @@
+ # else
+ # _def_feature='#undef HAVE_FEATURE'
+ # fi
+-# echores "$_feature"
++ echores "$_feature"
+ #
+ # Furthermore you need to add the variable _feature to the list of default
+ # settings and set it to one of yes/no/auto. Also add appropriate
+@@ -61,9 +61,9 @@
echo >> "$TMPLOG"
- cat "$TMPC" >> "$TMPLOG"
+ cat "$1" >> "$TMPLOG"
echo >> "$TMPLOG"
-- echo "$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$TMPLOG"
-+ echo "$_cc $CFLAGS -fno-fast-math $_inc_extra $_ld_static $_ld_extra $TMPC -o $TMPO $@" >> "$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 "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1
-+ ( $_cc $CFLAGS -fno-fast-math $_inc_extra $_ld_static $_ld_extra "$TMPC" -o "$TMPO" "$@" ) >> "$TMPLOG" 2>&1
+- $_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"
-@@ -369,7 +369,7 @@
-
-
- # 1st pass checking for vital options
+@@ -453,7 +453,7 @@
+ _sse=auto
+ _sse2=auto
+ _mtrr=auto
-_install=install
+_install=@${BSD_INSTALL_PROGRAM}
_ranlib=ranlib
_cc=cc
test "$CC" && _cc="$CC"
-@@ -471,14 +471,7 @@
- case "`( uname -m ) 2>&1`" in
+@@ -574,14 +574,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 [ "`$_cc -dumpmachine | grep x86_64 | cut -d- -f1`" = "x86_64" -a \
+- if [ -n "`$_cc -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p'`" -a \
- -z "`echo $CFLAGS | grep -- -m32`" ]; then
- host_arch=x86_64
- else
@@ -34,10 +43,10 @@
- fi
- ;;
+ x86_64|amd64) host_arch=x86_64 ;;
- macppc|ppc) host_arch=ppc ;;
+ macppc|ppc|ppc64) host_arch=ppc ;;
alpha) host_arch=alpha ;;
sparc) host_arch=sparc ;;
-@@ -691,22 +684,10 @@
+@@ -806,25 +799,10 @@
_cpuinfo="echo"
# Cygwin has /proc/cpuinfo, but only supports Intel CPUs
# FIXME: Remove the cygwin check once AMD CPUs are supported
@@ -48,9 +57,12 @@
- # FreeBSD with Linux emulation /proc mounted,
- # extract CPU information from it
- _cpuinfo="cat /compat/linux/proc/cpuinfo"
--elif darwin ; then
+-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; then
# all other OSes try to extract CPU information from a small helper
# program TOOLS/cpuinfo instead
@@ -58,29 +70,28 @@
_cpuinfo="TOOLS/cpuinfo"
-fi
- x86_exts_check()
- {
-@@ -1878,8 +1859,8 @@
+ if x86 || x86_64 ; then
+ # gather more CPU information
+@@ -1526,7 +1504,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
+@@ -2177,8 +2155,7 @@
;;
*)
- echo "Unknown parameter: $ac_option"
- exit 1
-+ echo -n "Unknown parameter: $ac_option"
-+ echo " (ignoring)."
++ echo "Unknown parameter: $ac_option (ignoring)..."
;;
esac
-@@ -1889,7 +1870,7 @@
- test -z "$_bindir" && _bindir="$_prefix/bin"
- test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
- test -z "$_mandir" && _mandir="$_prefix/man"
--test -z "$_confdir" && _confdir="$_prefix/etc/mplayer"
-+test -z "$_confdir" && _confdir="$_prefix/share/mplayer"
- test -z "$_libdir" && _libdir="$_prefix/lib"
- test -z "$_mlibdir" && _mlibdir="$MLIBHOME"
-
-@@ -2591,13 +2572,7 @@
+@@ -2826,13 +2803,7 @@
echocheck "memalign()"
@@ -94,74 +105,40 @@
if test "$_memalign" = yes ; then
_def_memalign='#define HAVE_MEMALIGN 1'
else
-@@ -2699,47 +2674,11 @@
+@@ -2931,20 +2902,8 @@
_def_threads='#undef HAVE_THREADS'
echocheck "pthread"
+-if test "$_pthreads" != no ; 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
--if mingw32 ; then
-- _ld_pthread=''
--elif hpux ; then
-- _ld_pthread=''
--elif ( cc_check && $TMPO ) ; then # QNX
-- _ld_pthread=' ' # _ld_pthread='' would disable pthreads, but the test worked
--elif ( cc_check -lpthread && $TMPO ) ; then
-- _ld_pthread='-lpthread'
--elif ( cc_check -pthread && $TMPO ) ; then
-- _ld_pthread='-pthread'
--else
-- if test "$_ld_static" ; then
+-_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
-- if ( cc_check -lpthread ) ; then
-- _ld_pthread='-lpthread'
-- elif ( cc_check -pthread ) ; then
-- _ld_pthread='-pthread'
-- else
-- echores "no static pthread found (v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, Win32 loader disabled)"
-- _ld_pthread='' ; _nas=no ; _tv_v4l=no ; _macosx=no ; _win32=no
-- fi
-- else
-- echores "no (v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, win32 loader disabled)"
-- _ld_pthread='' ; _nas=no ; _tv_v4l=no ; _macosx=no ; _win32=no
-- fi
+- cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break
+- done
+-fi
-fi
--if test "$_ld_pthread" != '' ; then
++_pthreads=yes
+_ld_pthread="${PTHREAD_LIBS}"
- echores "yes (using $_ld_pthread)"
- _pthreads='yes'
+ if test "$_pthreads" = yes ; then
+ _res_comment="using $_ld_pthread"
_def_pthreads='#define HAVE_PTHREADS 1'
- _def_threads='#define HAVE_THREADS 1'
--else
-- echores "no"
-- _pthreads=''
-- _def_pthreads='#undef HAVE_PTHREADS'
--fi
-
-
- echocheck "sys/soundcard.h"
-@@ -5323,7 +5262,7 @@
- if test "$_faad_internal" = auto ; then
- # the faad check needs a config.h file
- if not test -f "config.h" ; then
-- > config.h
-+ echo "$_def_lrintf" > config.h
- fi
- # internal faad: check if our dear gcc is able to compile it...
- cp "`pwd`/libfaad2/cfft.c" $TMPC
-@@ -5935,7 +5874,7 @@
- cat > $TMPC << EOF
- #include <inttypes.h>
- #include <x264.h>
--#if X264_BUILD < 22
-+#if X264_BUILD < 29
- #error We do not support old versions of x264. Get the latest from SVN.
+@@ -6529,7 +6488,8 @@
#endif
int main(void) { x264_encoder_open((void*)0); return 0; }
-@@ -6115,8 +6054,11 @@
+ 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"
+ if test "$_x264" != no ; then
+ _x264=no
+ if cc_check $_inc_x264 $_ld_x264 $_ld_lm ; then
+@@ -6723,8 +6683,11 @@
if test "$_tv" = yes ; then
cat > $TMPC <<EOF
#include <sys/types.h>
@@ -173,26 +150,7 @@
#else
#include <machine/ioctl_bt848.h>
#endif
-@@ -6477,7 +6419,7 @@
- fi
- _stripbinaries=no
- elif test -z "$CFLAGS" ; then
-- CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
-+ CFLAGS="-O $_pipe"
- # always compile with '-g' if .developer:
- if test -f ".developer" ; then
- CFLAGS="-g $CFLAGS"
-@@ -6487,6 +6429,9 @@
- _stripbinaries=no
- fi
- else
-+ if test "$_runtime_cpudetection" = no ; then
-+ CFLAGS="$CFLAGS $_march $_mcpu"
-+ fi
- cat <<EOF
-
- MPlayer compilation will use the CFLAGS set by you, but:
-@@ -6526,7 +6471,7 @@
+@@ -7166,7 +7129,7 @@
CFLAGS="$CFLAGS -D_REENTRANT"
elif bsd ; then
# FIXME bsd needs this so maybe other OS'es
@@ -201,7 +159,7 @@
fi
# 64 bit file offsets?
if test "$_largefiles" = yes || freebsd ; then
-@@ -6640,13 +6585,11 @@
+@@ -7318,13 +7281,11 @@
echocheck "lirc"
if test "$_lirc" = auto ; then
_lirc=no
Index: files/patch-ae
===================================================================
RCS file: /var/ncvs/freebsd/ports/multimedia/mplayer/files/patch-ae,v
retrieving revision 1.13
diff -u -r1.13 patch-ae
--- files/patch-ae 6 Mar 2005 10:34:16 -0000 1.13
+++ files/patch-ae 15 Jun 2006 08:29:05 -0000
@@ -1,20 +1,20 @@
---- Makefile.orig Fri Nov 5 15:02:40 2004
-+++ Makefile Mon Jan 10 21:53:25 2005
-@@ -273,57 +273,10 @@
- ifeq ($(VIDIX),yes)
- $(DO_MAKE)
+--- Makefile.orig Thu Jun 15 10:20:29 2006
++++ Makefile Thu Jun 15 10:27:06 2006
+@@ -446,47 +446,11 @@
+ $(MAKE) -C libdha install
+ $(MAKE) -C vidix install
endif
-- if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
+- $(INSTALL) -d $(BINDIR)
- $(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
-ifeq ($(GUI),yes)
- -ln -sf $(PRG) $(BINDIR)/gmplayer
-endif
-- if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi
+- $(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 \
-- mkdir -p $(MANDIR)/$$i/man1 ; \
+- $(INSTALL) -d $(MANDIR)/$$i/man1 ; \
- $(INSTALL) -c -m 644 DOCS/man/$$i/mplayer.1 $(MANDIR)/$$i/man1/mplayer.1 ; \
- fi ; \
- done
@@ -30,34 +30,24 @@
- fi ; \
- done
-endif
-- @if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
-- @if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
+- @$(INSTALL) -d $(DATADIR)
+- @$(INSTALL) -d $(DATADIR)/font
- @if test ! -f $(DATADIR)/font/font.desc ; then \
-- echo "*** Download font at http://www.mplayerhq.hu/homepage/dload.html" ; \
+- echo "*** Download font at http://www.mplayerhq.hu/dload.html" ; \
- echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/" ; \
- fi
-ifeq ($(GUI),yes)
-- @if test ! -d $(DATADIR)/Skin ; then mkdir -p $(DATADIR)/Skin ; fi
-- @echo "*** Download skin(s) at http://www.mplayerhq.hu/homepage/dload.html"
-- @echo "*** for GUI, and extract to $(DATADIR)/Skin/"
-- @if test ! -d $(prefix)/share/pixmaps ; then mkdir -p $(prefix)/share/pixmaps ; fi
-- $(INSTALL) -m 644 Gui/mplayer/pixmaps/mplayer-desktop.xpm $(prefix)/share/pixmaps/mplayer-desktop.xpm
-- @if test ! -d $(prefix)/share/applications ; then mkdir -p $(prefix)/share/applications ; fi
+- @$(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
--endif
-- @if test ! -d $(CONFDIR) ; then mkdir -p $(CONFDIR) ; fi
-- @if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
--ifeq ($(DVDKIT_SHARED),yes)
--ifeq ($(DVDKIT2),yes)
-- if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
-- $(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit2/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
--else
--ifeq ($(DVDKIT),yes)
-- if test ! -d $(LIBDIR) ; then mkdir -p $(LIBDIR) ; fi
-- $(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
--endif
--endif
+ @${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
Index: files/patch-bswap.h
===================================================================
RCS file: /var/ncvs/freebsd/ports/multimedia/mplayer/files/patch-bswap.h,v
retrieving revision 1.2
diff -u -r1.2 patch-bswap.h
--- files/patch-bswap.h 10 May 2005 12:06:45 -0000 1.2
+++ files/patch-bswap.h 15 Jun 2006 08:32:07 -0000
@@ -1,5 +1,5 @@
---- bswap.h.orig Thu Oct 21 08:54:57 2004
-+++ bswap.h Mon May 9 20:57:34 2005
+--- 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__
Index: files/patch-libfaad2-common.h
===================================================================
RCS file: /var/ncvs/freebsd/ports/multimedia/mplayer/files/patch-libfaad2-common.h,v
retrieving revision 1.1
diff -u -r1.1 patch-libfaad2-common.h
--- files/patch-libfaad2-common.h 14 Mar 2005 23:07:15 -0000 1.1
+++ files/patch-libfaad2-common.h 15 Jun 2006 08:41:16 -0000
@@ -1,13 +1,14 @@
---- libfaad2/common.h.orig Thu Mar 10 15:33:19 2005
-+++ libfaad2/common.h Thu Mar 10 15:34:38 2005
-@@ -328,7 +328,9 @@
+--- 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__)
+-
+- #if defined(_WIN32) && !defined(__MINGW32__) && !defined(HAVE_LRINTF)
+ #if defined(HAVE_LRINTF)
+ #define HAS_LRINTF
-+ #elif defined(_WIN32) && !defined(__MINGW32__)
++ #elif defined(_WIN32) && !defined(__MINGW32__) && !defined(HAVE_LRINTF)
#define HAS_LRINTF
static INLINE int lrintf(float f)
{
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200607070753.k677rL1B042124>