On 2024/11/24 13:33, Stuart Henderson wrote: > On 2024/11/24 00:47, Brad Smith wrote: > > Here is an update to x264 20241027. > > Tested on amd64 IBT. I will test on aarch64 M2 BTI but pkg_add -u > over axen is taking forever today.
both work, committed. > > > > Index: Makefile > > =================================================================== > > RCS file: /cvs/ports/multimedia/x264/Makefile,v > > retrieving revision 1.70 > > diff -u -p -u -p -r1.70 Makefile > > --- Makefile 25 Feb 2024 15:04:17 -0000 1.70 > > +++ Makefile 24 Nov 2024 05:44:11 -0000 > > @@ -1,13 +1,12 @@ > > COMMENT= free H.264/MPEG-4 AVC encoder > > > > -DISTNAME= x264-20221028 > > -GH_ACCOUNT= mirror > > +DISTNAME= x264-20241027 > > +GH_ACCOUNT= brad0 > > GH_PROJECT= x264 > > -GH_COMMIT= 416e3eb2b52abb0a67e57599aba4f8be3003b36d > > -REVISION= 3 > > +GH_COMMIT= da14df5535fd46776fb1c9da3130973295c87aca > > CATEGORIES= multimedia > > > > -SHARED_LIBS= x264 24.0 > > +SHARED_LIBS= x264 25.0 > > > > HOMEPAGE= https://www.videolan.org/developers/x264.html > > > > Index: distinfo > > =================================================================== > > RCS file: /cvs/ports/multimedia/x264/distinfo,v > > retrieving revision 1.27 > > diff -u -p -u -p -r1.27 distinfo > > --- distinfo 23 Dec 2022 13:54:24 -0000 1.27 > > +++ distinfo 24 Nov 2024 05:44:11 -0000 > > @@ -1,2 +1,2 @@ > > -SHA256 (x264-20221028-416e3eb2.tar.gz) = > > wdZtp6TlcIO4SXa9UH0mG3guXRyTbdu+HzkB3mB5TX8= > > -SIZE (x264-20221028-416e3eb2.tar.gz) = 943322 > > +SHA256 (x264-20241027-da14df55.tar.gz) = > > ACcAmilgjiIWTj7zyUzixWsBqvGeixwLFx2AtGv+7gs= > > +SIZE (x264-20241027-da14df55.tar.gz) = 1036049 > > Index: patches/patch-Makefile > > =================================================================== > > RCS file: /cvs/ports/multimedia/x264/patches/patch-Makefile,v > > retrieving revision 1.23 > > diff -u -p -u -p -r1.23 patch-Makefile > > --- patches/patch-Makefile 23 Dec 2022 13:54:24 -0000 1.23 > > +++ patches/patch-Makefile 24 Nov 2024 05:44:11 -0000 > > @@ -1,7 +1,7 @@ > > Index: Makefile > > --- Makefile.orig > > +++ Makefile > > -@@ -261,7 +261,7 @@ example: example$(EXE) > > +@@ -297,7 +297,7 @@ example: example$(EXE) > > endif > > > > x264$(EXE): $(OBJCLI) $(CLI_LIBX264) > > @@ -10,7 +10,7 @@ Index: Makefile > > > > checkasm8$(EXE): $(OBJCHK) $(OBJCHK_8) $(LIBX264) > > $(LD)$@ $(OBJCHK) $(OBJCHK_8) $(LIBX264) $(LDFLAGS) > > -@@ -408,7 +408,6 @@ ifneq ($(IMPLIBNAME),) > > +@@ -444,7 +444,6 @@ ifneq ($(IMPLIBNAME),) > > $(INSTALL) -m 755 $(SONAME) $(DESTDIR)$(bindir) > > $(INSTALL) -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir) > > else ifneq ($(SONAME),) > > Index: patches/patch-common_x86_x86inc_asm > > =================================================================== > > RCS file: /cvs/ports/multimedia/x264/patches/patch-common_x86_x86inc_asm,v > > retrieving revision 1.2 > > diff -u -p -u -p -r1.2 patch-common_x86_x86inc_asm > > --- patches/patch-common_x86_x86inc_asm 25 Feb 2024 15:04:17 -0000 > > 1.2 > > +++ patches/patch-common_x86_x86inc_asm 24 Nov 2024 05:44:11 -0000 > > @@ -1,7 +1,7 @@ > > Index: common/x86/x86inc.asm > > --- common/x86/x86inc.asm.orig > > +++ common/x86/x86inc.asm > > -@@ -802,6 +802,9 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, > > +@@ -848,6 +848,9 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, > > %endif > > align function_align > > %2: > > @@ -11,7 +11,7 @@ Index: common/x86/x86inc.asm > > RESET_MM_PERMUTATION ; needed for x86-64, also makes > > disassembly somewhat nicer > > %xdefine rstk rsp ; copy of the original stack pointer, > > used when greater alignment than the known stack alignment is required > > %assign stack_offset 0 ; stack pointer offset relative to the > > return address > > -@@ -823,6 +826,9 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, > > +@@ -869,6 +872,9 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg, > > global current_function %+ %1 > > %endif > > %1: > > Index: patches/patch-configure > > =================================================================== > > RCS file: /cvs/ports/multimedia/x264/patches/patch-configure,v > > retrieving revision 1.32 > > diff -u -p -u -p -r1.32 patch-configure > > --- patches/patch-configure 23 Dec 2022 13:54:24 -0000 1.32 > > +++ patches/patch-configure 24 Nov 2024 05:44:11 -0000 > > @@ -7,7 +7,7 @@ Index: configure > > > > if test x"$1" = x"-h" -o x"$1" = x"--help" ; then > > cat <<EOF > > -@@ -1323,10 +1323,6 @@ if [ "$pic" = "yes" ] ; then > > +@@ -1360,10 +1360,6 @@ if [ "$pic" = "yes" ] ; then > > [ $SYS = SunOS -a "$ARCH" = "X86" ] && SOFLAGS="$SOFLAGS > > -mimpure-text" > > fi > > > > @@ -18,7 +18,7 @@ Index: configure > > if [ "$strip" = "yes" ]; then > > LDFLAGS="$LDFLAGS -s" > > fi > > -@@ -1335,11 +1331,11 @@ if [ "$debug" = "yes" ]; then > > +@@ -1372,11 +1368,11 @@ if [ "$debug" = "yes" ]; then > > CFLAGS="-O1 -g $CFLAGS" > > RCFLAGS="$RCFLAGS -DDEBUG" > > else > > @@ -32,7 +32,7 @@ Index: configure > > fi > > fi > > [ "$lto" = "auto" ] && lto="no" > > -@@ -1571,7 +1567,6 @@ if [ "$cli" = "yes" ]; then > > +@@ -1608,7 +1604,6 @@ if [ "$cli" = "yes" ]; then > > fi > > > > if [ "$shared" = "yes" ]; then > > @@ -40,12 +40,3 @@ Index: configure > > if [ "$SYS" = "WINDOWS" -o "$SYS" = "CYGWIN" ]; then > > echo "SONAME=libx264-$API.dll" >> config.mak > > if [ $compiler_style = MS ]; then > > -@@ -1592,7 +1587,7 @@ if [ "$shared" = "yes" ]; then > > - else > > - echo "SOSUFFIX=so" >> config.mak > > - echo "SONAME=libx264.so.$API" >> config.mak > > -- echo "SOFLAGS=-shared -Wl,-soname,\$(SONAME) $SOFLAGS" >> > > config.mak > > -+ echo "SOFLAGS=-shared $SOFLAGS" >> config.mak > > - fi > > - echo 'default: lib-shared' >> config.mak > > - echo 'install: install-lib-shared' >> config.mak > > >
