@@ -1,4 +1,13 @@

 -------------------------------------------------------------------

+Sun Jun 12 07:23:57 UTC 2022 - Luigi Baldoni <aloisio@gmx.com>

+

+- Update to version 0.164+git20220602.baee400f

+- Bump soversion to 164

+- Drop pre_checkin.sh (no longer used)

+- Drop x264-use-shared-library.patch, x264-gpac_no_static.patch

+  and libx264.patch (no longer necessary)

+

+-------------------------------------------------------------------

 Tue Dec 29 16:16:16 UTC 2020 - olaf@aepfle.de

 - Fix arm build with libx264.patch

​

@@ -18,7 +18,7 @@

 # remember to adjust baselibs.conf

-%define sover   161

+%define sover   164

 %bcond_with     gpac

 %define build_flavor @BUILD_FLAVOR@%{nil}

@@ -29,7 +29,7 @@

 %define pkg %{tag}-%{build_flavor}

 %endif

 Name:           %{pkg}

-Version:        0.161+git20200912.d198931a

+Version:        0.164+git20220602.baee400f

 Release:        0

 %if "%{build_flavor}" == ""

 Summary:        A free h264/avc encoder

@@ -41,14 +41,11 @@

 URL:            http://www.videolan.org/developers/x264.html

 Source:         x264-%{version}.tar.xz

 Source1:        baselibs.conf

-Patch0:         x264-use-shared-library.patch

-# PATCH_FIX-OPENSUSE x264-gpac_no_static.patch

-Patch2:         x264-gpac_no_static.patch

-Patch3:         libx264.patch

 BuildRequires:  nasm >= 2.13

 BuildRequires:  pkgconfig

 BuildRequires:  yasm >= 1.2.0

 %if "%{build_flavor}" == "x264"

+BuildRequires:  pkgconfig(x264) == %{version}

 %if %{with gpac}

 BuildRequires:  pkgconfig(gpac)

 %else

@@ -139,6 +136,7 @@

   --disable-opencl \

   --enable-shared \

 %if "%{build_flavor}" == "x264"

+  --system-libx264 \

 %if %{with gpac}

   --disable-lsmash \

 %else

@@ -163,6 +161,9 @@

 rm -f %{buildroot}%{_libdir}/%{name}.so

 rm -f %{buildroot}%{_libdir}/%{name}.a

 ln -s %{name}.so.%{sover} %{buildroot}%{_libdir}/%{name}.so

+

+# fix pkg-config version

+sed -i 's/Version:.*/Version: %{version}/' %{buildroot}%{_libdir}/pkgconfig/x264.pc

 %endif

 %if "%{build_flavor}" == "x264"

​

@@ -1,20 +0,0 @@

-   40s lto1: warning: switch '-mcpu=cortex-a8' conflicts with '-march=armv7-a' switch

---- a/configure

-+++ b/configure

-@@ -966,7 +966,6 @@ fi

- 

- if  $asm = auto -a $ARCH = ARM  ; then

-     # set flags so neon is built by default

--     $compiler == CL  || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"

- 

-     cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM

-     if  $compiler = CL  && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then

-@@ -1031,7 +1030,7 @@ ASFLAGS="$ASFLAGS -DSTACK_ALIGNMENT=$sta

- CPU_ENDIAN="little-endian"

- if  $compiler = GNU ; then

-     echo "int i2 = {0x42494745,0}; double f2 = {0x1.0656e6469616ep+102,0};" > conftest.c

--    $CC $CFLAGS conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"

-+    $CC $CFLAGS -fno-lto conftest.c -c -o conftest.o 2>/dev/null || die "endian test failed"

-     if (${STRINGS} -a conftest.o | grep -q BIGE) && (${STRINGS} -a conftest.o | grep -q FPendian) ; then

-         define WORDS_BIGENDIAN

-         CPU_ENDIAN="big-endian"

​

@@ -1,13 +0,0 @@

-Index: x264-0.160+git20200702.4c2aafd8/configure

-===================================================================

---- x264-0.160+git20200702.4c2aafd8.orig/configure

-+++ x264-0.160+git20200702.4c2aafd8/configure

-@@ -1230,7 +1230,7 @@ fi

- 

- if  "$gpac" = "auto" -a "$lsmash" != "yes"  ; then

-     gpac="no"

--    GPAC_LIBS="-lgpac_static"

-+    GPAC_LIBS="-lgpac"

-     cc_check "" -lz && GPAC_LIBS="$GPAC_LIBS -lz"

-     cc_check "" -ldl && GPAC_LIBS="$GPAC_LIBS -ldl"

-     if  "$SYS" = "WINDOWS"  ; then

​

@@ -1,23 +0,0 @@

-Index: x264-snapshot-20160430-2245-stable/Makefile

-===================================================================

---- x264-snapshot-20160430-2245-stable.orig/Makefile

-+++ x264-snapshot-20160430-2245-stable/Makefile

-@@ -190,6 +190,7 @@ $(LIBX264): $(GENERATED) .depend $(OBJS)

- 

- $(SONAME): $(GENERATED) .depend $(OBJS) $(OBJASM) $(OBJSO)

-   $(LD)$@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS)

-+  ln -s $(SONAME) libx264.so

- 

- $(IMPLIBNAME): $(SONAME)

- 

-@@ -198,8 +199,8 @@ checkasm: checkasm$(EXE)

- example: example$(EXE)

- endif

- 

--x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(CLI_LIBX264)

--  $(LD)$@ $(OBJCLI) $(CLI_LIBX264) $(LDFLAGSCLI) $(LDFLAGS)

-+x264$(EXE): $(GENERATED) .depend $(OBJCLI) $(SONAME)

-+  $(LD)$@ $(OBJCLI) -L. -lx264 $(LDFLAGSCLI) $(LDFLAGS)

- 

- checkasm8$(EXE): $(GENERATED) .depend $(OBJCHK) $(OBJCHK_8) $(LIBX264)

-   $(LD)$@ $(OBJCHK) $(OBJCHK_8) $(LIBX264) $(LDFLAGS)

​

@@ -3,7 +3,7 @@

     <param name="url">https://code.videolan.org/videolan/x264.git</param>

     <param name="scm">git</param>

     <param name="revision">stable</param>

-    <param name="versionformat">0.161+git%cd.%h</param>

+    <param name="versionformat">0.164+git%cd.%h</param>

   </service>

   <service name="recompress" mode="disabled">

     <param name="file">*.tar</param>

​

@@ -1,1 +1,1 @@

-libx264-161

+libx264-164

​

@@ -1,8 +0,0 @@

-#!/bin/sh

-EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####\n"

-sed "s/^%bcond_with     x264_binary$/${EDIT_WARNING}%bcond_without  x264_binary/;

-     s/^\(Name:.*\)$/\1-x264/;

-     0,/^Summary:.*/{s/^Summary:.*/Summary:        Command line tool for libx264/};

-    " < libx264.spec > libx264-x264.spec

-cp libx264.changes libx264-x264.changes

-

​