From owner-svn-ports-all@FreeBSD.ORG Tue Apr 14 19:28:15 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 72F3537E; Tue, 14 Apr 2015 19:28:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 544B82D2; Tue, 14 Apr 2015 19:28:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3EJSFJd055038; Tue, 14 Apr 2015 19:28:15 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3EJSDsE055027; Tue, 14 Apr 2015 19:28:13 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201504141928.t3EJSDsE055027@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Tue, 14 Apr 2015 19:28:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r384023 - in branches/2015Q2/multimedia: mencoder mplayer mplayer/files X-SVN-Group: ports-branches 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: Tue, 14 Apr 2015 19:28:15 -0000 Author: riggs Date: Tue Apr 14 19:28:12 2015 New Revision: 384023 URL: https://svnweb.freebsd.org/changeset/ports/384023 Log: MFH: r383871 Fix runtime crash with certain MPEG2 files on pre-10 systems. PR: 199283 Approved by: ports-secteam (delphij) Added: branches/2015Q2/multimedia/mplayer/files/extra-patch-aligned_alloc - copied unchanged from r383871, head/multimedia/mplayer/files/extra-patch-aligned_alloc Modified: branches/2015Q2/multimedia/mencoder/Makefile branches/2015Q2/multimedia/mplayer/Makefile branches/2015Q2/multimedia/mplayer/Makefile.options branches/2015Q2/multimedia/mplayer/files/patch-configure Directory Properties: branches/2015Q2/ (props changed) Modified: branches/2015Q2/multimedia/mencoder/Makefile ============================================================================== --- branches/2015Q2/multimedia/mencoder/Makefile Tue Apr 14 19:25:03 2015 (r384022) +++ branches/2015Q2/multimedia/mencoder/Makefile Tue Apr 14 19:28:12 2015 (r384023) @@ -3,6 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 COMMENT= Convenient video file and movie encoder Modified: branches/2015Q2/multimedia/mplayer/Makefile ============================================================================== --- branches/2015Q2/multimedia/mplayer/Makefile Tue Apr 14 19:25:03 2015 (r384022) +++ branches/2015Q2/multimedia/mplayer/Makefile Tue Apr 14 19:28:12 2015 (r384023) @@ -3,6 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 COMMENT= High performance media player supporting many formats Modified: branches/2015Q2/multimedia/mplayer/Makefile.options ============================================================================== --- branches/2015Q2/multimedia/mplayer/Makefile.options Tue Apr 14 19:25:03 2015 (r384022) +++ branches/2015Q2/multimedia/mplayer/Makefile.options Tue Apr 14 19:28:12 2015 (r384023) @@ -84,6 +84,11 @@ CONFIGURE_ARGS+= --disable-tv-v4l1 \ # Build system handling (including OPTIONS) # ========================================= +# Support for aligned_alloc +.if ${OSVERSION} >= 1000000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-aligned_alloc +.endif + # Supported architectures for runtime CPU detection .if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ppc" MPLAYER_RTCPU_SUPPORTED_ARCH= yes Copied: branches/2015Q2/multimedia/mplayer/files/extra-patch-aligned_alloc (from r383871, head/multimedia/mplayer/files/extra-patch-aligned_alloc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2015Q2/multimedia/mplayer/files/extra-patch-aligned_alloc Tue Apr 14 19:28:12 2015 (r384023, copy of r383871, head/multimedia/mplayer/files/extra-patch-aligned_alloc) @@ -0,0 +1,27 @@ +--- configure.orig 2014-12-17 22:02:44.000000000 +0100 ++++ configure 2015-03-28 13:56:41.340987552 +0100 +@@ -3798,17 +3808,17 @@ + echores "$aligned_malloc" + + +-echocheck "memalign()" ++echocheck "aligned_alloc()" + # XXX restrict to x86 ? extend to other CPUs/cacheline sizes ? +-def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' ++def_memalign='#define HAVE_MEMALIGN 0' + _memalign=no +-statement_check malloc.h 'memalign(64, sizeof(char))' && _memalign=yes ++statement_check stdlib.h 'aligned_alloc(32, 32*sizeof(char))' && _memalign=yes + if test "$_memalign" = yes ; then +- def_memalign='#define HAVE_MEMALIGN 1' ++ def_map_memalign='#define memalign(a, b) aligned_alloc(a, b)' ++ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' + else +- def_memalign='#define HAVE_MEMALIGN 0' + def_map_memalign='#define memalign(a, b) malloc(b)' +- darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' ++ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' + fi + echores "$_memalign" + + Modified: branches/2015Q2/multimedia/mplayer/files/patch-configure ============================================================================== --- branches/2015Q2/multimedia/mplayer/files/patch-configure Tue Apr 14 19:25:03 2015 (r384022) +++ branches/2015Q2/multimedia/mplayer/files/patch-configure Tue Apr 14 19:28:12 2015 (r384023) @@ -62,30 +62,6 @@ echocheck "softfloat ABI" softfloat=yes cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no -@@ -3798,17 +3808,17 @@ - echores "$aligned_malloc" - - --echocheck "memalign()" -+echocheck "aligned_alloc()" - # XXX restrict to x86 ? extend to other CPUs/cacheline sizes ? --def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' -+def_memalign='#define HAVE_MEMALIGN 0' - _memalign=no --statement_check malloc.h 'memalign(64, sizeof(char))' && _memalign=yes -+statement_check stdlib.h 'aligned_alloc(32, 32*sizeof(char))' && _memalign=yes - if test "$_memalign" = yes ; then -- def_memalign='#define HAVE_MEMALIGN 1' -+ def_map_memalign='#define memalign(a, b) aligned_alloc(a, b)' -+ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 0' - else -- def_memalign='#define HAVE_MEMALIGN 0' - def_map_memalign='#define memalign(a, b) malloc(b)' -- darwin || def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' -+ def_memalign_hack='#define CONFIG_MEMALIGN_HACK 1' - fi - echores "$_memalign" - @@ -3914,7 +3924,7 @@ if linux ; then THREAD_CFLAGS=-D_REENTRANT