cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to mplayer-20101024. Noteworthy improvements include vpx

Browse Source 
(webm) support and alpha support. This work is a joint effort from
myself, naddy@ and jakemsr@. Cheers.

OK jakemsr@
This commit is contained in:
edd 2010-11-08 21:25:44 +00:00
parent fb410bf98e
commit 666f370183
28 changed files with 446 additions and 368 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
x11/mplayer/Makefile
View File

@ -1,47 +1,45 @@
# $OpenBSD: Makefile,v 1.174 2010/10/24 21:15:33 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.175 2010/11/08 21:25:44 edd Exp $
# May not be hard to add more.
ONLY_FOR_ARCHS= amd64 i386 powerpc sparc64 arm mips64 mips64el
ONLY_FOR_ARCHS = amd64 arm i386 mips64 mips64el powerpc sparc64 alpha
COMMENT= movie player supporting many formats
COMMENT = movie player supporting many formats
V= 20100308
V_DASHED= 2010-03-08
V = 20101024
V_DASHED = 2010-10-24
SUBST_VARS+= PREFIX CONFDIR
SUBST_VARS += PREFIX CONFDIR
N= mplayer
DISTNAME= mplayer-export-snapshot-${V}
PKGNAME= ${N}-${V}
REVISION= 5
CATEGORIES= x11 multimedia
EXTRACT_SUFX= .tar.bz2
N = mplayer
DISTNAME = mplayer-export-snapshot-${V}
PKGNAME = ${N}-${V}
CATEGORIES = x11 multimedia
EXTRACT_SUFX = .tar.bz2
WRKDIST = ${WRKDIR}/mplayer-export-${V_DASHED}
HOMEPAGE= http://www.mplayerhq.hu/
HOMEPAGE = http://www.mplayerhq.hu/
# GPLv2
PERMIT_PACKAGE_CDROM= patents
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= a52 bz2 c cdda_interface cdda_paranoia crypto dca \
dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
m mng mp3lame mpcdec ncurses ogg.>=5 orc-0.4 png \
pthread schroedinger-1.0 sndio speex stdc++ theora \
ungif util x264.>=3 xvidcore z
PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
WANTLIB = bz2 c cdda_interface cdda_paranoia crypto \
dv dvdnavmini dvdread faac faad fribidi jpeg lcms \
m mng mp3lame mpcdec ncurses ogg.>=5 orc-0.4 png \
pthread schroedinger-1.0 sndio speex stdc++ theora \
ungif util vpx x264.>=5 xvidcore z
# we use a snapshot
MASTER_SITES= http://theunixzoo.co.uk/distfiles/
MASTER_SITES = http://theunixzoo.co.uk/distfiles/
MAINTAINER= Edd Barrett <edd@openbsd.org>
MAINTAINER = Edd Barrett <edd@openbsd.org>
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MODULES += converters/libiconv
MODULES+= converters/libiconv
LIB_DEPENDS= ::graphics/png \
LIB_DEPENDS = ::graphics/png \
::graphics/jpeg \
::graphics/libungif \
:cdparanoia->=3.a9.8:audio/cdparanoia \
@ -57,15 +55,14 @@ LIB_DEPENDS= ::graphics/png \
::devel/fribidi \
::graphics/lcms \
::graphics/libmng \
::audio/libdca \
::archivers/bzip2 \
::multimedia/schroedinger \
::audio/faad \
::audio/faac \
::audio/liba52 \
::multimedia/x264
:x264->=20101023:multimedia/x264 \
::multimedia/libvpx
BUILD_DEPENDS= ::net/livemedia \
BUILD_DEPENDS = ::net/livemedia \
:rtunes->=0.8:audio/rtunes \
:libxml-*:textproc/libxml \
:libxslt-*:textproc/libxslt \
@ -74,113 +71,145 @@ BUILD_DEPENDS= ::net/livemedia \
::audio/ladspa
.if ${MACHINE_ARCH:Mamd64} || ${MACHINE_ARCH:Mi386}
BUILD_DEPENDS+= ::devel/yasm
BUILD_DEPENDS += ::devel/yasm
.endif
CONFDIR= ${SYSCONFDIR}/mplayer
CONFDIR = ${SYSCONFDIR}/mplayer
USE_GMAKE= Yes
USE_GMAKE = Yes
USE_GROFF = Yes
CONFIGURE_STYLE=simple
CONFIGURE_ARGS+=--disable-alsa \
--disable-arts \
--disable-esd \
--disable-ossaudio \
--disable-nas \
--disable-liblzo \
--disable-caca \
--disable-vidix \
--disable-smb \
--disable-select \
--disable-langinfo \
--disable-openal \
--disable-libvorbis \
--disable-tremor \
--disable-mad \
--disable-libcdio \
--disable-toolame \
--disable-dvdread-internal \
--disable-libdvdcss-internal \
--disable-faad-internal \
--disable-gui \
--disable-win32dll \
--disable-ggi \
--disable-libopenjpeg \
--enable-menu \
--confdir=${CONFDIR} \
MAKE_ENV = V=1 # turn on verbose ffmpeg build
CONFIGURE_STYLE = simple
# CONFIGURE_ARGS for misc stuff
CONFIGURE_ARGS += --confdir=${CONFDIR} \
--mandir=${LOCALBASE}/man \
--extra-cflags="-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng" \
--extra-ldflags="-L${LOCALBASE}/lib" \
--extra-libs-mplayer="-lrtunes -lcrypto"
CONFIGURE_ENV+= TMPDIR="${WRKBUILD}"
# CONFIGURE_ARGS that disable internal stuff
CONFIGURE_ARGS += --disable-alsa \
--disable-arts \
--disable-esd \
--disable-ossaudio \
--disable-sunaudio \
--disable-vidix \
--disable-select \
--disable-libcdio \
--disable-dvdread-internal \
--disable-libdvdcss-internal \
--disable-faad-internal
# gui is not supported anymore and we have better ones in ports
CONFIGURE_ARGS += --disable-gui
# bintools 2.15 does not do sse3 for i386/amd64
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
CONFIGURE_ARGS+=--enable-runtime-cpudetection
CONFIGURE_ARGS+=--disable-ssse3
.endif
# CONFIGURE_ARGS that enable internal stuff
CONFIGURE_ARGS += --enable-menu
# again bintools 2.15 limits what we can do here too
.if ${MACHINE_ARCH:Mpowerpc}
CONFIGURE_ARGS+=--disable-altivec
CONFIGURE_ARGS+=--enable-runtime-cpudetection
.endif
# CONFIGURE_ARGS that disable external stuff
CONFIGURE_ARGS += --disable-smb \
--disable-liblzo \
--disable-nas \
--disable-caca \
--disable-langinfo \
--disable-mad \
--disable-openal \
--disable-libdca \
--disable-liba52 \
--disable-toolame \
--disable-win32dll \
--disable-ggi \
--disable-libopenjpeg \
--disable-mpg123
FLAVORS= sdl debug no_x11 aa jack
FLAVOR?=
# again old binutils...
# internal tremor, external tremor, external libvorbis all conflict
# we choose libvorbis to enable encoding to vorbis
CONFIGURE_ARGS += --disable-tremor
.if ${MACHINE_ARCH:Marm}
CONFIGURE_ARGS+=--disable-mp3lib
CONFIGURE_ARGS+=--target=generic-openbsd
# ... except on arm, which has no floating point hardware
CONFIGURE_ARGS += --disable-libvorbis
.else
LIB_DEPENDS += ::audio/libvorbis
WANTLIB += vorbisenc vorbis
CONFIGURE_ARGS += --disable-tremor-internal
.endif
CONFIGURE_ENV += TMPDIR="${WRKBUILD}"
# binutils 2.15 does not do sse3 for i386/amd64
.if ${MACHINE_ARCH:Mi386} || ${MACHINE_ARCH:Mamd64}
CONFIGURE_ARGS += --enable-runtime-cpudetection
CONFIGURE_ARGS += --disable-ssse3
.endif
# again binutils 2.15 limits what we can do here too
.if ${MACHINE_ARCH:Mpowerpc}
CONFIGURE_ARGS += --disable-altivec
CONFIGURE_ARGS += --enable-runtime-cpudetection
.endif
.if ${MACHINE_ARCH:Marm}
# disable common floating point decoders that have integer alternatives
CONFIGURE_ARGS += --disable-mp3lib \
--disable-decoder=mp3on4float \
--disable-decoder=mp3adufloat \
--disable-decoder=mp3float \
--disable-decoder=mp2float \
--disable-decoder=vorbis
# again old binutils...
CONFIGURE_ARGS += --target=generic-openbsd
.endif
FLAVORS = sdl debug no_x11 aa jack
FLAVOR ?=
.if ${FLAVOR:L:Mno_x11}
CONFIGURE_ARGS+=--disable-gl \
CONFIGURE_ARGS += --disable-gl \
--disable-xv \
--disable-x11 \
--disable-fontconfig \
--disable-freetype
.else
WANTLIB+= GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm fontconfig \
WANTLIB += GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm fontconfig \
freetype
RUN_DEPENDS+= :desktop-file-utils-*:devel/desktop-file-utils
RUN_DEPENDS += :desktop-file-utils-*:devel/desktop-file-utils
.endif
.if ${FLAVOR:L:Msdl}
CONFIGURE_ARGS+=--with-sdl-config=${LOCALBASE}/bin/sdl-config
LIB_DEPENDS+= :sdl->=1.2.5:devel/sdl
WANTLIB+= SDL
CONFIGURE_ARGS += --with-sdl-config=${LOCALBASE}/bin/sdl-config
LIB_DEPENDS += :sdl->=1.2.5:devel/sdl
WANTLIB += SDL
.else
CONFIGURE_ARGS+=--disable-sdl
CONFIGURE_ARGS += --disable-sdl
.endif
.if ${FLAVOR:L:Mdebug}
CONFIGURE_ARGS+=--enable-debug=3
CONFIGURE_ARGS += --enable-debug=3 \
--disable-sighandler
.endif
.if ${FLAVOR:L:Maa}
.if ${FLAVOR:L:Mno_x11}
LIB_DEPENDS+= :aalib-*-no_x11:graphics/aalib,no_x11
WANTLIB+= aa.>=1.3
LIB_DEPENDS += :aalib-*-no_x11:graphics/aalib,no_x11
WANTLIB += aa.>=1.3
.else
LIB_DEPENDS+= :aalib-*:graphics/aalib
WANTLIB+= aa.>=1.3
LIB_DEPENDS += :aalib-*:graphics/aalib
WANTLIB += aa.>=1.3
.endif
.else
CONFIGURE_ARGS+=--disable-aa
CONFIGURE_ARGS += --disable-aa
.endif
.if ${FLAVOR:L:Mjack}
LIB_DEPENDS+= ::audio/jack
WANTLIB+= jack
LIB_DEPENDS += ::audio/jack
WANTLIB += jack
.else
CONFIGURE_ARGS+=--disable-jack
CONFIGURE_ARGS += --disable-jack
.endif
NO_REGRESS= Yes
NO_REGRESS = Yes
# copy in rtunes and sndio backends
post-extract:
@cp ${FILESDIR}/ao_rtunes.c ${FILESDIR}/ao_sndio.c ${WRKSRC}/libao2
@cp ${FILESDIR}/ai_sndio.c ${WRKSRC}/stream
@ -189,9 +218,10 @@ post-extract:
pre-configure:
${SUBST_CMD} ${WRKSRC}/DOCS/xml/configure
# Put a version.h in place so svn is not a BUILD_DEPEND
# (see version.sh for how this was supposed to work).
post-configure:
# Put a version.h in place so svn is not a BUILD_DEPEND
# (see version.sh for how this was supposed to work).
cp ${FILESDIR}/version.h ${WRKDIST}/version.h
post-build:
@ -200,6 +230,7 @@ post-build:
DOCDIR = ${PREFIX}/share/doc/mplayer
EXAMPLEDIR = ${PREFIX}/share/examples/mplayer
# install docs
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
${INSTALL_DATA_DIR} ${EXAMPLEDIR}
@ -207,6 +238,5 @@ post-install:
${EXAMPLEDIR}
${INSTALL_DATA} ${WRKDIST}/etc/example.conf ${EXAMPLEDIR}/mplayer.conf
${INSTALL_DATA} ${WRKDIST}/DOCS/HTML/en/*.html ${DOCDIR}
${INSTALL_DATA} ${FILESDIR}/README.OpenBSD ${DOCDIR}
.include <bsd.port.mk>

10
x11/mplayer/distinfo
View File

@ -1,5 +1,5 @@
MD5 (mplayer-export-snapshot-20100308.tar.bz2) = y/60A+FbzhccShluFskeGg==
RMD160 (mplayer-export-snapshot-20100308.tar.bz2) = WCGSDqQH6Sde3of6xFvrwgjcgFE=
SHA1 (mplayer-export-snapshot-20100308.tar.bz2) = nSMSY1qcl0fo38VKZrYQyUYXI8U=
SHA256 (mplayer-export-snapshot-20100308.tar.bz2) = TOzg0vR+1cRwIPNklgFuIpiEGe1TaNULKLMRV7ZWfWc=
SIZE (mplayer-export-snapshot-20100308.tar.bz2) = 8870973
MD5 (mplayer-export-snapshot-20101024.tar.bz2) = F797FlNAF1eu01Goo2VXNw==
RMD160 (mplayer-export-snapshot-20101024.tar.bz2) = S9533qXXp0k7Y5TXnXHbk4yfRBs=
SHA1 (mplayer-export-snapshot-20101024.tar.bz2) = iGBuBIpI6dKVOxdmJ4HKyatTHUM=
SHA256 (mplayer-export-snapshot-20101024.tar.bz2) = BbFJxSzFbQ2CpHSGr0b5UAGLJ0wu8VqHCMvBsvy5uJE=
SIZE (mplayer-export-snapshot-20101024.tar.bz2) = 9998106

6
x11/mplayer/files/ao_sndio.c
View File

@ -157,8 +157,10 @@ static int init(int rate, int channels, int format, int flags)
ac3 = 1;
break;
default:
mp_msg(MSGT_AO, MSGL_ERR, "ao2: unsupported format\n");
return 0;
mp_msg(MSGT_AO, MSGL_V, "ao2: unsupported format\n");
par.bits = 16;
par.sig = 1;
par.le = SIO_LE_NATIVE;
}
par.rate = rate;
par.pchan = channels;

4
x11/mplayer/files/version.h
View File

@ -1,2 +1,2 @@
#define VERSION "SVN-r30866"
#define MP_TITLE "%s "VERSION" (C) 2000-2010 MPlayer Team\n"
#define VERSION "SVN-r32528"
#define MP_TITLE "%s "VERSION"-OpenBSD (C) 2000-2010 MPlayer Team\n"

10
x11/mplayer/patches/patch-DOCS_man_en_mplayer_1
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.3 2010/05/26 21:29:56 jakemsr Exp $
--- DOCS/man/en/mplayer.1.orig Fri Mar 5 23:13:08 2010
+++ DOCS/man/en/mplayer.1 Mon Mar 8 14:28:41 2010
@@ -1296,7 +1296,7 @@ May be negative.
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.4 2010/11/08 21:25:44 edd Exp $
--- DOCS/man/en/mplayer.1.orig Sat Oct 23 22:09:45 2010
+++ DOCS/man/en/mplayer.1 Sun Oct 24 10:36:58 2010
@@ -1390,7 +1390,7 @@ May be negative.
.
.TP
.B \-cdrom\-device <path to device>
@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.3 2010/05/26 21:29:56 jakemsr Exp $
.
.TP
.B \-channels <number> (also see \-af channels)
@@ -11474,11 +11474,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
@@ -11821,11 +11821,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
.PP
.B Play DTS-CD with passthrough:
.nf

43
x11/mplayer/patches/patch-DOCS_xml_configure
View File

@ -1,39 +1,48 @@
$OpenBSD: patch-DOCS_xml_configure,v 1.2 2010/05/26 21:29:56 jakemsr Exp $
--- DOCS/xml/configure.orig Sun Dec 13 15:48:20 2009
+++ DOCS/xml/configure Wed May 19 10:14:40 2010
@@ -18,7 +18,8 @@ for _try_catalog in \
$OpenBSD: patch-DOCS_xml_configure,v 1.3 2010/11/08 21:25:44 edd Exp $
--- DOCS/xml/configure.orig Wed Jul 28 11:00:56 2010
+++ DOCS/xml/configure Thu Oct 28 01:08:35 2010
@@ -16,7 +16,8 @@ for try_catalog in \
/usr/lib/sgml/catalog \
/usr/local/lib/sgml/catalog \
/usr/share/docbook-xml42/catalog.xml \
- /usr/share/sgml/docbook/xmlcatalog
+ /usr/share/sgml/docbook/xmlcatalog \
+ ${PREFIX}/share/sgml/catalog
+ ${LOCALBASE}/share/sgml/catalog
do
if test -f "$_try_catalog"
then
@@ -49,6 +50,7 @@ for _try_chunk_xsl in \
if test -f "$try_catalog"; then
catalog=$try_catalog
@@ -45,6 +46,7 @@ for try_chunk_xsl in \
/usr/share/sgml/docbook/xsl-stylesheets*/html/chunk.xsl \
/usr/share/xml/docbook/stylesheet/nwalsh/current/html/chunk.xsl \
/opt/local/share/xsl/docbook-xsl/html/chunk.xsl \
+ ${PREFIX}/share/xsl/docbook/html/chunk.xsl
+ ${LOCALBASE}/share/xsl/docbook/html/chunk.xsl
do
if test -f "$_try_chunk_xsl"
@@ -78,6 +80,7 @@ for _try_docbook_xsl in \
if test -f "$try_chunk_xsl"; then
@@ -72,6 +74,7 @@ for try_docbook_xsl in \
/usr/share/sgml/docbook/xsl-stylesheets*/html/docbook.xsl \
/usr/share/xml/docbook/stylesheet/nwalsh/current/html/docbook.xsl \
/opt/local/share/xsl/docbook-xsl/html/docbook.xsl \
+ ${PREFIX}/share/xsl/docbook/html/docbook.xsl
+ ${LOCALBASE}/share/xsl/docbook/html/docbook.xsl
do
if test -f "$_try_docbook_xsl"
@@ -135,7 +138,8 @@ for _try_dtd in \
if test -f "$try_docbook_xsl"; then
@@ -126,7 +129,8 @@ for try_dtd in \
/usr/share/sgml/docbook/dtd/xml/*/docbookx.dtd \
/usr/share/docbook-xml*/docbookx.dtd \
/opt/local/share/xml/docbook*/*/docbookx.dtd \
- /usr/share/apps/ksgmltools2/docbook/*/docbookx.dtd
+ /usr/share/apps/ksgmltools2/docbook/*/docbookx.dtd \
+ ${PREFIX}/share/xml/docbook/*/docbookx.dtd
+ ${LOCALBASE}/share/xml/docbook/*/docbookx.dtd
do
if test -f "$_try_dtd"
then
if test -f "$try_dtd"; then
dtd=$try_dtd
@@ -169,7 +173,7 @@ echo "Looking for a valid XSLT processor..."
if xsltproc --version > /dev/null 2>&1; then
if test -z "$fake_chunk_xsl"; then
echo "Found xsltproc. If it works, it's probably the best choice."
- xsltcommand="xsltproc $catalog_opts -o \$\$1 \$\$2 \$\$3"
+ xsltcommand="xsltproc $catalog_opts -o \$$1 \$$2 \$$3"
else
echo "Found xsltproc but no stylesheets on your system."
echo "xsltproc is unusable without stylesheets."

14
x11/mplayer/patches/patch-DOCS_xml_en_cd-dvd_xml
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-DOCS_xml_en_cd-dvd_xml,v 1.1 2009/10/11 13:36:23 edd Exp $
--- DOCS/xml/en/cd-dvd.xml.orig Mon Jul 13 19:08:41 2009
+++ DOCS/xml/en/cd-dvd.xml Mon Jul 13 19:10:04 2009
@@ -202,8 +202,8 @@ For the complete list of available options, please rea
Syntax for a standard Video CD (VCD) is as follows:
<screen>mplayer vcd://<replaceable>&lt;track&gt;</replaceable> [-cdrom-device <replaceable>&lt;device&gt;</replaceable>]</screen>
Example:
-<screen>mplayer vcd://2 -cdrom-device /dev/hdc</screen>
-The default VCD device is <filename>/dev/cdrom</filename>. If your setup
+<screen>mplayer vcd://2 -cdrom-device /dev/rcd1c</screen>
+The default VCD device is <filename>/dev/rcd0c</filename>. If your setup
differs, make a symlink or specify the correct device on the command line
with the <option>-cdrom-device</option> option.
</para>

21
x11/mplayer/patches/patch-DOCS_xml_en_usage_xml Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-DOCS_xml_en_usage_xml,v 1.1 2010/11/08 21:25:44 edd Exp $
--- DOCS/xml/en/usage.xml.orig Tue Oct 26 12:49:00 2010
+++ DOCS/xml/en/usage.xml Tue Oct 26 12:50:35 2010
@@ -452,7 +452,7 @@ syntax is the same, except that you need to use dvdnav
</para>
<para>
-The default DVD device is <filename>/dev/dvd</filename>. If your setup
+The default DVD device is <filename>/dev/rcd0c</filename>. If your setup
differs, make a symlink or specify the correct device on the command
line with the <option>-dvd-device</option> option.
</para>
@@ -527,7 +527,7 @@ Syntax for a standard Video CD (VCD) is as follows:
<screen>mplayer vcd://<replaceable>&lt;track&gt;</replaceable> [-cdrom-device <replaceable>&lt;device&gt;</replaceable>]</screen>
Example:
<screen>mplayer vcd://2 -cdrom-device /dev/hdc</screen>
-The default VCD device is <filename>/dev/cdrom</filename>. If your setup
+The default VCD device is <filename>/dev/rcd0c</filename>. If your setup
differs, make a symlink or specify the correct device on the command line
with the <option>-cdrom-device</option> option.
</para>

27
x11/mplayer/patches/patch-Makefile
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.20 2010/05/26 21:29:56 jakemsr Exp $
--- Makefile.orig Fri Mar 5 23:13:08 2010
+++ Makefile Mon Mar 8 21:24:09 2010
@@ -28,6 +28,7 @@ include config.mak
$OpenBSD: patch-Makefile,v 1.21 2010/11/08 21:25:44 edd Exp $
--- Makefile.orig Fri Oct 22 21:39:43 2010
+++ Makefile Sun Oct 24 10:38:28 2010
@@ -26,6 +26,7 @@ include config.mak
SRCS_AUDIO_INPUT-$(ALSA1X) += stream/ai_alsa1x.c
SRCS_AUDIO_INPUT-$(ALSA9) += stream/ai_alsa.c
SRCS_AUDIO_INPUT-$(OSS) += stream/ai_oss.c
@ -9,15 +9,15 @@ $OpenBSD: patch-Makefile,v 1.20 2010/05/26 21:29:56 jakemsr Exp $
SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
SRCS_COMMON-$(BITMAP_FONT) += libvo/font_load.c
SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \
@@ -627,6 +628,7 @@ SRCS_MPLAYER-$(S3FB) += libvo/vo_s3fb.c
SRCS_MPLAYER-$(SDL) += libao2/ao_sdl.c libvo/vo_sdl.c
@@ -623,6 +624,7 @@ SRCS_MPLAYER-$(S3FB) += libvo/vo_s3fb.c
SRCS_MPLAYER-$(SDL) += libao2/ao_sdl.c libvo/vo_sdl.c libvo/sdl_common.c
SRCS_MPLAYER-$(SGIAUDIO) += libao2/ao_sgi.c
SRCS_MPLAYER-$(SUNAUDIO) += libao2/ao_sun.c
+SRCS_MPLAYER-$(SNDIO) += libao2/ao_sndio.c
SRCS_MPLAYER-$(SVGA) += libvo/vo_svga.c
SRCS_MPLAYER-$(TDFXFB) += libvo/vo_tdfxfb.c
SRCS_MPLAYER-$(TDFXVID) += libvo/vo_tdfx_vid.c
@@ -689,7 +691,8 @@ SRCS_MPLAYER = command.c \
@@ -686,7 +688,8 @@ SRCS_MPLAYER = command.c \
libvo/video_out.c \
libvo/vo_mpegpes.c \
libvo/vo_null.c \
@ -27,18 +27,7 @@ $OpenBSD: patch-Makefile,v 1.20 2010/05/26 21:29:56 jakemsr Exp $
SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c
@@ -901,7 +904,9 @@ version.h: version.sh
# Make sure all generated header files are created.
codec-cfg.d codec-cfg.o: codecs.conf.h
$(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
-$(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui osdep/mplayer.rc): version.h
+#$(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui osdep/mplayer.rc): version.h
+# OpenBSD - don't run version.sh, it requres SVN, see post-configure
+$(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui osdep/mplayer.rc):
libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)
@@ -912,7 +917,16 @@ loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_N
@@ -906,7 +909,16 @@ loader/%: CFLAGS += -fno-omit-frame-pointer $(CFLAGS_N
#loader/%: CFLAGS += -Ddbg_printf=__vprintf -DTRACE=__vprintf -DDETAILED_OUT
loader/win32%: CFLAGS += $(CFLAGS_STACKREALIGN)

20
x11/mplayer/patches/patch-command_c
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-command_c,v 1.2 2010/05/26 21:29:56 jakemsr Exp $
--- command.c.orig Sat Jan 30 23:24:23 2010
+++ command.c Mon Mar 8 14:28:42 2010
@@ -3167,7 +3167,7 @@ int run_command(MPContext * mpctx, mp_cmd_t * cmd)
case MP_CMD_RUN:
$OpenBSD: patch-command_c,v 1.3 2010/11/08 21:25:44 edd Exp $
--- command.c.orig Sun Oct 24 11:11:25 2010
+++ command.c Sun Oct 24 11:11:43 2010
@@ -3379,7 +3379,7 @@ int run_command(MPContext *mpctx, mp_cmd_t *cmd)
case MP_CMD_RUN:
#ifndef __MINGW32__
if (!fork()) {
- execl("/bin/sh", "sh", "-c", cmd->args[0].v.s, NULL);
+ execl("/bin/sh", "sh", "-c", cmd->args[0].v.s, (char *)NULL);
exit(0);
}
if (!fork()) {
- execl("/bin/sh", "sh", "-c", cmd->args[0].v.s, NULL);
+ execl("/bin/sh", "sh", "-c", cmd->args[0].v.s, (char *) NULL);
exit(0);
}
#endif

166
x11/mplayer/patches/patch-configure
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.56 2010/05/26 21:29:56 jakemsr Exp $
--- configure.orig Thu Mar 4 14:46:44 2010
+++ configure Mon Mar 8 21:09:42 2010
@@ -423,6 +423,7 @@ Audio output:
$OpenBSD: patch-configure,v 1.57 2010/11/08 21:25:44 edd Exp $
--- configure.orig Thu Oct 21 10:35:56 2010
+++ configure Sat Nov 6 13:41:02 2010
@@ -461,6 +461,7 @@ Audio output:
--disable-nas disable NAS audio output [autodetect]
--disable-sgiaudio disable SGI audio output [autodetect]
--disable-sunaudio disable Sun audio output [autodetect]
@ -9,7 +9,7 @@ $OpenBSD: patch-configure,v 1.56 2010/05/26 21:29:56 jakemsr Exp $
--disable-kai disable KAI audio output [autodetect]
--disable-dart disable DART audio output [autodetect]
--disable-win32waveout disable Windows waveout audio output [autodetect]
@@ -665,6 +666,7 @@ _xf86keysym=auto
@@ -698,6 +699,7 @@ _xf86keysym=auto
_mlib=no #broken, thus disabled
_sgiaudio=auto
_sunaudio=auto
@ -17,7 +17,7 @@ $OpenBSD: patch-configure,v 1.56 2010/05/26 21:29:56 jakemsr Exp $
_alsa=auto
_fastmemcpy=yes
hardcoded_tables=no
@@ -1098,6 +1100,8 @@ for ac_option do
@@ -1126,6 +1128,8 @@ for ac_option do
--disable-mlib) _mlib=no ;;
--enable-sunaudio) _sunaudio=yes ;;
--disable-sunaudio) _sunaudio=no ;;
@ -26,7 +26,7 @@ $OpenBSD: patch-configure,v 1.56 2010/05/26 21:29:56 jakemsr Exp $
--enable-sgiaudio) _sgiaudio=yes ;;
--disable-sgiaudio) _sgiaudio=no ;;
--enable-alsa) _alsa=yes ;;
@@ -1434,7 +1438,7 @@ if test -z "$_target" ; then
@@ -1446,7 +1450,7 @@ if test -z "$_target" ; then
sh3|sh4|sh4a) host_arch=sh ;;
s390) host_arch=s390 ;;
s390x) host_arch=s390x ;;
@ -35,7 +35,16 @@ $OpenBSD: patch-configure,v 1.56 2010/05/26 21:29:56 jakemsr Exp $
vax) host_arch=vax ;;
xtensa*) host_arch=xtensa ;;
*) host_arch=UNKNOWN ;;
@@ -2456,7 +2460,7 @@ cat > $TMPC << EOF
@@ -2157,7 +2161,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
- _vis='yes'
+ # _vis='yes'
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
@@ -2476,7 +2480,7 @@ cat > $TMPC << EOF
int ff_extern;
EOF
cc_check -c || die "Symbol mangling check failed."
@ -44,15 +53,40 @@ $OpenBSD: patch-configure,v 1.56 2010/05/26 21:29:56 jakemsr Exp $
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
@@ -3205,6 +3209,7 @@ if test "$_struct_sockaddr_storage" = auto; then
#if HAVE_WINSOCK2_H
#include <winsock2.h>
#else
+#include <stdlib.h>
#include <sys/socket.h>
#endif
int main(void) { struct sockaddr_storage sas; return 0; }
@@ -3613,7 +3618,7 @@ int main(void) { pthread_t tid; return pthread_create(
@@ -2535,7 +2539,7 @@ elif test -z "$CFLAGS" ; then
elif test "$cc_vendor" != "gnu" ; then
CFLAGS="-O2 $_march $_mcpu $_pipe"
else
- CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
+ CFLAGS="$_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
WARNFLAGS="-Wall -Wno-switch -Wno-parentheses -Wpointer-arith -Wredundant-decls"
extra_ldflags="$extra_ldflags -ffast-math"
fi
@@ -2817,8 +2821,11 @@ echores "$ibm_asm"
def_gnu_as='#define HAVE_GNU_AS 0'
gnu_as=no
echocheck "GNU assembler"
-inline_asm_check '".macro m n\n\\n:.int 0\n.endm\nm x"' &&
- gnu_as=yes && def_gnu_as='#define HAVE_GNU_AS 1'
+# OpenBSD - some altivec stuff causes build failures, fix from kili
+if ! ppc; then
+ inline_asm_check '".macro m n\n\\n:.int 0\n.endm\nm x"' &&
+ gnu_as=yes && def_gnu_as='#define HAVE_GNU_AS 1'
+fi
echores "$gnu_as"
fi
@@ -3436,7 +3443,8 @@ if test "$_memalign" = yes ; then
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'
+ # OpenBSD - prevent CONFIG_MEMALIGN_HACK which causes exit crash
+ #darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1'
fi
echores "$_memalign"
@@ -3543,7 +3551,7 @@ int main(void) { pthread_t tid; return pthread_create(
EOF
_pthreads=no
if ! hpux ; then
@ -61,16 +95,16 @@ $OpenBSD: patch-configure,v 1.56 2010/05/26 21:29:56 jakemsr Exp $
# 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
@@ -4892,6 +4897,8 @@ if test "$_aa" = yes ; then
@@ -4664,6 +4672,8 @@ if test "$_aa" = yes ; then
def_aa='#define CONFIG_AA 1'
if cygwin ; then
libs_mplayer="$libs_mplayer $(aalib-config --libs | cut -d " " -f 2,5,6)"
+ else
+ libs_mplayer="$libs_mplayer $(aalib-config --libs)"
fi
_vomodules="aa $_vomodules"
vomodules="aa $vomodules"
else
@@ -5188,14 +5195,14 @@ int main(void) {
@@ -4873,14 +4883,14 @@ int main(void) {
return !p_ver || p_ver[0] == 0;
}
EOF
@ -87,15 +121,7 @@ $OpenBSD: patch-configure,v 1.56 2010/05/26 21:29:56 jakemsr Exp $
else
def_mng='#undef CONFIG_MNG'
fi
@@ -5823,6 +5830,7 @@ fi
if test "$_jack" = yes ; then
def_jack='#define CONFIG_JACK 1'
_aomodules="jack $_aomodules"
+ libs_mplayer="$libs_mplayer $(pkg-config --libs jack)"
else
_noaomodules="jack $_noaomodules"
fi
@@ -5985,6 +5993,26 @@ fi
@@ -5691,6 +5701,26 @@ fi
echores "$_sunaudio"
@ -122,62 +148,46 @@ $OpenBSD: patch-configure,v 1.56 2010/05/26 21:29:56 jakemsr Exp $
def_mlib='#define CONFIG_MLIB 0'
if sunos; then
echocheck "Sun mediaLib"
@@ -6100,7 +6128,7 @@ elif dragonfly ; then
elif freebsd ; then
default_cdrom_device="/dev/acd0"
elif openbsd ; then
- default_cdrom_device="/dev/rcd0a"
+ default_cdrom_device="/dev/rcd0c"
elif sunos ; then
default_cdrom_device="/vol/dev/aliases/cdrom0"
# Modern Solaris versions use HAL instead of the vold daemon, the volfs
@@ -6169,8 +6197,9 @@ elif test "$_dvdread" = auto ; then
#include <dvdread/nav_read.h>
int main(void) { return 0; }
EOF
- _dvdreadcflags=$($_dvdreadconfig --cflags)
- _dvdreadlibs=$($_dvdreadconfig --libs)
@@ -5860,8 +5890,9 @@ if test "$_dvdread_internal" = auto ; then
elif test "$_dvdread" = auto ; then
_dvdread=no
if test "$_dl" = yes; then
- _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null)
- _dvdreadlibs=$($_dvdreadconfig --libs 2> /dev/null)
+# OpenBSD - we do not use dvdread-config, picked up anyway without
+# _dvdreadcflags=$($_dvdreadconfig --cflags)
+# _dvdreadlibs=$($_dvdreadconfig --libs)
if cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
$_dvdreadcflags $_dvdreadlibs $_ld_dl ; then
+# _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null)
+# _dvdreadlibs=$($_dvdreadconfig --libs 2> /dev/null)
if header_check dvdread/dvd_reader.h $_dvdreadcflags $_dvdreadlibs $_ld_dl ; then
_dvdread=yes
@@ -6848,7 +6877,7 @@ if test "$_libdca" = auto ; then
#include <dts.h>
int main(void) { dts_init(0); return 0; }
EOF
extra_cflags="$extra_cflags $_dvdreadcflags"
@@ -6347,7 +6378,7 @@ elif test "$_libvorbis" = yes ; then
def_vorbis='#define CONFIG_OGGVORBIS 1'
codecmodules="libvorbis $codecmodules"
res_comment="libvorbis"
- extra_ldflags="$extra_ldflags -lvorbis -logg"
+ extra_ldflags="$extra_ldflags -lvorbisenc -lvorbis -logg"
libavencoders="$libavencoders LIBVORBIS_ENCODER"
else
_vorbis=no
@@ -6547,7 +6578,7 @@ echores "$_libmpeg2"
echocheck "libdca support"
if test "$_libdca" = auto ; then
_libdca=no
- for _ld_dca in -ldca -ldts ; do
+ for _ld_dca in -ldca; do
cc_check $_ld_dca $_ld_lm && extra_ldflags="$extra_ldflags $_ld_dca" \
&& _libdca=yes && break
statement_check_broken stdint.h dts.h 'dts_init(0)' $_ld_dca $_ld_lm &&
extra_ldflags="$extra_ldflags $_ld_dca" && _libdca=yes && break
done
@@ -6898,7 +6927,7 @@ int main(void) { unsigned long x, y; faacEncOpen(48000
EOF
_faac=no
for _ld_faac in "-lfaac" "-lfaac -lmp4v2 -lstdc++" ; do
- cc_check -O4 $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder $_ld_faac" && _faac=yes && break
+ cc_check $_ld_faac $_ld_lm && libs_mencoder="$libs_mencoder $_ld_faac" && _faac=yes && break
done
fi
if test "$_faac" = yes ; then
@@ -7899,6 +7928,15 @@ if test "$_tv_v4l2" = auto ; then
int main(void) { return 0; }
EOF
cc_check && _tv_v4l2=yes
+ else
+ cat > $TMPC <<EOF
+#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/videoio.h>
+int main(void) { return 0; }
+EOF
+ cc_check && _tv_v4l2=yes
@@ -7448,6 +7479,8 @@ if test "$_tv_v4l2" = auto ; then
_tv_v4l2=no
if test "$_tv" = yes && linux ; then
header_check linux/videodev2.h && _tv_v4l2=yes
+ elif test "$_tv" = yes && openbsd ; then
+ header_check sys/videoio.h && _tv_v4l2=yes
fi
fi
if test "$_tv_v4l2" = yes ; then
@@ -8637,6 +8675,7 @@ SPEEX = $_speex
@@ -8158,6 +8191,7 @@ SPEEX = $_speex
STREAM_CACHE = $_stream_cache
SGIAUDIO = $_sgiaudio
SUNAUDIO = $_sunaudio
@ -185,7 +195,7 @@ $OpenBSD: patch-configure,v 1.56 2010/05/26 21:29:56 jakemsr Exp $
SVGA = $_svga
TDFXFB = $_tdfxfb
TDFXVID = $_tdfxvid
@@ -9026,6 +9065,7 @@ $def_ossaudio_devmixer
@@ -8540,6 +8574,7 @@ $def_ossaudio_devmixer
$def_pulse
$def_sgiaudio
$def_sunaudio

35
x11/mplayer/patches/patch-ffmpeg_libavcodec_Makefile Normal file
View File

@ -0,0 +1,35 @@
$OpenBSD: patch-ffmpeg_libavcodec_Makefile,v 1.1 2010/11/08 21:25:44 edd Exp $
--- ffmpeg/libavcodec/Makefile.orig Sat Oct 2 10:51:26 2010
+++ ffmpeg/libavcodec/Makefile Sun Oct 24 13:08:08 2010
@@ -692,3 +692,31 @@ $(SUBDIR)motionpixels.o: $(SUBDIR)motionpixels_tables.
$(SUBDIR)pcm.o: $(SUBDIR)pcm_tables.h
$(SUBDIR)qdm2.o: $(SUBDIR)qdm2_tables.h
endif
+
+ifdef ARCH_X86_32
+ifeq (,$(findstring -O,$(CFLAGS)))
+x86/dsputil_mmx.o: CFLAGS += -O
+x86/flacdsp_mmx.o: CFLAGS += -O
+x86/fft_3dn.o: CFLAGS += -O
+x86/fft_3dn2.o: CFLAGS += -O
+x86/mlpdsp.o: CFLAGS += -O
+x86/snowdsp_mmx.o: CFLAGS += -O
+h264.o: CFLAGS += -O
+h264_cabac.o: CFLAGS += -O
+h264_parser.o: CFLAGS += -O
+cabac.o: CFLAGS += -O
+endif
+# OpenBSD -- otherwise we run out of registers, eg:
+# "cabac.h:527: error: can't find a register in class..."
+x86/dsputil_mmx.o: CFLAGS += -fomit-frame-pointer
+x86/flacdsp_mmx.o: CFLAGS += -fomit-frame-pointer
+x86/fft_3dn.o: CFLAGS += -fomit-frame-pointer
+x86/fft_3dn2.o: CFLAGS += -fomit-frame-pointer
+x86/mlpdsp.o: CFLAGS += -fomit-frame-pointer
+x86/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer
+h264.o: CFLAGS += -fomit-frame-pointer
+h264_cabac.o: CFLAGS += -fomit-frame-pointer
+h264_parser.o: CFLAGS += -fomit-frame-pointer
+cabac.o: CFLAGS += -fomit-frame-pointer
+endif
+

12
x11/mplayer/patches/patch-ffmpeg_libavcodec_x86_vp56_arith_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ffmpeg_libavcodec_x86_vp56_arith_h,v 1.1 2010/11/08 21:25:44 edd Exp $
--- ffmpeg/libavcodec/x86/vp56_arith.h.orig Mon Oct 25 23:11:14 2010
+++ ffmpeg/libavcodec/x86/vp56_arith.h Mon Oct 25 23:12:00 2010
@@ -24,7 +24,7 @@
#ifndef AVCODEC_X86_VP56_ARITH_H
#define AVCODEC_X86_VP56_ARITH_H
-#if HAVE_FAST_CMOV
+#if HAVE_FAST_CMOV && !ARCH_X86_64
#define vp56_rac_get_prob vp56_rac_get_prob
static av_always_inline int vp56_rac_get_prob(VP56RangeCoder *c, uint8_t prob)
{

12
x11/mplayer/patches/patch-ffmpeg_libavutil_x86_cpu_h Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-ffmpeg_libavutil_x86_cpu_h,v 1.1 2010/11/08 21:25:44 edd Exp $
--- ffmpeg/libavutil/x86_cpu.h.orig Mon Oct 25 23:02:43 2010
+++ ffmpeg/libavutil/x86_cpu.h Mon Oct 25 23:03:10 2010
@@ -71,7 +71,7 @@ typedef int x86_reg;
#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
-#if ARCH_X86_64 && defined(PIC)
+#if ARCH_X86_64 // && defined(PIC)
# define BROKEN_RELOCATIONS 1
#endif

16
x11/mplayer/patches/patch-ffmpeg_libswscale_Makefile Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-ffmpeg_libswscale_Makefile,v 1.1 2010/11/08 21:25:44 edd Exp $
--- ffmpeg/libswscale/Makefile.orig Sun Oct 24 13:08:24 2010
+++ ffmpeg/libswscale/Makefile Sun Oct 24 13:09:41 2010
@@ -21,3 +21,12 @@ DIRS = bfin mlib ppc sparc x86
include $(SUBDIR)../subdir.mak
$(SUBDIR)swscale-test$(EXESUF): ELIBS = -lavcore
+
+ifdef ARCH_X86_32
+ifeq (,$(findstring -O,$(CFLAGS)))
+x86/yuv2rgb_mmx.o: CFLAGS += -O
+endif
+# OpenBSD: Again - we run out of registers otherwise
+x86/yuv2rgb_mmx.o: CFLAGS += -fomit-frame-pointer
+endif
+

52
x11/mplayer/patches/patch-libavcodec_Makefile
View File

@ -1,52 +0,0 @@
$OpenBSD: patch-libavcodec_Makefile,v 1.9 2010/05/26 21:29:56 jakemsr Exp $
Anything requiring cabac.h will only build with -O -fomit-frame-pointer.
--- libavcodec/Makefile.orig Mon Mar 8 04:33:02 2010
+++ libavcodec/Makefile Mon Mar 22 15:20:40 2010
@@ -729,6 +729,45 @@ CLEANFILES = sin_tables.c cos_tables.c *_tables.h *_ta
include $(SUBDIR)../subdir.mak
+ifdef ARCH_X86_32
+ifeq (,$(findstring -O,$(CFLAGS)))
+x86/dsputil_mmx.o: CFLAGS += -O
+x86/flacdsp_mmx.o: CFLAGS += -O
+x86/fft_3dn.o: CFLAGS += -O
+x86/fft_3dn2.o: CFLAGS += -O
+x86/mlpdsp.o: CFLAGS += -O
+x86/snowdsp_mmx.o: CFLAGS += -O
+h264.o: CFLAGS += -O
+h264_parser.o: CFLAGS += -O
+h264_loopfilter.o: CFLAGS += -O
+h264_direct.o: CFLAGS += -O
+h264_sei.o: CFLAGS += -O
+h264_ps.o: CFLAGS += -O
+h264_refs.o: CFLAGS += -O
+h264_cavlc.o: CFLAGS += -O
+h264_cabac.o: CFLAGS += -O
+svq3.o: CFLAGS += -O
+cabac.o: CFLAGS += -O
+endif
+x86/dsputil_mmx.o: CFLAGS += -fomit-frame-pointer
+x86/flacdsp_mmx.o: CFLAGS += -fomit-frame-pointer
+x86/fft_3dn.o: CFLAGS += -fomit-frame-pointer
+x86/fft_3dn2.o: CFLAGS += -fomit-frame-pointer
+x86/mlpdsp.o: CFLAGS += -fomit-frame-pointer
+x86/snowdsp_mmx.o: CFLAGS += -fomit-frame-pointer
+h264.o: CFLAGS += -fomit-frame-pointer
+h264_parser.o: CFLAGS += -fomit-frame-pointer
+h264_loopfilter.o: CFLAGS += -fomit-frame-pointer
+h264_direct.o: CFLAGS += -fomit-frame-pointer
+h264_sei.o: CFLAGS += -fomit-frame-pointer
+h264_ps.o: CFLAGS += -fomit-frame-pointer
+h264_refs.o: CFLAGS += -fomit-frame-pointer
+h264_cavlc.o: CFLAGS += -fomit-frame-pointer
+h264_cabac.o: CFLAGS += -fomit-frame-pointer
+svq3.o: CFLAGS += -fomit-frame-pointer
+cabac.o: CFLAGS += -fomit-frame-pointer
+endif
+
$(SUBDIR)dct-test$(EXESUF): $(SUBDIR)dctref.o
$(SUBDIR)cos_tables.c: $(SUBDIR)costablegen$(HOSTEXESUF)

12
x11/mplayer/patches/patch-libavutil_x86_cpu_h
View File

@ -1,12 +0,0 @@
$OpenBSD: patch-libavutil_x86_cpu_h,v 1.2 2009/10/11 13:36:23 edd Exp $
--- libavutil/x86_cpu.h.orig Wed Jul 29 20:37:28 2009
+++ libavutil/x86_cpu.h Wed Jul 29 20:37:58 2009
@@ -69,7 +69,7 @@ typedef int x86_reg;
#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
#define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
-#if ARCH_X86_64 && defined(PIC)
+#if ARCH_X86_64 /* && defined(PIC) */
# define BROKEN_RELOCATIONS 1
#endif

12
x11/mplayer/patches/patch-libmenu_menu_console_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libmenu_menu_console_c,v 1.3 2010/11/08 21:25:44 edd Exp $
--- libmenu/menu_console.c.orig Sun Oct 24 11:11:55 2010
+++ libmenu/menu_console.c Sun Oct 24 11:12:56 2010
@@ -321,7 +321,7 @@ static int run_shell_cmd(menu_t* menu, char* cmd) {
dup2(in[0],0);
dup2(out[1],1);
dup2(err[1],2);
- execl("/bin/sh","sh","-c",cmd,(void*)NULL);
+ execl("/bin/sh","sh","-c",cmd,(char *) NULL);
fprintf(errf,"exec failed : %s\n",strerror(errno));
exit(1);
}

12
x11/mplayer/patches/patch-libmpcodecs_ad_faad_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-libmpcodecs_ad_faad_c,v 1.4 2010/05/26 21:29:56 jakemsr Exp $
--- libmpcodecs/ad_faad.c.orig Wed Feb 17 21:36:00 2010
+++ libmpcodecs/ad_faad.c Mon Mar 8 14:37:50 2010
@@ -83,7 +83,7 @@ static int aac_probe(unsigned char *buffer, int len)
$OpenBSD: patch-libmpcodecs_ad_faad_c,v 1.5 2010/11/08 21:25:44 edd Exp $
--- libmpcodecs/ad_faad.c.orig Wed Sep 8 18:38:52 2010
+++ libmpcodecs/ad_faad.c Sun Oct 24 10:39:37 2010
@@ -84,7 +84,7 @@ static int aac_probe(unsigned char *buffer, int len)
static int init(sh_audio_t *sh)
{
@ -10,7 +10,7 @@ $OpenBSD: patch-libmpcodecs_ad_faad_c,v 1.4 2010/05/26 21:29:56 jakemsr Exp $
unsigned char faac_channels;
int faac_init, pos = 0;
faac_hdec = faacDecOpen();
@@ -164,7 +164,7 @@ static int init(sh_audio_t *sh)
@@ -197,7 +197,7 @@ static int init(sh_audio_t *sh)
return 0;
} else {
mp_msg(MSGT_DECAUDIO,MSGL_V,"FAAD: Decoder init done (%dBytes)!\n", sh->a_in_buffer_len); // XXX: remove or move to debug!
@ -19,7 +19,7 @@ $OpenBSD: patch-libmpcodecs_ad_faad_c,v 1.4 2010/05/26 21:29:56 jakemsr Exp $
// 8 channels is aac channel order #7.
sh->channels = faac_channels == 7 ? 8 : faac_channels;
if (audio_output_channels <= 2) sh->channels = faac_channels > 1 ? 2 : 1;
@@ -293,7 +293,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *
@@ -327,7 +327,7 @@ static int decode_audio(sh_audio_t *sh,unsigned char *
} else {
/* XXX: samples already multiplied by channels! */
mp_msg(MSGT_DECAUDIO,MSGL_DBG2,"FAAD: Successfully decoded frame (%ld Bytes)!\n",

14
x11/mplayer/patches/patch-libpostproc_Makefile
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-libpostproc_Makefile,v 1.1 2009/10/11 13:36:23 edd Exp $
--- libpostproc/Makefile.orig Mon Apr 7 14:16:31 2008
+++ libpostproc/Makefile Mon Jul 20 17:37:07 2009
@@ -8,3 +8,10 @@ HEADERS = postprocess.h
OBJS = postprocess.o
include $(SUBDIR)../subdir.mak
+
+ifdef ARCH_X86_32
+ifeq (,$(findstring -O,$(CFLAGS)))
+postprocess.o: CFLAGS += -O
+endif
+postprocess.o: CFLAGS += -fomit-frame-pointer
+endif

14
x11/mplayer/patches/patch-libswscale_Makefile
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-libswscale_Makefile,v 1.2 2010/05/26 21:29:56 jakemsr Exp $
--- libswscale/Makefile.orig Wed Jan 27 00:25:23 2010
+++ libswscale/Makefile Mon Mar 8 14:28:42 2010
@@ -21,3 +21,10 @@ TESTPROGS = colorspace swscale
DIRS = bfin mlib ppc sparc x86
include $(SUBDIR)../subdir.mak
+
+ifdef ARCH_X86_32
+ifeq (,$(findstring -O,$(CFLAGS)))
+x86/yuv2rgb_mmx.o: CFLAGS += -O
+endif
+x86/yuv2rgb_mmx.o: CFLAGS += -fomit-frame-pointer
+endif

12
x11/mplayer/patches/patch-libvo_x11_common_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-libvo_x11_common_c,v 1.4 2010/11/08 21:25:44 edd Exp $
--- libvo/x11_common.c.orig Sat Nov 6 05:50:16 2010
+++ libvo/x11_common.c Sat Nov 6 05:50:59 2010
@@ -735,7 +735,7 @@ void vo_x11_decoration(Display * vo_Display, Window w,
void vo_x11_classhint(Display * display, Window window, const char *name)
{
XClassHint wmClass;
- pid_t pid = getpid();
+ long pid = getpid();
wmClass.res_name = vo_winname ? vo_winname : name;
wmClass.res_class = "MPlayer";

12
x11/mplayer/patches/patch-mplayer_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mplayer_c,v 1.10 2010/11/08 21:25:44 edd Exp $
--- mplayer.c.orig Sun Oct 24 11:13:11 2010
+++ mplayer.c Sun Oct 24 11:13:29 2010
@@ -852,7 +852,7 @@ static void exit_sighandler(int x){
char spid[20];
snprintf(spid, sizeof(spid), "%i", getppid());
getch2_disable(); // allow terminal to work properly with gdb
- if (execlp("gdb", "gdb", prog_path, spid, "-ex", "bt", NULL) == -1)
+ if (execlp("gdb", "gdb", prog_path, spid, "-ex", "bt", (char *) NULL) == -1)
mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't start gdb\n");
} else if (gdb_pid < 0)
mp_msg(MSGT_CPLAYER, MSGL_ERR, "Couldn't fork\n");

10
x11/mplayer/patches/patch-stream_tvi_bsdbt848_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.3 2010/05/26 21:29:56 jakemsr Exp $
--- stream/tvi_bsdbt848.c.orig Sat Jan 30 14:26:47 2010
+++ stream/tvi_bsdbt848.c Wed May 19 15:25:37 2010
$OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.4 2010/11/08 21:25:44 edd Exp $
--- stream/tvi_bsdbt848.c.orig Mon Sep 13 19:09:29 2010
+++ stream/tvi_bsdbt848.c Sun Oct 24 10:40:01 2010
@@ -54,9 +54,10 @@
#include <signal.h>
#include <string.h>
@ -31,7 +31,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.3 2010/05/26 21:29:56 jakemsr Exp $
#include "libaf/af_format.h"
#include "libmpcodecs/img_format.h"
@@ -106,7 +111,13 @@ typedef struct {
@@ -106,7 +111,13 @@ typedef struct priv {
/* Audio */
char *dspdev;
int dspready;
@ -45,7 +45,7 @@ $OpenBSD: patch-stream_tvi_bsdbt848_c,v 1.3 2010/05/26 21:29:56 jakemsr Exp $
int dspsamplesize;
int dspstereo;
int dspspeed;
@@ -114,6 +125,9 @@ typedef struct {
@@ -114,6 +125,9 @@ typedef struct priv {
int dspframesize;
int dsprate;
long long dspbytesread;

16
x11/mplayer/patches/patch-unrar_exec_c Normal file
View File

@ -0,0 +1,16 @@
$OpenBSD: patch-unrar_exec_c,v 1.1 2010/11/08 21:25:44 edd Exp $
--- unrar_exec.c.orig Sun Oct 24 11:15:56 2010
+++ unrar_exec.c Sun Oct 24 11:16:11 2010
@@ -66,10 +66,10 @@ static FILE* launch_pipe(pid_t *apid, const char *exec
|| open("/dev/null", O_WRONLY) != 2)
_exit(EXIT_FAILURE);
if (action == UNRAR_LIST)
- execl(executable, executable, "v", archive, NULL);
+ execl(executable, executable, "v", archive, (char *) NULL);
else if (action == UNRAR_EXTRACT)
execl(executable, executable, "p", "-inul", "-p-",
- archive,filename,NULL);
+ archive,filename, (char *) NULL);
mp_msg(MSGT_GLOBAL, MSGL_ERR, "UnRAR: Cannot execute %s\n", executable);
_exit(EXIT_FAILURE);
}

1
x11/mplayer/pkg/MESSAGE
View File

@ -1 +0,0 @@
This package may need further setup. Please see ${PREFIX}/share/doc/mplayer/README.OpenBSD for some information regarding running MPlayer on OpenBSD.

15
x11/mplayer/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.26 2010/08/06 20:05:18 naddy Exp $
@comment $OpenBSD: PLIST,v 1.27 2010/11/08 21:25:44 edd Exp $
@pkgpath x11/mplayer,mad
@pkgpath x11/mplayer,mad,no_x11
@pkgpath x11/mplayer,sdl,mad
@ -8,13 +8,12 @@
@man man/man1/mplayer.1
share/doc/mplayer/
share/doc/mplayer/MPlayer.html
share/doc/mplayer/README.OpenBSD
share/doc/mplayer/aalib.html
share/doc/mplayer/advaudio-channels.html
share/doc/mplayer/advaudio-surround.html
share/doc/mplayer/advaudio-volume.html
share/doc/mplayer/advaudio.html
share/doc/mplayer/aspect.html
share/doc/mplayer/blinkenlights.html
share/doc/mplayer/bsd.html
share/doc/mplayer/bugreports.html
share/doc/mplayer/bugreports_advusers.html
@ -25,14 +24,12 @@ share/doc/mplayer/bugreports_security.html
share/doc/mplayer/bugreports_what.html
share/doc/mplayer/bugreports_where.html
share/doc/mplayer/caca.html
share/doc/mplayer/cd-dvd.html
share/doc/mplayer/codec-installation.html
share/doc/mplayer/commandline.html
share/doc/mplayer/control.html
share/doc/mplayer/dfbmga.html
share/doc/mplayer/dga.html
share/doc/mplayer/directfb.html
share/doc/mplayer/drives.html
share/doc/mplayer/dummy.html
share/doc/mplayer/dvd.html
share/doc/mplayer/edl.html
@ -68,14 +65,11 @@ share/doc/mplayer/menc-feat-xvid.html
share/doc/mplayer/mencoder.html
share/doc/mplayer/mga_vid.html
share/doc/mplayer/mpeg_decoders.html
share/doc/mplayer/mtrr.html
share/doc/mplayer/networksync.html
share/doc/mplayer/opengl.html
share/doc/mplayer/other.html
share/doc/mplayer/ports.html
share/doc/mplayer/radio-input.html
share/doc/mplayer/radio.html
share/doc/mplayer/rtc.html
share/doc/mplayer/sdl.html
share/doc/mplayer/skin-file.html
share/doc/mplayer/skin-fonts.html
share/doc/mplayer/skin-gui.html
@ -90,7 +84,6 @@ share/doc/mplayer/tdfx_vid.html
share/doc/mplayer/tdfxfb.html
share/doc/mplayer/tv-input.html
share/doc/mplayer/tv-teletext.html
share/doc/mplayer/tv.html
share/doc/mplayer/tvout.html
share/doc/mplayer/unix.html
share/doc/mplayer/usage.html
@ -101,6 +94,8 @@ share/doc/mplayer/vidix.html
share/doc/mplayer/windows.html
share/doc/mplayer/x11.html
share/doc/mplayer/xv.html
share/doc/mplayer/zr.html
share/doc/pkg-readmes/${FULLPKGNAME}
share/examples/mplayer/
@sample ${CONFDIR}/
share/examples/mplayer/codecs.conf

8
x11/mplayer/files/README.OpenBSD → x11/mplayer/pkg/README
View File

@ -1,9 +1,14 @@
$OpenBSD: README,v 1.1 2010/11/08 21:25:44 edd Exp $
Possible issues with using MPlayer on OpenBSD:
all arches:
The GUI is deprecated so we stripped it from the build. You can use
x11/gnome-mplayer or x11/smplayer instead.
Mencoder is not expected to do a good job of multiplexing into container
formats other than AVI or MPEG.
i386:
win32 codecs were disabled in OpenBSD's build, as the open-source codecs
are now of decent quality.
@ -14,7 +19,4 @@ arm:
video you are playing you may want to pass the -framedrop or the
-hardframedrop option to mplayer.
In order to improve vorbis performance on ARM, try using the tremor codec.
This can be achieved using '-ac tremor'.
See the package description for a list of FLAVORs and their meaning.