From 3bd6c01d94dd0906ec49f2b6dfa2adde9d336dcf Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Sun, 15 Apr 2018 08:23:54 +0000 Subject: [PATCH] Update to upstream snapshot as of 20180413 Details: - Update to recent upstream snapshot (20180413) - Drop SCHROEDINGER OPTION (removed upstream) - Remove --disable-libdirac-lavc from CONFIGURE_ARGS (removed upstream) --- multimedia/mencoder/Makefile | 3 +-- multimedia/mencoder/distinfo | 6 +++--- multimedia/mplayer/Makefile | 4 +--- multimedia/mplayer/Makefile.common | 3 +-- multimedia/mplayer/Makefile.optvars | 3 --- multimedia/mplayer/distinfo | 6 +++--- 6 files changed, 9 insertions(+), 16 deletions(-) diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile index 4e047bea494f..025ef56e2e16 100644 --- a/multimedia/mencoder/Makefile +++ b/multimedia/mencoder/Makefile @@ -3,7 +3,6 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 2 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org @@ -14,7 +13,7 @@ COMMENT= Convenient video file and movie encoder OPTIONS_DEFINE= AMR_NB AMR_WB ASS BLURAY CDIO DEBUG DV DVDNAV FAAC FONTCONFIG \ FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \ MAD NAS OPENAL OPENJPEG OPUS PULSEAUDIO \ - RTMP SCHROEDINGER SMB SPEEX THEORA TWOLAME V4L VPX \ + RTMP SMB SPEEX THEORA TWOLAME V4L VPX \ X264 XVID OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG GIF GNUTLS X264 XVID diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo index 8ec47e49d988..463a7eaa8bef 100644 --- a/multimedia/mencoder/distinfo +++ b/multimedia/mencoder/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513858159 -SHA256 (mplayer-1.3.0.20171220.tar.xz) = be8862b17bfdcb657661853ac1c2b728c7538bbb915658e14c6a5daa28d0ad6c -SIZE (mplayer-1.3.0.20171220.tar.xz) = 5170604 +TIMESTAMP = 1523776583 +SHA256 (mplayer-1.3.0.20180413.tar.xz) = 542c33d66976e603408b45054c82f8a6ee21d95eee901b941e71bc4261c954a2 +SIZE (mplayer-1.3.0.20180413.tar.xz) = 5184616 diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile index fb82ba2b1135..9aa2b1f97b0a 100644 --- a/multimedia/mplayer/Makefile +++ b/multimedia/mplayer/Makefile @@ -3,7 +3,6 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} -PORTREVISION= 4 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org @@ -15,7 +14,7 @@ OPTIONS_DEFINE= AALIB AMR_NB AMR_WB ASS BLURAY CACA CDIO DEBUG DV DVDNAV \ ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \ LADSPA LIBMNG LIRC LZO NAS OPENAL OPENGL \ OPENJPEG OPUS PULSEAUDIO RTC RTMP \ - SCHROEDINGER SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \ + SDL SKINS SNDIO SMB SPEEX SVGALIB V4L VDPAU VPX \ X11 X11DGA X11VM XINERAMA XVIDEO XVMC OPTIONS_DEFAULT=ASS DVDNAV FONTCONFIG FRIBIDI GNUTLS OPENGL \ @@ -60,7 +59,6 @@ CONFIGURE_ARGS+= --disable-arts \ --disable-twolame \ --disable-x264 \ --disable-xvid \ - --disable-libdirac-lavc \ --disable-mencoder \ --disable-mpg123 \ --disable-musepack \ diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common index 72004a078278..7422d82d0184 100644 --- a/multimedia/mplayer/Makefile.common +++ b/multimedia/mplayer/Makefile.common @@ -5,7 +5,7 @@ # $FreeBSD$ MPLAYER_PORT_VERSION= 1.3.0 -MPLAYER_SNAPSHOT_DATE= 2017-12-20 +MPLAYER_SNAPSHOT_DATE= 2018-04-13 MASTER_SITES= LOCAL/riggs/mplayer DISTNAME= mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} WRKSRC= ${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE} @@ -38,7 +38,6 @@ CONFIGURE_ARGS= --cc="${CC}" \ --disable-ggiwmh \ --disable-liba52 \ --disable-libbs2b \ - --disable-libdirac-lavc \ --disable-libilbc \ --disable-libnut \ --disable-libvorbis \ diff --git a/multimedia/mplayer/Makefile.optvars b/multimedia/mplayer/Makefile.optvars index 76bff7a8f958..68a69bb82dfb 100644 --- a/multimedia/mplayer/Makefile.optvars +++ b/multimedia/mplayer/Makefile.optvars @@ -103,9 +103,6 @@ RTCPU_CONFIGURE_ON= --enable-runtime-cpudetection RTMP_LIB_DEPENDS= librtmp.so:multimedia/librtmp RTMP_CONFIGURE_OFF= --disable-librtmp -SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger -SCHROEDINGER_CONFIGURE_OFF= --disable-libschroedinger-lavc - SDL_USE= SDL=sdl SDL_LIB_DEPENDS= libaa.so:graphics/aalib SDL_CONFIGURE_OFF= --disable-sdl diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo index 5b007e64b03f..f66f4071c065 100644 --- a/multimedia/mplayer/distinfo +++ b/multimedia/mplayer/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1513852581 -SHA256 (mplayer-1.3.0.20171220.tar.xz) = be8862b17bfdcb657661853ac1c2b728c7538bbb915658e14c6a5daa28d0ad6c -SIZE (mplayer-1.3.0.20171220.tar.xz) = 5170604 +TIMESTAMP = 1523710560 +SHA256 (mplayer-1.3.0.20180413.tar.xz) = 542c33d66976e603408b45054c82f8a6ee21d95eee901b941e71bc4261c954a2 +SIZE (mplayer-1.3.0.20180413.tar.xz) = 5184616