Index: head/multimedia/mencoder/Makefile
===================================================================
--- head/multimedia/mencoder/Makefile	(revision 383870)
+++ head/multimedia/mencoder/Makefile	(revision 383871)
@@ -1,123 +1,124 @@
 # Created by: Thomas E. Zander
 # $FreeBSD$
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
+PORTREVISION=	1
 
 COMMENT=	Convenient video file and movie encoder
 
 .include "${.CURDIR}/../mplayer/Makefile.shared"
 
 OPTIONS_DEFINE=	AMR_NB AMR_WB BLURAY CDIO DEBUG DV FAAC FONTCONFIG \
 		FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \
 		MAD NAS OCFLAGS OPENAL OPENJPEG OPUS PULSEAUDIO REAL \
 		RTCPU RTMP SCHROEDINGER SMB THEORA TWOLAME V4L VPX \
 		WIN32 X264 XVID
 
 OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS RTCPU WIN32 X264 XVID
 
 BLURAY_DESC?=	BluRay support
 LZO_DESC?=	Enable external liblzo library
 OCFLAGS_DESC?=	Use optimized compiler flags
 REAL_DESC?=	Enable realplayer plugin
 RTCPU_DESC?=	Use runtime CPU detection on supported archs
 WIN32_DESC?=	Install win32 binary codecs
 
 RESTRICTED=	Port has restricted dependencies
 
 PATCHDIR=	${.CURDIR}/../mplayer/files
 FILESDIR=	${PATCHDIR}
 DATADIR=	${PREFIX}/share/mplayer
 
 TOOLFILES=	aconvert.sh binary_codecs.sh calcbpp.pl \
 		checktree.sh countquant.pl divx2svcd.sh \
 		dvd2divxscript.pl edgedetect.fp edgeenh.fp \
 		emboss.fp mencvcd.sh midentify.sh \
 		mpconsole.sh mphelp_check.py mplmult.sh \
 		plotpsnr.pl psnr-video.sh qepdvcd.sh \
 		subedit.pl subsearch.sh vobshift.py \
 		w32codec_dl.pl wma2ogg.pl
 
 USES+=		alias iconv pkgconfig shebangfix
 SHEBANG_FILES=	TOOLS/calcbpp.pl TOOLS/checktree.sh TOOLS/countquant.pl	\
 		TOOLS/divx2svcd.sh TOOLS/dvd2divxscript.pl TOOLS/mencvcd.sh \
 		TOOLS/mphelp_check.py TOOLS/plotpsnr.pl TOOLS/psnr-video.sh \
 		TOOLS/qepdvcd.sh TOOLS/subedit.pl TOOLS/w32codec_dl.pl \
 		TOOLS/wma2ogg.pl
 
 .include "${.CURDIR}/../mplayer/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-mplayer \
 			--disable-libdca \
 			--disable-x11 \
 			--disable-vdpau \
 			--disable-rtc \
 			--disable-arts \
 			--disable-caca \
 			--disable-lirc \
 			--disable-sdl \
 			--disable-svga \
 			--disable-aa \
 			--disable-joystick \
 			--disable-directfb \
 			--disable-mpg123 \
 			--disable-enca \
 			--disable-musepack
 
 LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
 
 ALL_TARGET=	mencoder
 
 .include "${.CURDIR}/../mplayer/Makefile.options"
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
 post-patch:
 .if ${OSVERSION} >= 900010
 	@${REINPLACE_CMD} -e \
 		'/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 	@${REINPLACE_CMD} \
 		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|-lbz2|/usr/lib/libbz2.so|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
 		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
 		${XARGS} -x -0 -n 10 \
 		${REINPLACE_CMD} -E \
 			-e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
 			-e 's|[[:space:]]gcc| ${CC}|' \
 			-e 's|\$$\(CC\)|${CC}|' \
 			-e 's|/usr/X11R6|${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 ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/mencoder.1
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/tools
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/tools
 .for tool in ${TOOLFILES}
 	${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${STAGEDIR}${DATADIR}/tools
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/multimedia/mplayer/Makefile
===================================================================
--- head/multimedia/mplayer/Makefile	(revision 383870)
+++ head/multimedia/mplayer/Makefile	(revision 383871)
@@ -1,171 +1,172 @@
 # Created by: Thomas E. Zander with help from Vladimir Kushnir
 # $FreeBSD$
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
+PORTREVISION=	1
 
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
 
 OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV \
 		ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
 		LADSPA LIBMNG LIRC LZO NAS OCFLAGS  OPENAL OPENGL \
 		OPENJPEG OPUS PULSEAUDIO REAL RTC RTCPU RTMP \
 		SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \
 		WIN32 X11 X11DGA X11VM XINERAMA XVIDEO XVMC
 
 OPTIONS_DEFAULT=FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL RTCPU \
 		SKINS WIN32 X11 X11DGA X11VM XINERAMA XVIDEO
 
 BLURAY_DESC?=	BluRay support
 ENCA_DESC?=	Charset conversion via enca
 LZO_DESC?=	External liblzo support
 OCFLAGS_DESC?=	Use optimized compiler flags
 REAL_DESC?=	Enable realplayer plugin
 RTC_DESC?=	Add support for kernel real time clock
 RTCPU_DESC?=	Use runtime CPU detection on supported archs
 SKINS_DESC?=	Install skins for GUI
 WIN32_DESC?=	Install win32 binary codecs
 X11DGA_DESC?=	X11 DGA video driver support
 X11VM_DESC?=	X11 VidMode support
 
 SUB_FILES=	pkg-message
 
 CONFLICTS=	mplayer2-2.*
 
 CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
 USES+=		iconv pkgconfig
 
 .include "${.CURDIR}/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-arts \
 			--disable-directfb \
 			--disable-faac \
 			--disable-libdca \
 			--disable-toolame \
 			--disable-twolame \
 			--disable-x264 \
 			--disable-xvid \
 			--disable-libdirac-lavc \
 			--disable-mencoder \
 			--disable-mpg123 \
 			--disable-musepack \
 			--disable-theora
 
 .include "${.CURDIR}/Makefile.options"
 
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 PLIST_SUB+=	GMPLAYER=""
 DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
 .if ${PORT_OPTIONS:MSKINS}
 RUN_DEPENDS+=	mplayer-skins>=0:${PORTSDIR}/multimedia/mplayer-skins
 .endif
 
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gui
 
 .else
 PLIST_SUB+=	GMPLAYER="@comment "
 .endif #GUI && X11
 
 .if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11 xproto xscrnsaver
 .if ${PORT_OPTIONS:MXVIDEO}
 USE_XORG+=	xv
 .else
 CONFIGURE_ARGS+=--disable-xv
 .endif
 .if ${PORT_OPTIONS:MX11DGA}
 USE_XORG+=	xxf86dga
 .else
 CONFIGURE_ARGS+=--disable-dga1 --disable-dga2
 .endif
 .if ${PORT_OPTIONS:MOPENGL}
 USE_GL+=	gl
 .else
 CONFIGURE_ARGS+=--disable-gl
 .endif
 .if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama xineramaproto
 .else
 CONFIGURE_ARGS+=--disable-xinerama
 .endif
 .if ${PORT_OPTIONS:MX11VM}
 USE_XORG+=	xxf86vm
 .else
 CONFIGURE_ARGS+=--disable-vm
 .endif
 .if ${PORT_OPTIONS:MXVMC}
 USE_XORG+=	xvmc
 CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW
 .endif
 .else	#X11
 CONFIGURE_ARGS+=--disable-x11
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "WITH_KERN_HZ=${DEFAULT_KERN_HZ}"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${ECHO_MSG} "If you want to use the GUI, you can use the skins from"
 	@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
 	@${ECHO_MSG} "or download them from"
 	@${ECHO_MSG} "http://www.mplayerhq.hu/"
 .endif
 
 post-patch:
 .if ${OSVERSION} >= 900010
 	@${REINPLACE_CMD} -e \
 		'/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 .endif
 	@${REINPLACE_CMD} \
 		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|-lbz2|/usr/lib/libbz2.so|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
 		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
 		${XARGS} -x -0 -n 10 \
 		${REINPLACE_CMD} -E \
 			-e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
 			-e 's|[[:space:]]gcc| ${CC}|' \
 			-e 's|\$$\(CC\)|${CC}|' \
 			-e 's|/usr/X11R6|${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 ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
 .if ${PORT_OPTIONS:MRTC}
 	@${REINPLACE_CMD} -e \
 		's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
 		${WRKSRC}/mplayer.c
 .endif
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc
 	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc
 .for conf in ${CONFFILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc
 .endfor
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${LN} -sf ${PREFIX}/bin/mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer
 	@(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
 	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${PREFIX}/share/pixmaps/mplayer.png
 .endif
 
 .include <bsd.port.post.mk>
Index: head/multimedia/mplayer/Makefile.options
===================================================================
--- head/multimedia/mplayer/Makefile.options	(revision 383870)
+++ head/multimedia/mplayer/Makefile.options	(revision 383871)
@@ -1,153 +1,158 @@
 # Contains non-trivial handling of option variables
 # and build environment. Must be included after
 # bsd.port.pre.mk
 #
 # Some of the knobs are not tunable by the OPTIONS framework. These are
 # explained here in detail.
 #
 # $FreeBSD$
 #
 # Feature options:
 # These options influence some general behaviour of mplayer. Almost all of the featues,
 # for example all the codecs, are selected via the OPTIONS framework.
 # The following options WITH_DVD_DEVICE, WITH_CDROM_DEVICE, are *not*
 # selected via the options framework and must be set via make.conf or by passing
 # the variable to make during build, e.g. make WITH_DVD_DEVICE=/dev/cd0
 #
 # WITH_DVD_DEVICE=/path/to/desired/device
 # default: /dev/cd0
 # This option changes the default device where mplayer looks for
 # a DVD medium
 #
 # WITH_CDROM_DEVICE=/path/to/desired/device
 # default: /dev/cd0
 # This option changes the default cdrom device, maybe useful for VCDs
 
 # Non-OPTIONS knob handling
 # =========================
 
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
 DEFAULT_DVD_DEVICE=/dev/cd0
 .endif
 
 .if defined(WITH_CDROM_DEVICE)
 DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
 .else
 DEFAULT_CDROM_DEVICE=/dev/cd0
 .endif
 
 .if defined(WITH_KERN_HZ)
 DEFAULT_KERN_HZ=${WITH_KERN_HZ}
 .else
 DEFAULT_KERN_HZ=1024
 .endif
 
 
 # Non-simplified OPTIONS handling
 # ===============================
 
 .if ${PORT_OPTIONS:MIPV6}
 CATEGORIES+=	ipv6
 .else
 CONFIGURE_ARGS+=	--disable-inet6
 .endif
 
 .if ${PORT_OPTIONS:MRTMP}
 LIB_DEPENDS+=		librtmp.so:${PORTSDIR}/multimedia/librtmp
 CONFIGURE_ARGS+=	--enable-librtmp
 EXTRA_LIBS+=		-lrtmp
 .else
 CONFIGURE_ARGS+=	--disable-librtmp
 .endif
 
 .if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl
 LIB_DEPENDS+=		libaa.so:${PORTSDIR}/graphics/aalib
 .else
 CONFIGURE_ARGS+=	--disable-sdl
 .endif
 
 .if ${PORT_OPTIONS:MV4L}
 BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
 LIB_DEPENDS+=		libv4l2.so:${PORTSDIR}/multimedia/libv4l
 CONFIGURE_ARGS+=	--enable-tv-v4l1 \
 			--enable-tv-v4l2
 EXTRA_LIBS+=		-lv4l1 -lv4l2
 .else
 CONFIGURE_ARGS+=	--disable-tv-v4l1 \
 			--disable-tv-v4l2
 .endif
 
 
 # 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
 .endif
 
 # Unsupported architectures for inline assembly
 .if ${ARCH} == "ppc"
 CONFIGURE_ARGS+=	--disable-asm
 .endif
 
 # Unsupported architectures
 .if ${ARCH} == "sparc64"
 BROKEN=		Does not compile on sparc64
 .endif
 
 .if ${PORT_OPTIONS:MRTCPU} \
 	&& defined(MPLAYER_RTCPU_SUPPORTED_ARCH)
 CONFIGURE_ARGS+=--enable-runtime-cpudetection
 .endif
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-clang-version
 # Require 16 byte stack realignment on i386 to interface
 # properly with hand crafted assembler code in ffmpeg
 .if ${ARCH} == "i386"
 CFLAGS+=	-mstack-alignment=16 -mstackrealign
 .endif # ${ARCH} == "i386"
 .endif # ${CHOSEN_COMPILER_TYPE} == clang
 
 .if ${ARCH} == "armv6"
 CFLAGS_armv6+=	-no-integrated-as
 .endif
 
 # Extra build options for debugging and optimised CFLAGS
 # ======================================================
 
 .if ${PORT_OPTIONS:MDEBUG}
 WITH_DEBUG=	yes
 CONFIGURE_ARGS+=	--enable-debug=3
 .else
 .if ${PORT_OPTIONS:MOCFLAGS}
 CFLAGS+=	-O3 -fomit-frame-pointer -ffast-math
 .endif #OCFLAGS
 .endif #DEBUG
 
 # Edge case: binary codecs on i386, mostly superseded by internal ffmpeg
 # ======================================================================
 
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
 .if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
 RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 CONFIGURE_ARGS+=	--codecsdir=${LOCALBASE}/lib/win32
 CODEC_PORT=	${PORTSDIR}/multimedia/win32-codecs
 CODEC_DETECTION_FILE!=	${MAKE} -f ${CODEC_PORT}/Makefile -V CODEC_DETECTION_FILE
 .else
 CONFIGURE_ARGS+=	--disable-win32dll \
 			--disable-qtx
 .endif
 .endif # ARCH == i386/amd64
 
 
 # Additional extra libraries handling
 # ===================================
 
 .if defined(EXTRA_LIBS)
 CONFIGURE_ARGS+=	--extra-libs="${EXTRA_LIBS}"
 .endif
Index: head/multimedia/mplayer/files/extra-patch-aligned_alloc
===================================================================
--- head/multimedia/mplayer/files/extra-patch-aligned_alloc	(nonexistent)
+++ head/multimedia/mplayer/files/extra-patch-aligned_alloc	(revision 383871)
@@ -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"
+ 
+

Property changes on: head/multimedia/mplayer/files/extra-patch-aligned_alloc
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-configure
===================================================================
--- head/multimedia/mplayer/files/patch-configure	(revision 383870)
+++ head/multimedia/mplayer/files/patch-configure	(revision 383871)
@@ -1,204 +1,180 @@
 --- configure.orig	2014-12-17 22:02:44.000000000 +0100
 +++ configure	2015-03-28 13:56:41.340987552 +0100
 @@ -646,7 +646,7 @@
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
 -_install=install
 +_install=@${BSD_INSTALL_PROGRAM}
  _ranlib=ranlib
  _windres=windres
  _cc=cc
 @@ -988,7 +988,7 @@
      ld_static=''
      ;;
    --enable-profile)
 -    _profile='-p'
 +    _profile='-pg'
      ;;
    --disable-profile)
      _profile=
 @@ -1459,7 +1459,6 @@
  
    *)
      echo "Unknown parameter: $ac_option"
 -    exit 1
      ;;
  
    esac
 @@ -1712,7 +1711,7 @@
    case "$1" in
        x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
        ia64) host_arch=ia64 ;;
 -      macppc|ppc*|Power*) host_arch=ppc ;;
 +      macppc|powerpc|ppc*|Power*) host_arch=ppc ;;
        alpha) host_arch=alpha ;;
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
 @@ -1834,7 +1833,11 @@
  cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
  echo "yes"
  
 -cflag_check "-lm" && libm="-lm"
 +if test -z "$_profile" ; then
 +  cflag_check "-lm" && libm="-lm"
 +else
 +  cflag_check "-lm_p" && libm="-lm_p"
 +fi
  
  if test -z "$_target" ; then
    cat > $TMPC << EOF
 @@ -3164,6 +3167,13 @@
    fi
    echores "$setend"
  
 +  echocheck "ARM setend"
 +  if test $setend = "auto" ; then
 +    setend=no
 +    inline_asm_check '"setend be"' && setend=yes
 +  fi
 +  echores "$setend"
 +
    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
  elif freebsd || netbsd || openbsd || bsdos ; then
 -  THREAD_CFLAGS=-D_THREAD_SAFE
 +  THREAD_CFLAGS=
  fi
  if test "$_pthreads" = auto ; then
  cat > $TMPC << EOF
 @@ -3924,7 +3934,7 @@
  EOF
  _pthreads=no
  if ! hpux ; then
 -  for ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
 +  for ld_tmp in "-lpthread" "-pthread" ; do
      # 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
 @@ -4076,7 +4086,7 @@
    # 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
 +  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
 @@ -5474,15 +5484,6 @@
        break
      fi
    done
 -  if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then
 -    _gl=yes
 -    _gl_egl_x11=yes
 -    libs_mplayer="$libs_mplayer -lEGL $ld_dl"
 -  elif cc_check -DGL_EGL_ANDROID -lEGL ; then
 -    _gl=yes
 -    _gl_egl_android=yes
 -    libs_mplayer="$libs_mplayer -lEGL $ld_dl"
 -  fi
    if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
      _gl=yes
      _gl_win32=yes
 @@ -6046,7 +6047,7 @@
  elif dragonfly ; then
    default_cdrom_device="/dev/cd0"
  elif freebsd ; then
 -  default_cdrom_device="/dev/acd0"
 +  default_cdrom_device="/dev/cdrom"
  elif openbsd ; then
    default_cdrom_device="/dev/rcd0c"
  elif sunos ; then
 @@ -6059,7 +6060,7 @@
    default_cdrom_device="/dev/cdrom"
  fi
  
 -if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then
 +if win32 || os2 || dragonfly || openbsd || sunos || amigaos ; then
    default_dvd_device=$default_cdrom_device
  elif darwin ; then
    default_dvd_device="/dev/rdiskN"
 @@ -6133,8 +6134,8 @@
          cat > $TMPC << EOF
  #include <stdio.h>
  #include <cdio/version.h>
 -#include <cdio/cdda.h>
 -#include <cdio/paranoia.h>
 +#include <cdio/paranoia/cdda.h>
 +#include <cdio/paranoia/paranoia.h>
  int main(void) {
      void *test = cdda_verbose_set;
      printf("%s\n", CDIO_VERSION);
 @@ -6566,7 +6567,7 @@
  echocheck "libgsm"
  if test "$_libgsm" = auto ; then
    _libgsm=no
 -  statement_check gsm/gsm.h 'gsm_create()' -lgsm && _libgsm=yes
 +  statement_check gsm.h 'gsm_create()' -lgsm && _libgsm=yes
  fi
  if test "$_libgsm" = yes ; then
    def_libgsm='#define CONFIG_LIBGSM 1'
 @@ -7051,6 +7052,16 @@
    nolibrtmp=no
    def_librtmp='#define CONFIG_LIBRTMP 1'
    inputmodules="librtmp $inputmodules"
 +
 +  if $_pkg_config --exists librtmp; then
 +	_inc_tmp=$($_pkg_config --cflags librtmp)
 +	_ld_tmp=$($_pkg_config --libs librtmp)
 +  else
 +	_inc_tmp="-I${LOCALBASE}/include"
 +	_ld_tmp="-L${LOCALBASE}/lib -lrtmp -lz -lssl -lcrypto"
 +  fi
 +  extra_ldflags="$extra_ldflags $_ld_tmp"
 +  extra_cflags="$extra_cflags $_inc_tmp"
  else
    nolibrtmp=yes
    _librtmp=no
 @@ -7450,7 +7461,7 @@
  echocheck "mencoder"
  if test "$_mencoder" = no ; then
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
 -  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
 +  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
  fi
  echores "$_mencoder"
  
 @@ -8329,7 +8340,7 @@
  EXESUF      = $_exesuf
  EXESUFS_ALL = .exe
  
 -ARCH = $arch
 +MPLAYER_ARCH = $arch
  $(mak_enable "$arch_all"    "$arch"    ARCH)
  $(mak_enable "$subarch_all" "$subarch" ARCH)
  $(mak_enable "$cpuexts_all" "$cpuexts" HAVE)