Date: Sun, 12 Apr 2015 14:37:51 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r383871 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <201504121437.t3CEbplN029614@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sun Apr 12 14:37:50 2015 New Revision: 383871 URL: https://svnweb.freebsd.org/changeset/ports/383871 Log: Fix runtime crash with certain MPEG2 files on pre-10 systems. PR: 199283 MFH: 2015Q2 Added: head/multimedia/mplayer/files/extra-patch-aligned_alloc (contents, props changed) Modified: head/multimedia/mencoder/Makefile head/multimedia/mplayer/Makefile head/multimedia/mplayer/Makefile.options head/multimedia/mplayer/files/patch-configure Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Sun Apr 12 14:15:14 2015 (r383870) +++ head/multimedia/mencoder/Makefile Sun Apr 12 14:37:50 2015 (r383871) @@ -3,6 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 COMMENT= Convenient video file and movie encoder Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Sun Apr 12 14:15:14 2015 (r383870) +++ head/multimedia/mplayer/Makefile Sun Apr 12 14:37:50 2015 (r383871) @@ -3,6 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} +PORTREVISION= 1 COMMENT= High performance media player supporting many formats Modified: head/multimedia/mplayer/Makefile.options ============================================================================== --- head/multimedia/mplayer/Makefile.options Sun Apr 12 14:15:14 2015 (r383870) +++ head/multimedia/mplayer/Makefile.options Sun Apr 12 14:37:50 2015 (r383871) @@ -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 Added: head/multimedia/mplayer/files/extra-patch-aligned_alloc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/extra-patch-aligned_alloc Sun Apr 12 14:37:50 2015 (r383871) @@ -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: head/multimedia/mplayer/files/patch-configure ============================================================================== --- head/multimedia/mplayer/files/patch-configure Sun Apr 12 14:15:14 2015 (r383870) +++ head/multimedia/mplayer/files/patch-configure Sun Apr 12 14:37:50 2015 (r383871) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504121437.t3CEbplN029614>