Index: Mk/bsd.options.desc.mk =================================================================== --- Mk/bsd.options.desc.mk +++ Mk/bsd.options.desc.mk @@ -363,6 +363,7 @@ OGG_DESC?= Ogg media format support OPENAL_DESC?= Audio support via OpenAL OPENBLAS_DESC?= OpenBLAS blas implementation +OPENCL_DESC?= Heterogeneous computing via OpenCL OPENCV_DESC?= Computer Vision support via OpenCV OPENEXR_DESC?= HDR image format support via OpenEXR OPENGL_DESC?= 2D/3D rendering support via OpenGL Index: multimedia/avidemux/Makefile =================================================================== --- multimedia/avidemux/Makefile +++ multimedia/avidemux/Makefile @@ -6,7 +6,7 @@ PORTNAME= avidemux PORTVERSION= ${AVIDEMUX_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MAINTAINER= multimedia@FreeBSD.org Index: multimedia/ffmpeg/Makefile =================================================================== --- multimedia/ffmpeg/Makefile +++ multimedia/ffmpeg/Makefile @@ -3,6 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 2.8.8 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -63,7 +64,6 @@ LICENSE_DESC= Licensing options NEON_DESC= Enable Media Processing Engine instructions NONFREE_DESC= Allow use of nonfree code -OPENCL_DESC= Heterogeneous computing via OpenCL OPENH264_DESC= H.264 video codec support via OpenH264 QUVI_DESC= Flash media stream URLs RTCPU_DESC= Detect CPU capabilities at runtime Index: multimedia/ffmpeg0/Makefile =================================================================== --- multimedia/ffmpeg0/Makefile +++ multimedia/ffmpeg0/Makefile @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 0.7.17 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ Index: multimedia/gstreamer-plugins-x264/Makefile =================================================================== --- multimedia/gstreamer-plugins-x264/Makefile +++ multimedia/gstreamer-plugins-x264/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ # $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $ -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia COMMENT= Gstreamer x264 plugin Index: multimedia/gstreamer1-plugins-x264/Makefile =================================================================== --- multimedia/gstreamer1-plugins-x264/Makefile +++ multimedia/gstreamer1-plugins-x264/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= multimedia COMMENT= GStreamer libx264 based H264 plugin Index: multimedia/handbrake/Makefile =================================================================== --- multimedia/handbrake/Makefile +++ multimedia/handbrake/Makefile @@ -3,6 +3,7 @@ PORTNAME= handbrake PORTVERSION= 0.10.5 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://download.handbrake.fr/releases/${PORTVERSION}/ \ http://download.handbrake.fr/handbrake/contrib/:contrib \ Index: multimedia/libav/Makefile =================================================================== --- multimedia/libav/Makefile +++ multimedia/libav/Makefile @@ -2,6 +2,7 @@ PORTNAME= libav PORTVERSION= 11.7 +PORTREVISION= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://libav.org/releases/ Index: multimedia/libquicktime/Makefile =================================================================== --- multimedia/libquicktime/Makefile +++ multimedia/libquicktime/Makefile @@ -3,7 +3,7 @@ PORTNAME= libquicktime PORTVERSION= 1.2.4 -PORTREVISION?= 12 +PORTREVISION?= 13 CATEGORIES= multimedia MASTER_SITES= SF Index: multimedia/libx264/Makefile =================================================================== --- multimedia/libx264/Makefile +++ multimedia/libx264/Makefile @@ -3,22 +3,26 @@ # # Updating notes: see multimedia/x264/Makefile. -PORTREVISION= 1 PKGNAMEPREFIX= lib COMMENT= H.264/MPEG-4 AVC Video Encoding (Library) MASTERDIR= ${.CURDIR}/../x264 PLIST= ${.CURDIR}/pkg-plist +# Clear dependency on libx264 (itself), see x264/Makefile LIB_DEPENDS= # USES= pathfix -OPTIONS_DEFINE= HI10P +OPTIONS_DEFINE= HI10P OPENCL +OPTIONS_DEFAULT= OPENCL OPTIONS_EXCLUDE= FFMS GPAC LAVF LSMASH SWSCALE HI10P_DESC= Enable High 10 Profile 10-bit encoding HI10P_CONFIGURE_ON= --bit-depth=10 +OPENCL_BUILD_DEPENDS= ${LOCALBASE}/include/CL/opencl.h:devel/opencl +OPENCL_CONFIGURE_ENABLE=opencl + CONFIGURE_ARGS= \ --enable-static \ --enable-shared \ Index: multimedia/mencoder/Makefile =================================================================== --- multimedia/mencoder/Makefile +++ multimedia/mencoder/Makefile @@ -3,6 +3,7 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g} +PORTREVISION= 1 CATEGORIES= multimedia audio MAINTAINER= riggs@FreeBSD.org Index: multimedia/mpeg4ip/Makefile =================================================================== --- multimedia/mpeg4ip/Makefile +++ multimedia/mpeg4ip/Makefile @@ -3,7 +3,7 @@ PORTNAME= mpeg4ip PORTVERSION= 1.6.1 -PORTREVISION= 33 +PORTREVISION= 34 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= LOCAL/ahze # http://sourceforge.net/forum/forum.php?thread_id=1839453&forum_id=59136 Index: multimedia/msx264/Makefile =================================================================== --- multimedia/msx264/Makefile +++ multimedia/msx264/Makefile @@ -2,6 +2,7 @@ PORTNAME= msx264 PORTVERSION= 1.5.2 +PORTREVISION= 1 CATEGORIES= multimedia net MASTER_SITES= SAVANNAH/linphone/plugins/sources/ Index: multimedia/obs-studio/Makefile =================================================================== --- multimedia/obs-studio/Makefile +++ multimedia/obs-studio/Makefile @@ -2,6 +2,7 @@ PORTNAME= obs-studio PORTVERSION= 0.15.2 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= ports@FreeBSD.org Index: multimedia/transcode/Makefile =================================================================== --- multimedia/transcode/Makefile +++ multimedia/transcode/Makefile @@ -3,7 +3,7 @@ PORTNAME= transcode PORTVERSION= 1.1.7 -PORTREVISION= 26 +PORTREVISION= 27 CATEGORIES= multimedia MASTER_SITES= https://bitbucket.org/france/transcode-tcforge/downloads/ Index: multimedia/vlc/Makefile =================================================================== --- multimedia/vlc/Makefile +++ multimedia/vlc/Makefile @@ -3,6 +3,7 @@ PORTNAME= vlc DISTVERSION= 2.2.4 +PORTREVISION= 1 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ Index: multimedia/x264/Makefile =================================================================== --- multimedia/x264/Makefile +++ multimedia/x264/Makefile @@ -19,7 +19,7 @@ PORTNAME= x264 PORTVERSION= 0.${X264_BUILD}.${X264_REV} -PORTREVISION?= 3 +PORTREVISION?= 0 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.videolan.org/pub/videolan/x264/snapshots/ \ http://samples.mplayerhq.hu/yuv4mpeg2/:pgo @@ -38,11 +38,11 @@ bash:shells/bash LIB_DEPENDS?= libx264.so:multimedia/libx264 -X264_BUILD= 144 -X264_REV= 2533 -X264_COMMIT= c8a773ebfca148ef04f5a60d42cbd7336af0baf6 +X264_BUILD= 148 +X264_REV= 2708 +X264_COMMIT= 86b71982e131eaa70125f8d0e725fcade9c4c677 X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g} -X264_SNAPSHOT= 20150629 +X264_SNAPSHOT= 20160921 USES?= pkgconfig USES+= gmake localbase shebangfix tar:bzip2 @@ -63,28 +63,28 @@ MP4_DESC= MPEG-4 output SWSCALE_DESC= Resize video filter -ASM_CONFIGURE_OFF= --disable-asm +ASM_CONFIGURE_ENABLE= asm -DEBUG_CONFIGURE_ON= --enable-debug +DEBUG_CONFIGURE_ENABLE= debug DEBUG_CONFIGURE_OFF= --enable-strip FFMS_LIB_DEPENDS= libffms2.so:multimedia/ffms2 -FFMS_CONFIGURE_OFF= --disable-ffms +FFMS_CONFIGURE_ENABLE= ffms FFMS_IMPLIES= SWSCALE GCC_VARS= USE_GCC=yes -GPAC_CONFIGURE_OFF= --disable-gpac GPAC_LIB_DEPENDS= libgpac.so:multimedia/gpac-libgpac +GPAC_CONFIGURE_ENABLE= gpac -LAVF_CONFIGURE_OFF= --disable-lavf LAVF_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libavformat.so:multimedia/ffmpeg \ libavutil.so:multimedia/ffmpeg +LAVF_CONFIGURE_ENABLE= lavf LAVF_IMPLIES= SWSCALE LSMASH_LIB_DEPENDS= liblsmash.so:multimedia/l-smash -LSMASH_CONFIGURE_OFF= --disable-lsmash +LSMASH_CONFIGURE_ENABLE=lsmash PGO_DISTFILES= ${Y4M_VIDEO_DISTFILE}:pgo PGO_MAKE_ENV= VIDS="${WRKDIR}/${Y4M_VIDEO}" @@ -96,15 +96,14 @@ RESTRICTED="${Y4M_VIDEO_DISTFILE} file may not be mirrored" \ RESTRICTED_FILES="${Y4M_VIDEO_DISTFILE}" -SWSCALE_CONFIGURE_OFF= --disable-swscale SWSCALE_LIB_DEPENDS= libavutil.so:multimedia/ffmpeg \ libswscale.so:multimedia/ffmpeg +SWSCALE_CONFIGURE_ENABLE= swscale CONFIGURE_ARGS?= --system-libx264 CONFIGURE_ARGS+= --prefix="${PREFIX}" \ --extra-cflags="${CPPFLAGS} ${CFLAGS}" \ - --extra-ldflags="${LDFLAGS}" \ - --disable-opencl \ + --extra-ldflags="${LDFLAGS}" CFLAGS_armv6+= -mcpu=arm1136jf-s Index: multimedia/x264/distinfo =================================================================== --- multimedia/x264/distinfo +++ multimedia/x264/distinfo @@ -1,4 +1,5 @@ -SHA256 (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 403a1e7178cf9d676d5ffd4641031ae568a501bb3c14fc8ca9bb7c8ac7465340 -SIZE (x264/x264-snapshot-20150629-2245-stable.tar.bz2) = 672453 +TIMESTAMP = 1474449136 +SHA256 (x264/x264-snapshot-20160921-2245-stable.tar.bz2) = 340045020a79e44784ec158d9d2f73ec4248b6923393f6d5fbb683ec63db6d2f +SIZE (x264/x264-snapshot-20160921-2245-stable.tar.bz2) = 731264 SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7 SIZE (x264/example.y4m.bz2) = 4910029 Index: multimedia/x264/files/patch-common_cpu.c =================================================================== --- multimedia/x264/files/patch-common_cpu.c +++ /dev/null @@ -1,29 +0,0 @@ ---- common/cpu.c.orig 2015-06-29 20:45:09 UTC -+++ common/cpu.c -@@ -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 ) - { -@@ -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: multimedia/x264/files/patch-configure =================================================================== --- multimedia/x264/files/patch-configure +++ multimedia/x264/files/patch-configure @@ -1,33 +1,37 @@ --- configure.orig 2015-06-29 20:45:09 UTC +++ configure -@@ -639,7 +639,7 @@ case $host_cpu in - ASFLAGS="$ASFLAGS -f elf" +@@ -677,12 +677,6 @@ case $host_cpu in + AS_EXT=".asm" + ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/" + if [ $compiler = GNU ]; then +- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then +- CFLAGS="$CFLAGS -march=i686" +- fi +- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then +- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2" +- fi + CFLAGS="-m32 $CFLAGS" + LDFLAGS="-m32 $LDFLAGS" + fi +@@ -697,7 +691,7 @@ case $host_cpu in + ASFLAGS="$ASFLAGS -f elf32" fi ;; - x86_64) + x86_64|amd64) ARCH="X86_64" - AS="yasm" + AS="${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 +@@ -761,7 +755,7 @@ case $host_cpu in AS="${AS-${CC}}" fi ;; - aarch64) + aarch64|arm64) ARCH="AARCH64" + stack_alignment=16 if [ "$SYS" = MACOSX ] ; then - AS="${AS-${SRCPATH}/tools/gas-preprocessor.pl -arch aarch64 -- ${CC}}" -@@ -1089,10 +1089,6 @@ if cc_check '' -Wshadow ; then +@@ -1225,10 +1219,6 @@ if cc_check '' -Wshadow ; then CFLAGS="-Wshadow $CFLAGS" fi @@ -38,3 +42,13 @@ if [ $compiler = ICC -o $compiler = ICL ] ; then if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then define HAVE_INTEL_DISPATCHER +@@ -1128,6 +1118,9 @@ if [ "$opencl" = "yes" ]; then + opencl="yes" + define HAVE_OPENCL + libdl="-ldl" ++ else ++ opencl="yes" ++ define HAVE_OPENCL + fi + LDFLAGS="$LDFLAGS $libdl" + fi Index: multimedia/x264/files/patch-deblock-a.S =================================================================== --- multimedia/x264/files/patch-deblock-a.S +++ /dev/null @@ -1,20 +0,0 @@ ---- common/aarch64/deblock-a.S.orig 2016-01-04 11:21:40.265233000 +0000 -+++ common/aarch64/deblock-a.S 2016-01-04 11:27:19.291080000 +0000 -@@ -538,7 +538,7 @@ - ret - endfunc - --.macro h264_loop_filter_chroma_intra, width=16 -+.macro h264_loop_filter_chroma_intra width=16 - uabd v26.16b, v16.16b, v17.16b // abs(p0 - q0) - uabd v27.16b, v18.16b, v16.16b // abs(p1 - p0) - uabd v28.16b, v19.16b, v17.16b // abs(q1 - q0) -@@ -604,7 +604,7 @@ - - transpose4x4.h v18, v16, v17, v19, v26, v27, v28, v29 - -- h264_loop_filter_chroma_intra, width=8 -+ h264_loop_filter_chroma_intra width=8 - - st2 {v16.h,v17.h}[0], [x0], x1 - st2 {v16.h,v17.h}[1], [x0], x1 Index: multimedia/x264/files/patch-quant-a.S =================================================================== --- multimedia/x264/files/patch-quant-a.S +++ /dev/null @@ -1,24 +0,0 @@ ---- common/aarch64/quant-a.S.orig 2016-01-04 11:28:55.378084000 +0000 -+++ common/aarch64/quant-a.S 2016-01-04 11:30:55.055050000 +0000 -@@ -546,12 +546,10 @@ - sub x0, x0, #2 - .endif - .if \size < 15 -- .equ shiftw, 3 - ld1 {v0.8h}, [x0] - uqxtn v0.8b, v0.8h - cmtst v0.8b, v0.8b, v0.8b - .else -- .equ shiftw, 2 - ld1 {v0.8h,v1.8h}, [x0] - uqxtn v0.8b, v0.8h - uqxtn2 v0.16b, v1.8h -@@ -565,7 +563,7 @@ - - coeff_level_run_start \size - -- coeff_level_run shiftw -+ coeff_level_run (4 - (\size + 1) / 8) - - ret - endfunc Index: multimedia/x264/files/patch-x264.h =================================================================== --- multimedia/x264/files/patch-x264.h +++ /dev/null @@ -1,15 +0,0 @@ -Our stdint.h is a symlink to sys/stdint.h so we need to teach x264 -the header guard of the sys/stdint.h file. - -Accepted upstream, see https://reviews.freebsd.org/D2863 for details. ---- x264.h.orig 2015-06-19 08:05:22.728325000 +0200 -+++ x264.h 2015-06-19 08:05:39.433879000 +0200 -@@ -29,7 +29,7 @@ - #define X264_X264_H - - #if !defined(_STDINT_H) && !defined(_STDINT_H_) && !defined(_STDINT_H_INCLUDED) && !defined(_STDINT) &&\ -- !defined(_INTTYPES_H) && !defined(_INTTYPES_H_) && !defined(_INTTYPES) -+ !defined(_SYS_STDINT_H_) && !defined(_INTTYPES_H) && !defined(_INTTYPES_H_) && !defined(_INTTYPES) - # ifdef _MSC_VER - # pragma message("You must include stdint.h or inttypes.h before x264.h") - # else Index: net/opal/Makefile =================================================================== --- net/opal/Makefile +++ net/opal/Makefile @@ -3,7 +3,7 @@ PORTNAME= opal PORTVERSION= 3.10.10 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net MASTER_SITES= GNOME Index: x11/xpra/Makefile =================================================================== --- x11/xpra/Makefile +++ x11/xpra/Makefile @@ -3,7 +3,7 @@ PORTNAME= xpra PORTVERSION= 0.15.10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= http://xpra.org/src/