svn commit: r368091 - in head/multimedia: mencoder mplayer mplayer/files
Thomas Zander
riggs at FreeBSD.org
Sat Sep 13 12:46:28 UTC 2014
Author: riggs
Date: Sat Sep 13 12:46:27 2014
New Revision: 368091
URL: http://svnweb.freebsd.org/changeset/ports/368091
QAT: https://qat.redports.org/buildarchive/r368091/
Log:
- Add experimental OPTION to avoid memory alignment hacks
Added:
head/multimedia/mplayer/files/extra-patch-memalign (contents, props changed)
Modified:
head/multimedia/mencoder/Makefile
head/multimedia/mplayer/Makefile
head/multimedia/mplayer/Makefile.options
Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile Sat Sep 13 12:43:27 2014 (r368090)
+++ head/multimedia/mencoder/Makefile Sat Sep 13 12:46:27 2014 (r368091)
@@ -11,14 +11,15 @@ COMMENT= Convenient video file and movie
OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \
DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK \
- LADSPA LIBMNG LZO MAD NAS OCFLAGS OPENAL OPENJPEG \
- OPUS OTCHAIN PROFILE PULSEAUDIO REAL RTCPU RTMP \
+ LADSPA LIBMNG LZO MAD MEMALIGN NAS OCFLAGS OPENAL \
+ OPENJPEG OPUS OTCHAIN PROFILE PULSEAUDIO REAL RTCPU RTMP \
SCHROEDINGER SMB THEORA TWOLAME V4L VPX WIN32 X264 XVID
OPTIONS_DEFAULT=GIF IPV6 OCFLAGS RTCPU WIN32 X264 XVID
BLURAY_DESC?= BluRay support
LZO_DESC?= Enable external liblzo library
+MEMALIGN_DESC?= Avoid memory alignment hacks (EXPERIMENTAL)
OCFLAGS_DESC?= Use optimized compiler flags
OTCHAIN_DESC?= Use gcc 4.6+ toolchain on legacy systems
REAL_DESC?= Enable realplayer plugin
Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile Sat Sep 13 12:43:27 2014 (r368090)
+++ head/multimedia/mplayer/Makefile Sat Sep 13 12:46:27 2014 (r368091)
@@ -11,7 +11,7 @@ COMMENT= High performance media player s
OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \
ENCA FRIBIDI GIF GSM GUI IPV6 JACK \
- LADSPA LIBMNG LIRC LZO NAS OCFLAGS \
+ LADSPA LIBMNG LIRC LZO MEMALIGN NAS OCFLAGS \
OPENAL OPENGL OPENJPEG OPUS OTCHAIN PROFILE \
PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \
SKINS SMB SVGALIB V4L VDPAU VPX WIN32 \
@@ -26,6 +26,7 @@ OPTIONS_DEFAULT=FRIBIDI IPV6 OCFLAGS OPE
BLURAY_DESC?= BluRay support
ENCA_DESC?= Charset conversion via enca
LZO_DESC?= External liblzo support
+MEMALIGN_DESC?= Avoid memory alignment hacks (EXPERIMENTAL)
OCFLAGS_DESC?= Use optimized compiler flags
OTCHAIN_DESC?= Use gcc 4.6+ toolchain on legacy systems
REAL_DESC?= Enable realplayer plugin
Modified: head/multimedia/mplayer/Makefile.options
==============================================================================
--- head/multimedia/mplayer/Makefile.options Sat Sep 13 12:43:27 2014 (r368090)
+++ head/multimedia/mplayer/Makefile.options Sat Sep 13 12:46:27 2014 (r368091)
@@ -54,6 +54,10 @@ CATEGORIES+= ipv6
CONFIGURE_ARGS+= --disable-inet6
.endif
+.if ${PORT_OPTIONS:MMEMALIGN}
+EXTRA_PATCHES+= ${FILESDIR}/extra-patch-memalign
+.endif
+
.if ${PORT_OPTIONS:MRTMP}
LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/librtmp
CONFIGURE_ARGS+= --enable-librtmp
@@ -144,7 +148,7 @@ MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bi
#trying to compile a debug version with the default flags.
.if ${PORT_OPTIONS:MDEBUG}
WITH_DEBUG= yes
-CONFIGURE_ARGS+= --enable-debug
+CONFIGURE_ARGS+= --enable-debug=3
.if ${ARCH} == "i386" && !defined(WITH_BASE_CLANG)
DEBUG_FLAGS= -g -fomit-frame-pointer
.endif
Added: head/multimedia/mplayer/files/extra-patch-memalign
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/mplayer/files/extra-patch-memalign Sat Sep 13 12:46:27 2014 (r368091)
@@ -0,0 +1,26 @@
+--- configure.orig 2014-08-23 15:59:32.000000000 +0200
++++ configure 2014-09-11 18:37:11.383671007 +0200
+@@ -3766,17 +3766,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"
+
More information about the svn-ports-head
mailing list