summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2019-12-21 19:00:27 +0000
committerJan Beich <jbeich@FreeBSD.org>2019-12-21 19:00:27 +0000
commit3642ceafef74f24f1d2d42efe67f9e64dd00d6e6 (patch)
treeb67cf732dfd32685ed44d482b0f346835133bcd8 /multimedia
parentTake maintainership. (diff)
multimedia/x264: update to 0.159.2991
Changes: https://code.videolan.org/videolan/x264/compare/34c06d1...1771b55 ABI: https://abi-laboratory.pro/tracker/timeline/x264/
Notes
Notes: svn path=/head/; revision=520577
Diffstat (limited to '')
-rw-r--r--multimedia/avidemux-plugins/Makefile2
-rw-r--r--multimedia/ccextractor/Makefile2
-rw-r--r--multimedia/cinelerra-gg/Makefile2
-rw-r--r--multimedia/emby-server/Makefile2
-rw-r--r--multimedia/ffmpeg/Makefile2
-rw-r--r--multimedia/gstreamer-plugins-vp8/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-vpx/Makefile2
-rw-r--r--multimedia/handbrake/Makefile1
-rw-r--r--multimedia/libav/Makefile2
-rw-r--r--multimedia/libquicktime/Makefile2
-rw-r--r--multimedia/mencoder/Makefile1
-rw-r--r--multimedia/mplayer/Makefile1
-rw-r--r--multimedia/obs-studio/Makefile1
-rw-r--r--multimedia/transcode/Makefile2
-rw-r--r--multimedia/vlc/Makefile2
-rw-r--r--multimedia/x264/Makefile30
-rw-r--r--multimedia/x264/distinfo6
-rw-r--r--multimedia/x264/files/patch-configure32
-rw-r--r--multimedia/zoneminder/Makefile2
19 files changed, 49 insertions, 47 deletions
diff --git a/multimedia/avidemux-plugins/Makefile b/multimedia/avidemux-plugins/Makefile
index 98297ec75531..b5fa0891d0ad 100644
--- a/multimedia/avidemux-plugins/Makefile
+++ b/multimedia/avidemux-plugins/Makefile
@@ -3,7 +3,7 @@
PORTNAME= avidemux
PORTVERSION= ${AVIDEMUX_VERSION}
-PORTREVISION= 17
+PORTREVISION= 18
CATEGORIES= multimedia
PKGNAMESUFFIX= -plugins
diff --git a/multimedia/ccextractor/Makefile b/multimedia/ccextractor/Makefile
index 39c8bb9fb796..5e86a1305c36 100644
--- a/multimedia/ccextractor/Makefile
+++ b/multimedia/ccextractor/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ccextractor
DISTVERSIONPREFIX= v
DISTVERSION= 0.85
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= multimedia
MAINTAINER= oz@nixil.net
diff --git a/multimedia/cinelerra-gg/Makefile b/multimedia/cinelerra-gg/Makefile
index 9619204f8f39..bade81873e26 100644
--- a/multimedia/cinelerra-gg/Makefile
+++ b/multimedia/cinelerra-gg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cinelerra-gg
DISTVERSION= 5.1-20180714
DISTVERSIONSUFFIX= -${REV:C/(.......).*/\1/}
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= multimedia
MASTER_SITES= https://git.cinelerra-cv.org/gitweb?p=goodguy/cinelerra.git;a=snapshot;h=${REV};sf=tgz;dummy=/ # tarballs are @ https://cinelerra-cv.org/five/pkgs/src/
diff --git a/multimedia/emby-server/Makefile b/multimedia/emby-server/Makefile
index 46478d5b5b9f..299b90fd80dc 100644
--- a/multimedia/emby-server/Makefile
+++ b/multimedia/emby-server/Makefile
@@ -2,7 +2,7 @@
PORTNAME= emby-server
PORTVERSION= 4.3.1.0
-PORTREVISION= 0
+PORTREVISION= 1
FFVERSION= 2019_11_09
CATEGORIES= multimedia
MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${PORTVERSION}/ \
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 946ef5dc6115..f30023f03d0b 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 4.2.1
-PORTREVISION= 20
+PORTREVISION= 21
PORTEPOCH= 1
CATEGORIES= multimedia audio net
MASTER_SITES= https://ffmpeg.org/releases/
diff --git a/multimedia/gstreamer-plugins-vp8/Makefile b/multimedia/gstreamer-plugins-vp8/Makefile
index 7c5714d72021..3c100c7a3bb3 100644
--- a/multimedia/gstreamer-plugins-vp8/Makefile
+++ b/multimedia/gstreamer-plugins-vp8/Makefile
@@ -1,7 +1,7 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia
COMMENT= Gstreamer vp8 codec plugin
diff --git a/multimedia/gstreamer1-plugins-vpx/Makefile b/multimedia/gstreamer1-plugins-vpx/Makefile
index 6bfc3c68914e..2fa9fe7a991d 100644
--- a/multimedia/gstreamer1-plugins-vpx/Makefile
+++ b/multimedia/gstreamer1-plugins-vpx/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
COMMENT= GStreamer vp8 codec plugin
diff --git a/multimedia/handbrake/Makefile b/multimedia/handbrake/Makefile
index 6eb5173bd923..b26d648fdb74 100644
--- a/multimedia/handbrake/Makefile
+++ b/multimedia/handbrake/Makefile
@@ -3,6 +3,7 @@
PORTNAME= handbrake
DISTVERSION= 1.3.0
+PORTREVISION= 1
CATEGORIES= multimedia
DIST_SUBDIR= ${PORTNAME}
diff --git a/multimedia/libav/Makefile b/multimedia/libav/Makefile
index 846c5e092a5a..c6a5a2c1980a 100644
--- a/multimedia/libav/Makefile
+++ b/multimedia/libav/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libav
PORTVERSION= 12.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= multimedia audio net
MASTER_SITES= http://libav.org/releases/
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index 8c500624364b..e866753ea028 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libquicktime
PORTVERSION= 1.2.4
-PORTREVISION?= 27
+PORTREVISION?= 28
CATEGORIES= multimedia
MASTER_SITES= SF
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 025ef56e2e16..3381be65e938 100644
--- a/multimedia/mencoder/Makefile
+++ b/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
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index ab635d4265ef..83cc5d4cc187 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
+PORTREVISION= 1
CATEGORIES= multimedia audio
MAINTAINER= riggs@FreeBSD.org
diff --git a/multimedia/obs-studio/Makefile b/multimedia/obs-studio/Makefile
index e6f6883e057f..4e4005bac9e7 100644
--- a/multimedia/obs-studio/Makefile
+++ b/multimedia/obs-studio/Makefile
@@ -2,6 +2,7 @@
PORTNAME= obs-studio
DISTVERSION= 24.0.5
+PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= yuri@FreeBSD.org
diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 437611b0abf6..739d5643fe21 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -3,7 +3,7 @@
PORTNAME= transcode
PORTVERSION= 1.1.7
-PORTREVISION= 40
+PORTREVISION= 41
CATEGORIES= multimedia
MASTER_SITES= https://bitbucket.org/france/transcode-tcforge/downloads/
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 2780335290b2..99db5764d1e7 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= vlc
DISTVERSION= 3.0.8
-PORTREVISION= 12
+PORTREVISION= 13
PORTEPOCH= 4
CATEGORIES= multimedia audio net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
diff --git a/multimedia/x264/Makefile b/multimedia/x264/Makefile
index de15a263e09a..5cfc53576c5e 100644
--- a/multimedia/x264/Makefile
+++ b/multimedia/x264/Makefile
@@ -7,24 +7,20 @@
#
# X264_BUILD is the "core" number, and can be found in x264.h.
#
-# X264_COMMIT is the commit number, and can be found here:
-# https://code.videolan.org/videolan/x264/commits/stable
-#
# 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
+# fgrep -lr --include='*/Makefile*' :multimedia/libx264 $PORTSDIR |
+# sed 's,/Makefile.*,,' | xargs $PORTSDIR/Tools/scripts/bump-revision.sh
+# or
+# rg -l :multimedia/libx264 $PORTSDIR | xargs -n1 portedit bump-revision -i
PORTNAME= x264
PORTVERSION= 0.${X264_BUILD}.${X264_REV}
-PORTREVISION?= 2 # 2 in libx264
+PORTREVISION?= 0
CATEGORIES= multimedia
-MASTER_SITES= https://downloads.videolan.org/pub/videolan/x264/snapshots/ \
- https://samples.mplayerhq.hu/yuv4mpeg2/:pgo
-DISTNAME= ${PORTNAME}-snapshot-${X264_SNAPSHOT}-2245-stable
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES= https://samples.mplayerhq.hu/yuv4mpeg2/:pgo
DIST_SUBDIR= x264
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
@@ -37,15 +33,17 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS?= libx264.so:multimedia/libx264
-X264_BUILD= 157
-X264_REV= 2980
-X264_COMMIT= 34c06d1c17ad968fbdda153cb772f77ee31b3095
-X264_GITVER= ${X264_COMMIT:C/^(.......).*$/\1/g}
-X264_SNAPSHOT= 20190719
+X264_BUILD= 159
+X264_REV= 2991
+X264_GITVER= ${GL_COMMIT:C/^(.{7}).*/\1/}
USES?= pkgconfig
-USES+= compiler:c11 gmake localbase shebangfix tar:bzip2
+USES+= compiler:c11 gmake localbase shebangfix
+USE_GITLAB= yes
USE_LDCONFIG= yes
+GL_SITE= https://code.videolan.org
+GL_ACCOUNT= videolan
+GL_COMMIT= 1771b556ee45207f8711744ccbd5d42a3949b14c
HAS_CONFIGURE= yes
SHEBANG_FILES= configure
PLIST_FILES?= bin/x264
diff --git a/multimedia/x264/distinfo b/multimedia/x264/distinfo
index 7fcb71a8a60e..c283493c804e 100644
--- a/multimedia/x264/distinfo
+++ b/multimedia/x264/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1563569105
-SHA256 (x264/x264-snapshot-20190719-2245-stable.tar.bz2) = aff7ecdb846cdeefd7ed066fabac4a2bae936eab184f9f2c6eec037a5fbca1e7
-SIZE (x264/x264-snapshot-20190719-2245-stable.tar.bz2) = 770463
+TIMESTAMP = 1574812200
SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
SIZE (x264/example.y4m.bz2) = 4910029
+SHA256 (x264/videolan-x264-1771b556ee45207f8711744ccbd5d42a3949b14c_GL0.tar.gz) = 84dfaafd8412bc034058da66d29606aa9ec7e1e7405e97709e63cb7e6fe808ad
+SIZE (x264/videolan-x264-1771b556ee45207f8711744ccbd5d42a3949b14c_GL0.tar.gz) = 932468
diff --git a/multimedia/x264/files/patch-configure b/multimedia/x264/files/patch-configure
index 6564f2058e1c..62f8ea92ede9 100644
--- a/multimedia/x264/files/patch-configure
+++ b/multimedia/x264/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig 2017-12-25 21:45:05 UTC
+--- configure.orig 2019-11-26 23:50:00 UTC
+++ configure
-@@ -692,12 +692,6 @@ case $host_cpu in
+@@ -728,12 +728,6 @@ case $host_cpu in
AS_EXT=".asm"
ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/"
if [ $compiler = GNU ]; then
@@ -13,7 +13,7 @@
CFLAGS="-m32 $CFLAGS"
LDFLAGS="-m32 $LDFLAGS"
fi
-@@ -712,7 +706,7 @@ case $host_cpu in
+@@ -748,7 +742,7 @@ case $host_cpu in
ASFLAGS="$ASFLAGS -f elf32"
fi
;;
@@ -22,7 +22,7 @@
ARCH="X86_64"
AS="${AS-nasm}"
AS_EXT=".asm"
-@@ -786,7 +780,7 @@ case $host_cpu in
+@@ -824,7 +818,7 @@ case $host_cpu in
AS="${AS-${CC}}"
fi
;;
@@ -30,17 +30,17 @@
+ aarch64|arm64)
ARCH="AARCH64"
stack_alignment=16
- AS="${AS-${CC}}"
-@@ -888,7 +882,7 @@ elif [ $compiler = ICC -a $ARCH = X86 ]; then
+ if [ "$SYS" = MACOSX ] ; then
+@@ -937,7 +931,7 @@ if cc_check '' '' '' '__attribute__((force_align_arg_p
fi
fi
-if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
+if [ $cli_libx264 != system -a $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
if ! as_check "vmovdqa32 [eax]{k1}{z}, zmm0" ; then
- VER=`($AS --version || echo no assembler) 2>/dev/null | head -n 1`
+ VER="$( ($AS --version || echo no assembler) 2>/dev/null | head -n 1 )"
echo "Found $VER"
-@@ -901,9 +895,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \
+@@ -950,9 +944,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \
fi
if [ $asm = auto -a $ARCH = ARM ] ; then
@@ -50,7 +50,7 @@
cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM
if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then
define HAVE_ARMV6
-@@ -914,9 +905,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
+@@ -963,9 +954,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
ASFLAGS="$ASFLAGS -c"
else
@@ -62,7 +62,7 @@
fi
fi
-@@ -943,9 +933,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
+@@ -997,9 +987,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then
define HAVE_MSA
else
@@ -74,7 +74,7 @@
fi
fi
-@@ -1257,10 +1246,6 @@ if cc_check '' -Wshadow ; then
+@@ -1327,10 +1316,6 @@ if cc_check '' -Wshadow ; then
CFLAGS="-Wshadow $CFLAGS"
fi
@@ -82,12 +82,12 @@
- 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
-@@ -1296,6 +1281,9 @@ if [ "$opencl" = "yes" ]; then
+ if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then
+ CFLAGS="$CFLAGS -fvisibility=hidden"
+ fi
+@@ -1370,6 +1355,9 @@ if [ "$opencl" = "yes" ]; then
opencl="yes"
- define HAVE_OPENCL
+ define HAVE_OPENCL "(BIT_DEPTH==8)"
libdl="-ldl"
+ else
+ opencl="yes"
diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile
index 5f1e8eb3677a..20e1974f2518 100644
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@@ -2,7 +2,7 @@
PORTNAME= zoneminder
PORTVERSION= 1.32.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= multimedia
MAINTAINER= bsd@abinet.ru
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-13 00:55:45 +0000