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

Update to MPlayer 20141103 snapshot.

Browse Source 
ok sthen@
This commit is contained in:
brad 2014-11-14 06:18:42 +00:00
parent 565c6a3073
commit 63f29034d6
5 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/mplayer/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.242 2014/10/19 23:14:24 brad Exp $
# $OpenBSD: Makefile,v 1.243 2014/11/14 06:18:42 brad Exp $
SHARED_ONLY= Yes
@ -7,7 +7,7 @@ ONLY_FOR_ARCHS = ${GCC4_ARCHS}
COMMENT = movie player supporting many formats
V = 20140824
V = 20141103
FFMPEG_V = 20141010
SUBST_VARS += PREFIX CONFDIR
@ -15,7 +15,6 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N = mplayer
DISTNAME = mplayer-${V}
REVISION = 0
EXTRACT_SUFX = .tar.xz
CATEGORIES = x11 multimedia
@ -26,9 +25,9 @@ HOMEPAGE = http://www.mplayerhq.hu/
PERMIT_PACKAGE_CDROM = patents
PERMIT_PACKAGE_FTP = Yes
WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
WANTLIB = EGL GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
crypto dv dvdnav dvdread enca fontconfig freetype \
fribidi jpeg m mng mp3lame ncurses png postproc pthread \
SDL sndio stdc++ swscale gif util x264>=5 xvidcore z
@ -112,8 +111,6 @@ CONFIGURE_ARGS += --disable-alsa \
--disable-select \
--disable-libcdio \
--disable-libmpeg2-internal \
--disable-dvdread-internal \
--disable-libdvdcss-internal \
--disable-gui \
--disable-ffmpeg_a # link FFmpeg .so (graphics/ffmpeg)

4
x11/mplayer/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mplayer-20140824.tar.xz) = 45dPJ+Yy2FFI2ORJNFDt733EsdztgYUK2CIO7DaJFGg=
SIZE (mplayer-20140824.tar.xz) = 5268352
SHA256 (mplayer-20141103.tar.xz) = /qn2DuxpWV1ZKtvnet6cvU7SBSbw0L8Lt+Irx2jvHAg=
SIZE (mplayer-20141103.tar.xz) = 5147172

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

@ -1,6 +1,6 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.11 2014/09/03 06:43:28 brad Exp $
--- DOCS/man/en/mplayer.1.orig Thu Aug 14 04:26:57 2014
+++ DOCS/man/en/mplayer.1 Thu Aug 14 04:32:10 2014
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.12 2014/11/14 06:18:42 brad Exp $
--- DOCS/man/en/mplayer.1.orig Mon Nov 3 01:29:02 2014
+++ DOCS/man/en/mplayer.1 Mon Nov 3 01:34:51 2014
@@ -1546,7 +1546,7 @@ May be negative.
.
.TP
@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.11 2014/09/03 06:43:28 brad Exp $
.
.TP
.B \-channels <number> (also see \-af channels)
@@ -12315,11 +12315,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
@@ -12318,11 +12318,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
.PP
.B Play DTS-CD with passthrough:
.nf

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.28 2014/01/10 21:52:29 brad Exp $
--- Makefile.orig Mon Jan 6 17:02:58 2014
+++ Makefile Mon Jan 6 17:22:43 2014
$OpenBSD: patch-Makefile,v 1.29 2014/11/14 06:18:42 brad Exp $
--- Makefile.orig Mon Nov 3 01:28:57 2014
+++ Makefile Mon Nov 3 01:34:51 2014
@@ -35,6 +35,7 @@ OS_FEATURE-$(VSSCANF) += osdep/vsscanf.
# conditional source declarations
SRCS_AUDIO_INPUT-$(ALSA) += stream/ai_alsa.c
@ -9,7 +9,7 @@ $OpenBSD: patch-Makefile,v 1.28 2014/01/10 21:52:29 brad Exp $
SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c
SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \
@@ -639,7 +640,8 @@ SRCS_MPLAYER = command.c \
@@ -615,7 +616,8 @@ SRCS_MPLAYER = command.c \
libvo/vo_mpegpes.c \
libvo/vo_null.c \
sub/spuenc.c \

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

@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.75 2014/09/03 06:43:28 brad Exp $
--- configure.orig Sun Aug 24 20:39:15 2014
+++ configure Sun Aug 24 20:52:56 2014
@@ -1513,39 +1513,39 @@ echo configuration: $configuration > "$TMPLOG"
$OpenBSD: patch-configure,v 1.76 2014/11/14 06:18:42 brad Exp $
--- configure.orig Mon Nov 3 01:29:00 2014
+++ configure Mon Nov 3 01:34:51 2014
@@ -1498,39 +1498,39 @@ echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"
@ -73,7 +73,7 @@ $OpenBSD: patch-configure,v 1.75 2014/09/03 06:43:28 brad Exp $
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
@@ -2400,7 +2400,7 @@ case "$host_arch" in
@@ -2392,7 +2392,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
@ -82,7 +82,7 @@ $OpenBSD: patch-configure,v 1.75 2014/09/03 06:43:28 brad Exp $
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
@@ -2736,7 +2736,7 @@ cat > $TMPC << EOF
@@ -2735,7 +2735,7 @@ cat > $TMPC << EOF
int ff_extern;
EOF
cc_check -c || die "Symbol mangling check failed."
@ -91,7 +91,7 @@ $OpenBSD: patch-configure,v 1.75 2014/09/03 06:43:28 brad Exp $
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
@@ -2864,7 +2864,7 @@ elif test $relocatable = "yes" ; then
@@ -2863,7 +2863,7 @@ elif test $relocatable = "yes" ; then
fi
echores $relocatable
@ -100,7 +100,7 @@ $OpenBSD: patch-configure,v 1.75 2014/09/03 06:43:28 brad Exp $
# Checking assembler (_as) compatibility...
# Added workaround for older as that reads from stdin by default - atmos
as_version=$(echo '' | $_as -version 2>&1 | sed -n 's/^.*assembler \(version \)*\([0-9.]*\).*$/\2/p')
@@ -6213,7 +6213,7 @@ echocheck "cdparanoia"
@@ -6165,7 +6165,7 @@ echocheck "cdparanoia"
if test "$_cdparanoia" = auto ; then
_cdparanoia=no
for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
@ -109,7 +109,7 @@ $OpenBSD: patch-configure,v 1.75 2014/09/03 06:43:28 brad Exp $
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
done
fi
@@ -8169,6 +8169,7 @@ extra_ldflags="$extra_ldflags $libm"
@@ -8071,6 +8071,7 @@ extra_ldflags="$extra_ldflags $libm"
# XML documentation tests
echocheck "XML catalogs"
for try_catalog in \
@ -117,7 +117,7 @@ $OpenBSD: patch-configure,v 1.75 2014/09/03 06:43:28 brad Exp $
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
@@ -8196,6 +8197,7 @@ fi
@@ -8098,6 +8099,7 @@ fi
echocheck "XML chunked stylesheet"
for try_chunk_xsl in \
@ -125,7 +125,7 @@ $OpenBSD: patch-configure,v 1.75 2014/09/03 06:43:28 brad Exp $
/usr/share/xml/docbook/*/html/chunk.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/chunk.xsl \
@@ -8221,6 +8223,7 @@ fi
@@ -8123,6 +8125,7 @@ fi
echocheck "XML monolithic stylesheet"
for try_docbook_xsl in \
@ -133,7 +133,7 @@ $OpenBSD: patch-configure,v 1.75 2014/09/03 06:43:28 brad Exp $
/usr/share/xml/docbook/*/html/docbook.xsl \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/docbook.xsl \
/usr/share/sgml/docbook/yelp/docbook/html/docbook.xsl \
@@ -8274,6 +8277,7 @@ EOF
@@ -8176,6 +8179,7 @@ EOF
echocheck "XML DTD"
#FIXME: This should prefer higher version numbers, not the other way around ..
for try_dtd in \