cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

multimedia/x264: update to 0.161.3020

Browse Source 
Changes:	cde9a93...d198931
ABI:		https://abi-laboratory.pro/tracker/timeline/x264/
This commit is contained in:
Jan Beich 2020-11-07 15:49:38 +00:00
parent 9c50607c0c
commit 1eee34b954
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=554400
22 changed files with 54 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multimedia/avidemux-plugins/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= avidemux
PORTVERSION= ${AVIDEMUX_VERSION}
PORTREVISION= 0
PORTREVISION= 1
CATEGORIES= multimedia
PKGNAMESUFFIX= -plugins

2
multimedia/ccextractor/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= ccextractor
DISTVERSIONPREFIX= v
DISTVERSION= 0.85
PORTREVISION= 18
PORTREVISION= 19
CATEGORIES= multimedia
MAINTAINER= oz@nixil.net

1
multimedia/emby-server/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= emby-server
PORTVERSION= 4.5.2.0
PORTREVISION= 1
CATEGORIES= multimedia
MASTER_SITES= https://github.com/MediaBrowser/Emby.Releases/releases/download/${PORTVERSION}/ \
https://mediabrowser.github.io/embytools/

2
multimedia/ffmpeg/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= ffmpeg
PORTVERSION= 4.3.1
PORTREVISION= 3
PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= multimedia audio net
MASTER_SITES= https://ffmpeg.org/releases/

2
multimedia/gstreamer-plugins-x264/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $
PORTREVISION= 10
PORTREVISION= 11
CATEGORIES= multimedia
COMMENT= Gstreamer x264 plugin

2
multimedia/gstreamer1-plugins-x264/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= multimedia
COMMENT= GStreamer libx264 based H264 plugin

2
multimedia/handbrake/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= handbrake
DISTVERSION= 1.3.3
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= multimedia
DIST_SUBDIR= ${PORTNAME}

2
multimedia/libav/Makefile
View File

@ -2,7 +2,7 @@
PORTNAME= libav
PORTVERSION= 12.3
PORTREVISION= 8
PORTREVISION= 9
CATEGORIES= multimedia audio net
MASTER_SITES= http://libav.org/releases/

2
multimedia/libquicktime/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= libquicktime
PORTVERSION= 1.2.4
PORTREVISION?= 29
PORTREVISION?= 30
CATEGORIES= multimedia
MASTER_SITES= SF

2
multimedia/libx264/Makefile
View File

@ -19,7 +19,7 @@ LDFLAGS_armv7= -Wl,-znotext
OPTIONS_DEFINE= ASM OPENCL
OPTIONS_DEFAULT= ASM OPENCL
OPTIONS_EXCLUDE= FFMS GPAC LAVF LSMASH SWSCALE
OPTIONS_EXCLUDE= BASH FFMS GPAC LAVF LSMASH SWSCALE
ASM_BUILD_DEPENDS= ${ASM_BUILD_DEPENDS_${ARCH}}
ASM_BUILD_DEPENDS_amd64=${ASM_BUILD_DEPENDS_i386}

2
multimedia/mencoder/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= multimedia audio
MAINTAINER= riggs@FreeBSD.org

1
multimedia/obs-studio/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= obs-studio
DISTVERSION= 26.0.2
PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= yuri@FreeBSD.org

2
multimedia/transcode/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= transcode
PORTVERSION= 1.1.7
PORTREVISION= 44
PORTREVISION= 45
CATEGORIES= multimedia
MASTER_SITES= https://bitbucket.org/france/transcode-tcforge/downloads/

2
multimedia/vlc/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= vlc
DISTVERSION= 3.0.11
PORTREVISION= 5
PORTREVISION= 6
PORTEPOCH= 4
CATEGORIES= multimedia audio net www
MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \

17
multimedia/x264/Makefile
View File

@ -18,7 +18,7 @@
PORTNAME= x264
PORTVERSION= 0.${X264_BUILD}.${X264_REV}
PORTREVISION?= 1
PORTREVISION?= 0
CATEGORIES= multimedia
MASTER_SITES= https://samples.mplayerhq.hu/yuv4mpeg2/:pgo
DIST_SUBDIR= x264
@ -33,8 +33,8 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= bash:shells/bash
LIB_DEPENDS?= libx264.so:multimedia/libx264
X264_BUILD= 160
X264_REV= 3011
X264_BUILD= 161
X264_REV= 3020
X264_GITVER= ${GL_COMMIT:C/^(.{7}).*/\1/}
USES?= pkgconfig
@ -43,15 +43,15 @@ USE_GITLAB= yes
USE_LDCONFIG= yes
GL_SITE= https://code.videolan.org
GL_ACCOUNT= videolan
GL_COMMIT= cde9a93319bea766a92e306d69059c76de970190
GL_COMMIT= d198931a63049db1f2c92d96c34904c69fde8117
HAS_CONFIGURE= yes
SHEBANG_FILES= configure
PLIST_FILES?= bin/x264
OPTIONS_DEFINE+= DEBUG FFMS LAVF PGO SWSCALE
OPTIONS_DEFINE+= BASH DEBUG FFMS LAVF PGO SWSCALE
OPTIONS_RADIO+= MP4
OPTIONS_RADIO_MP4+= GPAC LSMASH
OPTIONS_DEFAULT+= FFMS LAVF LSMASH SWSCALE
OPTIONS_DEFAULT+= BASH FFMS LAVF LSMASH SWSCALE
.if make(makesum) # for optional distfiles
.MAKEFLAGS: WITH="${OPTIONS_DEFINE}"
@ -64,6 +64,11 @@ LSMASH_DESC= L-SMASH library support
MP4_DESC= MPEG-4 output
SWSCALE_DESC= Resize video filter
BASH_BUILD_DEPENDS= bash-completion>0:shells/bash-completion
BASH_RUN_DEPENDS= bash-completion>0:shells/bash-completion
BASH_CONFIGURE_ENABLE= bashcompletion
BASH_PLIST_FILES= share/bash-completion/completions/x264
DEBUG_CONFIGURE_ENABLE= debug
DEBUG_CONFIGURE_OFF= --enable-strip

6
multimedia/x264/distinfo
View File

@ -1,5 +1,5 @@
TIMESTAMP = 1593708647
TIMESTAMP = 1599931437
SHA256 (x264/example.y4m.bz2) = a5bec9d37362bd9d7773fbd0644643f9ec096d654d20823004e88d5df32bbff7
SIZE (x264/example.y4m.bz2) = 4910029
SHA256 (x264/videolan-x264-cde9a93319bea766a92e306d69059c76de970190_GL0.tar.gz) = 3d84866375b3d6981ba49ff6cc8d77c9daf95908fa3d988c647b03ada22d6533
SIZE (x264/videolan-x264-cde9a93319bea766a92e306d69059c76de970190_GL0.tar.gz) = 933096
SHA256 (x264/videolan-x264-d198931a63049db1f2c92d96c34904c69fde8117_GL0.tar.gz) = 3474023542414706ed0620a5438ce5c700bdedede323831746384a971f0565fd
SIZE (x264/videolan-x264-d198931a63049db1f2c92d96c34904c69fde8117_GL0.tar.gz) = 934108

13
multimedia/x264/files/patch-Makefile Normal file
View File

@ -0,0 +1,13 @@
-T (treat DEST as a normal file) is not supported by BSD install(1)
--- Makefile.orig 2020-09-12 17:23:57 UTC
+++ Makefile
@@ -413,7 +413,7 @@ endif
install-bashcompletion:
ifneq ($(BASHCOMPLETIONSDIR),)
$(INSTALL) -d $(DESTDIR)$(BASHCOMPLETIONSDIR)
- $(INSTALL) -m 644 -T $(SRCPATH)/tools/bash-autocomplete.sh $(DESTDIR)$(BASHCOMPLETIONSDIR)/x264
+ $(INSTALL) -m 644 $(SRCPATH)/tools/bash-autocomplete.sh $(DESTDIR)$(BASHCOMPLETIONSDIR)/x264
endif
uninstall:

39
multimedia/x264/files/patch-configure
View File

@ -1,6 +1,6 @@
--- configure.orig 2020-07-02 16:50:47 UTC
--- configure.orig 2020-09-12 17:23:57 UTC
+++ configure
@@ -729,12 +729,6 @@ case $host_cpu in
@@ -743,12 +743,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
@@ -749,7 +743,7 @@ case $host_cpu in
@@ -763,7 +757,7 @@ case $host_cpu in
ASFLAGS="$ASFLAGS -f elf32"
fi
;;
@ -22,7 +22,7 @@
ARCH="X86_64"
AS="${AS-nasm}"
AS_EXT=".asm"
@@ -825,7 +819,7 @@ case $host_cpu in
@@ -839,7 +833,7 @@ case $host_cpu in
AS="${AS-${CC}}"
fi
;;
@ -31,7 +31,7 @@
ARCH="AARCH64"
stack_alignment=16
if [ "$SYS" = MACOSX ] ; then
@@ -938,7 +932,7 @@ if cc_check '' '' '' '__attribute__((force_align_arg_p
@@ -952,7 +946,7 @@ if cc_check '' '' '' '__attribute__((force_align_arg_p
fi
fi
@ -40,7 +40,7 @@
if ! as_check "vmovdqa32 [eax]{k1}{z}, zmm0" ; then
VER="$( ($AS --version || echo no assembler) 2>/dev/null | head -n 1 )"
echo "Found $VER"
@@ -951,9 +945,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \
@@ -965,9 +959,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
@@ -964,9 +955,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
@@ -978,9 +969,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
@@ -998,9 +988,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
@@ -1012,9 +1002,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then
define HAVE_MSA
else
@ -74,26 +74,7 @@
fi
fi
@@ -1232,15 +1221,16 @@ if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
gpac="no"
GPAC_LIBS="-lgpac_static"
cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
+ cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl"
if [ "$SYS" = "WINDOWS" ] ; then
cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm"
fi
if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_close(0);" ; then
- if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0);" ; then
+ if cc_check gpac/isomedia.h "$GPAC_LIBS" "gf_isom_set_pixel_aspect_ratio(0,0,0,0,0,0);" ; then
gpac="yes"
else
- echo "Warning: gpac is too old, update to 2007-06-21 UTC or later"
+ echo "Warning: gpac is too old, update to v0.8.0 or later"
fi
fi
fi
@@ -1328,10 +1318,6 @@ if cc_check '' -Wshadow ; then
@@ -1343,10 +1332,6 @@ if cc_check '' -Wshadow ; then
CFLAGS="-Wshadow $CFLAGS"
fi
@ -104,7 +85,7 @@
if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then
CFLAGS="$CFLAGS -fvisibility=hidden"
fi
@@ -1371,6 +1357,9 @@ if [ "$opencl" = "yes" ]; then
@@ -1386,6 +1371,9 @@ if [ "$opencl" = "yes" ]; then
opencl="yes"
define HAVE_OPENCL "(BIT_DEPTH==8)"
libdl="-ldl"

20
multimedia/x264/files/patch-output_mp4.c
View File

@ -1,20 +0,0 @@
--- output/mp4.c.orig 2020-07-02 16:50:47 UTC
+++ output/mp4.c
@@ -147,7 +147,7 @@ static int close_file( hnd_t handle, int64_t largest_p
{
uint32_t mvhd_timescale = gf_isom_get_timescale( p_mp4->p_file );
uint64_t tkhd_duration = (uint64_t)( mdhd_duration * ( (double)mvhd_timescale / p_mp4->i_time_res ) );
- gf_isom_append_edit_segment( p_mp4->p_file, p_mp4->i_track, tkhd_duration, sample->CTS_Offset, GF_ISOM_EDIT_NORMAL );
+ gf_isom_append_edit( p_mp4->p_file, p_mp4->i_track, tkhd_duration, sample->CTS_Offset, GF_ISOM_EDIT_NORMAL );
}
gf_isom_sample_del( &sample );
@@ -233,7 +233,7 @@ static int set_param( hnd_t handle, x264_param_t *p_pa
dw *= sar;
else
dh /= sar;
- gf_isom_set_pixel_aspect_ratio( p_mp4->p_file, p_mp4->i_track, p_mp4->i_descidx, p_param->vui.i_sar_width, p_param->vui.i_sar_height );
+ gf_isom_set_pixel_aspect_ratio( p_mp4->p_file, p_mp4->i_track, p_mp4->i_descidx, p_param->vui.i_sar_width, p_param->vui.i_sar_height, 0 );
gf_isom_set_track_layout_info( p_mp4->p_file, p_mp4->i_track, dw, dh, 0, 0, 0 );
}

1
multimedia/zoneminder/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= zoneminder
PORTVERSION= 1.34.21
PORTREVISION= 1
CATEGORIES= multimedia
MAINTAINER= bsd@abinet.ru

2
net/opal/Makefile
View File

@ -3,7 +3,7 @@
PORTNAME= opal
PORTVERSION= 3.10.10
PORTREVISION= 25
PORTREVISION= 26
CATEGORIES= net
MASTER_SITES= GNOME

1
x11/xpra/Makefile
View File

@ -2,6 +2,7 @@
PORTNAME= xpra
PORTVERSION= 4.0.4
PORTREVISION= 1
CATEGORIES= x11
MASTER_SITES= http://xpra.org/src/