Here is an update to x264 20241229.

NFC for OpenBSD, just merged my patch upstream.


Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/x264/Makefile,v
retrieving revision 1.71
diff -u -p -u -p -r1.71 Makefile
--- Makefile    24 Nov 2024 15:42:37 -0000      1.71
+++ Makefile    14 Feb 2025 07:48:33 -0000
@@ -1,9 +1,9 @@
 COMMENT=       free H.264/MPEG-4 AVC encoder
 
-DISTNAME=      x264-20241027
+DISTNAME=      x264-20241229
 GH_ACCOUNT=    brad0
 GH_PROJECT=    x264
-GH_COMMIT=     da14df5535fd46776fb1c9da3130973295c87aca
+GH_COMMIT=     52f7694ddd35209cb95225e7acce91d8a30cb57d
 CATEGORIES=    multimedia
 
 SHARED_LIBS=   x264    25.0
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/x264/distinfo,v
retrieving revision 1.28
diff -u -p -u -p -r1.28 distinfo
--- distinfo    24 Nov 2024 15:42:37 -0000      1.28
+++ distinfo    14 Feb 2025 07:48:33 -0000
@@ -1,2 +1,2 @@
-SHA256 (x264-20241027-da14df55.tar.gz) = 
ACcAmilgjiIWTj7zyUzixWsBqvGeixwLFx2AtGv+7gs=
-SIZE (x264-20241027-da14df55.tar.gz) = 1036049
+SHA256 (x264-20241229-52f7694d.tar.gz) = 
Xx1SDPkxyD6xpnq9jBtStTIkpUyxsBGXiCpwY8T1wVA=
+SIZE (x264-20241229-52f7694d.tar.gz) = 1036250
Index: patches/patch-common_osdep_h
===================================================================
RCS file: patches/patch-common_osdep_h
diff -N patches/patch-common_osdep_h
--- patches/patch-common_osdep_h        11 Mar 2022 19:39:29 -0000      1.15
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-Enable the use of __sync_fetch_and_add().
-
-Index: common/osdep.h
---- common/osdep.h.orig
-+++ common/osdep.h
-@@ -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
--#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 
0) && (ARCH_X86 || ARCH_X86_64)
-+#if defined(__GNUC__) && (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__ > 0)
-     return __sync_fetch_and_add( val, add );
- #else
-     x264_pthread_mutex_lock( mutex );
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/multimedia/x264/patches/patch-configure,v
retrieving revision 1.33
diff -u -p -u -p -r1.33 patch-configure
--- patches/patch-configure     24 Nov 2024 15:42:37 -0000      1.33
+++ patches/patch-configure     14 Feb 2025 07:48:33 -0000
@@ -7,7 +7,7 @@ Index: configure
  
  if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
  cat <<EOF
-@@ -1360,10 +1360,6 @@ if [ "$pic" = "yes" ] ; then
+@@ -1364,10 +1364,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
-@@ -1372,11 +1368,11 @@ if [ "$debug" = "yes" ]; then
+@@ -1376,11 +1372,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"
-@@ -1608,7 +1604,6 @@ if [ "$cli" = "yes" ]; then
+@@ -1612,7 +1608,6 @@ if [ "$cli" = "yes" ]; then
  fi
  
  if [ "$shared" = "yes" ]; then

Reply via email to