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

Update to mplayer-20191224.

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2019-12-25 15:52:25 +00:00
parent 442df69140
commit 93265ac5f3
6 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/mplayer/Makefile
View File

@ -1,11 +1,10 @@
# $OpenBSD: Makefile,v 1.303 2019/09/08 10:08:59 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.304 2019/12/25 15:52:25 ajacoutot Exp $
COMMENT= movie player supporting many formats
V= 20190817
V= 20191224
FFMPEG_V= 4.2.1
DISTNAME= mplayer-${V}
REVISION= 0
CATEGORIES= x11 multimedia
MASTER_SITES= https://comstyle.com/source/
EXTRACT_SUFX= .tar.xz

4
x11/mplayer/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mplayer-20190817.tar.xz) = 340Gek0SZ2ptY1Pbeh4ku6f45Q6j92ZHSiVXBk6OwyI=
SIZE (mplayer-20190817.tar.xz) = 5167224
SHA256 (mplayer-20191224.tar.xz) = TnJ7ZIPcUocPq4+VCRWTV4bdmzpgfzesr0AH4qIXR2E=
SIZE (mplayer-20191224.tar.xz) = 5163244

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

@ -1,4 +1,4 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.18 2019/03/30 17:17:54 ajacoutot Exp $
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.19 2019/12/25 15:52:25 ajacoutot Exp $
Index: DOCS/man/en/mplayer.1
--- DOCS/man/en/mplayer.1.orig
@ -12,7 +12,7 @@ Index: DOCS/man/en/mplayer.1
.
.TP
.B \-channels <number> (also see \-af channels)
@@ -12283,7 +12283,7 @@ mplayer dvd://1 \-dvdangle 2
@@ -12263,7 +12263,7 @@ mplayer dvd://1 \-dvdangle 2
.PP
.B Play from a different DVD device:
.nf
@ -21,7 +21,7 @@ Index: DOCS/man/en/mplayer.1
.fi
.
.PP
@@ -12349,11 +12349,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
@@ -12329,11 +12329,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
.PP
.B Play DTS-CD with passthrough:
.nf

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

@ -1,4 +1,4 @@
$OpenBSD: patch-Makefile,v 1.32 2019/03/30 17:17:54 ajacoutot Exp $
$OpenBSD: patch-Makefile,v 1.33 2019/12/25 15:52:25 ajacoutot Exp $
Index: Makefile
--- Makefile.orig
@ -11,7 +11,7 @@ Index: Makefile
SRCS_COMMON-$(AUDIO_INPUT) += $(SRCS_AUDIO_INPUT-yes)
SRCS_COMMON-$(BITMAP_FONT) += sub/font_load.c
SRCS_COMMON-$(CDDA) += stream/stream_cdda.c \
@@ -612,7 +613,8 @@ SRCS_MPLAYER = command.c \
@@ -611,7 +612,8 @@ SRCS_MPLAYER = command.c \
libvo/vo_mpegpes.c \
libvo/vo_null.c \
sub/spuenc.c \

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

@ -1,9 +1,9 @@
$OpenBSD: patch-configure,v 1.86 2019/05/23 08:52:16 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.87 2019/12/25 15:52:25 ajacoutot Exp $
Index: configure
--- configure.orig
+++ configure
@@ -1498,39 +1498,39 @@ echo configuration: $configuration > "$TMPLOG"
@@ -1501,39 +1501,39 @@ echo configuration: $configuration > "$TMPLOG"
echo >> "$TMPLOG"
@ -75,7 +75,7 @@ Index: configure
list_subparts() {
test ! -e ffmpeg/libav${3} && return 1
pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
@@ -2432,7 +2432,7 @@ case "$host_arch" in
@@ -2438,7 +2438,7 @@ case "$host_arch" in
arch='sparc'
iproc='sparc'
if test "$host_arch" = "sparc64" ; then
@ -84,7 +84,7 @@ Index: configure
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
@@ -2801,7 +2801,7 @@ cat > $TMPC << EOF
@@ -2807,7 +2807,7 @@ cat > $TMPC << EOF
int ff_extern;
EOF
cc_check -c || die "Symbol mangling check failed."
@ -93,7 +93,7 @@ Index: configure
extern_prefix=${sym%%ff_extern*}
def_extern_asm="#define EXTERN_ASM $extern_prefix"
def_extern_prefix="#define EXTERN_PREFIX \"$extern_prefix\""
@@ -2861,7 +2861,7 @@ else
@@ -2867,7 +2867,7 @@ else
fi
CFLAGS="-D_ISOC99_SOURCE -I. -Iffmpeg $CFLAGS"
@ -102,7 +102,7 @@ Index: configure
# On glibc, add some more CPPFLAGS for enabling required functionality.
cpp_condition_check features.h "defined __GLIBC__" &&
@@ -2942,7 +2942,7 @@ elif test $relocatable = "yes" ; then
@@ -2948,7 +2948,7 @@ elif test $relocatable = "yes" ; then
fi
echores $relocatable
@ -111,7 +111,7 @@ Index: configure
# 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')
@@ -4339,8 +4339,8 @@ echores "$gettimeofday"
@@ -4375,8 +4375,8 @@ echores "$gettimeofday"
echocheck "clock_gettime()"
clock_gettime=no
def_clock_gettime='#undef HAVE_CLOCK_GETTIME'
@ -122,7 +122,7 @@ Index: configure
echores "$clock_gettime"
@@ -6351,7 +6351,7 @@ echocheck "cdparanoia"
@@ -6358,7 +6358,7 @@ echocheck "cdparanoia"
if test "$_cdparanoia" = auto ; then
_cdparanoia=no
for inc_tmp in "" "-I/usr/include/cdda" "-I/usr/local/include/cdda" ; do
@ -131,7 +131,7 @@ Index: configure
_cdparanoia=yes && extra_cflags="$extra_cflags $inc_tmp" && break
done
fi
@@ -8191,6 +8191,7 @@ extra_ldflags="$extra_ldflags $libm"
@@ -8198,6 +8198,7 @@ extra_ldflags="$extra_ldflags $libm"
# XML documentation tests
echocheck "XML catalogs"
for try_catalog in \
@ -139,7 +139,7 @@ Index: configure
/etc/sgml/catalog \
/usr/share/xml/docbook/*/catalog.xml \
/opt/local/share/xml/docbook-xml/*/catalog.xml \
@@ -8218,6 +8219,7 @@ fi
@@ -8225,6 +8226,7 @@ fi
echocheck "XML chunked stylesheet"
for try_chunk_xsl in \
@ -147,7 +147,7 @@ Index: configure
/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 \
@@ -8243,6 +8245,7 @@ fi
@@ -8250,6 +8252,7 @@ fi
echocheck "XML monolithic stylesheet"
for try_docbook_xsl in \
@ -155,7 +155,7 @@ Index: configure
/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 \
@@ -8296,6 +8299,7 @@ EOF
@@ -8303,6 +8306,7 @@ EOF
echocheck "XML DTD"
#FIXME: This should prefer higher version numbers, not the other way around ..
for try_dtd in \
@ -163,7 +163,7 @@ Index: configure
/usr/share/xml/docbook/*/dtd/4*/docbookx.dtd \
/usr/share/xml/docbook/*/docbookx.dtd \
/usr/share/sgml/docbook/*/docbookx.dtd \
@@ -9450,9 +9454,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
@@ -9460,9 +9464,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
############################################################################
@ -173,7 +173,7 @@ Index: configure
# Create avconfig.h for FFmpeg.
cat > "$TMPH" << EOF
/* Generated by mpconfigure */
@@ -9544,8 +9545,6 @@ print_enabled_components libavformat/demuxer_list.c AV
@@ -9554,8 +9555,6 @@ print_enabled_components libavformat/demuxer_list.c AV
print_enabled_components libavformat/muxer_list.c AVOutputFormat muxer_list $libavmuxers
print_enabled_components libavformat/protocol_list.c URLProtocol url_protocols $libavprotocols
print_enabled_filters libavfilter/filter_list.c AVFilter filter_list $libavfilters

6
x11/mplayer/patches/patch-libao2_audio_out_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-libao2_audio_out_c,v 1.7 2019/03/30 17:17:54 ajacoutot Exp $
$OpenBSD: patch-libao2_audio_out_c,v 1.8 2019/12/25 15:52:25 ajacoutot Exp $
Index: libao2/audio_out.c
--- libao2/audio_out.c.orig
+++ libao2/audio_out.c
@@ -55,6 +55,7 @@ extern const ao_functions_t audio_out_v4l2;
@@ -54,6 +54,7 @@ extern const ao_functions_t audio_out_v4l2;
extern const ao_functions_t audio_out_mpegpes;
extern const ao_functions_t audio_out_pcm;
extern const ao_functions_t audio_out_pss;
@ -11,7 +11,7 @@ Index: libao2/audio_out.c
const ao_functions_t* const audio_out_drivers[] =
{
@@ -124,6 +125,7 @@ const ao_functions_t* const audio_out_drivers[] =
@@ -120,6 +121,7 @@ const ao_functions_t* const audio_out_drivers[] =
&audio_out_null,
// should not be auto-selected:
&audio_out_pcm,