!7 update to version 0.164

From: @weigang-li 
Reviewed-by: @open123bot 
Signed-off-by: @open123bot

version.h

@@ -0,0 +1,4 @@
+#define X264_REV 3108
+#define X264_REV_DIFF 0
+#define X264_VERSION " r3108 31e19f9"
+#define X264_POINTVER "0.164.3108 31e19f9"

x264-gpac.patch

@@ -1,13 +0,0 @@
---- ./configure.orig	2019-03-12 00:41:42.000000000 +0000
-+++ ./configure	2019-03-12 01:10:12.603640526 +0000
-@@ -1207,7 +1207,9 @@ fi
- if [ "$gpac" = "auto" -a "$lsmash" != "yes" ] ; then
-     gpac="no"
-     GPAC_LIBS="-lgpac_static"
--    cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"
-+    for lib in -lz -lssl -lcrypto -lpng -ljpeg; do
-+        cc_check "" $lib && GPAC_LIBS="$GPAC_LIBS $lib"
-+    done
-     if [ "$SYS" = "WINDOWS" ] ; then
-         cc_check "" -lws2_32 && GPAC_LIBS="$GPAC_LIBS -lws2_32"
-         cc_check "" -lwinmm && GPAC_LIBS="$GPAC_LIBS -lwinmm"

x264-nover.patch

@@ -1,11 +1,11 @@
---- ./configure.orig	2015-10-21 19:24:34.933238254 +0100
+--- ./configure.orig	2019-12-17 02:19:30.000000000 +0000
-+++ ./configure	2015-10-21 19:25:53.907124640 +0100
++++ ./configure	2019-12-17 02:31:06.483935577 +0000
-@@ -1236,7 +1236,7 @@ cat > x264_config.h << EOF
+@@ -1390,7 +1390,7 @@ cat > x264_config.h << EOF
  #define X264_CHROMA_FORMAT $config_chroma_format
  EOF
  
 -${SRCPATH}/version.sh >> x264_config.h
 +cat ${SRCPATH}/version.h >> ${SRCPATH}/x264_config.h
  
- if [ "$cli_libx264" = "system" ] ; then
+ if [ "$shared" = "yes" ]; then
-     if [ "$shared" = "yes" ]; then
+     CFLAGSSO="$CFLAGSSO -DX264_API_EXPORTS"

x264-snapshot.sh

@@ -20,18 +20,21 @@ pushd "$tmp"
 git clone https://code.videolan.org/videolan/x264.git -b ${branch}
 
 cd ${package}
-tag=$(git rev-list HEAD -n 1 | cut -c 1-7)
+tag=$(git rev-list HEAD -n 1 | cut -c 1-8)
 git checkout ${commit}
-git checkout -b rpmfusion
+./version.sh > "$pwd"/version.h
-./version.sh > version.h
 API="$(grep '#define X264_BUILD' < x264.h | sed 's/^.* \([1-9][0-9]*\).*$/\1/')"
 date=$(git log -1 --format=%cd --date=short | tr -d \-)
-git add version.h
+git archive --prefix="${package}-0.$API-${date}git${tag}/" --format=tar ${branch} | bzip2 > "$pwd"/${package}-0.$API-${date}git${tag}.tar.bz2
-git commit -m "generated version.h" version.h
-git archive --prefix="${package}-0.$API-${date}-${tag}/" --format=tar rpmfusion | bzip2 > "$pwd"/${package}-0.$API-${date}-${tag}.tar.bz2
 popd >/dev/null
 
-echo \# globals for x264-0.$API-$date-$tag.tar.bz2
+echo \# globals for x264-0.$API-${date}git${tag}.tar.bz2
 echo %global api $API
 echo %global gitdate ${date}
 echo %global gitversion ${tag}
+echo
+echo rpmdev-bumpspec -c \"Update to x264-0.$API-${date}git${tag} \(stable branch\)\" x264.spec
+echo rfpkg scratch-build --srpm --arches x86_64
+echo rfpkg new-sources x264-0.$API-${date}git${tag}.tar.bz2
+echo rfpkg ci -c
+

x264.spec

@@ -1,9 +1,9 @@
-# globals for x264-0.157-20190717-34c06d1.tar.bz2
+# globals for x264-0.164-20231001git31e19f92.tar.bz2
-%global api 157
+%global api 164
-%global gitdate 20190717
+%global gitdate 20231001
-%global gitversion 34c06d1
+%global gitversion 31e19f92
 
-%global snapshot %{gitdate}-%{gitversion}
+%global snapshot %{gitdate}git%{gitversion}
 %global gver .%{gitdate}git%{gitversion}
 %global branch stable
 
@@ -19,46 +19,39 @@
 %define _without_libswscale  1
 %endif
 #Whitelist of arches with dedicated ASM code
-%global asmarch x86_64 armv7hl armv7hnl ppc64le aarch64
+%global asmarch x86_64 armv7hl armv7hnl ppc64le aarch64 i686 ppc64
-# list of arches where ASM must be optional
-%global simdarch i686 ppc64
 %ifnarch %{asmarch}
 %global _without_asm 1
 %endif
-%ifarch i686
-%global slibdir %{_libdir}/sse2
-%endif
-%ifarch ppc64
-%global slibdir %{_libdir}/altivec
-%endif
 
 Summary: H264/AVC video streams encoder
 Name: x264
 Version: 0.%{api}
-Release: 13%{?gver}%{?_with_bootstrap:_bootstrap}
+Release: 1%{?gver}%{?_with_bootstrap:_bootstrap}
 License: GPLv2+
 URL: https://www.videolan.org/developers/x264.html
 Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
 Source1: x264-snapshot.sh
+Source2: version.h
 
 # don't remove config.h and don't re-run version.sh
 Patch0: x264-nover.patch
 # add 10b suffix to high bit depth build
 Patch1: x264-10b.patch
-Patch10: x264-gpac.patch
 Patch11: x264-opencl.patch
 
 BuildRequires: gcc
-%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel}
+%{!?_without_gpac:BuildRequires: gpac-devel-static zlib-devel openssl-devel libpng-devel libjpeg-devel xz-devel libglvnd-devel mesa-libGLU-devel faad2-devel libmad-devel xvidcore-devel a52dec-devel libvorbis-devel libtheora-devel openjpeg2-devel}
 %{!?_without_libavformat:BuildRequires: ffmpeg-devel}
 %{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
 # https://bugzilla.rpmfusion.org/show_bug.cgi?id=3975
 %ifarch armv7hl armv7hnl
 BuildRequires: execstack
 %endif
-%ifarch %{asmarch} %{simdarch}
+%ifarch %{asmarch}
 BuildRequires: nasm
 %endif
+BuildRequires: bash-completion
 # we need to enforce the exact EVR for an ISA - not only the same ABI
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -89,6 +82,12 @@ This package contains the development files.
 
 %global x_configure \
 %configure \\\
+    --host=%{_host} \\\
+    --prefix=%{_prefix} \\\
+    --exec-prefix=%{_exec_prefix} \\\
+    --bindir=%{_bindir} \\\
+    --includedir=%{_includedir} \\\
+    --libdir=%{_libdir} \\\
     %{?_without_libavformat:--disable-lavf} \\\
     %{?_without_libswscale:--disable-swscale} \\\
     %{!?_with_ffmpegsource:--disable-ffms} \\\
@@ -100,16 +99,14 @@ This package contains the development files.
 %prep
 %setup -q -c -n %{name}-0.%{api}-%{snapshot}
 pushd %{name}-0.%{api}-%{snapshot}
+cp %{SOURCE2} .
 %patch0 -p1 -b .nover
 %patch1 -p1 -b .10b
-%patch10 -p1 -b .gpac
 %patch11 -p1 -b .opencl
 popd
 
 variants="generic generic10"
-%ifarch %{simdarch}
+
-variants="$variants simd simd10"
-%endif
 for variant in $variants ; do
   rm -rf ${variant}
   cp -pr %{name}-0.%{api}-%{snapshot} ${variant}
@@ -117,11 +114,12 @@ done
 
 
 %build
+%set_build_flags
 pushd generic
 %{x_configure}\
     %{?_without_asm:--disable-asm}
 
-%{__make} %{?_smp_mflags}
+%make_build
 popd
 
 pushd generic10
@@ -131,28 +129,9 @@ pushd generic10
     --disable-opencl \
     --bit-depth=10
 
-%{__make} %{?_smp_mflags}
+%make_build
 popd
 
-%ifarch %{simdarch}
-pushd simd
-%{x_configure}\
-    --libdir=%{slibdir}
-
-%{__make} %{?_smp_mflags}
-popd
-
-pushd simd10
-%{x_configure}\
-    --disable-cli\
-    --libdir=%{slibdir}\
-    --disable-opencl \
-    --bit-depth=10
-
-%{__make} %{?_smp_mflags}
-popd
-%endif
-
 %install
 # NOTE: the order is important here! We want the generic devel stuff
 for variant in generic10 generic ; do
@@ -160,14 +139,6 @@ pushd ${variant}
 %make_install
 popd
 done
-%ifarch %{simdarch}
-for variant in simd10 simd ; do
-pushd ${variant}
-%make_install
-rm %{buildroot}%{slibdir}/pkgconfig/x264.pc
-popd
-done
-%endif
 
 #Fix timestamp on x264 generated headers
 touch -r generic/version.h %{buildroot}%{_includedir}/x264.h %{buildroot}%{_includedir}/x264_config.h
@@ -180,12 +151,14 @@ execstack -c %{buildroot}%{_libdir}/libx264{,10b}.so.%{api}
 install -dm755 %{buildroot}%{_pkgdocdir}
 install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
 
-%post libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
 
-%postun libs -p /sbin/ldconfig
 
 %files
 %{_bindir}/x264
+%dir %{_datadir}/bash-completion
+%dir %{_datadir}/bash-completion/completions
+%{_datadir}/bash-completion/completions/x264
 
 %files libs
 %dir %{_pkgdocdir}
@@ -193,10 +166,6 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
 %license %{_pkgdocdir}/COPYING
 %{_libdir}/libx264.so.%{api}
 %{_libdir}/libx26410b.so.%{api}
-%ifarch %{simdarch}
-%{slibdir}/libx264.so.%{api}
-%{slibdir}/libx26410b.so.%{api}
-%endif
 
 %files devel
 %doc generic/doc/*
@@ -205,13 +174,12 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
 %{_libdir}/libx264.so
 %{_libdir}/libx26410b.so
 %{_libdir}/pkgconfig/%{name}.pc
-%ifarch %{simdarch}
-%{slibdir}/libx264.so
-%{slibdir}/libx26410b.so
-%endif
 
 %changelog
-* Tue Dec 21 2021 - Chenxi Mao <chenxi.mao@suse.com> - 0.157-13
+* Wed Oct 18 2023 li weigang <weigangli99@gmail.com> - 0.164-1
+- update to version 0.164
+
+* Tue Dec 21 2021 Chenxi Mao <chenxi.mao@suse.com> - 0.157-13
 - x264: fix build error
 
 * Fri May 07 2021 weidong <weidong@uniontech.com> - 0.157-12.20190717git34c06d1