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

Update to mplayer 20190520.

Browse Source 
from Brad (maintainer)
This commit is contained in:
ajacoutot 2019-05-23 08:52:16 +00:00
parent a7d407f1cb
commit d390afa349
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/mplayer/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.298 2019/04/02 18:42:11 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.299 2019/05/23 08:52:16 ajacoutot Exp $
COMMENT= movie player supporting many formats
V= 20190330
V= 20190520
FFMPEG_V= 4.1.3
DISTNAME= mplayer-${V}
REVISION= 0

4
x11/mplayer/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (mplayer-20190330.tar.xz) = GLiXDzUVOT08jkEyjS8Su4TMtbMQAzAHDv1mxHHoUOU=
SIZE (mplayer-20190330.tar.xz) = 5162516
SHA256 (mplayer-20190520.tar.xz) = /O5MGaK3xJhooUva7r3K+zs4Uo0NzsFpPL185p7GTaw=
SIZE (mplayer-20190520.tar.xz) = 5165756

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

@ -1,4 +1,4 @@
$OpenBSD: patch-configure,v 1.85 2019/03/30 17:17:54 ajacoutot Exp $
$OpenBSD: patch-configure,v 1.86 2019/05/23 08:52:16 ajacoutot Exp $
Index: configure
--- configure.orig
@ -19,7 +19,7 @@ Index: configure
+#fi
+#
+#FFBRANCH=master
+#test -e FFBRANCH && FFBRANCH=$(cat FFMPEG_BRANCH)
+#test -e FFBRANCH && FFBRANCH=$(cat FFBRANCH)
+#
+#if test -e ffmpeg/mp_auto_pull ; then
+# echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
@ -46,7 +46,7 @@ Index: configure
+#fi
-FFBRANCH=master
-test -e FFBRANCH && FFBRANCH=$(cat FFMPEG_BRANCH)
-test -e FFBRANCH && FFBRANCH=$(cat FFBRANCH)
-
-if test -e ffmpeg/mp_auto_pull ; then
- echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
@ -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')
@@ -4331,8 +4331,8 @@ echores "$gettimeofday"
@@ -4339,8 +4339,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"
@@ -6343,7 +6343,7 @@ echocheck "cdparanoia"
@@ -6351,7 +6351,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
@@ -8183,6 +8183,7 @@ extra_ldflags="$extra_ldflags $libm"
@@ -8191,6 +8191,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 \
@@ -8210,6 +8211,7 @@ fi
@@ -8218,6 +8219,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 \
@@ -8235,6 +8237,7 @@ fi
@@ -8243,6 +8245,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 \
@@ -8288,6 +8291,7 @@ EOF
@@ -8296,6 +8299,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 \
@@ -9442,9 +9446,6 @@ cmp -s "$TMPH" config.h || mv -f "$TMPH" config.h
@@ -9450,9 +9454,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 */
@@ -9536,8 +9537,6 @@ print_enabled_components libavformat/demuxer_list.c AV
@@ -9544,8 +9545,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