Index: head/multimedia/avidemux/Makefile =================================================================== --- head/multimedia/avidemux/Makefile (revision 391216) +++ head/multimedia/avidemux/Makefile (revision 391217) @@ -1,50 +1,50 @@ # Created by: Anish Mistry (with help from mean) # $FreeBSD$ # assuming freebsd always has 16 byte aligned malloc as macos does. is this true? # nls files not getting installed with nls=on. are they getting built? # sync port options with current software options PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org COMMENT= Simple GUI based video editor .include "${.CURDIR}/Makefile.common" .if ${PORT_OPTIONS:MGTK2} || ${PORT_OPTIONS:MQT4} PLIST_FILES+= ${DATADIR}/${PORTNAME}.png .endif .if ${PORT_OPTIONS:MGTK2} PLIST_FILES+= ${DESKTOPDIR}/${PORTNAME}.desktop .endif .if ${PORT_OPTIONS:MQT4} PLIST_FILES+= ${DESKTOPDIR}/${PORTNAME}_qt4.desktop .endif CMAKE_SOURCE_PATH= ${WRKSRC}/avidemux_core post-configure: post-configure-common post-install: .if ${PORT_OPTIONS:MGTK3} || ${PORT_OPTIONS:MQT4} @${MKDIR} "${STAGEDIR}${DATADIR}" ${INSTALL_DATA} "${WRKSRC}/avidemux_icon.png" "${STAGEDIR}${DATADIR}/${PORTNAME}.png" .if ${PORT_OPTIONS:MGTK3} @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \ -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|gtk|g" \ < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}.desktop ${INSTALL_DATA} "${WRKDIR}/${PORTNAME}.desktop" "${STAGEDIR}${DESKTOPDIR}" .endif .if ${PORT_OPTIONS:MQT4} @${SED} -e "s|%%PREFIX%%|${PREFIX}|g" -e "s|%%DATADIR%%|${DATADIR}|g" \ -e "s|%%NAME%%|${PORTNAME}|g" -e "s|%%API%%|qt4|g" \ < ${FILESDIR}/avidemux2.desktop.in > ${WRKDIR}/${PORTNAME}_qt4.desktop ${INSTALL_DATA} "${WRKDIR}/${PORTNAME}_qt4.desktop" "${STAGEDIR}${DESKTOPDIR}" .endif .endif .include Index: head/multimedia/ffmpeg/Makefile =================================================================== --- head/multimedia/ffmpeg/Makefile (revision 391216) +++ head/multimedia/ffmpeg/Makefile (revision 391217) @@ -1,402 +1,403 @@ # Created by: Martin Matuska # $FreeBSD$ PORTNAME= ffmpeg PORTVERSION= 2.7.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils HAS_CONFIGURE= yes CONFIGURE_LOG= config.err USES= cpe gmake pkgconfig perl5 tar:bzip2 USE_LDCONFIG= yes USE_PERL5= build WANT_SDL= yes OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG DOCS FAAC \ FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GSM ICONV \ JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG \ OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \ THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \ X11GRAB X264 X265 XVID OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \ OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= GNUTLS OPENSSL ASS_DESC= Subtitles rendering via libass CDIO_DESC= Audio CD grabbing with libcdio FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK FFSERVER_DESC= Build and install ffserver LIBV4L_DESC= Video for Linux support X11GRAB_DESC= Enable x11 grabbing OPTIONS_SUB= yes # aacplus AACPLUS_LIB_DEPENDS= libaacplus.so:${PORTSDIR}/audio/libaacplus AACPLUS_CONFIGURE_ENABLE= libaacplus # alsa 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 # Opencore AMR WB AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb # ass ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass ASS_CONFIGURE_ENABLE= libass # cdio CDIO_LIB_DEPENDS= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia CDIO_CONFIGURE_ENABLE= libcdio # celt CELT_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt CELT_CONFIGURE_ENABLE= libcelt # faac FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac FAAC_CONFIGURE_ENABLE= libfaac # fdk_aac FDK_AAC_LIB_DEPENDS= libfdk-aac.so:${PORTSDIR}/audio/fdk-aac FDK_AAC_CONFIGURE_ENABLE= libfdk-aac # ffserver FFSERVER_CONFIGURE_ENABLE= ffserver # fontconfig FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig FONTCONFIG_CONFIGURE_ENABLE= fontconfig # freetype FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype # frei0r FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r # gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ENABLE= gnutls # gsm GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm GSM_CONFIGURE_ENABLE= libgsm # iconv ICONV_USES= iconv ICONV_CONFIGURE_ENABLE= iconv JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_OFF= --disable-indev=jack # lame LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CONFIGURE_ENABLE= libmp3lame # libbluray LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray # libv4l LIBV4L_BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat LIBV4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l LIBV4L_CONFIGURE_ENABLE= libv4l2 LIBV4L_CONFIGURE_OFF= --disable-indev=v4l2 \ --disable-outdev=v4l2 # modplug MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug MODPLUG_CONFIGURE_ENABLE= libmodplug # OpenAL OPENAL_LIB_DEPENDS= libopenal.so:${PORTSDIR}/audio/openal-soft OPENAL_CONFIGURE_ENABLE= openal OPENAL_CONFIGURE_OFF= --disable-indev=openal # opencv OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core OPENCV_CONFIGURE_ENABLE= libopencv # openjpeg OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg # openssl OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ENABLE= openssl # opus OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus OPUS_CONFIGURE_ENABLE= libopus # pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse PULSEAUDIO_CONFIGURE_OFF= --disable-indev=pulse \ --disable-outdev=pulse # rtmp RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_CONFIGURE_ENABLE= librtmp # schroedinger SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger # speex SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_ENABLE= libspeex # theora THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora # vaapi VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi # vdpau VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau # vo-aacenc VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc # vo-amrwbenc VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc # vorbis VORBIS_LIB_DEPENDS= libvorbisenc.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= libvorbis # vp8 VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx # x264 X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 # x265 X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265 X265_CONFIGURE_ENABLE= libx265 # xvid 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 DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} .include # ssl .if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS) 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 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 CONFIGURE_ARGS+= --enable-memalign-hack .endif .if ${ARCH} == "armv6" CONFIGURE_ENV+= ASFLAGS=-no-integrated-as .endif 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" \ --datadir="${DATADIR}" \ --pkgconfigdir="${PREFIX}/libdata/pkgconfig" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ --enable-avresample \ --enable-pthreads \ --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="-lpthread" DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \ README.md RELEASE_NOTES # under doc subdirectory DOC_DOCFILES= APIchanges *.txt PORTDOCS= * .if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= *.html BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html .endif .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --disable-stripping .else CONFIGURE_ARGS+= --disable-debug .endif .if ${PORT_OPTIONS:MFFSERVER} USE_RC_SUBR= ffserver .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} FFPROGS+= ffserver .if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= ffserver.html .endif .endif # sdl .if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl FFPROGS+= ffplay .if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= ffplay.html .endif .else CONFIGURE_ARGS+= --disable-ffplay --disable-outdev=sdl .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 CONFIGURE_ARGS+= --enable-nonfree .endif .if defined(FFMPEG_LICENSE_GPL3) CONFIGURE_ARGS+= --enable-version3 LICENSE= GPLv3 LGPL3 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 .endif post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \ ${WRKSRC}/ffserver.c @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||' \ -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ -e 's|freetype/freetype.h|freetype.h|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \ ${WRKSRC}/doc/texi2pod.pl .if ${PORT_OPTIONS:MSDL} @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -E \ -e 's|#include Index: head/multimedia/ffmpeg0/Makefile =================================================================== --- head/multimedia/ffmpeg0/Makefile (revision 391216) +++ head/multimedia/ffmpeg0/Makefile (revision 391217) @@ -1,479 +1,479 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= ffmpeg PORTVERSION= 0.7.16 -PORTREVISION= 8 +PORTREVISION= 9 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ PKGNAMESUFFIX= 0 MAINTAINER= wg@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1 BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \ ${LOCALBASE}/bin/texi2html:${PORTSDIR}/textproc/texi2html PORTSCOUT= limit:^0\.7.* HAS_CONFIGURE= yes CONFIGURE_LOG= config.err USES= cpe gmake perl5 pkgconfig tar:bzip2 WANT_SDL= yes USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX} USE_PERL5= build FFMPEG_SUFFIX= 0 PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}" CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}" MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}" PROGS= ffmpeg ffprobe DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \ FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \ OPTIMIZED_CFLAGS RTMP SCHROEDINGER SDL SPEEX THEORA VAAPI \ VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX X11GRAB X264 XVID DOCS OPTIONS_DEFAULT= FFSERVER FREETYPE FREI0R OPENCV SCHROEDINGER \ THEORA VORBIS VPX X264 XVID FFSERVER_DESC= Build and install ffserver X11GRAB_DESC= Enable x11 grabbing COMPAT_HEADERS=libavcodec/avcodec.h \ libavcodec/opt.h \ libavcodec/vdpau.h \ libavcodec/xvmc.h \ libavdevice/avdevice.h \ libavfilter/avfilter.h \ libavformat/avformat.h \ libavformat/avio.h \ libavutil/adler32.h \ libavutil/avstring.h \ libavutil/avutil.h \ libavutil/base64.h \ libavutil/common.h \ libavutil/crc.h \ libavutil/fifo.h \ libavutil/intfloat_readwrite.h \ libavutil/log.h \ libavutil/lzo.h \ libavutil/mathematics.h \ libavutil/md5.h \ libavutil/mem.h \ libavutil/pixfmt.h \ libavutil/rational.h \ libavutil/sha1.h \ libpostproc/postprocess.h \ libswscale/swscale.h .include # rtmp .if ${PORT_OPTIONS:MRTMP} USE_OPENSSL= yes .endif # x11grab .if ${PORT_OPTIONS:MX11GRAB} USE_XORG= x11 xext xfixes CONFIGURE_ARGS+= --enable-x11grab .endif .include .if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 CONFIGURE_ARGS+= --enable-memalign-hack .endif .if ${ARCH} == armv6 CONFIGURE_ENV+= ASFLAGS=-no-integrated-as CFLAGS= -no-integrated-as .endif 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}" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ --enable-pthreads \ --enable-runtime-cpudetect \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ --extra-libs="-lpthread" SHLIB_VER= 1 PLIST_SUB+= SHLIB_VER=${SHLIB_VER} DOC_FILES= CREDITS INSTALL LICENSE MAINTAINERS README RELEASE # under doc subdirectory DOC_DOCFILES= APIchanges RELEASE_NOTES TODO *.txt *.html .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --disable-stripping .else CONFIGURE_ARGS+= --disable-debug .endif .if ${PORT_OPTIONS:MFFSERVER} USE_RC_SUBR= ffserver${FFMPEG_SUFFIX} PROGS+= ffserver .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) CFLAGS+= -msse .endif # optimizations .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer .endif #aacplus .if ${PORT_OPTIONS:MAACPLUS} FFMPEG_NONFREE= yes LIB_DEPENDS+= libaacplus.so:${PORTSDIR}/audio/libaacplus CONFIGURE_ARGS+= --enable-libaacplus .else CONFIGURE_ARGS+= --disable-libaacplus .endif #alsa .if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib .else CONFIGURE_ARGS+= --disable-indev=alsa \ --disable-outdev=alsa .endif # Opencore AMR NB .if ${PORT_OPTIONS:MAMR_NB} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr CONFIGURE_ARGS+= --enable-libopencore-amrnb .else CONFIGURE_ARGS+= --disable-libopencore-amrnb .endif # Opencore AMR WB .if ${PORT_OPTIONS:MAMR_WB} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr CONFIGURE_ARGS+= --enable-libopencore-amrwb .else CONFIGURE_ARGS+= --disable-libopencore-amrwb .endif # celt .if ${PORT_OPTIONS:MCELT} LIB_DEPENDS+= libcelt0.so:${PORTSDIR}/audio/celt CONFIGURE_ARGS+= --enable-libcelt .else CONFIGURE_ARGS+= --disable-libcelt .endif # dirac .if ${PORT_OPTIONS:MDIRAC} LIB_DEPENDS+= libdirac_encoder.so:${PORTSDIR}/multimedia/dirac CONFIGURE_ARGS+= --enable-libdirac .else CONFIGURE_ARGS+= --disable-libdirac .endif # faac .if ${PORT_OPTIONS:MFAAC} FFMPEG_NONFREE= yes LIB_DEPENDS+= libfaac.so:${PORTSDIR}/audio/faac CONFIGURE_ARGS+= --enable-libfaac .else CONFIGURE_ARGS+= --disable-libfaac .endif # ffserver .if ${PORT_OPTIONS:MFFSERVER} PLIST_SUB+= FFSERVER="" .else PLIST_SUB+= FFSERVER="@comment " CONFIGURE_ARGS+= --disable-ffserver .endif # freetype .if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 CONFIGURE_ARGS+= --enable-libfreetype .else CONFIGURE_ARGS+= --disable-libfreetype .endif # frei0r .if ${PORT_OPTIONS:MFREI0R} BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r CONFIGURE_ARGS+= --enable-frei0r .else CONFIGURE_ARGS+= --disable-frei0r .endif # gsm .if ${PORT_OPTIONS:MGSM} LIB_DEPENDS+= libgsm.so:${PORTSDIR}/audio/gsm CONFIGURE_ARGS+= --enable-libgsm .else CONFIGURE_ARGS+= --disable-libgsm .endif # mp3 .if ${PORT_OPTIONS:MLAME} LIB_DEPENDS+= libmp3lame.so:${PORTSDIR}/audio/lame CONFIGURE_ARGS+= --enable-libmp3lame .else CONFIGURE_ARGS+= --disable-libmp3lame .endif # opencv .if ${PORT_OPTIONS:MOPENCV} LIB_DEPENDS+= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core CONFIGURE_ARGS+= --enable-libopencv .else CONFIGURE_ARGS+= --disable-libopencv .endif # openjpeg .if ${PORT_OPTIONS:MOPENJPEG} LIB_DEPENDS+= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 CONFIGURE_ARGS+= --enable-libopenjpeg .else CONFIGURE_ARGS+= --disable-libopenjpeg .endif # rtmp .if ${PORT_OPTIONS:MRTMP} LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/librtmp CONFIGURE_ARGS+= --enable-librtmp . if ${OPENSSLBASE} != "/usr" FFMPEG_CFLAGS+= -I${OPENSSLINC} FFMPEG_LDFLAGS+= -L${OPENSSLLIB} . endif .else CONFIGURE_ARGS+= --disable-librtmp .endif # schroedinger .if ${PORT_OPTIONS:MSCHROEDINGER} LIB_DEPENDS+= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger CONFIGURE_ARGS+= --enable-libschroedinger .else CONFIGURE_ARGS+= --disable-libschroedinger .endif # sdl .if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl PLIST_FILES+= bin/ffplay${FFMPEG_SUFFIX} man/man1/ffplay${FFMPEG_SUFFIX}.1.gz PROGS+= ffplay .else CONFIGURE_ARGS+= --disable-ffplay .endif # speex .if ${PORT_OPTIONS:MSPEEX} LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex CONFIGURE_ARGS+= --enable-libspeex .else CONFIGURE_ARGS+= --disable-libspeex .endif # theora .if ${PORT_OPTIONS:MTHEORA} LIB_DEPENDS+= libtheora.so:${PORTSDIR}/multimedia/libtheora CONFIGURE_ARGS+= --enable-libtheora .else CONFIGURE_ARGS+= --disable-libtheora .endif # vaapi .if ${PORT_OPTIONS:MVAAPI} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libva.so:${PORTSDIR}/multimedia/libva CONFIGURE_ARGS+= --enable-vaapi .else CONFIGURE_ARGS+= --disable-vaapi .endif # vdpau .if ${PORT_OPTIONS:MVDPAU} BUILD_DEPENDS+= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau CONFIGURE_ARGS+= --enable-vdpau .else CONFIGURE_ARGS+= --disable-vdpau .endif # vo-aacenc .if ${PORT_OPTIONS:MVO_AACENC} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc CONFIGURE_ARGS+= --enable-libvo-aacenc .else CONFIGURE_ARGS+= --disable-libvo-aacenc .endif # vo-amrwbenc .if ${PORT_OPTIONS:MVO_AMRWBENC} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc CONFIGURE_ARGS+= --enable-libvo-amrwbenc .else CONFIGURE_ARGS+= --disable-libvo-amrwbenc .endif # vorbis .if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= libvorbisenc.so:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --enable-libvorbis FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis .else CONFIGURE_ARGS+= --disable-libvorbis .endif # vp8 .if ${PORT_OPTIONS:MVPX} LIB_DEPENDS+= libvpx.so:${PORTSDIR}/multimedia/libvpx CONFIGURE_ARGS+= --enable-libvpx .else CONFIGURE_ARGS+= --disable-libvpx .endif # x264 .if ${PORT_OPTIONS:MX264} LIB_DEPENDS+= libx264.so:${PORTSDIR}/multimedia/libx264 CONFIGURE_ARGS+= --enable-libx264 .else CONFIGURE_ARGS+= --disable-libx264 .endif # xvid .if ${PORT_OPTIONS:MXVID} LIB_DEPENDS+= libxvidcore.so:${PORTSDIR}/multimedia/xvid CONFIGURE_ARGS+= --enable-libxvid .else CONFIGURE_ARGS+= --disable-libxvid .endif # License knobs .if defined(FFMPEG_NONFREE) RESTRICTED= linking to libfaac or libaacplus restricts redistribution CONFIGURE_ARGS+= --enable-nonfree .endif .if defined(FFMPEG_LICENSE_GPL3) LICENSE+= GPLv3 LGPL3 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 CONFIGURE_ARGS+= --enable-version3 .endif post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \ ${WRKSRC}/subdir.mak @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.conf|' \ ${WRKSRC}/ffserver.c @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \ -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ -e 's|freetype/freetype.h|freetype.h|g' \ -e 's|check_ldflags -Wl,--as-needed||' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \ ${WRKSRC}/doc/texi2pod.pl .if ${PORT_OPTIONS:MSDL} @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -E \ -e 's|#include Index: head/multimedia/ffmpeg23/Makefile =================================================================== --- head/multimedia/ffmpeg23/Makefile (revision 391216) +++ head/multimedia/ffmpeg23/Makefile (revision 391217) @@ -1,418 +1,419 @@ # Created by: Thomas Zander # $FreeBSD$ PORTNAME= ffmpeg PORTVERSION= 2.3.6 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ PKGNAMESUFFIX= 23 MAINTAINER= multimedia@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} HAS_CONFIGURE= yes CONFIGURE_LOG= config.err USES= cpe gmake pkgconfig perl5 tar:bzip2 USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX} USE_LDCONFIG= yes USE_PERL5= build WANT_SDL= yes PORTSCOUT= limit:^2\.3.* FFMPEG_SUFFIX= 23 PLIST_SUB+= FFMPEG_SUFFIX="${FFMPEG_SUFFIX}" CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}" MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}" OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG DOCS FAAC \ FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GSM ICONV \ JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG \ OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \ THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \ X11GRAB X264 X265 XVID OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \ OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= GNUTLS OPENSSL ASS_DESC= Subtitles rendering via libass CDIO_DESC= Audio CD grabbing with libcdio FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK FFSERVER_DESC= Build and install ffserver LIBV4L_DESC= Video for Linux support X11GRAB_DESC= Enable x11 grabbing OPTIONS_SUB= yes # aacplus AACPLUS_LIB_DEPENDS= libaacplus.so:${PORTSDIR}/audio/libaacplus AACPLUS_CONFIGURE_ENABLE= libaacplus # alsa 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 # Opencore AMR WB AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb # ass ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass ASS_CONFIGURE_ENABLE= libass # cdio CDIO_LIB_DEPENDS= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia CDIO_CONFIGURE_ENABLE= libcdio # celt CELT_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt CELT_CONFIGURE_ENABLE= libcelt # faac FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac FAAC_CONFIGURE_ENABLE= libfaac # fdk_aac FDK_AAC_LIB_DEPENDS= libfdk-aac.so:${PORTSDIR}/audio/fdk-aac FDK_AAC_CONFIGURE_ENABLE= libfdk-aac # ffserver FFSERVER_CONFIGURE_ENABLE= ffserver # fontconfig FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig FONTCONFIG_CONFIGURE_ENABLE= fontconfig # freetype FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype # frei0r FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r # gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ENABLE= gnutls # gsm GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm GSM_CONFIGURE_ENABLE= libgsm # iconv ICONV_USES= iconv ICONV_CONFIGURE_ENABLE= iconv JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_OFF= --disable-indev=jack # lame LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CONFIGURE_ENABLE= libmp3lame # libbluray LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray # libv4l LIBV4L_BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat LIBV4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l LIBV4L_CONFIGURE_ENABLE= libv4l2 LIBV4L_CONFIGURE_OFF= --disable-indev=v4l2 \ --disable-outdev=v4l2 # modplug MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug MODPLUG_CONFIGURE_ENABLE= libmodplug # OpenAL OPENAL_LIB_DEPENDS= libopenal.so:${PORTSDIR}/audio/openal-soft OPENAL_CONFIGURE_ENABLE= openal OPENAL_CONFIGURE_OFF= --disable-indev=openal # opencv OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core OPENCV_CONFIGURE_ENABLE= libopencv # openjpeg OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg # openssl OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ENABLE= openssl # opus OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus OPUS_CONFIGURE_ENABLE= libopus # pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse PULSEAUDIO_CONFIGURE_OFF= --disable-indev=pulse \ --disable-outdev=pulse # rtmp RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_CONFIGURE_ENABLE= librtmp # schroedinger SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger # speex SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_ENABLE= libspeex # theora THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora # vaapi VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi # vdpau VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau # vo-aacenc VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc # vo-amrwbenc VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc # vorbis VORBIS_LIB_DEPENDS= libvorbisenc.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= libvorbis # vp8 VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx # x264 X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 # x265 X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265 X265_CONFIGURE_ENABLE= libx265 # xvid 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 DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} .include # ssl .if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS) 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 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 CONFIGURE_ARGS+= --enable-memalign-hack .endif .if ${ARCH} == "armv6" CONFIGURE_ENV+= ASFLAGS=-no-integrated-as .endif 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" \ --datadir="${DATADIR}" \ --docdir="${DOCSDIR}" \ --incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \ --libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \ --shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \ --build-suffix="${FFMPEG_SUFFIX}" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ --enable-avresample \ --enable-pthreads \ --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="-lpthread" DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \ README.md RELEASE_NOTES # under doc subdirectory DOC_DOCFILES= APIchanges *.txt PORTDOCS= * .if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= *.html BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html .endif .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} FFPROGS+= ffserver .if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= ffserver.html .endif .endif # sdl .if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl FFPROGS+= ffplay .if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= ffplay.html .endif .else CONFIGURE_ARGS+= --disable-ffplay --disable-outdev=sdl .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 CONFIGURE_ARGS+= --enable-nonfree .endif .if defined(FFMPEG_LICENSE_GPL3) CONFIGURE_ARGS+= --enable-version3 LICENSE= GPLv3 LGPL3 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 .endif post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \ ${WRKSRC}/library.mak @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.conf|' \ ${WRKSRC}/ffserver.c @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||' \ -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ -e 's|freetype/freetype.h|freetype.h|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \ ${WRKSRC}/doc/texi2pod.pl .if ${PORT_OPTIONS:MSDL} @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -E \ -e 's|#include Index: head/multimedia/ffmpeg26/Makefile =================================================================== --- head/multimedia/ffmpeg26/Makefile (revision 391216) +++ head/multimedia/ffmpeg26/Makefile (revision 391217) @@ -1,420 +1,420 @@ # Created by: Thomas Zander # $FreeBSD$ PORTNAME= ffmpeg PORTVERSION= 2.6.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ PKGNAMESUFFIX= 26 MAINTAINER= riggs@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils UNIQUENAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX} DEPRECATED= 2.6 branch is outdated, use multimedia/ffmpeg instead EXPIRATION_DATE= 2015-07-31 HAS_CONFIGURE= yes CONFIGURE_LOG= config.err USES= cpe gmake pkgconfig perl5 tar:bzip2 USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX} USE_PERL5= build WANT_SDL= yes FFMPEG_SUFFIX= 26 PLIST_SUB+= FFMPEG_SUFFIX="${FFMPEG_SUFFIX}" CONFIGURE_ENV+= EXESUF="${FFMPEG_SUFFIX}" MAKE_ARGS+= EXESUF="${FFMPEG_SUFFIX}" OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG DOCS FAAC \ FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GSM ICONV \ JACK LAME LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG \ OPTIMIZED_CFLAGS OPUS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \ THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \ X11GRAB X264 X265 XVID OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS ICONV \ OPENCV SCHROEDINGER THEORA VORBIS VPX X264 XVID OPTIONS_SINGLE= SSL OPTIONS_SINGLE_SSL= GNUTLS OPENSSL ASS_DESC= Subtitles rendering via libass CDIO_DESC= Audio CD grabbing with libcdio FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK FFSERVER_DESC= Build and install ffserver LIBV4L_DESC= Video for Linux support X11GRAB_DESC= Enable x11 grabbing OPTIONS_SUB= yes # aacplus AACPLUS_LIB_DEPENDS= libaacplus.so:${PORTSDIR}/audio/libaacplus AACPLUS_CONFIGURE_ENABLE= libaacplus # alsa 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 # Opencore AMR WB AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb # ass ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass ASS_CONFIGURE_ENABLE= libass # cdio CDIO_LIB_DEPENDS= libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia CDIO_CONFIGURE_ENABLE= libcdio # celt CELT_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt CELT_CONFIGURE_ENABLE= libcelt # faac FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac FAAC_CONFIGURE_ENABLE= libfaac # fdk_aac FDK_AAC_LIB_DEPENDS= libfdk-aac.so:${PORTSDIR}/audio/fdk-aac FDK_AAC_CONFIGURE_ENABLE= libfdk-aac # ffserver FFSERVER_CONFIGURE_ENABLE= ffserver # fontconfig FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig FONTCONFIG_CONFIGURE_ENABLE= fontconfig # freetype FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype # frei0r FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r # gnutls GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ENABLE= gnutls # gsm GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm GSM_CONFIGURE_ENABLE= libgsm # iconv ICONV_USES= iconv ICONV_CONFIGURE_ENABLE= iconv JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_OFF= --disable-indev=jack # lame LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CONFIGURE_ENABLE= libmp3lame # libbluray LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= libbluray # libv4l LIBV4L_BUILD_DEPENDS= v4l_compat>0:${PORTSDIR}/multimedia/v4l_compat LIBV4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l LIBV4L_CONFIGURE_ENABLE= libv4l2 LIBV4L_CONFIGURE_OFF= --disable-indev=v4l2 \ --disable-outdev=v4l2 # modplug MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug MODPLUG_CONFIGURE_ENABLE= libmodplug # OpenAL OPENAL_LIB_DEPENDS= libopenal.so:${PORTSDIR}/audio/openal-soft OPENAL_CONFIGURE_ENABLE= openal OPENAL_CONFIGURE_OFF= --disable-indev=openal # opencv OPENCV_LIB_DEPENDS= libopencv_imgproc.so:${PORTSDIR}/graphics/opencv-core OPENCV_CONFIGURE_ENABLE= libopencv # openjpeg OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg # openssl OPENSSL_USE= OPENSSL=yes OPENSSL_CONFIGURE_ENABLE= openssl # opus OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus OPUS_CONFIGURE_ENABLE= libopus # pulseaudio PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse PULSEAUDIO_CONFIGURE_OFF= --disable-indev=pulse \ --disable-outdev=pulse # rtmp RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_CONFIGURE_ENABLE= librtmp # schroedinger SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger # speex SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_ENABLE= libspeex # theora THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora # vaapi VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi # vdpau VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau # vo-aacenc VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc # vo-amrwbenc VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc # vorbis VORBIS_LIB_DEPENDS= libvorbisenc.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= libvorbis # vp8 VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx # x264 X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 # x265 X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265 X265_CONFIGURE_ENABLE= libx265 # xvid 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 DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} .include # ssl .if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS) 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 .if ${OPSYS} == "FreeBSD" && ${OSVERSION} < 1000000 CONFIGURE_ARGS+= --enable-memalign-hack .endif .if ${ARCH} == "armv6" CONFIGURE_ENV+= ASFLAGS=-no-integrated-as .endif 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" \ --datadir="${DATADIR}" \ --docdir="${DOCSDIR}" \ --incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \ --libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \ --shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \ --build-suffix="${FFMPEG_SUFFIX}" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ --enable-avresample \ --enable-pthreads \ --disable-libmfx \ --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="-lpthread" DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \ README.md RELEASE_NOTES # under doc subdirectory DOC_DOCFILES= APIchanges *.txt PORTDOCS= * .if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= *.html BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html .endif .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} FFPROGS+= ffserver .if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= ffserver.html .endif .endif # sdl .if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl FFPROGS+= ffplay .if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= ffplay.html .endif .else CONFIGURE_ARGS+= --disable-ffplay --disable-outdev=sdl .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 CONFIGURE_ARGS+= --enable-nonfree .endif .if defined(FFMPEG_LICENSE_GPL3) CONFIGURE_ARGS+= --enable-version3 LICENSE= GPLv3 LGPL3 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 .endif post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|$$(DESTDIR)$$(prefix)/libdata/pkgconfig|' \ ${WRKSRC}/library.mak @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.conf|' \ ${WRKSRC}/ffserver.c @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||' \ -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ -e 's|freetype/freetype.h|freetype.h|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \ ${WRKSRC}/doc/texi2pod.pl .if ${PORT_OPTIONS:MSDL} @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -E \ -e 's|#include Index: head/multimedia/gstreamer-plugins-x264/Makefile =================================================================== --- head/multimedia/gstreamer-plugins-x264/Makefile (revision 391216) +++ head/multimedia/gstreamer-plugins-x264/Makefile (revision 391217) @@ -1,14 +1,14 @@ # Created by: Koop Mast # $FreeBSD$ # $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $ -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia COMMENT= Gstreamer x264 plugin GST_PLUGIN= x264 MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer-plugins .include "${MASTERDIR}/Makefile" Index: head/multimedia/gstreamer1-plugins-x264/Makefile =================================================================== --- head/multimedia/gstreamer1-plugins-x264/Makefile (revision 391216) +++ head/multimedia/gstreamer1-plugins-x264/Makefile (revision 391217) @@ -1,13 +1,13 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= multimedia COMMENT= Gstreamer x264 plugin GST_PLUGIN= x264 DIST= ugly MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins .include "${MASTERDIR}/Makefile" Index: head/multimedia/handbrake/Makefile =================================================================== --- head/multimedia/handbrake/Makefile (revision 391216) +++ head/multimedia/handbrake/Makefile (revision 391217) @@ -1,194 +1,195 @@ # Created by: Andrew Thompson # $FreeBSD$ PORTNAME= handbrake PORTVERSION= 0.10.2 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.handbrake.fr/releases/${PORTVERSION}/ \ http://download.handbrake.fr/handbrake/contrib/:contrib \ http://download.handbrake.fr/contrib/:contrib DISTFILES= HandBrake-${PORTVERSION}.tar.bz2 \ a52dec-0.7.4.tar.gz:contrib \ faac-1.28.tar.gz:contrib \ faad2-2.7.tar.gz:contrib \ fdk-aac-v0.1.1-6-gbae4553.tar.bz2:contrib \ libav-v10.1.tar.bz2:contrib \ libbluray-0.5.0.tar.bz2:contrib \ libdca-r81-strapped.tar.gz:contrib \ libdvdnav-5.0.1-0-gaa3659d.tar.gz:contrib \ libdvdread-5.0.0-6-gcb1ae87.tar.gz:contrib \ libvpx-v1.3.0.tar.bz2:contrib \ x264-r2479-dd79a61.tar.gz:contrib \ x265-9329-0d30d2641875-1.5.tar.bz2:contrib DIST_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Versatile DVD ripper and video transcoder LICENSE= GPLv2 BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ cmake:${PORTSDIR}/devel/cmake LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libfribidi.so:${PORTSDIR}/converters/fribidi \ libxml2.so:${PORTSDIR}/textproc/libxml2 \ libass.so:${PORTSDIR}/multimedia/libass \ libogg.so:${PORTSDIR}/audio/libogg \ libvorbis.so:${PORTSDIR}/audio/libvorbis \ libvorbisenc.so:${PORTSDIR}/audio/libvorbis \ libtheoradec.so:${PORTSDIR}/multimedia/libtheora \ libtheoraenc.so:${PORTSDIR}/multimedia/libtheora \ libsamplerate.so:${PORTSDIR}/audio/libsamplerate \ libx264.so:${PORTSDIR}/multimedia/libx264 \ libmp3lame.so:${PORTSDIR}/audio/lame CONFLICTS_BUILD= x265 .if !defined(PACKAGE_BUILDING) # DVDCSS version hardcoded in contrib/libdvdread/libdvdread/src/dvd_input.c (dlopen'ed) LIB_DEPENDS+= libdvdcss.so.2:${PORTSDIR}/multimedia/libdvdcss .endif GNU_CONFIGURE= yes USES= autoreconf:build gmake iconv libtool:build pkgconfig python:build WRKSRC= ${WRKDIR}/HandBrake-${PORTVERSION} PLIST_FILES= bin/HandBrakeCLI CONFIGURE_ARGS= --force CONFIGURE_TARGET= build BUILD_WRKSRC= ${WRKSRC}/build MAKEFILE= GNUmakefile ALL_TARGET= # MAKE_JOBS_UNSAFE= yes NOPRECIOUSMAKEVARS= yes # for ffmpeg and x264 OPTIONS_DEFINE= X11 X11_DESC= Build GTK+3 based GUI program OPTIONS_DEFAULT= X11 .include # Recent GNU binutils are required to handle inline SSSE3 asm (in x264), and # to support --exclude-libs option for ld(1) when building GUI program .if ${PORT_OPTIONS:MX11} BUILD_DEPENDS+= ${LOCALBASE}/bin/ld:${PORTSDIR}/devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin LIB_DEPENDS+= libvpx.so:${PORTSDIR}/multimedia/libvpx .endif CC!=/usr/bin/which ${CC} MAKE_ENV+=ACLOCAL=${LOCALBASE}/bin/aclocal .if ${PORT_OPTIONS:MX11} CONFIGURE_ARGS+= --disable-gtk-update-checks --disable-gst CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libnotify.so:${PORTSDIR}/devel/libnotify USES+= gettext USE_GNOME+= gtk30 PLIST_FILES+= bin/HandBrake DESKTOP_ENTRIES="HandBrake" \ "${COMMENT}" \ "" \ "HandBrake" \ "AudioVideo;" \ false .else CONFIGURE_ARGS+= --disable-gtk .endif # Enforce linking to the system c++ standard lib .if ${OSVERSION} >= 1000054 LDFLAGS+= -lc++ .else LDFLAGS+= -lstdc++ .endif # HandBrake tries to fetch its dependencies during build phase, which is not # considered good in FreeBSD. Instead, we will prepare everything manually. post-extract: .SILENT # Unversioned directories can be copied in a loop .for d in a52dec libdca x264 ${MKDIR} ${BUILD_WRKSRC}/contrib/${d} ${MV} ${WRKDIR}/${d} ${BUILD_WRKSRC}/contrib/${d} .endfor # Others had to be processed one by one due to irregular (versioned) names cd ${BUILD_WRKSRC}/contrib && ${MKDIR} faac faad2 fdkaac ffmpeg libbluray libdvdnav \ libdvdread libvpx x265 ${MV} ${WRKDIR}/faac-1.28 ${BUILD_WRKSRC}/contrib/faac ${MV} ${WRKDIR}/faad2-2.7 ${BUILD_WRKSRC}/contrib/faad2 ${MV} ${WRKDIR}/fdk-aac-v0.1.1-6-gbae4553 ${BUILD_WRKSRC}/contrib/fdkaac ${MV} ${WRKDIR}/libav-v10.1 ${BUILD_WRKSRC}/contrib/ffmpeg/libav-v10.1 ${MV} ${WRKDIR}/libbluray-0.5.0 ${BUILD_WRKSRC}/contrib/libbluray ${MV} ${WRKDIR}/libdvdnav-5.0.1-0-gaa3659d ${BUILD_WRKSRC}/contrib/libdvdnav ${MV} ${WRKDIR}/libdvdread-5.0.0-6-gcb1ae87 ${BUILD_WRKSRC}/contrib/libdvdread ${MV} ${WRKDIR}/libvpx-v1.3.0 ${BUILD_WRKSRC}/contrib/libvpx ${MV} ${WRKDIR}/x265-9329-0d30d2641875-1.5 ${BUILD_WRKSRC}/contrib/x265 # Avoid conflict with `print/harfbuzz' (also installs "hb.h") ${MV} ${WRKSRC}/libhb/hb.h ${WRKSRC}/libhb/hb-of-handbrake.h # Mark all bundled dependencies as extracted ${TOUCH} ${BUILD_WRKSRC}/contrib/a52dec/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/faac/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/faad2/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/fdkaac/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/ffmpeg/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libbluray/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libdca/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libdvdnav/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libdvdread/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/libvpx/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/x264/.stamp.extract ${TOUCH} ${BUILD_WRKSRC}/contrib/x265/.stamp.extract post-patch: @${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|' \ ${BUILD_WRKSRC}/contrib/a52dec/a52dec/libao/audio_out_oss.c @${REINPLACE_CMD} -e 's|-ldl|-lc| ; s|\[dl\]|[c]| ; s|ACLOCAL=.*|ACLOCAL=aclocal|g' \ ${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.5.0/configure @${REINPLACE_CMD} -e 's|ACLOCAL = @ACLOCAL@|ACLOCAL = ${LOCALBASE}/bin/aclocal|g' \ -e 's|-D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112L -D_REENTRANT||g' \ ${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.5.0/Makefile.in \ ${BUILD_WRKSRC}/contrib/libbluray/libbluray-0.5.0/src/Makefile.in @${REINPLACE_CMD} \ -e '/GHB_PACKAGES=/s/gthread-2.0/& gmodule-2.0/' \ -e 's/-lhb/& ${ICONV_LIB}/' \ -e 's/-lhandbrake/& ${ICONV_LIB}/' \ -e 's:-lxml2:& ../../contrib/lib/libx265.a ../../contrib/lib/libfdk-aac.a:g' \ ${WRKSRC}/gtk/configure.ac @${REINPLACE_CMD} -e 's| ${WRKDIR}/A06-frame-threading-state.patch @${MV} ${WRKDIR}/A06-frame-threading-state.patch ${WRKSRC}/contrib/ffmpeg/ @${REINPLACE_CMD} -e 's:/lib/cpp:${CPP}:g' ${BUILD_WRKSRC}/contrib/fdkaac/fdk-aac-v0.1.1-6-gbae4553/configure @${REINPLACE_CMD} -E \ -e 's|%%REP_CC%%|${CC}|g' \ -e 's|%%REP_CXX%%|${CXX}|g' \ -e 's|%%REP_I%%|-I./contrib/include -I${LOCALBASE}/include|g' \ -e 's|%%REP_L%%|-L${LOCALBASE}/lib|g' \ -e 's|%%REP_ARCHS%%|${CPUTYPE}|g' \ -e 's|%%REP_ICONV%%|${ICONV_LIB:S/-l//}|g' \ ${WRKSRC}/custom.defs .if !${PORT_OPTIONS:MX11} @${REINPLACE_CMD} -e 's:--enable-libvpx:--disable-libvpx:' ${WRKSRC}/contrib/ffmpeg/module.defs @${REINPLACE_CMD} -e 's| vpx | |' \ ${WRKSRC}/libhb/module.defs ${WRKSRC}/test/module.defs .endif do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/HandBrakeCLI ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MX11} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/gtk/src/ghb ${STAGEDIR}${PREFIX}/bin/HandBrake .endif .include Index: head/multimedia/libav/Makefile =================================================================== --- head/multimedia/libav/Makefile (revision 391216) +++ head/multimedia/libav/Makefile (revision 391217) @@ -1,246 +1,246 @@ # $FreeBSD$ PORTNAME= libav PORTVERSION= 11.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ MAINTAINER= ports@FreeBSD.org COMMENT= Realtime audio/video conversion library BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm USES= pkgconfig:build gmake compiler:features perl5 USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} HAS_CONFIGURE= yes WANT_SDL= yes USE_PERL5= build CPPFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+= --prefix="${PREFIX}" \ --libdir="${PREFIX}/lib/${PORTNAME}" \ --shlibdir="${PREFIX}/lib/${PORTNAME}" \ --incdir="${PREFIX}/include/${PORTNAME}" \ --mandir="${PREFIX}/man" \ --datadir="${DATADIR}" \ --extra-ldflags="-L${LOCALBASE}/lib" \ --enable-pthreads \ --enable-shared \ --enable-runtime-cpudetect \ --disable-debug \ --cc="${CC}" OPTIONS_DEFINE= ALSA AMR_NB AMR_WB BZIP2 CDIO FAAC FDK_AAC DOCS FREETYPE \ FREI0R GNUTLS GSM ILBC JACK LAME OPENCV OPENJPEG OPENSSL \ OPUS PULSEAUDIO RTMP SCHROEDINGER SPEEX THEORA V4L VAAPI \ VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX WAVPACK WEBP X11GRAB \ X264 XVID ZLIB OPTIONS_DEFAULT= BZIP2 FREETYPE FREI0R GNUTLS OPENCV SCHROEDINGER \ THEORA VO_AACENC VORBIS VPX X264 XVID ZLIB FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK ILBC_DESC= iLBC en/decoding via libilbc X11GRAB_DESC= X11 grabbing ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib ALSA_CONFIGURE_ON= --enable-indev=alsa --enable-outdev=alsa ALSA_CONFIGURE_OFF= --disable-indev=alsa --disable-outdev=alsa AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr AMR_NB_CONFIGURE_ENABLE= libopencore-amrnb AMR_WB_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr AMR_WB_CONFIGURE_ENABLE= libopencore-amrwb BZIP2_CONFIGURE_ENABLE= bzlib CDIO_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio \ libcdio_paranoia.so:${PORTSDIR}/sysutils/libcdio-paranoia CDIO_CONFIGURE_ENABLE= libcdio # --enable-libdc1394 # DC1394_LIB_DEPENDS= libdc1394.so:${PORTSDIR}/multimedia/libdc1394 # DC1394_CONFIGURE_ENABLE= libdc1394 FREI0R_BUILD_DEPENDS= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r FREI0R_CONFIGURE_ENABLE= frei0r FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac FAAC_CONFIGURE_ENABLE= libfaac FDK_AAC_LIB_DEPENDS= libfdk-aac.so:${PORTSDIR}/audio/fdk-aac FDK_AAC_CONFIGURE_ENABLE= libfdk-aac FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 FREETYPE_CONFIGURE_ENABLE= libfreetype GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ENABLE= gnutls GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm GSM_CONFIGURE_ENABLE= libgsm ILBC_BUILD_DEPENDS= ${LOCALBASE}/include/ilbc.h:${PORTSDIR}/net/libilbc ILBC_CONFIGURE_ENABLE= libilbc JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_ON= --enable-indev=jack JACK_CONFIGURE_OFF= --disable-indev=jack LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CONFIGURE_ENABLE= libmp3lame OPENCV_LIB_DEPENDS= libopencv_gpu.so:${PORTSDIR}/graphics/opencv OPENCV_CONFIGURE_ENABLE= libopencv OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15 OPENJPEG_CONFIGURE_ENABLE= libopenjpeg OPENSSL_CONFIGURE_ENABLE= openssl OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus OPUS_CONFIGURE_ENABLE= libopus PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= libpulse RTMP_LIB_DEPENDS= librtmp.so:${PORTSDIR}/multimedia/librtmp RTMP_CONFIGURE_ENABLE= librtmp SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= libschroedinger SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_ENABLE= libspeex THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE= libtheora V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat V4L_CONFIGURE_ON= --enable-indev=v4l2 V4L_CONFIGURE_OFF= --disable-indev=v4l2 VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_CONFIGURE_ENABLE= vaapi VDPAU_BUILD_DEPENDS= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau VO_AACENC_LIB_DEPENDS= libvo-aacenc.so:${PORTSDIR}/audio/vo-aacenc VO_AACENC_CONFIGURE_ENABLE= libvo-aacenc VO_AMRWBENC_LIB_DEPENDS= libvo-amrwbenc.so:${PORTSDIR}/audio/vo-amrwbenc VO_AMRWBENC_CONFIGURE_ENABLE= libvo-amrwbenc VORBIS_LIB_DEPENDS= libvorbisenc.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= libvorbis VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx VPX_CONFIGURE_ENABLE= libvpx WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack WAVPACK_CONFIGURE_ENABLE= libwavpack WEBP_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp WEBP_CONFIGURE_ENABLE= libwebp X11GRAB_USE= XORG=x11,xext,xfixes X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_CONFIGURE_ENABLE= libx264 XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid XVID_CONFIGURE_ENABLE= libxvid ZLIB_CONFIGURE_ENABLE= zlib .include .if ${PORT_OPTIONS:MDOCS} BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html .endif .if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes .endif .include .if ${ARCH} == "armv6" CONFIGURE_ENV+= ASFLAGS=-no-integrated-as .endif .if ${ARCH} == "i386" CONFIGURE_ARGS+= --extra-cflags=-m32 .endif .if ${OSVERSION} < 900000 || ${COMPILER_TYPE} == gcc USE_GCC= yes .endif .if ${HAVE_SDL:Msdl} USE_SDL+= sdl MAN1+= avplay.1 CONFIGURE_ARGS+= --enable-avplay PLIST_SUB+= AVPLAY="" .else CONFIGURE_ARGS+= --disable-avplay PLIST_SUB+= AVPLAY="@comment " .endif # License definitions .if ${PORT_OPTIONS:MFAAC} || ${PORT_OPTIONS:MFDK_AAC} || ${PORT_OPTIONS:MOPENSSL} RESTRICTED= linking to libfaac or libaacplus or using OpenSSL support restricts redistribution CONFIGURE_ARGS+= --enable-nonfree AV_NONFREE= true .endif .if ${PORT_OPTIONS:MCDIO} || ${PORT_OPTIONS:MX264} || ${PORT_OPTIONS:MXVID} || ${PORT_OPTIONS:MX11GRAB} CONFIGURE_ARGS+= --enable-gpl .if !defined(AV_NONFREE) LICENSE= GPLv2 AV_ISGPL= true .endif .endif .if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} || ${PORT_OPTIONS:MVO_AACENC} || ${PORT_OPTIONS:MVO_AMRWBENC} CONFIGURE_ARGS+= --enable-version3 .if !defined(AV_NONFREE) .if defined(AV_ISGPL) LICENSE= GPLv3 .else LICENSE= LGPL3 .endif .endif .endif .if !defined(AV_NONFREE) && !defined(AV_ISGPL) && !defined(LICENSE) LICENSE= LGPL21 .endif post-patch: @${REINPLACE_CMD} -e 's|freetype/freetype.h|freetype2/freetype.h|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \ ${WRKSRC}/configure \ ${WRKSRC}/libavcodec/libgsmdec.c @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/library.mak post-configure: .if !${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|CONFIG_TEXI2HTML=yes|!CONFIG_TEXI2HTML=yes|' ${WRKSRC}/config.mak .endif post-stage: .for a in bin/avconv bin/avprobe lib/libav/libavdevice.so.55.0.0\ lib/libav/libavfilter.so.5.0.0 lib/libav/libavformat.so.56.1.0\ lib/libav/libavcodec.so.56.1.0 lib/libav/libavresample.so.2.1.0\ lib/libav/libswscale.so.3.0.0 lib/libav/libavutil.so.54.3.0 ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${a} .endfor .include Index: head/multimedia/libquicktime/Makefile =================================================================== --- head/multimedia/libquicktime/Makefile (revision 391216) +++ head/multimedia/libquicktime/Makefile (revision 391217) @@ -1,141 +1,141 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= libquicktime PORTVERSION= 1.2.4 -PORTREVISION?= 10 +PORTREVISION?= 11 CATEGORIES= multimedia MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= library for reading and writing quicktime files .if !defined(_BUILDING_LIBQUICKTIME_PLUGINS) LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis .endif LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING USE_LDCONFIG= yes USES= gettext gmake libtool pathfix pkgconfig GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib -lintl INSTALL_TARGET= install-strip .if !defined(_BUILDING_LIBQUICKTIME_PLUGINS) USE_XORG= xaw xv CONFIGURE_ARGS= --with-x --enable-gpl --without-doxygen --without-lame OPTIONS_DEFINE= ALSA DV FAAC FAAD FFMPEG GTK2 JPEG OPENGL OPTIMIZED_CFLAGS PNG \ SCHROEDINGER X264 DOCS OPTIONS_DEFAULT= FFMPEG JPEG OPENGL PNG SCHROEDINGER X264 OPTIONS_SUB= yes PORTDOCS= api_usage.html codecs.html qt4l_building.html \ qt4l_codecs.html qt4l_index.html \ qt4l_license.html qt4l_opening.html qt4l_positioning.html \ qt4l_reading.html qt4l_util.html qt4l_writing.html .else CONFIGURE_ARGS+= --without-x --enable-gpl --without-doxygen OPTIONS_DEFINE= OPTIMIZED_CFLAGS .endif .include .if ! ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CONFIGURE_ARGS+= --without-cpuflags .endif .if !defined(_BUILDING_LIBQUICKTIME_PLUGINS) .if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 CONFIGURE_ARGS+= --with-gtk .else CONFIGURE_ARGS+= --without-gtk .endif .if ${PORT_OPTIONS:MALSA} LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib .else CONFIGURE_ARGS+= --without-alsa .endif .if ${PORT_OPTIONS:MOPENGL} USE_GL= yes CONFIGURE_ARGS+= --with-opengl .else CONFIGURE_ARGS+= --without-opengl .endif .if ${PORT_OPTIONS:MDV} LIB_DEPENDS+= libdv.so:${PORTSDIR}/multimedia/libdv CONFIGURE_ARGS+= --with-libdv .else CONFIGURE_ARGS+= --without-libdv .endif .if ${PORT_OPTIONS:MJPEG} USES+= jpeg CONFIGURE_ARGS+= --with-libjpeg .else CONFIGURE_ARGS+= --without-libjpeg .endif .if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png CONFIGURE_ARGS+= --with-libpng .else CONFIGURE_ARGS+= --without-libpng .endif .if ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg CONFIGURE_ARGS+= --with-ffmpeg .else CONFIGURE_ARGS+= --without-ffmpeg .endif .if ${PORT_OPTIONS:MFAAC} LIB_DEPENDS+= libfaac.so:${PORTSDIR}/audio/faac CONFIGURE_ARGS+= --with-faac .else CONFIGURE_ARGS+= --without-faac .endif .if ${PORT_OPTIONS:MFAAD} LIB_DEPENDS+= libfaad.so:${PORTSDIR}/audio/faad CONFIGURE_ARGS+= --with-faad2 .else CONFIGURE_ARGS+= --without-faad2 .endif .if ${PORT_OPTIONS:MX264} LIB_DEPENDS+= libx264.so:${PORTSDIR}/multimedia/libx264 CONFIGURE_ARGS+= --with-x264 .else CONFIGURE_ARGS+= --without-x264 .endif .if ${PORT_OPTIONS:MSCHROEDINGER} LIB_DEPENDS+= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger .else CONFIGURE_ARGS+= --without-schroedinger .endif .endif post-patch: @${REINPLACE_CMD} 's/-DGTK_DISABLE_DEPRECATED//' ${WRKSRC}/configure .if ${PORT_OPTIONS:MDOCS} && !defined(_BUILDING_LIBQUICKTIME_PLUGINS) post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif .include Index: head/multimedia/libx264/Makefile =================================================================== --- head/multimedia/libx264/Makefile (revision 391216) +++ head/multimedia/libx264/Makefile (revision 391217) @@ -1,97 +1,30 @@ # Created by: Michael Johnson # $FreeBSD$ # # Updating notes: see multimedia/x264/Makefile. -PORTNAME= libx264 -PORTVERSION= 0.${X264_BUILD}.${X264_REV} -PORTREVISION= 3 -CATEGORIES= multimedia -MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \ - http://samples.mplayerhq.hu/yuv4mpeg2/:pgo -DISTNAME= x264-snapshot-${X264_SNAPSHOT}-2245-stable -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} -DIST_SUBDIR= x264 -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +PKGNAMEPREFIX= lib +COMMENT= H.264/MPEG-4 AVC Video Encoding (Library) +MASTERDIR= ${.CURDIR}/../x264 +PLIST= ${.CURDIR}/pkg-plist -MAINTAINER= koobs@FreeBSD.org -COMMENT= Library for encoding H.264/MPEG-4 AVC video - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -BUILD_DEPENDS= yasm>=1.2.0:${PORTSDIR}/devel/yasm \ - bash:${PORTSDIR}/shells/bash - -X264_BUILD= 142 -X264_REV= 2455 -X264_COMMIT= 021c0dc6c95c1bc239c9db78a80dd85fc856a4dd -X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g} -X264_SNAPSHOT= 20140827 - USES= gmake pathfix tar:bzip2 -USE_LDCONFIG= yes -HAS_CONFIGURE= yes OPTIONS_DEFINE= ASM DEBUG GCC HI10P PGO -OPTIONS_DEFAULT= ASM +OPTIONS_EXCLUDE= GPAC LAV -ASM_DESC= Enable Assembly Optimizations -DEBUG_DESC= Generate Debugging Symbols -GCC_DESC= Use current GCC -HI10P_DESC= Enable High 10 Profile 10-bit encoding +DEBUG_CONFIGURE_OFF= --enable-strip -ASM_CONFIGURE_OFF= --disable-asm -DEBUG_CONFIGURE_ON= --enable-debug +HI10P_DESC= Enable High 10 Profile 10-bit encoding HI10P_CONFIGURE_ON= --bit-depth=10 -CONFIGURE_ARGS+= --extra-cflags="-I${LOCALBASE}/include" \ - --extra-ldflags="-L${LOCALBASE}/lib" \ - --enable-static --enable-shared \ - --disable-opencl -CFLAGS_armv6+= -mcpu=arm1136jf-s +CONFIGURE_ARGS= ${CONFIGURE_COMMON_ARGS} \ + --enable-static \ + --enable-shared \ + --disable-cli PATHFIX_MAKEFILEIN= Makefile -PLIST_SUB+= X264_BUILD=${X264_BUILD} -.include +PLIST_SUB+= X264_BUILD=${X264_BUILD} -.if ${PORT_OPTIONS:MGCC} -USE_GCC= yes -.elif ${PORT_OPTIONS:MPGO} -USE_GCC= any -.endif - -.if ${PORT_OPTIONS:MPGO} -# y4m sample video -Y4M_VIDEO= example.y4m -Y4M_VIDEO_DISTFILE= example.y4m.bz2 - -DISTFILES+= ${Y4M_VIDEO_DISTFILE}:pgo -ALL_TARGET= fprofiled -MAKE_ENV+= VIDS="${WRKDIR}/${Y4M_VIDEO}" - -RESTRICTED= ${Y4M_VIDEO_DISTFILE} file may not be mirrored -RESTRICTED_FILES= ${Y4M_VIDEO_DISTFILE} -.endif - -post-extract: -.if ${PORT_OPTIONS:MPGO} - @( cd ${WRKDIR} && ${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} > ${Y4M_VIDEO} ) -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ - s|/bin/bash|${LOCALBASE}/bin/bash|; \ - s|gpac_static|gpac|g' \ - ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|bash|sh|; \ - s|VER="x"|VER="${X264_REV} ${X264_GITVER}"|; \ - s|VERSION=""|VERSION=" r${X264_REV} ${X264_GITVER}"|' \ - ${WRKSRC}/version.sh - -post-install: - ${RM} ${STAGEDIR}${PREFIX}/bin/x264 - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libx264.so.* - -.include +.include "${MASTERDIR}/Makefile" Index: head/multimedia/libx264/files/patch-common_arm_predict-a.S =================================================================== --- head/multimedia/libx264/files/patch-common_arm_predict-a.S (revision 391216) +++ head/multimedia/libx264/files/patch-common_arm_predict-a.S (nonexistent) @@ -1,242 +0,0 @@ ---- common/arm/predict-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/predict-a.S -@@ -77,7 +77,7 @@ function x264_predict_4x4_h_armv6 - add ip, ip, ip, lsl #16 - str ip, [r0, #3*FDEC_STRIDE] - bx lr --.endfunc -+endfunc - - function x264_predict_4x4_v_armv6 - ldr r1, [r0, #0 - 1 * FDEC_STRIDE] -@@ -86,7 +86,7 @@ function x264_predict_4x4_v_armv6 - str r1, [r0, #0 + 2 * FDEC_STRIDE] - str r1, [r0, #0 + 3 * FDEC_STRIDE] - bx lr --.endfunc -+endfunc - - function x264_predict_4x4_dc_armv6 - mov ip, #0 -@@ -109,7 +109,7 @@ function x264_predict_4x4_dc_armv6 - str r1, [r0, #2*FDEC_STRIDE] - str r1, [r0, #3*FDEC_STRIDE] - bx lr --.endfunc -+endfunc - - function x264_predict_4x4_dc_top_neon - mov r12, #FDEC_STRIDE -@@ -124,7 +124,7 @@ function x264_predict_4x4_dc_top_neon - vst1.32 d1[0], [r0,:32], r12 - vst1.32 d1[0], [r0,:32], r12 - bx lr --.endfunc -+endfunc - - // return a1 = (a1+2*b1+c1+2)>>2 a2 = (a2+2*b2+c2+2)>>2 - .macro PRED4x4_LOWPASS a1 b1 c1 a2 b2 c2 pb_1 -@@ -167,7 +167,7 @@ function x264_predict_4x4_ddr_armv6 - add r5, r5, r4, lsr #8 - str r5, [r0, #3*FDEC_STRIDE] - pop {r4-r6,pc} --.endfunc -+endfunc - - function x264_predict_4x4_ddl_neon - sub r0, #FDEC_STRIDE -@@ -186,7 +186,7 @@ function x264_predict_4x4_ddl_neon - vst1.32 {d2[0]}, [r0,:32], ip - vst1.32 {d3[0]}, [r0,:32], ip - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_dc_neon - mov ip, #0 -@@ -210,7 +210,7 @@ function x264_predict_8x8_dc_neon - vst1.64 {d0}, [r0,:64], ip - .endr - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_predict_8x8_h_neon - add r1, r1, #7 -@@ -233,7 +233,7 @@ function x264_predict_8x8_h_neon - vst1.64 {d6}, [r0,:64], ip - vst1.64 {d7}, [r0,:64], ip - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_v_neon - add r1, r1, #16 -@@ -243,7 +243,7 @@ function x264_predict_8x8_v_neon - vst1.8 {d0}, [r0,:64], r12 - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_ddl_neon - add r1, #16 -@@ -271,7 +271,7 @@ function x264_predict_8x8_ddl_neon - vst1.8 d2, [r0,:64], r12 - vst1.8 d1, [r0,:64], r12 - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_ddr_neon - vld1.8 {d0-d3}, [r1,:128] -@@ -301,7 +301,7 @@ function x264_predict_8x8_ddr_neon - vst1.8 {d4}, [r0,:64], r12 - vst1.8 {d5}, [r0,:64], r12 - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_vl_neon - add r1, #16 -@@ -332,7 +332,7 @@ function x264_predict_8x8_vl_neon - vst1.8 {d3}, [r0,:64], r12 - vst1.8 {d2}, [r0,:64], r12 - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_vr_neon - add r1, #8 -@@ -364,7 +364,7 @@ function x264_predict_8x8_vr_neon - vst1.8 {d6}, [r0,:64], r12 - vst1.8 {d3}, [r0,:64], r12 - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_hd_neon - mov r12, #FDEC_STRIDE -@@ -397,7 +397,7 @@ function x264_predict_8x8_hd_neon - vst1.8 {d16}, [r0,:64], r12 - - bx lr --.endfunc -+endfunc - - function x264_predict_8x8_hu_neon - mov r12, #FDEC_STRIDE -@@ -430,7 +430,7 @@ function x264_predict_8x8_hu_neon - vst1.8 {d7}, [r0,:64], r12 - vst1.8 {d17}, [r0,:64] - bx lr --.endfunc -+endfunc - - function x264_predict_8x8c_dc_top_neon - sub r2, r0, #FDEC_STRIDE -@@ -443,7 +443,7 @@ function x264_predict_8x8c_dc_top_neon - vdup.8 d0, d0[0] - vtrn.32 d0, d1 - b pred8x8_dc_end --.endfunc -+endfunc - - function x264_predict_8x8c_dc_left_neon - mov r1, #FDEC_STRIDE -@@ -455,7 +455,7 @@ function x264_predict_8x8c_dc_left_neon - vdup.8 d1, d0[1] - vdup.8 d0, d0[0] - b pred8x8_dc_end --.endfunc -+endfunc - - function x264_predict_8x8c_dc_neon - sub r2, r0, #FDEC_STRIDE -@@ -481,7 +481,7 @@ pred8x8_dc_end: - vst1.8 {d1}, [r2,:64], r1 - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_8x8c_h_neon - sub r1, r0, #1 -@@ -493,7 +493,7 @@ function x264_predict_8x8c_h_neon - vst1.64 {d2}, [r0,:64], ip - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_8x8c_v_neon - sub r0, r0, #FDEC_STRIDE -@@ -503,7 +503,7 @@ function x264_predict_8x8c_v_neon - vst1.64 {d0}, [r0,:64], ip - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_8x8c_p_neon - sub r3, r0, #FDEC_STRIDE -@@ -556,7 +556,7 @@ function x264_predict_8x8c_p_neon - subs r3, r3, #1 - bne 1b - bx lr --.endfunc -+endfunc - - - function x264_predict_16x16_dc_top_neon -@@ -567,7 +567,7 @@ function x264_predict_16x16_dc_top_neon - vrshrn.u16 d0, q0, #4 - vdup.8 q0, d0[0] - b pred16x16_dc_end --.endfunc -+endfunc - - function x264_predict_16x16_dc_left_neon - mov r1, #FDEC_STRIDE -@@ -578,7 +578,7 @@ function x264_predict_16x16_dc_left_neon - vrshrn.u16 d0, q0, #4 - vdup.8 q0, d0[0] - b pred16x16_dc_end --.endfunc -+endfunc - - function x264_predict_16x16_dc_neon - sub r3, r0, #FDEC_STRIDE -@@ -616,7 +616,7 @@ pred16x16_dc_end: - vst1.64 {d0-d1}, [r0,:128], r1 - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_16x16_h_neon - sub r1, r0, #1 -@@ -630,7 +630,7 @@ function x264_predict_16x16_h_neon - vst1.64 {d2-d3}, [r0,:128], ip - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_16x16_v_neon - sub r0, r0, #FDEC_STRIDE -@@ -640,7 +640,7 @@ function x264_predict_16x16_v_neon - vst1.64 {d0-d1}, [r0,:128], ip - .endr - bx lr --.endfunc -+endfunc - - function x264_predict_16x16_p_neon - sub r3, r0, #FDEC_STRIDE -@@ -697,4 +697,4 @@ function x264_predict_16x16_p_neon - subs r3, r3, #1 - bne 1b - bx lr --.endfunc -+endfunc Property changes on: head/multimedia/libx264/files/patch-common_arm_predict-a.S ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libx264/files/patch-common_arm_deblock-a.S =================================================================== --- head/multimedia/libx264/files/patch-common_arm_deblock-a.S (revision 391216) +++ head/multimedia/libx264/files/patch-common_arm_deblock-a.S (nonexistent) @@ -1,44 +0,0 @@ ---- common/arm/deblock-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/deblock-a.S -@@ -142,7 +142,7 @@ function x264_deblock_v_luma_neon - - align_pop_regs - bx lr --.endfunc -+endfunc - - function x264_deblock_h_luma_neon - h264_loop_filter_start -@@ -194,7 +194,7 @@ function x264_deblock_h_luma_neon - - align_pop_regs - bx lr --.endfunc -+endfunc - - .macro h264_loop_filter_chroma - vdup.8 q11, r2 // alpha -@@ -255,7 +255,7 @@ function x264_deblock_v_chroma_neon - vst2.8 {d0, d1}, [r0,:128], r1 - - bx lr --.endfunc -+endfunc - - function x264_deblock_h_chroma_neon - h264_loop_filter_start -@@ -303,7 +303,7 @@ function x264_deblock_h_chroma_neon - vst1.8 {d3}, [r0], r1 - - bx lr --.endfunc -+endfunc - - function x264_deblock_strength_neon - ldr ip, [sp] -@@ -409,4 +409,4 @@ lists: - - vst1.8 {q8}, [r3,:128] @ bs[0] - bx lr --.endfunc -+endfunc Property changes on: head/multimedia/libx264/files/patch-common_arm_deblock-a.S ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libx264/files/patch-common_arm_mc-a.S =================================================================== --- head/multimedia/libx264/files/patch-common_arm_mc-a.S (revision 391216) +++ head/multimedia/libx264/files/patch-common_arm_mc-a.S (nonexistent) @@ -1,386 +0,0 @@ ---- common/arm/mc-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/mc-a.S -@@ -50,7 +50,7 @@ function x264_prefetch_ref_arm - pld [r3, r1, lsl #1] - pld [r3, r2] - bx lr --.endfunc -+endfunc - - // void prefetch_fenc( uint8_t *pix_y, intptr_t stride_y, - // uint8_t *pix_uv, intptr_t stride_uv, int mb_x ) -@@ -76,7 +76,7 @@ function x264_prefetch_fenc_arm - pld [ip] - pld [ip, r3] - pop {pc} --.endfunc -+endfunc - - - // void *x264_memcpy_aligned( void *dst, const void *src, size_t n ) -@@ -85,7 +85,7 @@ function x264_memcpy_aligned_neon - movrel ip, memcpy_table - and r3, r3, #0xc - ldr pc, [ip, r3] --.endfunc -+endfunc - - .macro MEMCPY_ALIGNED srcalign dstalign - function memcpy_aligned_\dstalign\()_\srcalign\()_neon, export=0 -@@ -127,7 +127,7 @@ function memcpy_aligned_\dstalign\()_\sr - vst1.64 {d0}, [r3,:64]! - .endif - bx lr --.endfunc -+endfunc - .endm - - MEMCPY_ALIGNED 16, 16 -@@ -156,7 +156,7 @@ memzero_loop: - .endr - bgt memzero_loop - bx lr --.endfunc -+endfunc - - - // void pixel_avg( uint8_t *dst, intptr_t dst_stride, -@@ -175,7 +175,7 @@ function x264_pixel_avg_\w\()x\h\()_neon - cmp ip, #0 - bge x264_pixel_avg_weight_w\w\()_add_add_neon - b x264_pixel_avg_weight_w\w\()_sub_add_neon // weight < 0 --.endfunc -+endfunc - .endm - - AVGH 4, 2 -@@ -253,7 +253,7 @@ function x264_pixel_avg_weight_w4_\ext\( - vst1.32 {d1[0]}, [r0,:32], r1 - bgt 1b - pop {r4-r6,pc} --.endfunc -+endfunc - - function x264_pixel_avg_weight_w8_\ext\()_neon, export=0 - load_weights_\ext -@@ -277,7 +277,7 @@ function x264_pixel_avg_weight_w8_\ext\( - vst1.64 {d3}, [r0,:64], r1 - bgt 1b - pop {r4-r6,pc} --.endfunc -+endfunc - - function x264_pixel_avg_weight_w16_\ext\()_neon, export=0 - load_weights_\ext -@@ -297,7 +297,7 @@ function x264_pixel_avg_weight_w16_\ext\ - vst1.64 {d2-d3}, [r0,:128], r1 - bgt 1b - pop {r4-r6,pc} --.endfunc -+endfunc - .endm - - AVG_WEIGHT add_add -@@ -316,7 +316,7 @@ function x264_pixel_avg_w4_neon, export= - vst1.32 {d1[0]}, [r0,:32], r1 - bgt x264_pixel_avg_w4_neon - pop {r4-r6,pc} --.endfunc -+endfunc - - function x264_pixel_avg_w8_neon, export=0 - subs lr, lr, #4 -@@ -338,7 +338,7 @@ function x264_pixel_avg_w8_neon, export= - vst1.64 {d3}, [r0,:64], r1 - bgt x264_pixel_avg_w8_neon - pop {r4-r6,pc} --.endfunc -+endfunc - - function x264_pixel_avg_w16_neon, export=0 - subs lr, lr, #4 -@@ -360,7 +360,7 @@ function x264_pixel_avg_w16_neon, export - vst1.64 {d6-d7}, [r0,:128], r1 - bgt x264_pixel_avg_w16_neon - pop {r4-r6,pc} --.endfunc -+endfunc - - - function x264_pixel_avg2_w4_neon -@@ -379,7 +379,7 @@ avg2_w4_loop: - vst1.32 {d1[0]}, [r0,:32], r1 - bgt avg2_w4_loop - pop {pc} --.endfunc -+endfunc - - function x264_pixel_avg2_w8_neon - ldr ip, [sp, #4] -@@ -397,7 +397,7 @@ avg2_w8_loop: - vst1.64 {d1}, [r0,:64], r1 - bgt avg2_w8_loop - pop {pc} --.endfunc -+endfunc - - function x264_pixel_avg2_w16_neon - ldr ip, [sp, #4] -@@ -415,7 +415,7 @@ avg2_w16_loop: - vst1.64 {d4-d5}, [r0,:128], r1 - bgt avg2_w16_loop - pop {pc} --.endfunc -+endfunc - - function x264_pixel_avg2_w20_neon - ldr ip, [sp, #4] -@@ -438,7 +438,7 @@ avg2_w20_loop: - vst1.32 {d6[0]}, [r0,:32], r1 - bgt avg2_w20_loop - pop {pc} --.endfunc -+endfunc - - - .macro weight_prologue type -@@ -499,7 +499,7 @@ weight20_loop: - vst1.32 {d20[1]}, [r0,:32], r1 - bgt weight20_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w16_neon - weight_prologue full -@@ -531,7 +531,7 @@ weight16_loop: - vst1.8 {d18-d19}, [r0,:128], r1 - bgt weight16_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w8_neon - weight_prologue full -@@ -553,7 +553,7 @@ weight8_loop: - vst1.8 {d18}, [r0,:64], r1 - bgt weight8_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w4_neon - weight_prologue full -@@ -572,7 +572,7 @@ weight4_loop: - vst1.32 {d16[1]}, [r0,:32], r1 - bgt weight4_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w20_nodenom_neon - weight_prologue nodenom -@@ -609,7 +609,7 @@ weight20_nodenom_loop: - vst1.32 {d20[1]}, [r0,:32], r1 - bgt weight20_nodenom_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w16_nodenom_neon - weight_prologue nodenom -@@ -637,7 +637,7 @@ weight16_nodenom_loop: - vst1.8 {d18-d19}, [r0,:128], r1 - bgt weight16_nodenom_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w8_nodenom_neon - weight_prologue nodenom -@@ -657,7 +657,7 @@ weight8_nodenom_loop: - vst1.8 {d17}, [r0,:64], r1 - bgt weight8_nodenom_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - function x264_mc_weight_w4_nodenom_neon - weight_prologue nodenom -@@ -675,7 +675,7 @@ weight4_nodenom_loop: - vst1.32 {d16[1]}, [r0,:32], r1 - bgt weight4_nodenom_loop - pop {r4-r5,pc} --.endfunc -+endfunc - - .macro weight_simple_prologue - push {lr} -@@ -699,7 +699,7 @@ weight20_\name\()_loop: - vst1.8 {d19-d21}, [r0,:64], r1 - bgt weight20_\name\()_loop - pop {pc} --.endfunc -+endfunc - - function x264_mc_weight_w16_\name\()_neon - weight_simple_prologue -@@ -713,7 +713,7 @@ weight16_\name\()_loop: - vst1.8 {d18-d19}, [r0,:128], r1 - bgt weight16_\name\()_loop - pop {pc} --.endfunc -+endfunc - - function x264_mc_weight_w8_\name\()_neon - weight_simple_prologue -@@ -726,7 +726,7 @@ weight8_\name\()_loop: - vst1.8 {d17}, [r0,:64], r1 - bgt weight8_\name\()_loop - pop {pc} --.endfunc -+endfunc - - function x264_mc_weight_w4_\name\()_neon - weight_simple_prologue -@@ -739,7 +739,7 @@ weight4_\name\()_loop: - vst1.32 {d17[0]}, [r0,:32], r1 - bgt weight4_\name\()_loop - pop {pc} --.endfunc -+endfunc - .endm - - weight_simple offsetadd, vqadd.u8 -@@ -761,7 +761,7 @@ copy_w4_loop: - vst1.32 {d3[0]}, [r0,:32], r1 - bgt copy_w4_loop - bx lr --.endfunc -+endfunc - - function x264_mc_copy_w8_neon - ldr ip, [sp] -@@ -777,7 +777,7 @@ copy_w8_loop: - vst1.32 {d3}, [r0,:64], r1 - bgt copy_w8_loop - bx lr --.endfunc -+endfunc - - function x264_mc_copy_w16_neon - ldr ip, [sp] -@@ -793,7 +793,7 @@ copy_w16_loop: - vst1.32 {d6-d7}, [r0,:128], r1 - bgt copy_w16_loop - bx lr --.endfunc -+endfunc - - function x264_mc_copy_w16_aligned_neon - ldr ip, [sp] -@@ -809,7 +809,7 @@ copy_w16_aligned_loop: - vst1.32 {d6-d7}, [r0,:128], r1 - bgt copy_w16_aligned_loop - bx lr --.endfunc -+endfunc - - - // void x264_mc_chroma_neon( uint8_t *dst, intptr_t i_dst_stride, -@@ -1159,7 +1159,7 @@ mc_chroma_w8: - vpop {d8-d11} - pop {r4-r8, pc} - --.endfunc -+endfunc - - - // hpel_filter_v( uint8_t *dst, uint8_t *src, int16_t *buf, intptr_t stride, int width ) -@@ -1200,7 +1200,7 @@ filter_v_loop: - vst1.64 {d0-d1}, [r0,:128]! - bgt filter_v_loop - pop {pc} --.endfunc -+endfunc - - // hpel_filter_c( uint8_t *dst, int16_t *buf, int width ); - function x264_hpel_filter_c_neon -@@ -1285,7 +1285,7 @@ filter_c_loop: - vst1.64 {d30-d31}, [r0,:128]! - bgt filter_c_loop - bx lr --.endfunc -+endfunc - - // hpel_filter_h( uint8_t *dst, uint8_t *src, int width ); - function x264_hpel_filter_h_neon -@@ -1372,7 +1372,7 @@ filter_h_loop: - vst1.64 {d6-d7}, [r0,:128]! - bgt filter_h_loop - bx lr --.endfunc -+endfunc - - - // frame_init_lowres_core( uint8_t *src0, uint8_t *dst0, uint8_t *dsth, uint8_t *dstv, -@@ -1464,7 +1464,7 @@ lowres_xloop_end: - - vpop {d8-d15} - pop {r4-r10,pc} --.endfunc -+endfunc - - function x264_load_deinterleave_chroma_fdec_neon - mov ip, #FDEC_STRIDE/2 -@@ -1477,7 +1477,7 @@ function x264_load_deinterleave_chroma_f - bgt 1b - - bx lr --.endfunc -+endfunc - - function x264_load_deinterleave_chroma_fenc_neon - mov ip, #FENC_STRIDE/2 -@@ -1490,7 +1490,7 @@ function x264_load_deinterleave_chroma_f - bgt 1b - - bx lr --.endfunc -+endfunc - - function x264_plane_copy_deinterleave_neon - push {r4-r7, lr} -@@ -1516,7 +1516,7 @@ block: - bgt block - - pop {r4-r7, pc} --.endfunc -+endfunc - - function x264_plane_copy_deinterleave_rgb_neon - push {r4-r8, r10, r11, lr} -@@ -1568,7 +1568,7 @@ block4: - bgt block4 - - pop {r4-r8, r10, r11, pc} --.endfunc -+endfunc - - function x264_plane_copy_interleave_neon - push {r4-r7, lr} -@@ -1595,7 +1595,7 @@ blocki: - bgt blocki - - pop {r4-r7, pc} --.endfunc -+endfunc - - function x264_store_interleave_chroma_neon - push {lr} -@@ -1609,4 +1609,4 @@ function x264_store_interleave_chroma_ne - bgt 1b - - pop {pc} --.endfunc -+endfunc Property changes on: head/multimedia/libx264/files/patch-common_arm_mc-a.S ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libx264/files/patch-configure =================================================================== --- head/multimedia/libx264/files/patch-configure (revision 391216) +++ head/multimedia/libx264/files/patch-configure (nonexistent) @@ -1,91 +0,0 @@ ---- configure.orig 2014-08-27 22:45:08.000000000 +0200 -+++ configure 2015-01-07 13:42:20.868702616 +0100 -@@ -197,8 +197,9 @@ - - as_check() { - log_check "whether $AS supports $1" -- echo "$1" > conftest.asm -- if $AS conftest.asm $ASFLAGS $2 -o conftest.o >conftest.log 2>&1; then -+ echo "$1" > conftest$AS_EXT -+ as_cmd="$AS conftest$AS_EXT $ASFLAGS $2 -o conftest.o" -+ if $as_cmd >conftest.log 2>&1; then - res=$? - log_ok - else -@@ -206,12 +207,12 @@ - log_fail - log_msg "Failed commandline was:" - log_msg "--------------------------------------------------" -- log_msg "$AS conftest.asm $ASFLAGS $2 -o conftest.o" -+ log_msg "$as_cmd" - cat conftest.log >> config.log - log_msg "--------------------------------------------------" - log_msg "Failed program was:" - log_msg "--------------------------------------------------" -- cat conftest.asm >> config.log -+ cat conftest$AS_EXT >> config.log - log_msg "--------------------------------------------------" - fi - return $res -@@ -302,10 +303,13 @@ - cross_prefix="" - - EXE="" -+AS_EXT=".S" -+NL=" -+" - - # list of all preprocessor HAVE values we can define - CONFIG_HAVE="MALLOC_H ALTIVEC ALTIVEC_H MMX ARMV6 ARMV6T2 NEON BEOSTHREAD POSIXTHREAD WIN32THREAD THREAD LOG2F SWSCALE \ -- LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP LSMASH X86_INLINE_ASM" -+ LAVF FFMS GPAC AVS GPL VECTOREXT INTERLACED CPU_COUNT OPENCL THP LSMASH X86_INLINE_ASM AS_FUNC" - - # parse options - -@@ -586,6 +590,7 @@ - i*86) - ARCH="X86" - AS="yasm" -+ AS_EXT=".asm" - ASFLAGS="$ASFLAGS -O2 -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" - if [ $compiler = GNU ]; then - if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then -@@ -626,6 +631,7 @@ - x86_64) - ARCH="X86_64" - AS="yasm" -+ AS_EXT=".asm" - ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -I\$(SRCPATH)/common/x86/" - [ $compiler = GNU ] && CFLAGS="-m64 $CFLAGS" && LDFLAGS="-m64 $LDFLAGS" - if [ "$SYS" = MACOSX ]; then -@@ -648,7 +654,8 @@ - ARCH="PPC" - if [ $asm = auto ] ; then - define HAVE_ALTIVEC -- AS="${AS-${cross_prefix}gcc}" -+ AS="${AS-${CC}}" -+ AS_EXT=".c" - if [ $SYS = MACOSX ] ; then - CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4" - else -@@ -674,7 +681,7 @@ - LDFLAGS="$LDFLAGS -arch armv7" - fi - else -- AS="${AS-${cross_prefix}gcc}" -+ AS="${AS-${CC}}" - fi - ;; - s390|s390x) -@@ -760,6 +767,11 @@ - fi - fi - -+if [ $asm = auto -a $ARCH = ARM ] ; then -+ # check if the assembler supports '.func' (clang 3.5 does not) -+ as_check ".func test${NL}.endfunc" && define HAVE_AS_FUNC 1 -+fi -+ - [ $asm = no ] && AS="" - [ "x$AS" = x ] && asm="no" || asm="yes" - Property changes on: head/multimedia/libx264/files/patch-configure ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libx264/files/patch-common_arm_dct-a.S =================================================================== --- head/multimedia/libx264/files/patch-common_arm_dct-a.S (revision 391216) +++ head/multimedia/libx264/files/patch-common_arm_dct-a.S (nonexistent) @@ -1,161 +0,0 @@ ---- common/arm/dct-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/dct-a.S -@@ -82,7 +82,7 @@ function x264_dct4x4dc_neon - vrhadd.s16 d3, d6, d7 - vst1.64 {d0-d3}, [r0,:128] - bx lr --.endfunc -+endfunc - - function x264_idct4x4dc_neon - vld1.64 {d0-d3}, [r0,:128] -@@ -94,7 +94,7 @@ function x264_idct4x4dc_neon - HADAMARD 2, sumsub, d3, d2, d6, d7 - vst1.64 {d0-d3}, [r0,:128] - bx lr --.endfunc -+endfunc - - - .macro DCT_1D d0 d1 d2 d3 d4 d5 d6 d7 -@@ -129,7 +129,7 @@ function x264_sub4x4_dct_neon - DCT_1D d4, d5, d6, d7, d0, d1, d2, d3 - vst1.64 {d4-d7}, [r0,:128] - bx lr --.endfunc -+endfunc - - function x264_sub8x4_dct_neon, export=0 - vld1.64 {d0}, [r1,:64], r3 -@@ -165,7 +165,7 @@ function x264_sub8x4_dct_neon, export=0 - vst1.64 {d4-d5}, [r0,:128]! - vst1.64 {d6-d7}, [r0,:128]! - bx lr --.endfunc -+endfunc - - function x264_sub8x8_dct_neon - push {lr} -@@ -174,7 +174,7 @@ function x264_sub8x8_dct_neon - bl x264_sub8x4_dct_neon - pop {lr} - b x264_sub8x4_dct_neon --.endfunc -+endfunc - - function x264_sub16x16_dct_neon - push {lr} -@@ -195,7 +195,7 @@ function x264_sub16x16_dct_neon - bl x264_sub8x4_dct_neon - pop {lr} - b x264_sub8x4_dct_neon --.endfunc -+endfunc - - - .macro DCT8_1D type -@@ -279,7 +279,7 @@ function x264_sub8x8_dct8_neon - vst1.64 {d24-d27}, [r0,:128]! - vst1.64 {d28-d31}, [r0,:128]! - bx lr --.endfunc -+endfunc - - function x264_sub16x16_dct8_neon - push {lr} -@@ -294,7 +294,7 @@ function x264_sub16x16_dct8_neon - sub r1, r1, #FENC_STRIDE*8 - 8 - sub r2, r2, #FDEC_STRIDE*8 - 8 - b X(x264_sub8x8_dct8_neon) --.endfunc -+endfunc - - - // First part of IDCT (minus final SUMSUB_BA) -@@ -336,7 +336,7 @@ function x264_add4x4_idct_neon - vst1.32 {d2[1]}, [r0,:32], r2 - vst1.32 {d2[0]}, [r0,:32], r2 - bx lr --.endfunc -+endfunc - - function x264_add8x4_idct_neon, export=0 - vld1.64 {d0-d3}, [r1,:128]! -@@ -376,7 +376,7 @@ function x264_add8x4_idct_neon, export=0 - vst1.32 {d2}, [r0,:64], r2 - vst1.32 {d3}, [r0,:64], r2 - bx lr --.endfunc -+endfunc - - function x264_add8x8_idct_neon - mov r2, #FDEC_STRIDE -@@ -384,7 +384,7 @@ function x264_add8x8_idct_neon - bl x264_add8x4_idct_neon - mov lr, ip - b x264_add8x4_idct_neon --.endfunc -+endfunc - - function x264_add16x16_idct_neon - mov r2, #FDEC_STRIDE -@@ -401,7 +401,7 @@ function x264_add16x16_idct_neon - bl x264_add8x4_idct_neon - mov lr, ip - b x264_add8x4_idct_neon --.endfunc -+endfunc - - - .macro IDCT8_1D type -@@ -498,7 +498,7 @@ function x264_add8x8_idct8_neon - vst1.64 {d6}, [r0,:64], r2 - vst1.64 {d7}, [r0,:64], r2 - bx lr --.endfunc -+endfunc - - function x264_add16x16_idct8_neon - mov ip, lr -@@ -510,7 +510,7 @@ function x264_add16x16_idct8_neon - sub r0, r0, #8*FDEC_STRIDE-8 - mov lr, ip - b X(x264_add8x8_idct8_neon) --.endfunc -+endfunc - - - function x264_add8x8_idct_dc_neon -@@ -562,7 +562,7 @@ function x264_add8x8_idct_dc_neon - vst1.64 {d6}, [r0,:64], r2 - vst1.64 {d7}, [r0,:64], r2 - bx lr --.endfunc -+endfunc - - .macro ADD16x4_IDCT_DC dc - vld1.64 {d16-d17}, [r0,:128], r3 -@@ -610,7 +610,7 @@ function x264_add16x16_idct_dc_neon - ADD16x4_IDCT_DC d2 - ADD16x4_IDCT_DC d3 - bx lr --.endfunc -+endfunc - - function x264_sub8x8_dct_dc_neon - mov r3, #FENC_STRIDE -@@ -658,7 +658,7 @@ function x264_sub8x8_dct_dc_neon - vpadd.s16 d0, d0, d1 - vst1.64 {d0}, [r0,:64] - bx lr --.endfunc -+endfunc - - - function x264_zigzag_scan_4x4_frame_neon -@@ -671,4 +671,4 @@ function x264_zigzag_scan_4x4_frame_neon - vtbl.8 d7, {d2-d3}, d19 - vst1.64 {d4-d7}, [r0,:128] - bx lr --.endfunc -+endfunc Property changes on: head/multimedia/libx264/files/patch-common_arm_dct-a.S ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libx264/files/patch-Makefile =================================================================== --- head/multimedia/libx264/files/patch-Makefile (revision 391216) +++ head/multimedia/libx264/files/patch-Makefile (nonexistent) @@ -1,42 +0,0 @@ ---- Makefile.orig 2014-12-31 01:23:15 UTC -+++ Makefile -@@ -85,12 +85,12 @@ X86SRC0 += sad-a.asm - endif - X86SRC = $(X86SRC0:%=common/x86/%) - --ifeq ($(ARCH),X86) -+ifeq ($(ARCH),i386) - ARCH_X86 = yes - ASMSRC = $(X86SRC) common/x86/pixel-32.asm - endif - --ifeq ($(ARCH),X86_64) -+ifeq ($(ARCH),amd64) - ARCH_X86 = yes - ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm - endif -@@ -104,7 +104,14 @@ endif - endif - - # AltiVec optims --ifeq ($(ARCH),PPC) -+ifeq ($(ARCH),powerpc) -+ARCH_PPC = yes -+endif -+ifeq ($(ARCH),powerpc64) -+ARCH_PPC = yes -+endif -+ -+ifdef ARCH_PPC - ifneq ($(AS),) - SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \ - common/ppc/quant.c common/ppc/deblock.c \ -@@ -113,7 +120,7 @@ endif - endif - - # NEON optims --ifeq ($(ARCH),ARM) -+ifeq ($(ARCH),armv6) - ifneq ($(AS),) - ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \ - common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \ Property changes on: head/multimedia/libx264/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libx264/files/patch-common_arm_asm.S =================================================================== --- head/multimedia/libx264/files/patch-common_arm_asm.S (revision 391216) +++ head/multimedia/libx264/files/patch-common_arm_asm.S (nonexistent) @@ -1,40 +0,0 @@ ---- common/arm/asm.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/asm.S -@@ -40,6 +40,12 @@ - # define ELF @ - #endif - -+#if HAVE_AS_FUNC -+# define FUNC -+#else -+# define FUNC @ -+#endif -+ - .macro require8, val=1 - ELF .eabi_attribute 24, \val - .endm -@@ -49,17 +55,22 @@ ELF .eabi_attribute 25, \val - .endm - - .macro function name, export=1 -+ .macro endfunc -+ELF .size \name, . - \name -+FUNC .endfunc -+ .purgem endfunc -+ .endm - .align 2 - .if \export == 1 - .global EXTERN_ASM\name - ELF .hidden EXTERN_ASM\name - ELF .type EXTERN_ASM\name, %function -- .func EXTERN_ASM\name -+FUNC .func EXTERN_ASM\name - EXTERN_ASM\name: - .else - ELF .hidden \name - ELF .type \name, %function -- .func \name -+FUNC .func \name - \name: - .endif - .endm Property changes on: head/multimedia/libx264/files/patch-common_arm_asm.S ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libx264/files/patch-common_arm_cpu-a.S =================================================================== --- head/multimedia/libx264/files/patch-common_arm_cpu-a.S (revision 391216) +++ head/multimedia/libx264/files/patch-common_arm_cpu-a.S (nonexistent) @@ -1,34 +0,0 @@ ---- common/arm/cpu-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/cpu-a.S -@@ -33,7 +33,7 @@ - function x264_cpu_neon_test - vadd.i16 q0, q0, q0 - bx lr --.endfunc -+endfunc - - // return: 0 on success - // 1 if counters were already enabled -@@ -49,14 +49,14 @@ function x264_cpu_enable_armv7_counter, - mov r2, #1 << 31 // enable cycle counter - mcr p15, 0, r2, c9, c12, 1 // write CNTENS - bx lr --.endfunc -+endfunc - - function x264_cpu_disable_armv7_counter, export=0 - mrc p15, 0, r0, c9, c12, 0 // read PMNC - bic r0, r0, #1 // disable counters - mcr p15, 0, r0, c9, c12, 0 // write PMNC - bx lr --.endfunc -+endfunc - - - .macro READ_TIME r -@@ -106,4 +106,4 @@ average_loop: - cmp r0, #10 - movgt r0, #0 - pop {r4-r6,pc} --.endfunc -+endfunc Property changes on: head/multimedia/libx264/files/patch-common_arm_cpu-a.S ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libx264/files/patch-common_arm_quant-a.S =================================================================== --- head/multimedia/libx264/files/patch-common_arm_quant-a.S (revision 391216) +++ head/multimedia/libx264/files/patch-common_arm_quant-a.S (nonexistent) @@ -1,98 +0,0 @@ ---- common/arm/quant-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/quant-a.S -@@ -80,7 +80,7 @@ function x264_quant_2x2_dc_neon - vsub.s16 d3, d3, d0 - vst1.64 {d3}, [r0,:64] - QUANT_END d3 --.endfunc -+endfunc - - // quant_4x4_dc( int16_t dct[16], int mf, int bias ) - function x264_quant_4x4_dc_neon -@@ -92,7 +92,7 @@ function x264_quant_4x4_dc_neon - QUANT_TWO q0, q0, d4, d5, d4, d5, q0 - vorr d0, d0, d1 - QUANT_END d0 --.endfunc -+endfunc - - // quant_4x4( int16_t dct[16], uint16_t mf[16], uint16_t bias[16] ) - function x264_quant_4x4_neon -@@ -104,7 +104,7 @@ function x264_quant_4x4_neon - QUANT_TWO q0, q1, d4, d5, d6, d7, q0 - vorr d0, d0, d1 - QUANT_END d0 --.endfunc -+endfunc - - // quant_4x4x4( int16_t dct[4][16], uint16_t mf[16], uint16_t bias[16] ) - function x264_quant_4x4x4_neon -@@ -145,7 +145,7 @@ function x264_quant_4x4x4_neon - orrne r0, #8 - vpop {d8-d15} - bx lr --.endfunc -+endfunc - - // quant_8x8( int16_t dct[64], uint16_t mf[64], uint16_t bias[64] ) - function x264_quant_8x8_neon -@@ -165,7 +165,7 @@ function x264_quant_8x8_neon - .endr - vorr d0, d0, d1 - QUANT_END d0 --.endfunc -+endfunc - - .macro DEQUANT_START mf_size offset dc=no - mov r3, #0x2b -@@ -257,7 +257,7 @@ dequant_\size\()_rshift_loop: - bgt dequant_\size\()_rshift_loop - .endif - bx lr --.endfunc -+endfunc - .endm - - DEQUANT 4x4, 4 -@@ -307,7 +307,7 @@ dequant_4x4_dc_rshift: - vmovn.s32 d3, q13 - vst1.16 {d0-d3}, [r0,:128] - bx lr --.endfunc -+endfunc - - - // int coeff_last( int16_t *l ) -@@ -319,7 +319,7 @@ function x264_coeff_last4_arm - lsrs r2, r2, #16 - addne r0, r0, #1 - bx lr --.endfunc -+endfunc - - function x264_coeff_last8_arm - ldrd r2, r3, [r0, #8] -@@ -333,7 +333,7 @@ function x264_coeff_last8_arm - lsrs r2, r2, #16 - addne r0, r0, #1 - bx lr --.endfunc -+endfunc - - .macro COEFF_LAST_1x size - function x264_coeff_last\size\()_neon -@@ -358,7 +358,7 @@ function x264_coeff_last\size\()_neon - subslt r0, r3, r0, lsr #2 - movlt r0, #0 - bx lr --.endfunc -+endfunc - .endm - - COEFF_LAST_1x 15 -@@ -407,4 +407,4 @@ function x264_coeff_last64_neon - subslt r0, ip, r0 - movlt r0, #0 - bx lr --.endfunc -+endfunc Property changes on: head/multimedia/libx264/files/patch-common_arm_quant-a.S ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libx264/files/patch-common_arm_pixel-a.S =================================================================== --- head/multimedia/libx264/files/patch-common_arm_pixel-a.S (revision 391216) +++ head/multimedia/libx264/files/patch-common_arm_pixel-a.S (nonexistent) @@ -1,275 +0,0 @@ ---- common/arm/pixel-a.S.orig 2014-08-27 20:45:08 UTC -+++ common/arm/pixel-a.S -@@ -29,10 +29,12 @@ - .section .rodata - .align 4 - --.rept 16 .byte 0xff -+.rept 16 -+ .byte 0xff - .endr - mask_ff: --.rept 16 .byte 0 -+.rept 16 -+ .byte 0 - .endr - - mask_ac4: -@@ -60,7 +62,7 @@ function x264_pixel_sad_4x\h\()_armv6 - .endr - usada8 r0, r6, lr, ip - pop {r4-r6,pc} --.endfunc -+endfunc - .endm - - SAD4_ARMV6 4 -@@ -137,7 +139,7 @@ function x264_pixel_sad\name\()_\w\()x\h - vpaddl.u16 d0, d0 - vmov.u32 r0, d0[0] - bx lr --.endfunc -+endfunc - .endm - - SAD_FUNC 4, 4 -@@ -222,7 +224,7 @@ function x264_pixel_sad_aligned_\w\()x\h - vpaddl.u16 d0, d0 - vmov.u32 r0, d0[0] - bx lr --.endfunc -+endfunc - .endm - - SAD_FUNC_DUAL 8, 4 -@@ -368,7 +370,7 @@ function x264_pixel_sad_x\x\()_\w\()x\h\ - vst1.32 {d0-d1}, [r7] - .endif - pop {r6-r7,pc} --.endfunc -+endfunc - .endm - - SAD_X_FUNC 3, 4, 4 -@@ -477,7 +479,7 @@ function x264_pixel_ssd_\w\()x\h\()_neon - vpadd.s32 d0, d0, d0 - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - .endm - - SSD_FUNC 4, 4 -@@ -517,7 +519,7 @@ function x264_pixel_var_8x8_neon - vld1.64 {d26}, [r0,:64], r1 - VAR_SQR_SUM q2, q10, q15, d26 - b x264_var_end --.endfunc -+endfunc - - function x264_pixel_var_8x16_neon - vld1.64 {d16}, [r0,:64], r1 -@@ -549,7 +551,7 @@ function x264_pixel_var_8x16_neon - 2: - VAR_SQR_SUM q2, q13, q15, d22 - b x264_var_end --.endfunc -+endfunc - - function x264_pixel_var_16x16_neon - vld1.64 {d16-d17}, [r0,:128], r1 -@@ -573,7 +575,7 @@ var16_loop: - VAR_SQR_SUM q1, q12, q14, d18 - VAR_SQR_SUM q2, q13, q15, d19 - bgt var16_loop --.endfunc -+endfunc - - function x264_var_end, export=0 - vpaddl.u16 q8, q14 -@@ -588,7 +590,7 @@ function x264_var_end, export=0 - - vmov r0, r1, d0 - bx lr --.endfunc -+endfunc - - .macro DIFF_SUM diff da db lastdiff - vld1.64 {\da}, [r0,:64], r1 -@@ -633,7 +635,7 @@ function x264_pixel_var2_8x8_neon - mul r0, r0, r0 - sub r0, r1, r0, lsr #6 - bx lr --.endfunc -+endfunc - - function x264_pixel_var2_8x16_neon - vld1.64 {d16}, [r0,:64], r1 -@@ -677,7 +679,7 @@ function x264_pixel_var2_8x16_neon - mul r0, r0, r0 - sub r0, r1, r0, lsr #7 - bx lr --.endfunc -+endfunc - - .macro LOAD_DIFF_8x4 q0 q1 q2 q3 - vld1.32 {d1}, [r2], r3 -@@ -714,7 +716,7 @@ function x264_pixel_satd_4x4_neon - HORIZ_ADD d0, d0, d1 - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_pixel_satd_4x8_neon - vld1.32 {d1[]}, [r2], r3 -@@ -741,7 +743,7 @@ function x264_pixel_satd_4x8_neon - vsubl.u8 q3, d6, d7 - SUMSUB_AB q10, q11, q2, q3 - b x264_satd_4x8_8x4_end_neon --.endfunc -+endfunc - - function x264_pixel_satd_8x4_neon - vld1.64 {d1}, [r2], r3 -@@ -758,7 +760,7 @@ function x264_pixel_satd_8x4_neon - vld1.64 {d6}, [r0,:64], r1 - vsubl.u8 q3, d6, d7 - SUMSUB_AB q10, q11, q2, q3 --.endfunc -+endfunc - - function x264_satd_4x8_8x4_end_neon, export=0 - vadd.s16 q0, q8, q10 -@@ -785,7 +787,7 @@ function x264_satd_4x8_8x4_end_neon, exp - HORIZ_ADD d0, d0, d1 - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_pixel_satd_8x8_neon - mov ip, lr -@@ -799,7 +801,7 @@ function x264_pixel_satd_8x8_neon - mov lr, ip - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_pixel_satd_8x16_neon - vpush {d8-d11} -@@ -821,7 +823,7 @@ function x264_pixel_satd_8x16_neon - mov lr, ip - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_satd_8x8_neon, export=0 - LOAD_DIFF_8x4 q8, q9, q10, q11 -@@ -841,7 +843,7 @@ function x264_satd_8x8_neon, export=0 - SUMSUB_AB q9, q11, q1, q3 - vld1.64 {d0}, [r0,:64], r1 - vsubl.u8 q15, d0, d1 --.endfunc -+endfunc - - // one vertical hadamard pass and two horizontal - function x264_satd_8x4v_8x8h_neon, export=0 -@@ -870,7 +872,7 @@ function x264_satd_8x4v_8x8h_neon, expor - vmax.s16 q14, q8, q10 - vmax.s16 q15, q9, q11 - bx lr --.endfunc -+endfunc - - function x264_pixel_satd_16x8_neon - vpush {d8-d11} -@@ -892,7 +894,7 @@ function x264_pixel_satd_16x8_neon - mov lr, ip - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_pixel_satd_16x16_neon - vpush {d8-d11} -@@ -926,7 +928,7 @@ function x264_pixel_satd_16x16_neon - mov lr, ip - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc - - function x264_satd_16x4_neon, export=0 - vld1.64 {d2-d3}, [r2], r3 -@@ -950,7 +952,7 @@ function x264_satd_16x4_neon, export=0 - SUMSUB_AB q2, q3, q10, q11 - SUMSUB_ABCD q8, q10, q9, q11, q0, q2, q1, q3 - b x264_satd_8x4v_8x8h_neon --.endfunc -+endfunc - - - function x264_pixel_sa8d_8x8_neon -@@ -963,7 +965,7 @@ function x264_pixel_sa8d_8x8_neon - add r0, r0, #1 - lsr r0, r0, #1 - bx lr --.endfunc -+endfunc - - function x264_pixel_sa8d_16x16_neon - vpush {d8-d11} -@@ -995,7 +997,7 @@ function x264_pixel_sa8d_16x16_neon - add r0, r0, #1 - lsr r0, r0, #1 - bx lr --.endfunc -+endfunc - - .macro HADAMARD4_V r1, r2, r3, r4, t1, t2, t3, t4 - SUMSUB_ABCD \t1, \t2, \t3, \t4, \r1, \r2, \r3, \r4 -@@ -1058,7 +1060,7 @@ function x264_sa8d_8x8_neon, export=0 - vadd.i16 q8, q8, q9 - vadd.i16 q9, q10, q11 - bx lr --.endfunc -+endfunc - - - .macro HADAMARD_AC w h -@@ -1094,7 +1096,7 @@ function x264_pixel_hadamard_ac_\w\()x\h - lsr r0, r0, #1 - lsr r1, r1, #2 - bx lr --.endfunc -+endfunc - .endm - - HADAMARD_AC 8, 8 -@@ -1189,7 +1191,7 @@ function x264_hadamard_ac_8x8_neon, expo - vadd.s16 q2, q2, q14 - vpadal.u16 q5, q2 - bx lr --.endfunc -+endfunc - - - .macro SSIM_ITER n ssa s12 ssb lastssa lasts12 lastssb da db dnext -@@ -1243,7 +1245,7 @@ function x264_pixel_ssim_4x4x2_core_neon - - vst4.32 {d0-d3}, [ip] - bx lr --.endfunc -+endfunc - - // FIXME: see about doing 16x16 -> 32 bit multiplies for s1/s2 - function x264_pixel_ssim_end4_neon -@@ -1314,4 +1316,4 @@ ssim_skip: - vpadd.f32 d0, d0, d0 - vmov.32 r0, d0[0] - bx lr --.endfunc -+endfunc Property changes on: head/multimedia/libx264/files/patch-common_arm_pixel-a.S ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libx264/files/patch-common_cpu.c =================================================================== --- head/multimedia/libx264/files/patch-common_cpu.c (revision 391216) +++ head/multimedia/libx264/files/patch-common_cpu.c (nonexistent) @@ -1,29 +0,0 @@ ---- common/cpu.c.orig 2014-08-27 20:45:08 UTC -+++ common/cpu.c -@@ -313,7 +313,7 @@ uint32_t x264_cpu_detect( void ) - - #elif ARCH_PPC - --#if SYS_MACOSX || SYS_OPENBSD -+#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD - #include - uint32_t x264_cpu_detect( void ) - { -@@ -321,12 +321,16 @@ uint32_t x264_cpu_detect( void ) - uint32_t cpu = 0; - #if SYS_OPENBSD - int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC }; --#else -+#elif SYS_MACOSX - int selectors[2] = { CTL_HW, HW_VECTORUNIT }; - #endif - int has_altivec = 0; - size_t length = sizeof( has_altivec ); -+#if SYS_MACOSX || SYS_OPENBSD - int error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 ); -+#else -+ int error = sysctlbyname("hw.altivec", &has_altivec, &length, NULL, 0 ); -+#endif - - if( error == 0 && has_altivec != 0 ) - cpu |= X264_CPU_ALTIVEC; Property changes on: head/multimedia/libx264/files/patch-common_cpu.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/libx264/pkg-plist =================================================================== --- head/multimedia/libx264/pkg-plist (revision 391216) +++ head/multimedia/libx264/pkg-plist (revision 391217) @@ -1,7 +1,6 @@ include/x264.h include/x264_config.h lib/libx264.a lib/libx264.so lib/libx264.so.%%X264_BUILD%% -@dir libdata/pkgconfig libdata/pkgconfig/x264.pc Index: head/multimedia/mpeg4ip/Makefile =================================================================== --- head/multimedia/mpeg4ip/Makefile (revision 391216) +++ head/multimedia/mpeg4ip/Makefile (revision 391217) @@ -1,175 +1,175 @@ # Created by: Mario Sergio Fujikawa Ferreira # $FreeBSD$ PORTNAME= mpeg4ip PORTVERSION= 1.6.1 -PORTREVISION= 32 +PORTREVISION= 33 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= LOCAL/ahze # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136 #MASTER_SITES= SF/${PORTNAME} MAINTAINER= multimedia@FreeBSD.org COMMENT= Standards-based system to encode, stream, and play MPEG-4 audio/video BUILD_DEPENDS= mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2 \ ${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac \ libfaad.so:${PORTSDIR}/audio/faad \ libmp3lame.so:${PORTSDIR}/audio/lame \ libid3tag.so:${PORTSDIR}/audio/libid3tag \ liba52.so:${PORTSDIR}/audio/liba52 \ libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 \ libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 \ libx264.so:${PORTSDIR}/multimedia/libx264 RUN_DEPENDS= mp4v2>=1.9.1:${PORTSDIR}/multimedia/mp4v2 USE_GNOME= gtk20 USE_SDL= sdl USES= gmake libtool pkgconfig GNU_CONFIGURE= yes USE_LDCONFIG= yes CFLAGS+= -Wno-return-type CPPFLAGS+= -I${LOCALBASE}/include/SDL -I${LOCALBASE}/include/ffmpeg0 -I${LOCALBASE}/include LIBS+= -L${LOCALBASE}/lib/ffmpeg0 -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-ffmpeg=${LOCALBASE} \ --enable-mp4live \ --disable-static OPTIONS_DEFINE= ESOUND IPV6 NAS OPTIMIZED_CFLAGS XVID DOCS OPTIONS_DEFAULT= IPV6 XVID DOC_FILES= ${PORTDOCS} PORTDOCS= MAINREADME.html MP4LIVE_INTERNALS.html MPEG4IP_Guide.pdf \ MP4LIVE_README.html PLAYER_INTERNALS.html PLAYER_README.html \ ReadingList.txt encoding.htm m4rm.html \ mp4player.jpg mrm.html pi.html prm.html .include ### ## Auto detect possible extensions ### # esound .if ${HAVE_GNOME:Mesound}!="" && empty(PORT_OPTIONS:MESOUND) PORT_OPTIONS+= ESOUND .endif # nas .if exists(${LOCALBASE}/lib/libaudio.so) && empty(PORT_OPTIONS:MNAS) PORT_OPTIONS+= NAS .endif # xvid .if exists(${LOCALBASE}/lib/libxvidcore.so) && empty(PORT_OPTIONS:MXVID) PORT_OPTIONS+= XVID .endif ### ## Enable extensions based on user choices ### # esound .if ${PORT_OPTIONS:MESOUND} USE_GNOME+= esound .endif # nas .if ${PORT_OPTIONS:MNAS} LIB_DEPENDS+= libaudio.so:${PORTSDIR}/audio/nas .endif # ipv6 .if ${PORT_OPTIONS:MIPV6} CONFIGURE_ARGS+= --enable-ipv6 .endif # xvid .if ${PORT_OPTIONS:MXVID} LIB_DEPENDS+= libxvidcore.so:${PORTSDIR}/multimedia/xvid PLIST_SUB+= XVID="" .else PLIST_SUB+= XVID="@comment " .endif .if ${ARCH} == "ia64" || ${ARCH} == "powerpc" || ${ARCH} == "sparc64" BROKEN= Does not compile on ia64, powerpc, or sparc64 .endif #post-patch: pre-configure: @${TOUCH} -f ${WRKSRC}/bootstrapped # don't compile or use libmp4v2 @${REINPLACE_CMD} -e 's|mp4v2||' \ ${WRKSRC}/lib/Makefile.in @${FIND} ${WRKSRC} -type f -name Makefile.in | \ ${XARGS} -n 10 ${REINPLACE_CMD} -e \ 's|-I$(top_srcdir)/lib/mp4v2||; \ s|$$(top_builddir)/lib/mp4v2/libmp4v2.la||; \ s|$$(top_srcdir)/lib/mp4v2/libmp4v2.la||; \ s|@LIBS@|@LIBS@ -lmp4v2|; \ s|nasm|yasm|' @${REINPLACE_CMD} -e 's|-Werror||' \ ${WRKSRC}/common/video/iso-mpeg4/src/Makefile.in @${REINPLACE_CMD} -e 's|mp4venc_template.par||' \ ${WRKSRC}/server/util/mp4encode/Makefile.in @${FIND} ${WRKSRC} -type f -name "*.[ch]" -or -name "*.cpp" | ${XARGS} -n 10 \ ${REINPLACE_CMD} -e \ 's|||; \ s|||; \ s|||; \ s|||; \ s|||' # replacing distfile's libs with ports' versions # SDL related fixes # a few others @${REINPLACE_CMD} -E -e 's|lib/SDL/sdl-config|${SDL_CONFIG}|; \ s|sdl-config|${SDL_CONFIG}|; \ s|^(SDL_LIBS=).+$$|\1"`${SDL_CONFIG} --libs`"|; \ s|-Wmissing-declarations||; s|-Wmissing-prototypes||; \ s|>&/|>/|; s|nasm|yasm|' \ ${CONFIGURE_WRKSRC}/configure # do not install manm man pages @${REINPLACE_CMD} -E \ -e 's|api.mpt||' \ -e 's|^(install-man.*)install-manm|\1|' \ ${WRKSRC}/doc/mp4v2/Makefile.in @${REINPLACE_CMD} -e 's|$${enable_ffmpeg}/lib/libavcodec.a|-lavcodec0 -lavutil0 -lswscale0|g' \ ${WRKSRC}/configure # replace bundled mp4v2 with placeholder post-configure: @${RM} -rf ${WRKSRC}/lib/mp4v2 @${MKDIR} ${WRKSRC}/lib/mp4v2 @echo '#include "mpeg4ip.h"' > ${WRKSRC}/lib/mp4v2/mp4.h post-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_SCRIPT} ${WRKSRC}/server/util/mp4encode/mp4encode \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_DATA} \ ${WRKSRC}/server/util/mp4encode/mp4venc_template.par \ ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${DOC_FILES} ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} .endfor .endif .if (defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "mmx") && !defined(PACKAGE_BUILDING) MMX=yes .endif ### ## Enable extensions based on arch detection ### # mmx .if defined(MMX) BUILD_DEPENDS+= yasm:${PORTSDIR}/devel/yasm .else CONFIGURE_ARGS+= --disable-mmx .endif # compiler optimizations .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -ffast-math -fomit-frame-pointer .endif .include Index: head/multimedia/mplayer/Makefile =================================================================== --- head/multimedia/mplayer/Makefile (revision 391216) +++ head/multimedia/mplayer/Makefile (revision 391217) @@ -1,172 +1,172 @@ # Created by: Thomas E. Zander with help from Vladimir Kushnir # $FreeBSD$ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 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 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 Index: head/multimedia/msx264/Makefile =================================================================== --- head/multimedia/msx264/Makefile (revision 391216) +++ head/multimedia/msx264/Makefile (revision 391217) @@ -1,22 +1,23 @@ # $FreeBSD$ PORTNAME= msx264 PORTVERSION= 1.5.1 +PORTREVISION= 1 CATEGORIES= multimedia net MASTER_SITES= SAVANNAH/linphone/plugins/sources/ MAINTAINER= tijl@FreeBSD.org COMMENT= Mediastreamer plugin for H264 encoding LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libmediastreamer_base.so:${PORTSDIR}/net/mediastreamer \ libx264.so:${PORTSDIR}/multimedia/libx264 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-strict INSTALL_TARGET= install-strip USES= libtool pkgconfig .include Index: head/multimedia/obs-studio/Makefile =================================================================== --- head/multimedia/obs-studio/Makefile (revision 391216) +++ head/multimedia/obs-studio/Makefile (revision 391217) @@ -1,41 +1,42 @@ # $FreeBSD$ PORTNAME= obs-studio PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= kmoore@FreeBSD.org COMMENT= Open Broadcaster Software Multiplatform LICENSE= GPLv2 LIB_DEPENDS= libsysinfo.so:${PORTSDIR}/devel/libsysinfo \ libx264.so:${PORTSDIR}/multimedia/libx264 \ libv4l2.so:${PORTSDIR}/multimedia/libv4l \ libpulse.so:${PORTSDIR}/audio/pulseaudio \ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libfdk-aac.so:${PORTSDIR}/audio/fdk-aac BUILD_DEPENDS= v4l_compat>=0:${PORTSDIR}/multimedia/v4l_compat BROKEN_FreeBSD_9= does not build USE_XORG= x11 xcomposite xdamage xrender USE_XCB= x11extras wm USE_LDCONFIG= yes USE_GL+= gl USE_QT5= core dbus gui opengl network svg multimedia \ imageformats buildtools qmake x11extras CFLAGS+= -fPIC LDFLAGS+= -lsysinfo USES= cmake compiler:c11 CMAKE_ARGS+= -DUNIX_STRUCTURE=1 \ -DOBS_VERSION_OVERRIDE=${PORTVERSION} INSTALLS_ICONS= yes USE_GITHUB= yes GH_ACCOUNT= jp9000 post-patch: @${REINPLACE_CMD} -e 's|-ldl||' \ ${CONFIGURE_WRKSRC}/deps/glad/CMakeLists.txt .include Index: head/multimedia/transcode/Makefile =================================================================== --- head/multimedia/transcode/Makefile (revision 391216) +++ head/multimedia/transcode/Makefile (revision 391217) @@ -1,161 +1,161 @@ # Created by: Hendrik Scholz # $FreeBSD$ PORTNAME= transcode PORTVERSION= 1.1.7 -PORTREVISION= 22 +PORTREVISION= 23 CATEGORIES= multimedia MASTER_SITES= http://cdn.bitbucket.org/france/transcode-tcforge/downloads/ MAINTAINER= cyberbotx@cyberbotx.com COMMENT= Text-console utility for video stream processing LICENSE= GPLv2 LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg USE_LDCONFIG= yes USES= gmake libtool pkgconfig tar:bzip2 USE_GCC= any WANT_SDL= yes WANT_GNOME= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-oss CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INSTALL_TARGET= install-strip NO_OPTIONS_SORT= yes OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS X11 MPEG2 BKTR POSTPROC FREETYPE LAME \ XVID X264 OGG VORBIS THEORA DVDREAD DV QUICKTIME LZO A52 \ FAAC LIBXML2 MJPEGTOOLS SDL IMAGEMAGICK JPEG ICONV V4L OPTIONS_DEFAULT= LAME DVDREAD JPEG ICONV BKTR_DESC= Bktr capture card support POSTPROC_DESC= Libpostproc support DVDREAD_DESC= Libdvdread support LZO_DESC= LZO compression support X11_USE= xorg=xv,xaw,xpm X11_CONFIGURE_WITH= x MPEG2_LIB_DEPENDS= libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 MPEG2_CONFIGURE_ENABLE= libmpeg2 libmpeg2convert BKTR_CONFIGURE_ENABLE= bktr POSTPROC_CONFIGURE_ENABLE= libpostproc FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 FREETYPE_CONFIGURE_ENABLE= freetype2 LAME_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame LAME_CONFIGURE_ENABLE= lame LAME_CONFIGURE_ON= --with-lame-prefix=${LOCALBASE} XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid XVID_CONFIGURE_ENABLE= xvid XVID_CONFIGURE_ON= --with-xvid-prefix=${LOCALBASE} X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_CONFIGURE_ENABLE= x264 OGG_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg OGG_CONFIGURE_ENABLE= ogg VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE= vorbis THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE= theora DVDREAD_LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread DVDREAD_CONFIGURE_ENABLE= libdvdread DVDREAD_CONFIGURE_ON= --with-libdvdread-prefix=${LOCALBASE} DV_LIB_DEPENDS= libdv.so:${PORTSDIR}/multimedia/libdv DV_CONFIGURE_ENABLE= libdv QUICKTIME_LIB_DEPENDS= libquicktime.so:${PORTSDIR}/multimedia/libquicktime QUICKTIME_CONFIGURE_ENABLE= libquicktime LZO_LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo2 LZO_CONFIGURE_ENABLE= lzo LZO_CONFIGURE_ON= --with-lzo-prefix=${LOCALBASE} --with-lzo-includes=${LOCALBASE} A52_LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52 A52_CONFIGURE_ENABLE= a52 A52_CONFIGURE_ON= --with-a52-prefix=${LOCALBASE} FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac FAAC_CONFIGURE_ENABLE= faac FAAC_CONFIGURE_ON= --with-faac-prefix=${LOCALBASE} LIBXML2_USE= GNOME=libxml2 LIBXML2_CONFIGURE_ENABLE= libxml2 MJPEGTOOLS_LIB_DEPENDS= liblavjpeg.so:${PORTSDIR}/multimedia/mjpegtools MJPEGTOOLS_CONFIGURE_ENABLE= mjpegtools SDL_USE= SDL=sdl SDL_CONFIGURE_ENABLE= sdl SDL_CONFIGURE_ENV_ON= SDL_CONFIG="${SDL_CONFIG}" IMAGEMAGICK_LIB_DEPENDS= libMagickWand-6.so:${PORTSDIR}/graphics/ImageMagick IMAGEMAGICK_CONFIGURE_ENABLE= imagemagick IMAGEMAGICK_CONFIGURE_ON= --with-imagemagick-prefix=${LOCALBASE} JPEG_USES= jpeg JPEG_CONFIGURE_ENABLE= libjpeg JPEG_CONFIGURE_ON= --with-libjpeg-prefix=${LOCALBASE} ICONV_USES= iconv ICONV_CONFIGURE_ENABLE= iconv ICONV_CONFIGURE_ON= --with-iconv-prefix=${ICONV_PREFIX} V4L_BUILD_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat V4L_CONFIGURE_ENABLE= v4l .include .if empty(ICONV_LIB) CONFIGURE_ARGS+=ac_cv_lib_iconv_iconv_open=no \ ac_cv_lib_iconv_libiconv_open=no .endif post-extract: @${RM} ${WRKSRC}/import/v4l/videodev* post-patch: .if ${PORT_OPTIONS:MLZO} @${REINPLACE_CMD} -e 's|%%NUV%%|nuv|' ${WRKSRC}/import/Makefile.in .else @${REINPLACE_CMD} -e 's|%%NUV%%||' ${WRKSRC}/import/Makefile.in .endif .if !${PORT_OPTIONS:MOPTIMIZED_CFLAGS} @${FIND} ${WRKSRC} -type f | ${XARGS} -n 10 -x ${REINPLACE_CMD} \ -e 's|-O[236]|${CFLAGS}|' .endif @${REINPLACE_CMD} -E -e 's|loff_t|uint64_t|' ${WRKSRC}/avilib/avidump.c @${REINPLACE_CMD} -E -e 's|> ${TMPPLIST}) .include Index: head/multimedia/vlc/Makefile =================================================================== --- head/multimedia/vlc/Makefile (revision 391216) +++ head/multimedia/vlc/Makefile (revision 391217) @@ -1,384 +1,384 @@ # Created by: Brian Somers # $FreeBSD$ PORTNAME= vlc DISTVERSION= 2.2.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ http://ftp.snt.utwente.nl/pub/software/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ ftp://ftp.crans.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ MAINTAINER= multimedia@FreeBSD.org COMMENT?= Qt based multimedia player and streaming server LICENSE= GPLv2 LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \ libdvbpsi.so:${PORTSDIR}/multimedia/libdvbpsi \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libidn.so:${PORTSDIR}/dns/libidn BUILD_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg \ yasm:${PORTSDIR}/devel/yasm RUN_DEPENDS= ffmpeg>=2.0:${PORTSDIR}/multimedia/ffmpeg USES= compiler:c11 desktop-file-utils gmake iconv libtool pathfix \ pkgconfig tar:xz USE_GNOME= libxml2 USE_LDCONFIG= yes INSTALL_TARGET= install-strip CONFLICTS?= vlc-qt4-* GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-avcodec --enable-avformat --enable-dvbpsi \ --enable-fontconfig --enable-freetype --enable-libgcrypt \ --enable-libxml2 --enable-oss --enable-postproc \ --enable-swscale --enable-vlc \ --disable-alsa --disable-chromaprint --disable-crystalhd \ --disable-dc1394 --disable-decklink --disable-directfb \ --disable-dv1394 --disable-egl --disable-fdkaac \ --disable-gles1 --disable-gles2 --disable-kai --disable-kva \ --disable-libvnc --disable-opencv --disable-projectm \ --disable-quicksync --disable-silent-rules --disable-telx \ --disable-tiger --disable-tremor --disable-udev \ --disable-update-check --disable-vcdx --disable-vsxu \ --disable-wasapi --disable-x26410b \ --with-kde-solid=${PREFIX}/share/apps/solid/actions \ ac_cv_search_pthread_rwlock_init=-pthread .if defined(WITH_DEBUG) && !defined(WITHOUT_DEBUG) CONFIGURE_ARGS+=--enable-debug .endif CPPFLAGS+= -I${LOCALBASE}/include CFLAGS_i386= -fomit-frame-pointer OPTIONS_DEFINE= A52 AALIB ASS AVAHI CACA DBUS DCA DIRAC DOCS DVDREAD \ DVDNAV FAAD FLAC FLUID FRIBIDI GME GNOMEVFS2 GNUTLS \ GOOM HTTPD JACK KATE LIBBLURAY LIBRSVG2 LIBSSH2 LIRC \ LIVEMEDIA LUA MAD MATROSKA MODPLUG \ MPEG2 MTP MUSEPACK NCURSES NLS NOTIFY OGG OPTIMIZED_CFLAGS \ OPUS PNG PULSEAUDIO QT4 QT5 REALRTSP RUNROOT SAMPLERATE \ SCHROEDINGER SDL SHOUTCAST SKINS SMB STREAM SPEEX \ TAGLIB THEORA TWOLAME UPNP V4L VAAPI VCD VDPAU VORBIS \ X11 X264 X265 ZVBI OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \ HTTPD LIVEMEDIA LUA MAD MATROSKA MPEG2 OGG OPTIMIZED_CFLAGS \ OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME V4L \ VCD VORBIS X11 OPTIONS_SUB= yes ASS_DESC= ASS/SSA subtitle rendering DVDREAD_DESC= DVD Playback support DVDNAV_DESC= DVD menu navigation FLUID_DESC= Fluidsynth MIDI support FREERDP_DESC= RDP support GME_DESC= Game Music Emu (libgme) support GOOM_DESC= Goom visualisation plugin KATE_DESC= Kate codec support LIBSSH2_DESC= SCP/SFTP support via libssh2 REALRTSP_DESC= Real RTSP access module RUNROOT_DESC= Enable running as root SIDPLAY_DESC= C64 sid demux support SKINS_DESC= Skins interface module STREAM_DESC= stream output TAGLIB_DESC= ID3 tag and Ogg comment support VCD_DESC= Audio/Video CD support ZVBI_DESC= VBI decoding support A52_CONFIGURE_ENABLE= a52 A52_CONFIGURE_ON= --with-a52=${LOCALBASE} A52_LIB_DEPENDS= liba52.so:${PORTSDIR}/audio/liba52 AALIB_LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib AALIB_CONFIGURE_ENABLE= aa ASS_LIB_DEPENDS= libass.so:${PORTSDIR}/multimedia/libass ASS_CONFIGURE_ENABLE= libass AVAHI_LIB_DEPENDS= libavahi-common.so:${PORTSDIR}/net/avahi-app AVAHI_CONFIGURE_ENABLE= bonjour CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca CACA_CONFIGURE_ENABLE= caca DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_ENABLE= dbus DCA_LIB_DEPENDS= libdca.so:${PORTSDIR}/multimedia/libdca DCA_CONFIGURE_ENABLE= dca DIRAC_LIB_DEPENDS= libdirac_decoder.so:${PORTSDIR}/multimedia/dirac DIRAC_CONFIGURE_ENABLE= dirac DVDREAD_LIB_DEPENDS= libdvdread.so:${PORTSDIR}/multimedia/libdvdread DVDREAD_CONFIGURE_ENABLE= dvdread DVDNAV_LIB_DEPENDS= libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav DVDNAV_CONFIGURE_ENABLE=dvdnav FAAD_LIB_DEPENDS= libfaad.so:${PORTSDIR}/audio/faad FAAD_CONFIGURE_ENABLE= faad FAAD_CONFIGURE_ENV= CPPFLAGS_faad="-I${LOCALBASE}/include" \ LIBS_faad="-L${LOCALBASE}/lib" FLAC_LIB_DEPENDS= libFLAC.so:${PORTSDIR}/audio/flac FLAC_CONFIGURE_ENABLE= flac FLUID_LIB_DEPENDS= libfluidsynth.so:${PORTSDIR}/audio/fluidsynth FLUID_CONFIGURE_ENABLE= fluidsynth # XXX vlc doesn't seem to like the freerdp version in ports #FREERDP_LIB_DEPENDS= libfreerdp-core.so:${PORTSDIR}/net/freerdp #FREERDP_CONFIGURE_ENABLE= libfreerdp CONFIGURE_ARGS+= -disable-freerdp FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi FRIBIDI_CONFIGURE_ENABLE= fribidi GME_LIB_DEPENDS= libgme.so:${PORTSDIR}/audio/libgme GME_CONFIGURE_ENABLE= gme GME_CONFIGURE_ENV= LIBS_gme="-L${LOCALBASE}/lib -lgme" GNOMEVFS2_USE= GNOME=gnomevfs2 GNOMEVFS2_CONFIGURE_ENABLE= gnomevfs GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_ENABLE=gnutls GOOM_LIB_DEPENDS= libgoom2.so:${PORTSDIR}/graphics/goom GOOM_CONFIGURE_ENABLE= goom HTTPD_CONFIGURE_ENABLE= httpd JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack JACK_CONFIGURE_ENABLE= jack KATE_LIB_DEPENDS= libkate.so:${PORTSDIR}/multimedia/libkate KATE_CONFIGURE_ENABLE= kate LIBBLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray LIBBLURAY_CONFIGURE_ENABLE= bluray LIBRSVG2_USE= GNOME=librsvg2 LIBRSVG2_CONFIGURE_ENABLE= svg LIBSSH2_LIB_DEPENDS= libssh2.so:${PORTSDIR}/security/libssh2 LIBSSH2_CONFIGURE_ENABLE= sftp LIRC_LIB_DEPENDS= liblirc_client.so:${PORTSDIR}/comms/lirc LIRC_CONFIGURE_ENABLE= lirc LIRC_CONFIGURE_ENV= LIBS_lirc="-L${LOCALBASE}/lib -llirc_client" LIVEMEDIA_LIB_DEPENDS= libliveMedia.so:${PORTSDIR}/net/liveMedia LIVEMEDIA_CONFIGURE_ENABLE= live555 LIVEMEDIA_CONFIGURE_ENV= \ LIVE555_CFLAGS="-I${LOCALBASE}/include/liveMedia \ -I${LOCALBASE}/include/UsageEnvironment \ -I${LOCALBASE}/include/groupsock \ -I${LOCALBASE}/include/BasicUsageEnvironment" \ LIVE555_LIBS="-L${LOCALBASE}/lib -lliveMedia \ -lgroupsock -lBasicUsageEnvironment \ -lUsageEnvironment" LUA_USES= lua LUA_CONFIGURE_ENABLE= lua LUA_CONFIGURE_ON= LUAC=${LUAC_CMD} LUA_CFLAGS="-I${LUA_INCDIR}" \ LUA_LIBS="-L${LUA_LIBDIR} -llua-${LUA_VER}" MAD_LIB_DEPENDS= libmad.so:${PORTSDIR}/audio/libmad MAD_CONFIGURE_ENABLE= mad MAD_CONFIGURE_ON= --with-mad=${LOCALBASE} MATROSKA_LIB_DEPENDS= libmatroska.so:${PORTSDIR}/multimedia/libmatroska MATROSKA_CONFIGURE_ENABLE= mkv MODPLUG_LIB_DEPENDS= libmodplug.so:${PORTSDIR}/audio/libmodplug MODPLUG_CONFIGURE_ENABLE= mod MPEG2_LIB_DEPENDS= libmpeg2.so:${PORTSDIR}/multimedia/libmpeg2 MPEG2_CONFIGURE_ENABLE= libmpeg2 MTP_LIB_DEPENDS= libmtp.so:${PORTSDIR}/multimedia/libmtp MTP_CONFIGURE_ENABLE= mtp MUSEPACK_LIB_DEPENDS= libmpcdec.so:${PORTSDIR}/audio/musepack MUSEPACK_CONFIGURE_ENABLE= mpc MUSEPACK_CONFIGURE_ENV= LIBS_mpc="-L${LOCALBASE}/lib -lmpcdec" NCURSES_USES= ncurses NCURSES_CONFIGURE_ENV= NCURSES_CFLAGS="-I${NCURSESINC}" \ NCURSES_LIBS="-L${NCURSESLIB} -lncursesw" NCURSES_CONFIGURE_ENABLE= ncurses NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify NOTIFY_USE= GNOME=gtk20 NOTIFY_CONFIGURE_ENABLE=notify OGG_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg OGG_CONFIGURE_ENABLE= ogg OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus OPUS_CONFIGURE_ENABLE= opus PNG_LIB_DEPENDS= libpng.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_ENABLE= png PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio PULSEAUDIO_CONFIGURE_ENABLE= pulse QT4_USE= QT4=gui,corelib,moc_build,rcc_build,uic_build # QT_CFLAGS: pkg-config --cflags "QtCore QtGui >= 4.6.0" # QT_LIBS: pkg-config --libs "QtCore QtGui >= 4.6.0" QT4_CONFIGURE_ENV= QT_CFLAGS="-I${QT_INCDIR}/QtGui -DQT_SHARED -I${QT_INCDIR} -I${QT_INCDIR}/QtCore" \ QT_LIBS="-lQtGui -L${QT_LIBDIR} -lQtCore" QT5_USE= QT5=gui,core,widgets,x11extras,buildtools_build REALRTSP_CONFIGURE_ENABLE= realrtsp RUNROOT_CONFIGURE_ENABLE= run-as-root SAMPLERATE_LIB_DEPENDS= libsamplerate.so:${PORTSDIR}/audio/libsamplerate SAMPLERATE_CONFIGURE_ENABLE= samplerate SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= schroedinger SDL_USE= SDL=image SDL_CONFIGURE_ENABLE= sdl sdl-image # libsidplay build broken with: # /usr/bin/ld: /usr/local/lib/sidplay/builders/libresid-builder.a(resid-builder.o): relocation R_X86_64_32S against `_ZTV12ReSIDBuilder' can not be used when making a shared object; recompile with -fPIC #SIDPLAY_LIB_DEPENDS= libsidplay2.so:${PORTSDIR}/audio/libsidplay2 #SIDPLAY_LDFLAGS= -L${LOCALBASE}/lib/sidplay/builders #SIDPLAY_CONFIGURE_ENABLE= sid CONFIGURE_ARGS+= --disable-sid SHOUTCAST_LIB_DEPENDS= libshout.so:${PORTSDIR}/audio/libshout SHOUTCAST_CONFIGURE_ENABLE= shout SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient SMB_CONFIGURE_ENABLE= smbclient STREAM_CONFIGURE_ENABLE=sout SPEEX_LIB_DEPENDS= libspeex.so:${PORTSDIR}/audio/speex SPEEX_CONFIGURE_ENABLE= speex TAGLIB_LIB_DEPENDS= libtag.so:${PORTSDIR}/audio/taglib TAGLIB_CONFIGURE_ENABLE=taglib THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora THEORA_CONFIGURE_ENABLE=theora TWOLAME_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame TWOLAME_CONFIGURE_ENABLE= twolame UPNP_LIB_DEPENDS= libupnp.so:${PORTSDIR}/devel/upnp UPNP_CONFIGURE_ENABLE= upnp V4L_LIB_DEPENDS= libv4l2.so:${PORTSDIR}/multimedia/libv4l V4L_CONFIGURE_ENABLE= v4l2 VAAPI_LIB_DEPENDS= libva.so:${PORTSDIR}/multimedia/libva VAAPI_CONFIGURE_ENABLE= libva VCD_LIB_DEPENDS= libcddb.so:${PORTSDIR}/audio/libcddb VCD_CONFIGURE_ENABLE= vcd libcddb VDPAU_LIB_DEPENDS= libvdpau.so:${PORTSDIR}/multimedia/libvdpau VDPAU_CONFIGURE_ENABLE= vdpau VORBIS_LIB_DEPENDS= libvorbis.so:${PORTSDIR}/audio/libvorbis VORBIS_CONFIGURE_ENABLE=vorbis X11_USE= GL=gl XORG=xcb,xproto X11_LIB_DEPENDS= libxcb-keysyms.so:${PORTSDIR}/x11/xcb-util-keysyms X11_CONFIGURE_ENABLE= glx xcb xvideo X11_CONFIGURE_WITH= x X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 X264_CONFIGURE_ENABLE= x264 X265_LIB_DEPENDS= libx265.so:${PORTSDIR}/multimedia/x265 X265_CONFIGURE_ENABLE= x265 ZVBI_LIB_DEPENDS= libzvbi.so:${PORTSDIR}/devel/libzvbi ZVBI_CONFIGURE_ENABLE= zvbi PORTDATA= * PORTDOCS= * .include .if ${PORT_OPTIONS:MPULSEAUDIO} && ${OSVERSION} <= 900044 IGNORE= Pulseaudio is unsupported with rtld prior to FreeBSD-9.x .endif .if ${PORT_OPTIONS:MX11} INSTALLS_ICONS= yes .endif .if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4} CONFIGURE_ARGS+= --enable-qt .else CONFIGURE_ARGS+= --disable-qt .endif .if ${PORT_OPTIONS:MQT5} && ${PORT_OPTIONS:MQT4} IGNORE= please choose one of QT4 or QT5 .endif .if ${PORT_OPTIONS:MSKINS} .if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4} LIB_DEPENDS+= libminizip.so:${PORTSDIR}/archivers/minizip \ libtar.so:${PORTSDIR}/devel/libtar USE_XORG+= xext xinerama xpm CONFIGURE_ARGS+=--enable-skins2 --enable-libtar .else IGNORE= SKINS option requires QT4 or QT5 option .endif .else CONFIGURE_ARGS+=--disable-skins2 --disable-libtar .endif # Define these to override # FreeBSD 9.x uses CAM devices .if (${OSVERSION} > 900037) WITH_CDROM_DEVICE?=/dev/cd0 WITH_DVD_DEVICE?=/dev/cd0 .else WITH_CDROM_DEVICE?=/dev/acd0 WITH_DVD_DEVICE?=/dev/acd0 .endif post-patch: @${REINPLACE_CMD} \ -e '\|LIBS|s|-lrt||' \ -e 's|LIBS="-llirc_client|LIBS="$$LIBS_lirc|' \ ${WRKSRC}/configure @${REINPLACE_CMD} -e 's|/dev/cdrom|${WITH_CDROM_DEVICE}|g' \ -e 's|/dev/dvd|${WITH_DVD_DEVICE}|g' \ ${WRKSRC}/src/libvlc-module.c @${RM} -rf ${WRKSRC}/modules/access/v4l2/linux # XXX FreeBSD doesn't have strerror_l() - use the android version of error.c @${CP} ${WRKSRC}/src/android/error.c ${WRKSRC}/src/posix .if ${PORT_OPTIONS:MQT4} # XXX no sane way to tell configure not to pick up Qt5X11Extras with qt4 @${REINPLACE_CMD} s/Qt5X11Extras/Qt5X11Extras-not/ \ ${WRKSRC}/configure .endif post-install: @(cd ${STAGEDIR}${PREFIX} && ${FIND} -s lib/vlc -not -name '*.la' \ -type f -o -type l >> ${TMPPLIST}) @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/vlc/plugins/*/*.so .include Index: head/multimedia/x264/Makefile =================================================================== --- head/multimedia/x264/Makefile (revision 391216) +++ head/multimedia/x264/Makefile (revision 391217) @@ -1,120 +1,127 @@ # Created by: Michael Johnson # $FreeBSD$ # -# Updating notes: -# We use the nightly tarballs for the *stable* branch of the git repo. -# X264_BUILD is the "core" number, and can always be found in x264.h. +# NOTES FOR UPDATING PORT: +# +# We use tarballs from the *stable* branch of the upstream git repository. +# +# X264_BUILD is the "core" number, and can be found in x264.h. +# # X264_COMMIT is the commit number, and can be found here: # http://git.videolan.org/?p=x264.git;a=shortlog;h=refs/heads/stable -# To get X264_REV, you must checkout the git revision for the version to -# which you wish to update, and then run version.sh against it. -# Don't forget to update these for multimedia/libx264 as well: -# X264_BUILD, X264_REV, X264_COMMIT, X264_SNAPSHOT # -# distinfo for this port and libx264 should always be *identical*. +# X264_REV requires a checkout the git revision for the version the port +# is being updated to. Then run version.sh against it. # # Bumping PORTREVISION for dependent ports? This is useful: # cd $PORTSDIR; for x in $(find . -name "Makefile*" -print); # do str=$(grep -i x264.so $x); if [[ -n $str ]] { echo "$x" }; done PORTNAME= x264 PORTVERSION= 0.${X264_BUILD}.${X264_REV} -PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo DISTNAME= ${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245-stable DISTFILES= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= x264 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= koobs@FreeBSD.org -COMMENT= Front-end for encoding H.264/MPEG-4 AVC video +COMMENT?= H.264/MPEG-4 AVC Video Encoding (Front End CLI) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= yasm>=1.2.0:${PORTSDIR}/devel/yasm \ bash:${PORTSDIR}/shells/bash -LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 -X264_BUILD= 142 -X264_REV= 2455 -X264_COMMIT= 021c0dc6c95c1bc239c9db78a80dd85fc856a4dd +X264_BUILD= 144 +X264_REV= 2533 +X264_COMMIT= c8a773ebfca148ef04f5a60d42cbd7336af0baf6 X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g} -X264_SNAPSHOT= 20140827 +X264_SNAPSHOT= 20150629 -USES= gmake pkgconfig tar:bzip2 +USES?= gmake pkgconfig tar:bzip2 USE_LDCONFIG= yes HAS_CONFIGURE= yes -OPTIONS_DEFINE= ASM DEBUG GCC GPAC LAVF PGO -OPTIONS_DEFAULT= ASM GPAC +OPTIONS_DEFINE?= ASM DEBUG GCC GPAC LAVF PGO +OPTIONS_DEFAULT?= ASM GPAC GCC_DESC= Use current GCC GPAC_DESC= MPEG-4 output support LAVF_DESC= libav* format input/output support (requires FFmpeg) ASM_CONFIGURE_OFF= --disable-asm + DEBUG_CONFIGURE_ON= --enable-debug -GPAC_LIB_DEPENDS= libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac +DEBUG_CONFIGURE_OFF= --enable-strip + GPAC_CONFIGURE_OFF= --disable-gpac +GPAC_LIB_DEPENDS= libgpac.so:${PORTSDIR}/multimedia/gpac-libgpac + +LAVF_CONFIGURE_OFF= --disable-swscale --disable-lavf LAVF_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libavformat.so:${PORTSDIR}/multimedia/ffmpeg \ libavutil.so:${PORTSDIR}/multimedia/ffmpeg \ libswscale.so:${PORTSDIR}/multimedia/ffmpeg -LAVF_CONFIGURE_OFF= --disable-swscale --disable-lavf -CONFIGURE_ARGS+= --extra-cflags="-I${LOCALBASE}/include" \ +CONFIGURE_COMMON_ARGS= --prefix=${PREFIX} \ + --extra-cflags="-I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib" \ --disable-opencl \ + +CONFIGURE_ARGS?= ${CONFIGURE_COMMON_ARGS} \ --system-libx264 CFLAGS_armv6+= -mcpu=arm1136jf-s -PLIST_FILES= bin/x264 -PLIST_SUB+= X264_BUILD=${X264_BUILD} - .include +.if ${SLAVE_PORT} == "no" +PLIST_FILES= bin/x264 +LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/libx264 +.endif + .if ${PORT_OPTIONS:MGCC} USE_GCC= yes .elif ${PORT_OPTIONS:MPGO} USE_GCC= any .endif .if ${PORT_OPTIONS:MPGO} # y4m sample video Y4M_VIDEO= example.y4m Y4M_VIDEO_DISTFILE= example.y4m.bz2 DISTFILES+= ${Y4M_VIDEO_DISTFILE}:pgo ALL_TARGET= fprofiled MAKE_ENV+= VIDS="${WRKDIR}/${Y4M_VIDEO}" RESTRICTED= ${Y4M_VIDEO_DISTFILE} file may not be mirrored RESTRICTED_FILES= ${Y4M_VIDEO_DISTFILE} .endif post-extract: .if ${PORT_OPTIONS:MPGO} @( cd ${WRKDIR} && ${BZIP2_CMD} -dc ${DISTDIR}/${DIST_SUBDIR}/${Y4M_VIDEO_DISTFILE} > ${Y4M_VIDEO} ) .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \ + @${REINPLACE_CMD} -e ' \ s|/bin/bash|${LOCALBASE}/bin/bash|; \ s|gpac_static|gpac|g' \ ${WRKSRC}/configure - @${REINPLACE_CMD} -e 's|bash|sh|; \ + @${REINPLACE_CMD} -e ' \ + s|bash|sh|; \ s|VER="x"|VER="${X264_REV} ${X264_GITVER}"|; \ s|VERSION=""|VERSION=" r${X264_REV} ${X264_GITVER}"|' \ ${WRKSRC}/version.sh +.if ${SLAVE_PORT} == "no" pre-build: @(${RM} ${WRKSRC}/x264_config.h) - -post-install: - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/x264 +.endif .include Index: head/multimedia/x264/distinfo =================================================================== --- head/multimedia/x264/distinfo (revision 391216) +++ head/multimedia/x264/distinfo (revision 391217) @@ -1,4 +1,2 @@ -SHA256 (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = fb1de3f802a83778527d45e69b552efa73b677ebb3ac633a8720923e71ffc5e3 -SIZE (x264/x264-snapshot-20140827-2245-stable.tar.bz2) = 624939 -SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7 -SIZE (x264/example.y4m.bz2) = 4910029 +SHA256 (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 403a1e7178cf9d676d5ffd4641031ae568a501bb3c14fc8ca9bb7c8ac7465340 +SIZE (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 672453 Index: head/multimedia/x264/files/patch-Makefile =================================================================== --- head/multimedia/x264/files/patch-Makefile (revision 391216) +++ head/multimedia/x264/files/patch-Makefile (nonexistent) @@ -1,42 +0,0 @@ ---- Makefile.orig 2014-08-27 20:45:08 UTC -+++ Makefile -@@ -85,12 +85,12 @@ X86SRC0 += sad-a.asm - endif - X86SRC = $(X86SRC0:%=common/x86/%) - --ifeq ($(ARCH),X86) -+ifeq ($(ARCH),i386) - ARCH_X86 = yes - ASMSRC = $(X86SRC) common/x86/pixel-32.asm - endif - --ifeq ($(ARCH),X86_64) -+ifeq ($(ARCH),amd64) - ARCH_X86 = yes - ASMSRC = $(X86SRC:-32.asm=-64.asm) common/x86/trellis-64.asm - endif -@@ -104,7 +104,14 @@ endif - endif - - # AltiVec optims --ifeq ($(ARCH),PPC) -+ifeq ($(ARCH),powerpc) -+ARCH_PPC = yes -+endif -+ifeq ($(ARCH),powerpc64) -+ARCH_PPC = yes -+endif -+ -+ifdef ARCH_PPC - ifneq ($(AS),) - SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c \ - common/ppc/quant.c common/ppc/deblock.c \ -@@ -113,7 +120,7 @@ endif - endif - - # NEON optims --ifeq ($(ARCH),ARM) -+ifeq ($(ARCH),armv6) - ifneq ($(AS),) - ASMSRC += common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S \ - common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S \ Property changes on: head/multimedia/x264/files/patch-Makefile ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/multimedia/x264/files/patch-common_cpu.c =================================================================== --- head/multimedia/x264/files/patch-common_cpu.c (revision 391216) +++ head/multimedia/x264/files/patch-common_cpu.c (revision 391217) @@ -1,29 +1,29 @@ ---- common/cpu.c.orig 2014-08-27 20:45:08 UTC +--- common/cpu.c.orig 2015-06-29 20:45:09 UTC +++ common/cpu.c -@@ -313,7 +313,7 @@ uint32_t x264_cpu_detect( void ) +@@ -316,7 +316,7 @@ uint32_t x264_cpu_detect( void ) #elif ARCH_PPC -#if SYS_MACOSX || SYS_OPENBSD +#if SYS_MACOSX || SYS_OPENBSD || SYS_FREEBSD #include uint32_t x264_cpu_detect( void ) { -@@ -321,12 +321,16 @@ uint32_t x264_cpu_detect( void ) +@@ -324,12 +324,16 @@ uint32_t x264_cpu_detect( void ) uint32_t cpu = 0; #if SYS_OPENBSD int selectors[2] = { CTL_MACHDEP, CPU_ALTIVEC }; -#else +#elif SYS_MACOSX int selectors[2] = { CTL_HW, HW_VECTORUNIT }; #endif int has_altivec = 0; size_t length = sizeof( has_altivec ); +#if SYS_MACOSX || SYS_OPENBSD int error = sysctl( selectors, 2, &has_altivec, &length, NULL, 0 ); +#else + int error = sysctlbyname("hw.altivec", &has_altivec, &length, NULL, 0 ); +#endif if( error == 0 && has_altivec != 0 ) cpu |= X264_CPU_ALTIVEC; Index: head/multimedia/x264/files/patch-configure =================================================================== --- head/multimedia/x264/files/patch-configure (revision 391216) +++ head/multimedia/x264/files/patch-configure (revision 391217) @@ -1,25 +1,40 @@ -From 9463ec0004f1bddc49c05ed8e38430a4ce1738fb Mon Sep 17 00:00:00 2001 -From: Janne Grunau -Date: Sun, 20 Jul 2014 13:40:28 +0200 -Subject: [PATCH] arm/ppc: use $CC as default assembler - ---- configure.orig 2014-08-27 20:45:08 UTC +--- configure.orig 2015-06-29 20:45:09 UTC +++ configure -@@ -648,7 +648,7 @@ case $host_cpu in - ARCH="PPC" - if [ $asm = auto ] ; then - define HAVE_ALTIVEC -- AS="${AS-${cross_prefix}gcc}" -+ AS="${AS-${CC}}" - if [ $SYS = MACOSX ] ; then - CFLAGS="$CFLAGS -faltivec -fastf -mcpu=G4" - else -@@ -674,7 +674,7 @@ case $host_cpu in - LDFLAGS="$LDFLAGS -arch armv7" - fi - else -- AS="${AS-${cross_prefix}gcc}" -+ AS="${AS-${CC}}" +@@ -639,7 +639,7 @@ case $host_cpu in + ASFLAGS="$ASFLAGS -f elf" fi ;; - s390|s390x) +- x86_64) ++ x86_64|amd64) + ARCH="X86_64" + AS="yasm" + AS_EXT=".asm" +@@ -678,7 +678,7 @@ case $host_cpu in + sparc) + ARCH="SPARC" + ;; +- mips|mipsel|mips64|mips64el) ++ mips|mipsel|mips64|mips64el|mipsn32) + ARCH="MIPS" + ;; + arm*) +@@ -695,7 +695,7 @@ case $host_cpu in + AS="${AS-${CC}}" + fi + ;; +- aarch64) ++ aarch64|arm64) + ARCH="AARCH64" + if [ "$SYS" = MACOSX ] ; then + AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -- ${CC}}" +@@ -1089,10 +1089,6 @@ if cc_check '' -Wshadow ; then + CFLAGS="-Wshadow $CFLAGS" + fi + +-if cc_check '' -Wmaybe-uninitialized ; then +- CFLAGS="-Wno-maybe-uninitialized $CFLAGS" +-fi +- + if [ $compiler = ICC -o $compiler = ICL ] ; then + if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then + define HAVE_INTEL_DISPATCHER Index: head/net/opal/Makefile =================================================================== --- head/net/opal/Makefile (revision 391216) +++ head/net/opal/Makefile (revision 391217) @@ -1,304 +1,304 @@ # Created by: Roger Hardiman # $FreeBSD$ PORTNAME= opal PORTVERSION= 3.10.10 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= net MASTER_SITES= GNOME MAINTAINER= gnome@FreeBSD.org COMMENT= VoIP abstraction library LICENSE= MPL LIB_DEPENDS= libpt.so:${PORTSDIR}/devel/ptlib USES= gmake pathfix pkgconfig tar:xz GNU_CONFIGURE= yes USE_LDCONFIG= yes CXXFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= JAVA CELT ILBC GSM SPEEX THEORA FFMPEG X264 SIP H323 IAX \ H224 H281 FAX MSRP SIPIM RTPTEXT H450 H460 H501 LID UVIDEO \ AEC DEBUG RUBY # ZRTP # MSRP = plist extra line vpd? # RTPTEXT disable == build fail, so make it default? OPTIONS_DEFAULT=CELT GSM SPEEX FFMPEG X264 SIP H224 H281 FAX MSRP SIPIM \ RTPTEXT LID AEC DEBUG_DESC= Install debug library ZRTP_DESC= ZRTP protocol support JAVA_DESC= Java JNI support RUBY_DESC= Ruby support CELT_DESC= Celt codec from ports ILBC_DESC= iLBC codec from ports GSM_DESC= GSM 06.10 codec from ports SPEEX_DESC= SPEEX codec from ports THEORA_DESC= Theora codec support FFMPEG_DESC= Ffmpeg codec support X264_DESC= x.264 codec support SIP_DESC= SIP protocol support H323_DESC= H.323 protocol support IAX_DESC= IAX2 protocol support H224_DESC= H.224 control protocol H281_DESC= H.281 (Far End Camera Control) protocol support FAX_DESC= Fax T.38 support MSRP_DESC= MSRP protocol SIPIM_DESC= SIP-IM protocol RTPTEXT_DESC= RFC4103 Text RTP payload support H450_DESC= H.450 H.323 subset H460_DESC= H.460 H.323 extension for NAT traversal H501_DESC= H.501 H323 mobility extensions LID_DESC= Light-Weight Identity (incl. xJack cards and voicetronix vpb) support UVIDEO_DESC= RFC4175 uncompressed video RTP payload AEC_DESC= Accoustic echo cancellation .include .ifdef OPALDIR .error OPALDIR is defined as an environment variable, or in the arguments \ to "make". Please unset it and restart the build. .endif PLIST_SUB+= VERSION=${PORTVERSION} \ PVERSION_MAJOR=${PVERSION_MAJOR} \ PVERSION_MINOR=${PVERSION_MINOR} PVERSION_MAJOR= ${PORTVERSION:C/.[0-9]+.[0-9]+$//g} PVERSION_MINOR= ${PORTVERSION:C/.[0-9]+$//g} .if ${PORT_OPTIONS:MDEBUG} ALL_TARGET= debug opt PLIST_SUB+= DEBUG="" .else ALL_TARGET= opt PLIST_SUB+= DEBUG="@comment " .endif # libzrtpcpp uses port ssl, which will conflict with this port since we use # base ssl. #.if ${PORT_OPTIONS:MZRTP} .if 0 .if !defined(SAFE_ZRTP) IGNORE= please build devel/libzrtpcpp WITHOUT ports SSL and re-run build with SAFE_ZRTP set .endif LIB_DEPENDS+= libzrtpcpp.so:${PORTSDIR}/devel/libzrtpcpp CONFIGURE_ARGS+= --enable-zrtp .else CONFIGURE_ARGS+= --disable-zrtp .endif .if ${PORT_OPTIONS:MGSM} LIB_DEPENDS+= libgsm.so:${PORTSDIR}/audio/gsm .else CONFIGURE_ARGS+= --enable-localgsm .endif .if ${PORT_OPTIONS:MSPEEX} LIB_DEPENDS+= libspeex.so:${PORTSDIR}/audio/speex .else CONFIGURE_ARGS+= --enable-localspeex .endif .if ${PORT_OPTIONS:MJAVA} CONFIGURE_ARGS+= --enable-java .else CONFIGURE_ARGS+= --disable-java .endif .if ${PORT_OPTIONS:MRUBY} CONFIGURE_ARGS+= --enable-ruby .else CONFIGURE_ARGS+= --disable-ruby .endif .if ${PORT_OPTIONS:MCELT} LIB_DEPENDS+= libcelt0.so:${PORTSDIR}/audio/celt CONFIGURE_ARGS+= --enable-celt PLIST_SUB+= CELT="" .else CONFIGURE_ARGS+= --disable-celt PLIST_SUB+= CELT="@comment " .endif .if ${PORT_OPTIONS:MILBC} LIB_DEPENDS+= libilbc.so:${PORTSDIR}/net/ilbc .else CONFIGURE_ARGS+= --enable-localilbc .endif .if ${PORT_OPTIONS:MTHEORA} LIB_DEPENDS+= libtheora.so:${PORTSDIR}/multimedia/libtheora CONFIGURE_ARGS+= --enable-theora PLIST_SUB+= THEORA="" WITH_VIDEO= yes .else CONFIGURE_ARGS+= --disable-theora PLIST_SUB+= THEORA="@comment " .endif .if ${PORT_OPTIONS:MX264} && ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= libx264.so:${PORTSDIR}/multimedia/libx264 CONFIGURE_ARGS+= --enable-x264 PLIST_SUB+= X264="" WITH_VIDEO= yes # work around some weirdness in plugins/configure where it looses the # cflags/libs of x264 CONFIGURE_ENV+= X264_CFLAGS="`pkg-config --cflags x264`" \ X264_LIBS="`pkg-config --libs x264`" .else CONFIGURE_ARGS+= --disable-x264 PLIST_SUB+= X264="@comment " .endif .if ${PORT_OPTIONS:MFFMPEG} LIB_DEPENDS+= libavcodec0.so:${PORTSDIR}/multimedia/ffmpeg0 CONFIGURE_ARGS+= --enable-libavcodec CONFIGURE_ENV+= LIBAVCODEC_LIBS="-lavcodec0" \ LIBAVCODEC_CFLAGS="-I${LOCALBASE}/include/ffmpeg0" \ LIBAVUTIL_LIBS="-lavutil0" \ LIBAVUTIL_CFLAGS="-I${LOCALBASE}/include/ffmpeg0" CFLAGS+= -I${LOCALBASE}/include/ffmpeg0 PLIST_SUB+= FFMPEG="" WITH_VIDEO= yes .else CONFIGURE_ARGS+= --disable-libavcodec PLIST_SUB+= FFMPEG="@comment " .endif WITH_VIDEO=yes .if defined(WITH_VIDEO) CONFIGURE_ARGS+= --enable-video PLIST_SUB+= VIDEO="" .else CONFIGURE_ARGS+= --disable-video PLIST_SUB+= VIDEO="@comment " .endif .if ${PORT_OPTIONS:MSIP} CONFIGURE_ARGS+= --enable-sip .else CONFIGURE_ARGS+= --disable-sip .endif .if ${PORT_OPTIONS:MH323} CONFIGURE_ARGS+= --enable-h323 .else CONFIGURE_ARGS+= --disable-h323 .endif .if ${PORT_OPTIONS:MIAX} CONFIGURE_ARGS+= --enable-iax2 .else CONFIGURE_ARGS+= --disable-iax2 .endif .if ${PORT_OPTIONS:MH224} CONFIGURE_ARGS+= --enable-h224 .else CONFIGURE_ARGS+= --disable-h224 .endif .if ${PORT_OPTIONS:MH281} CONFIGURE_ARGS+= --enable-h281 .else CONFIGURE_ARGS+= --disable-h281 .endif .if ${PORT_OPTIONS:MFAX} LIB_DEPENDS+= libspandsp.so:${PORTSDIR}/comms/spandsp CONFIGURE_ARGS+= --enable-spandsp --enable-fax --enable-t38 PLIST_SUB+= FAX="" .else CONFIGURE_ARGS+= --disable-fax --disable-t38 --disable-spandsp PLIST_SUB+= FAX="@comment " .endif .if ${PORT_OPTIONS:MMSRP} CONFIGURE_ARGS+= --enable-msrp ##BROKEN= Does not compile .else CONFIGURE_ARGS+= --disable-msrp .endif .if ${PORT_OPTIONS:MSIPIM} CONFIGURE_ARGS+= --enable-sipim .else CONFIGURE_ARGS+= --disable-sipim .endif .if ${PORT_OPTIONS:MRTPTEXT} CONFIGURE_ARGS+= --enable-rfc4103 .else CONFIGURE_ARGS+= --disable-rfc4103 .endif .if ${PORT_OPTIONS:MH450} CONFIGURE_ARGS+= --enable-h450 .else CONFIGURE_ARGS+= --disable-h450 .endif .if ${PORT_OPTIONS:MH460} CONFIGURE_ARGS+= --enable-h460 .else CONFIGURE_ARGS+= --disable-h460 .endif .if ${PORT_OPTIONS:MH501} CONFIGURE_ARGS+= --enable-h501 .else CONFIGURE_ARGS+= --disable-h501 .endif .if ${PORT_OPTIONS:MLID} CONFIGURE_ARGS+= --enable-lid --enable-ixj --enable-vpb PLIST_SUB+= LID="" .else CONFIGURE_ARGS+= --disable-lid --disable-ixj --disable-vpb PLIST_SUB+= LID="@comment " .endif .if ${PORT_OPTIONS:MUVIDEO} CONFIGURE_ARGS+= --enable-rfc4175 .else CONFIGURE_ARGS+= --disable-rfc4175 .endif # xxxx .if ${PORT_OPTIONS:MXXXX} CONFIGURE_ARGS+= --enable-rfc2435 .else CONFIGURE_ARGS+= --disable-rfc2435 .endif .if ${PORT_OPTIONS:MAEC} CONFIGURE_ARGS+= --enable-aec .else CONFIGURE_ARGS+= --disable-aec .endif # ?? CONFIGURE_ARGS+= --disable-debug # configure flags not used CONFIGURE_ARGS+= --disable-gsmamr \ --disable-ruby post-install: ${LN} -sf libopal.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PVERSION_MAJOR} ${LN} -sf libopal.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PVERSION_MINOR} .if ${PORT_OPTIONS:MDEBUG} ${LN} -sf libopal_d.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal_d.so.${PVERSION_MAJOR} ${LN} -sf libopal_d.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libopal_d.so.${PVERSION_MINOR} .endif @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libopal.so.${PORTVERSION} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/codecs/video/h264_video_pwplugin_helper @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/*/*.so @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/opal-${PORTVERSION}/*/*/*.so .include Index: head/x11/xpra/Makefile =================================================================== --- head/x11/xpra/Makefile (revision 391216) +++ head/x11/xpra/Makefile (revision 391217) @@ -1,55 +1,56 @@ # Created by: Steve Wills # $FreeBSD$ PORTNAME= xpra PORTVERSION= 0.15.2 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/ MAINTAINER= jkim@FreeBSD.org COMMENT= Xpra gives you persistent remote applications for X LICENSE= GPLv2 BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython \ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 RUN_DEPENDS= ${PYTHON_SITELIBDIR}/lz4.so:${PORTSDIR}/archivers/py-lz4 \ pulseaudio:${PORTSDIR}/audio/pulseaudio \ ${PYTHON_SITELIBDIR}/rencode/__init__.py:${PORTSDIR}/converters/py-rencode \ ${PYTHON_SITELIBDIR}/dbus/__init__.py:${PORTSDIR}/devel/py-dbus \ ${PYTHON_SITELIBDIR}/OpenGL/__init__.py:${PORTSDIR}/graphics/py-opengl \ ${PYTHON_SITELIBDIR}/OpenGL_accelerate/__init__.py:${PORTSDIR}/graphics/py-opengl-accelerate \ ${PYTHON_PKGNAMEPREFIX}pillow>0:${PORTSDIR}/graphics/py-pillow \ ${PYTHON_SITELIBDIR}/avahi/__init__.py:${PORTSDIR}/net/py-avahi \ ${PYTHON_SITELIBDIR}/netifaces.so:${PORTSDIR}/net/py-netifaces \ ${PYTHON_SITELIBDIR}/cups.so:${PORTSDIR}/print/py-cups \ ssh-askpass:${PORTSDIR}/security/openssh-askpass \ setxkbmap:${PORTSDIR}/x11/setxkbmap \ xauth:${PORTSDIR}/x11/xauth \ Xvfb:${PORTSDIR}/x11-servers/xorg-vfbserver \ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/__init__.py:${PORTSDIR}/x11-toolkits/py-gtk2 \ ${PYTHON_SITELIBDIR}/gtk-2.0/gtk/gtkgl/__init__.py:${PORTSDIR}/x11-toolkits/py-gtkglext LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp \ libavcodec.so:${PORTSDIR}/multimedia/ffmpeg \ libvpx.so:${PORTSDIR}/multimedia/libvpx \ libx264.so:${PORTSDIR}/multimedia/libx264 \ libx265.so:${PORTSDIR}/multimedia/x265 USES= pkgconfig python tar:xz USE_PYTHON= distutils USE_XORG= x11 xcomposite xdamage xfixes xkbfile xrandr xtst PLIST_SUB+= PORTVERSION=${PORTVERSION} PYTHON_VER=${PYTHON_VER} PYDISTUTILS_PKGNAME= xpra_all post-patch: ${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' \ ${WRKSRC}/xpra/platform/pycups_printing.py post-install: ${INSTALL_DATA} ${WRKSRC}/etc/xpra/xorg.conf \ ${STAGEDIR}${ETCDIR}/xorg.conf.sample ${INSTALL_DATA} ${WRKSRC}/build/etc/xpra/xpra.conf \ ${STAGEDIR}${ETCDIR}/xpra.conf.sample .include