1 files changed, 127 insertions, 125 deletions

diff --git a/multimedia/ffmpeg1/Makefile b/multimedia/ffmpeg1/Makefile
index 8abe79142ecc..d0694f48bbd3 100644
--- a/multimedia/ffmpeg1/Makefile
+++ b/multimedia/ffmpeg1/Makefile
@@ -44,105 +44,6 @@ LIBV4L_DESC=	Video for Linux support
 OPUS_DESC=	Opus decoding with libopus
 X11GRAB_DESC=	Enable x11 grabbing
 
-FFPROGS=	ffmpeg ffprobe
-INSTALL_TARGET=	install-progs install-data install-libs install-headers
-FFMPEG_SUFFIX=	1
-PLIST_SUB+=	SUFF="${FFMPEG_SUFFIX}"
-
-USE_LDCONFIG=	${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
-DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
-
-.include <bsd.port.options.mk>
-
-# ssl
-.if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS)
-USE_OPENSSL=	yes
-FFMPEG_NONFREE=	yes
-.endif
-
-.if ${PORT_OPTIONS:MAACPLUS} || ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC}
-FFMPEG_NONFREE=	yes
-.endif
-
-.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} || \
-${PORT_OPTIONS:MVO_AACENC} || ${PORT_OPTIONS:MVO_AMRWBENC}
-FFMPEG_LICENSE_GPL3=	yes
-.endif
-
-# x11grab
-.if ${PORT_OPTIONS:MX11GRAB}
-USE_XORG=	x11 xext xfixes
-CONFIGURE_ARGS+=	--enable-x11grab
-.endif
-
-.include <bsd.port.pre.mk>
-
-DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
-DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
-CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
-
-CONFIGURE_ARGS+=--prefix="${PREFIX}" \
-		--mandir="${PREFIX}/man" \
-		--incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \
-		--libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
-		--shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
-		--datadir="${DATADIR}" \
-		--build-suffix="${FFMPEG_SUFFIX}" \
-		--progs-suffix="${FFMPEG_SUFFIX}" \
-		--enable-shared \
-		--enable-gpl \
-		--enable-postproc \
-		--enable-avfilter \
-		--enable-avresample \
-		--enable-pthreads \
-		--enable-memalign-hack \
-		--disable-libstagefright-h264 \
-		--disable-libutvideo \
-		--disable-libsoxr \
-		--cc="${CC}" \
-		--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
-		--extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
-		--extra-libs="${PTHREAD_LIBS}"
-
-DOC_FILES=	Changelog CREDITS INSTALL LICENSE MAINTAINERS README
-# under doc subdirectory
-DOC_DOCFILES=	APIchanges RELEASE_NOTES *.txt *.html
-PORTDOCS=	*
-
-.if ${PORT_OPTIONS:MDEBUG}
-CONFIGURE_ARGS+=	--disable-stripping
-.else
-CONFIGURE_ARGS+=	--disable-debug
-.endif
-
-.if ${PORT_OPTIONS:MFFSERVER}
-USE_RC_SUBR=	ffserver${FFMPEG_SUFFIX}
-.endif
-
-# sse hardware vector support
-.if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64")
-_BUILTIN_VECTOR=	yes
-.else
-CONFIGURE_ARGS+=	--disable-sse
-.endif
-
-# mmx support
-.if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == ""
-CONFIGURE_ARGS+=	--disable-mmx
-_NO_BUILTIN_VECTOR=	yes
-.endif
-
-# builtin vector, requires mmx and sse
-.if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR)
-FFMPEG_CFLAGS+=		-msse
-.endif
-
-# optimizations
-.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
-CFLAGS+=	-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
-.endif
-
 AACPLUS_LIB_DEPENDS=	libaacplus.so:${PORTSDIR}/audio/libaacplus
 AACPLUS_CONFIGURE_ENABLE=	libaacplus
 
@@ -151,7 +52,6 @@ ALSA_CONFIGURE_OFF=	--disable-indev=alsa \
 			--disable-outdev=alsa
 ALSA_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 
-
 # Opencore AMR NB
 AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
 AMR_NB_CONFIGURE_ENABLE=	libopencore-amrnb
@@ -181,15 +81,6 @@ FDK_AAC_LIB_DEPENDS=	libfdk-aac.so:${PORTSDIR}/audio/fdk-aac
 FDK_AAC_CONFIGURE_ENABLE=	libfdk-aac
 
 # ffserver
-.if ${PORT_OPTIONS:MFFSERVER}
-PLIST_SUB+=	FFSERVER=""
-FFPROGS+=	ffserver
-. if ${PORT_OPTIONS:MDOCS}
-DOC_DOCFILES+=	ffserver.html
-. endif
-.else
-PLIST_SUB+=	FFSERVER="@comment "
-.endif
 FFSERVER_CONFIGURE_ENABLE=	ffserver
 
 # fontconfig
@@ -260,18 +151,6 @@ RTMP_CONFIGURE_ENABLE=	librtmp
 SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
 SCHROEDINGER_CONFIGURE_ENABLE=	libschroedinger
 
-# sdl
-.if ${PORT_OPTIONS:MSDL}
-USE_SDL+=	sdl
-PLIST_FILES+=	bin/ffplay${FFMPEG_SUFFIX} man/man1/ffplay${FFMPEG_SUFFIX}.1.gz
-FFPROGS+=	ffplay
-.if ${PORT_OPTIONS:MDOCS}
-DOC_DOCFILES+=	ffplay.html
-.endif
-.else
-CONFIGURE_ARGS+=	--disable-ffplay
-.endif
-
 # speex
 SPEEX_LIB_DEPENDS=	libspeex.so:${PORTSDIR}/audio/speex
 SPEEX_CONFIGURE_ENABLE=	libspeex
@@ -296,10 +175,6 @@ VO_AACENC_CONFIGURE_ENABLE=	libvo-aacenc
 VO_AMRWBENC_LIB_DEPENDS=	libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc
 VO_AMRWBENC_CONFIGURE_ENABLE=	libvo-amrwbenc
 
-# vorbis
-.if ${PORT_OPTIONS:MVORBIS}
-FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
-.endif
 VORBIS_LIB_DEPENDS=	libvorbisenc.so:${PORTSDIR}/audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=	libvorbis
 
@@ -315,6 +190,133 @@ X264_CONFIGURE_ENABLE=	libx264
 XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
 XVID_CONFIGURE_ENABLE=	libxvid
 
+FFPROGS=	ffmpeg ffprobe
+INSTALL_TARGET=	install-progs install-data install-libs install-headers
+FFMPEG_SUFFIX=	1
+PLIST_SUB+=	SUFF="${FFMPEG_SUFFIX}"
+
+USE_LDCONFIG=	${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+
+.include <bsd.port.options.mk>
+
+# ssl
+.if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS)
+USE_OPENSSL=	yes
+FFMPEG_NONFREE=	yes
+.endif
+
+.if ${PORT_OPTIONS:MAACPLUS} || ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC}
+FFMPEG_NONFREE=	yes
+.endif
+
+.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} || \
+${PORT_OPTIONS:MVO_AACENC} || ${PORT_OPTIONS:MVO_AMRWBENC}
+FFMPEG_LICENSE_GPL3=	yes
+.endif
+
+# x11grab
+.if ${PORT_OPTIONS:MX11GRAB}
+USE_XORG=	x11 xext xfixes
+CONFIGURE_ARGS+=	--enable-x11grab
+.endif
+
+.include <bsd.port.pre.mk>
+
+DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX}
+CONFIGURE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
+MAKE_ENV+=	COMPILER_PATH=${LOCALBASE}/bin
+
+CONFIGURE_ARGS+=--prefix="${PREFIX}" \
+		--mandir="${PREFIX}/man" \
+		--incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \
+		--libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
+		--shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \
+		--datadir="${DATADIR}" \
+		--build-suffix="${FFMPEG_SUFFIX}" \
+		--progs-suffix="${FFMPEG_SUFFIX}" \
+		--enable-shared \
+		--enable-gpl \
+		--enable-postproc \
+		--enable-avfilter \
+		--enable-avresample \
+		--enable-pthreads \
+		--enable-memalign-hack \
+		--disable-libstagefright-h264 \
+		--disable-libutvideo \
+		--disable-libsoxr \
+		--cc="${CC}" \
+		--extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \
+		--extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \
+		--extra-libs="${PTHREAD_LIBS}"
+
+DOC_FILES=	Changelog CREDITS INSTALL LICENSE MAINTAINERS README
+# under doc subdirectory
+DOC_DOCFILES=	APIchanges RELEASE_NOTES *.txt *.html
+PORTDOCS=	*
+
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--disable-stripping
+.else
+CONFIGURE_ARGS+=	--disable-debug
+.endif
+
+.if ${PORT_OPTIONS:MFFSERVER}
+USE_RC_SUBR=	ffserver${FFMPEG_SUFFIX}
+.endif
+
+# sse hardware vector support
+.if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64")
+_BUILTIN_VECTOR=	yes
+.else
+CONFIGURE_ARGS+=	--disable-sse
+.endif
+
+# mmx support
+.if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == ""
+CONFIGURE_ARGS+=	--disable-mmx
+_NO_BUILTIN_VECTOR=	yes
+.endif
+
+# builtin vector, requires mmx and sse
+.if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR)
+FFMPEG_CFLAGS+=		-msse
+.endif
+
+# optimizations
+.if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS}
+CFLAGS+=	-O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer
+.endif
+
+# ffserver
+.if ${PORT_OPTIONS:MFFSERVER}
+PLIST_SUB+=	FFSERVER=""
+FFPROGS+=	ffserver
+. if ${PORT_OPTIONS:MDOCS}
+DOC_DOCFILES+=	ffserver.html
+. endif
+.else
+PLIST_SUB+=	FFSERVER="@comment "
+.endif
+
+# sdl
+.if ${PORT_OPTIONS:MSDL}
+USE_SDL+=	sdl
+PLIST_FILES+=	bin/ffplay${FFMPEG_SUFFIX} man/man1/ffplay${FFMPEG_SUFFIX}.1.gz
+FFPROGS+=	ffplay
+.if ${PORT_OPTIONS:MDOCS}
+DOC_DOCFILES+=	ffplay.html
+.endif
+.else
+CONFIGURE_ARGS+=	--disable-ffplay
+.endif
+
+# vorbis
+.if ${PORT_OPTIONS:MVORBIS}
+FFMPEG_CFLAGS+=		-I${LOCALBASE}/include/vorbis
+.endif
+
 # License knobs
 .if defined(FFMPEG_NONFREE)
 RESTRICTED=	linking to libfaac or libaacplus restricts redistribution