Here is an update to x264 20210415.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/multimedia/x264/Makefile,v retrieving revision 1.59 diff -u -p -u -p -r1.59 Makefile --- Makefile 3 Apr 2021 11:15:46 -0000 1.59 +++ Makefile 15 Apr 2021 18:33:05 -0000 @@ -2,14 +2,13 @@ COMMENT= free H.264/MPEG-4 AVC encoder -DISTNAME= x264-20200705 +DISTNAME= x264-20210415 GH_ACCOUNT= mirror GH_PROJECT= x264 -GH_COMMIT= cde9a93319bea766a92e306d69059c76de970190 -REVISION= 1 +GH_COMMIT= c347e7a0b476d77674e2c9a6f137f57da026e8fc CATEGORIES= multimedia -SHARED_LIBS= x264 22.0 +SHARED_LIBS= x264 23.0 HOMEPAGE= https://www.videolan.org/developers/x264.html Index: distinfo =================================================================== RCS file: /home/cvs/ports/multimedia/x264/distinfo,v retrieving revision 1.24 diff -u -p -u -p -r1.24 distinfo --- distinfo 5 Jul 2020 07:42:11 -0000 1.24 +++ distinfo 15 Apr 2021 18:29:13 -0000 @@ -1,3 +1,2 @@ -SHA256 (-33f9e147.tar.gz) = VFZFDuGuAs0jKL4xVzZ6IyoKtzMV6Mj4DauARpUk9SU= -SHA256 (x264-20200705-cde9a933.tar.gz) = hRW6up+CxyPgclJ0fpsOFmoWCRunLyAXOHZBckuuwC0= -SIZE (x264-20200705-cde9a933.tar.gz) = 933373 +SHA256 (x264-20210415-c347e7a0.tar.gz) = /suw9UF7/cQN7gRcfllTeXeFr2jVhlkqP0uIcG9uXps= +SIZE (x264-20210415-c347e7a0.tar.gz) = 937339 Index: patches/patch-Makefile =================================================================== RCS file: /home/cvs/ports/multimedia/x264/patches/patch-Makefile,v retrieving revision 1.19 diff -u -p -u -p -r1.19 patch-Makefile --- patches/patch-Makefile 24 Dec 2019 15:03:18 -0000 1.19 +++ patches/patch-Makefile 15 Apr 2021 18:30:21 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.19 2019/12/ Index: Makefile --- Makefile.orig +++ Makefile -@@ -260,7 +260,7 @@ example: example$(EXE) +@@ -261,7 +261,7 @@ example: example$(EXE) endif x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264) @@ -12,7 +12,7 @@ Index: Makefile checkasm8$(EXE): $(GENERATED) .depend $(OBJCHK) $(OBJCHK_8) $(LIBX264) $(LD)$@ $(OBJCHK) $(OBJCHK_8) $(LIBX264) $(LDFLAGS) -@@ -406,7 +406,6 @@ ifneq ($(IMPLIBNAME),) +@@ -407,7 +407,6 @@ ifneq ($(IMPLIBNAME),) $(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir) $(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir) else ifneq ($(SONAME),) Index: patches/patch-common_arm_asm_S =================================================================== RCS file: patches/patch-common_arm_asm_S diff -N patches/patch-common_arm_asm_S --- patches/patch-common_arm_asm_S 16 Sep 2018 06:37:15 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-common_arm_asm_S,v 1.1 2018/09/16 06:37:15 ajacoutot Exp $ - -Index: common/arm/asm.S ---- common/arm/asm.S.orig -+++ common/arm/asm.S -@@ -74,7 +74,7 @@ - # define FUNC @ - #endif - --#if SYS_LINUX -+#if SYS_LINUX || SYS_OPENBSD - #define HAVE_SECTION_DATA_REL_RO 1 - #else - #define HAVE_SECTION_DATA_REL_RO 0 Index: patches/patch-common_cpu_c =================================================================== RCS file: patches/patch-common_cpu_c diff -N patches/patch-common_cpu_c --- patches/patch-common_cpu_c 3 Apr 2021 11:15:46 -0000 1.6 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,31 +0,0 @@ -$OpenBSD: patch-common_cpu_c,v 1.6 2021/04/03 11:15:46 sthen Exp $ - -Index: common/cpu.c ---- common/cpu.c.orig -+++ common/cpu.c -@@ -433,7 +433,7 @@ int x264_cpu_num_processors( void ) - #elif SYS_WINDOWS - return x264_pthread_num_processors_np(); - --#elif SYS_CYGWIN || SYS_SunOS -+#elif SYS_CYGWIN || SYS_SunOS || SYS_OPENBSD - return sysconf( _SC_NPROCESSORS_ONLN ); - - #elif SYS_LINUX -@@ -460,15 +460,10 @@ int x264_cpu_num_processors( void ) - get_system_info( &info ); - return info.cpu_count; - --#elif SYS_MACOSX || SYS_FREEBSD || SYS_OPENBSD -+#elif SYS_MACOSX || SYS_FREEBSD - int ncpu; - size_t length = sizeof( ncpu ); --#if SYS_OPENBSD -- int mib[2] = { CTL_HW, HW_NCPU }; -- if( sysctl(mib, 2, &ncpu, &length, NULL, 0) ) --#else - if( sysctlbyname("hw.ncpu", &ncpu, &length, NULL, 0) ) --#endif - { - ncpu = 1; - } Index: patches/patch-common_osdep_h =================================================================== RCS file: /home/cvs/ports/multimedia/x264/patches/patch-common_osdep_h,v retrieving revision 1.13 diff -u -p -u -p -r1.13 patch-common_osdep_h --- patches/patch-common_osdep_h 1 Mar 2020 10:02:12 -0000 1.13 +++ patches/patch-common_osdep_h 15 Apr 2021 18:30:20 -0000 @@ -5,7 +5,7 @@ Enable the use of __sync_fetch_and_add() Index: common/osdep.h --- common/osdep.h.orig +++ common/osdep.h -@@ -367,7 +367,7 @@ X264_API int x264_threading_init( void ); +@@ -434,7 +434,7 @@ X264_API int x264_threading_init( void ); static ALWAYS_INLINE int x264_pthread_fetch_and_add( int *val, int add, x264_pthread_mutex_t *mutex ) { #if HAVE_THREAD Index: patches/patch-configure =================================================================== RCS file: /home/cvs/ports/multimedia/x264/patches/patch-configure,v retrieving revision 1.28 diff -u -p -u -p -r1.28 patch-configure --- patches/patch-configure 5 Jul 2020 07:42:11 -0000 1.28 +++ patches/patch-configure 15 Apr 2021 18:30:20 -0000 @@ -9,7 +9,7 @@ Index: configure if test x"$1" = x"-h" -o x"$1" = x"--help" ; then cat <<EOF -@@ -1283,10 +1283,6 @@ if [ "$pic" = "yes" ] ; then +@@ -1322,10 +1322,6 @@ if [ "$pic" = "yes" ] ; then [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS -mimpure-text" fi @@ -20,7 +20,7 @@ Index: configure if [ "$strip" = "yes" ]; then LDFLAGS="$LDFLAGS -s" fi -@@ -1295,11 +1291,11 @@ if [ "$debug" = "yes" ]; then +@@ -1334,11 +1330,11 @@ if [ "$debug" = "yes" ]; then CFLAGS="-O1 -g $CFLAGS" RCFLAGS="$RCFLAGS -DDEBUG" else @@ -34,7 +34,7 @@ Index: configure fi fi [ "$lto" = "auto" ] && lto="no" -@@ -1328,10 +1324,6 @@ if cc_check '' -Wshadow ; then +@@ -1367,10 +1363,6 @@ if cc_check '' -Wshadow ; then CFLAGS="-Wshadow $CFLAGS" fi @@ -45,7 +45,7 @@ Index: configure if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then CFLAGS="$CFLAGS -fvisibility=hidden" fi -@@ -1531,7 +1523,6 @@ if [ "$cli" = "yes" ]; then +@@ -1570,7 +1562,6 @@ if [ "$cli" = "yes" ]; then fi if [ "$shared" = "yes" ]; then @@ -53,7 +53,7 @@ Index: configure if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then echo "SONAME=libx264-$API.dll" >> config.mak if [ $compiler_style = MS ]; then -@@ -1552,7 +1543,7 @@ if [ "$shared" = "yes" ]; then +@@ -1591,7 +1582,7 @@ if [ "$shared" = "yes" ]; then else echo "SOSUFFIX=so" >> config.mak echo "SONAME=libx264.so.$API" >> config.mak Index: pkg/PLIST =================================================================== RCS file: /home/cvs/ports/multimedia/x264/pkg/PLIST,v retrieving revision 1.6 diff -u -p -u -p -r1.6 PLIST --- pkg/PLIST 5 Jul 2020 07:42:11 -0000 1.6 +++ pkg/PLIST 15 Apr 2021 18:35:22 -0000 @@ -5,3 +5,6 @@ include/x264_config.h @static-lib lib/libx264.a @lib lib/libx264.so.${LIBx264_VERSION} lib/pkgconfig/x264.pc +share/bash-completion/ +share/bash-completion/completions/ +share/bash-completion/completions/x264
