From owner-svn-ports-all@freebsd.org Sat Dec 19 20:22:04 2015 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6BA34A4C70D; Sat, 19 Dec 2015 20:22:04 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 3E87A1E8A; Sat, 19 Dec 2015 20:22:04 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBJKM3AU040052; Sat, 19 Dec 2015 20:22:03 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBJKM25C040044; Sat, 19 Dec 2015 20:22:02 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201512192022.tBJKM25C040044@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 19 Dec 2015 20:22:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r404026 - in head/multimedia: mencoder mplayer mplayer/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Dec 2015 20:22:04 -0000 Author: riggs Date: Sat Dec 19 20:22:02 2015 New Revision: 404026 URL: https://svnweb.freebsd.org/changeset/ports/404026 Log: Update to mplayer snapshot as of 20151219 Added: head/multimedia/mplayer/files/patch-stream_stream__vcd.c (contents, props changed) Deleted: head/multimedia/mplayer/files/patch-gui_wm_ws.c Modified: head/multimedia/mencoder/Makefile head/multimedia/mencoder/distinfo head/multimedia/mplayer/Makefile head/multimedia/mplayer/Makefile.common head/multimedia/mplayer/distinfo head/multimedia/mplayer/files/patch-Makefile head/multimedia/mplayer/files/patch-configure Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Sat Dec 19 18:19:11 2015 (r404025) +++ head/multimedia/mencoder/Makefile Sat Dec 19 20:22:02 2015 (r404026) @@ -3,7 +3,6 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 6 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org @@ -109,7 +108,8 @@ post-patch: -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ -e 's|[[:space:]]gcc| ${CC}|' \ -e 's|\$$\(CC\)|${CC}|' \ - -e 's|/usr/X11R6|${LOCALBASE}|' + -e 's|/usr/X11R6|${LOCALBASE}|' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|' @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \ s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \ Modified: head/multimedia/mencoder/distinfo ============================================================================== --- head/multimedia/mencoder/distinfo Sat Dec 19 18:19:11 2015 (r404025) +++ head/multimedia/mencoder/distinfo Sat Dec 19 20:22:02 2015 (r404026) @@ -1,4 +1,4 @@ SHA256 (ffmpeg-2.8.3.tar.bz2) = 1bcf993a71839bb4a37eaa0c51daf315932b6dad6089f672294545cc51a5caf6 SIZE (ffmpeg-2.8.3.tar.bz2) = 8576798 -SHA256 (mplayer-1.1.20150822.tar.xz) = a01e31b8a54f61d37bdeddd5c3514956c1c6366b65e3e67c25c828c47c98d9f7 -SIZE (mplayer-1.1.20150822.tar.xz) = 5162400 +SHA256 (mplayer-1.2.20151219.tar.xz) = f11d1100a1c37ec9e3e19c7698baf77871ae305ae431ec4a3dc187ca9316e4a2 +SIZE (mplayer-1.2.20151219.tar.xz) = 5167716 Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Sat Dec 19 18:19:11 2015 (r404025) +++ head/multimedia/mplayer/Makefile Sat Dec 19 20:22:02 2015 (r404026) @@ -3,7 +3,6 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 8 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org @@ -151,7 +150,8 @@ post-patch: -e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \ -e 's|[[:space:]]gcc| ${CC}|' \ -e 's|\$$\(CC\)|${CC}|' \ - -e 's|/usr/X11R6|${LOCALBASE}|' + -e 's|/usr/X11R6|${LOCALBASE}|' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|' @${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \ 's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \ s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \ Modified: head/multimedia/mplayer/Makefile.common ============================================================================== --- head/multimedia/mplayer/Makefile.common Sat Dec 19 18:19:11 2015 (r404025) +++ head/multimedia/mplayer/Makefile.common Sat Dec 19 20:22:02 2015 (r404026) @@ -4,8 +4,8 @@ # # $FreeBSD$ -MPLAYER_SNAPSHOT_DATE= 2015-08-22 -MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g} +MPLAYER_SNAPSHOT_DATE= 2015-12-19 +MPLAYER_PORT_VERSION= 1.2.r${MPLAYER_SNAPSHOT_DATE:S/-//g} FFMPEG_VERSION= 2.8.3 MASTER_SITES= LOCAL/riggs/mplayer:local \ http://ffmpeg.org/releases/:ffmpeg Modified: head/multimedia/mplayer/distinfo ============================================================================== --- head/multimedia/mplayer/distinfo Sat Dec 19 18:19:11 2015 (r404025) +++ head/multimedia/mplayer/distinfo Sat Dec 19 20:22:02 2015 (r404026) @@ -1,4 +1,4 @@ SHA256 (ffmpeg-2.8.3.tar.bz2) = 1bcf993a71839bb4a37eaa0c51daf315932b6dad6089f672294545cc51a5caf6 SIZE (ffmpeg-2.8.3.tar.bz2) = 8576798 -SHA256 (mplayer-1.1.20150822.tar.xz) = a01e31b8a54f61d37bdeddd5c3514956c1c6366b65e3e67c25c828c47c98d9f7 -SIZE (mplayer-1.1.20150822.tar.xz) = 5162400 +SHA256 (mplayer-1.2.20151219.tar.xz) = f11d1100a1c37ec9e3e19c7698baf77871ae305ae431ec4a3dc187ca9316e4a2 +SIZE (mplayer-1.2.20151219.tar.xz) = 5167716 Modified: head/multimedia/mplayer/files/patch-Makefile ============================================================================== --- head/multimedia/mplayer/files/patch-Makefile Sat Dec 19 18:19:11 2015 (r404025) +++ head/multimedia/mplayer/files/patch-Makefile Sat Dec 19 20:22:02 2015 (r404026) @@ -1,5 +1,14 @@ --- Makefile.orig 2015-06-03 11:58:05 UTC +++ Makefile +@@ -752,7 +752,7 @@ mencoder$(EXESUF) mplayer$(EXESUF): + codec-cfg-test$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DTESTING + codec-cfg$(EXESUF) codecs2html$(EXESUF): HOSTCFLAGS := $(HOSTCFLAGS) -DCODECS2HTML + codec-cfg$(EXESUF) codec-cfg-test$(EXESUF) codecs2html$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h +- $(HOST_CC) $(HOSTCFLAGS) -o $@ $< ++ $(HOST_CC) $(HOSTCFLAGS) -I%%LOCALBASE%%/include -o $@ $< + + codecs.conf.h: codec-cfg$(EXESUF) etc/codecs.conf + ./$^ > $@ @@ -855,20 +855,17 @@ $(VIDIX_OBJS): $(VIDIX_PCI_FILES) install: $(INSTALL_TARGETS-yes) Modified: head/multimedia/mplayer/files/patch-configure ============================================================================== --- head/multimedia/mplayer/files/patch-configure Sat Dec 19 18:19:11 2015 (r404025) +++ head/multimedia/mplayer/files/patch-configure Sat Dec 19 20:22:02 2015 (r404026) @@ -1,4 +1,4 @@ ---- configure.orig 2015-08-02 17:29:05 UTC +--- configure.orig 2015-12-18 14:53:21 UTC +++ configure @@ -646,7 +646,7 @@ armthumb=auto _iwmmxt=auto @@ -48,7 +48,7 @@ if test -z "$_target" ; then cat > $TMPC << EOF -@@ -3170,6 +3173,13 @@ if arm ; then +@@ -3194,6 +3197,13 @@ if arm ; then fi echores "$setend" @@ -62,7 +62,7 @@ echocheck "softfloat ABI" softfloat=yes cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no -@@ -3920,7 +3930,7 @@ echocheck "pthread" +@@ -3944,7 +3954,7 @@ echocheck "pthread" if linux ; then THREAD_CFLAGS=-D_REENTRANT elif freebsd || netbsd || openbsd || bsdos ; then @@ -71,7 +71,7 @@ fi if test "$_pthreads" = auto ; then cat > $TMPC << EOF -@@ -3930,7 +3940,7 @@ int main(void) { pthread_t tid; return p +@@ -3954,7 +3964,7 @@ int main(void) { pthread_t tid; return p EOF _pthreads=no if ! hpux ; then @@ -80,16 +80,16 @@ # 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 -@@ -4082,7 +4092,7 @@ EOF - # NOTE: -L/usr/lib is a hack to avoid issues due to a - # broken libiconv that e.g. macports installs into /opt/local/lib - # which might get addded to the search path later by e.g. SDL -- for ld_tmp in "" "-L/usr/lib -liconv" "-liconv" "-liconv $ld_dl" ; do +@@ -4103,7 +4113,7 @@ int main(void) { + } + EOF + _iconv=no +- for ld_tmp in "" "-liconv" "-liconv $ld_dl" ; do + for ld_tmp in "" "-L$_prefix/lib -liconv" "-L%%LOCALBASE%%/lib -liconv" "-liconv" "-liconv $ld_dl" ; do cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" && ld_iconv="$ld_tmp" && _iconv=yes && break done -@@ -5484,15 +5494,6 @@ EOF +@@ -5505,15 +5515,6 @@ EOF break fi done @@ -105,7 +105,7 @@ if win32 && cc_check -DGL_WIN32 -lopengl32 ; then _gl=yes _gl_win32=yes -@@ -6056,7 +6057,7 @@ elif darwin ; then +@@ -6077,7 +6078,7 @@ elif darwin ; then elif dragonfly ; then default_cdrom_device="/dev/cd0" elif freebsd ; then @@ -114,7 +114,7 @@ elif openbsd ; then default_cdrom_device="/dev/rcd0c" elif sunos ; then -@@ -6069,7 +6070,7 @@ else +@@ -6090,7 +6091,7 @@ else default_cdrom_device="/dev/cdrom" fi @@ -123,7 +123,7 @@ default_dvd_device=$default_cdrom_device elif darwin ; then default_dvd_device="/dev/rdiskN" -@@ -6586,7 +6587,7 @@ echores "$_speex" +@@ -6607,7 +6608,7 @@ echores "$_speex" echocheck "libgsm" if test "$_libgsm" = auto ; then _libgsm=no @@ -132,7 +132,7 @@ fi if test "$_libgsm" = yes ; then def_libgsm='#define CONFIG_LIBGSM 1' -@@ -7071,6 +7072,16 @@ if test "$_librtmp" = yes && test "$netw +@@ -7092,6 +7093,16 @@ if test "$_librtmp" = yes && test "$netw nolibrtmp=no def_librtmp='#define CONFIG_LIBRTMP 1' inputmodules="librtmp $inputmodules" @@ -149,7 +149,7 @@ else nolibrtmp=yes _librtmp=no -@@ -7471,7 +7482,7 @@ echores "$_mp3lame" +@@ -7493,7 +7504,7 @@ echores "$_mp3lame" echocheck "mencoder" if test "$_mencoder" = no ; then # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint, @@ -158,7 +158,7 @@ fi echores "$_mencoder" -@@ -8072,7 +8083,7 @@ libs_mplayer=$ld_tmp +@@ -8094,7 +8105,7 @@ libs_mplayer=$ld_tmp ############################################################################# @@ -167,7 +167,7 @@ CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS" -@@ -8353,7 +8364,7 @@ TIMER = $_timer +@@ -8375,7 +8386,7 @@ TIMER = $_timer EXESUF = $_exesuf EXESUFS_ALL = .exe Added: head/multimedia/mplayer/files/patch-stream_stream__vcd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-stream_stream__vcd.c Sat Dec 19 20:22:02 2015 (r404026) @@ -0,0 +1,10 @@ +--- stream/stream_vcd.c.orig 2015-08-31 08:14:54 UTC ++++ stream/stream_vcd.c +@@ -39,6 +39,7 @@ + #include + + #if CONFIG_LIBCDIO ++#include + #include "vcd_read_libcdio.h" + #elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) + #include "vcd_read_fbsd.h"