@@ -1,267 +0,0 @@

---- _service.orig

-+++ _service

-@@ -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.160+git%cd.%h</param>

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

-   </service>

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

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

---- baselibs.conf.orig

-+++ baselibs.conf

-@@ -1 +1 @@

--libx264-160

-+libx264-161

---- libx264-x264.changes.orig

-+++ libx264-x264.changes

-@@ -1,4 +1,15 @@

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

-+Sat Nov 28 14:21:00 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>

-+

-+- Update to git version 0.161+git20200912.d198931a

-+- Bump soversion to 161

-+- Drop x264-gpac10.patch (merged upstream)

-+- Switch default muxer/demuxer library to l-smash and make gpac

-+  optional

-+- Add new update.sh helper script

-+- Enable lto via switch

-+

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

- Sat Jul 11 14:30:44 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>

- 

- - Update to git version 0.160+git20200702.cde9a933

---- libx264-x264.spec.orig

-+++ libx264-x264.spec

-@@ -19,12 +19,12 @@

- 

- %define _lto_cflags %{nil}

- # remember to adjust baselibs.conf

--%define soname  160

--%bcond_without  gpac

-+%define sover   161

-+%bcond_with     gpac

- ##### WARNING: please do not edit this auto generated spec file. Use the libx264.spec! #####

- %bcond_without  x264_binary

- Name:           libx264-x264

--Version:        0.160+git20200702.cde9a933

-+Version:        0.161+git20200912.d198931a

- Release:        0

- Summary:        Command line tool for libx264

- License:        GPL-2.0-or-later

-@@ -33,8 +33,6 @@ URL:            http://www.videolan.org/

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

- Source1:        baselibs.conf

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

--# PATCH-FIX-UPSTREAM x264-gpac10.patch

--Patch1:         x264-gpac10.patch

- # PATCH_FIX-OPENSUSE x264-gpac_no_static.patch

- Patch2:         x264-gpac_no_static.patch

- BuildRequires:  nasm >= 2.13

-@@ -43,6 +41,8 @@ BuildRequires:  yasm >= 1.2.0

- %if %{with x264_binary}

- %if %{with gpac}

- BuildRequires:  pkgconfig(gpac)

-+%else

-+BuildRequires:  pkgconfig(liblsmash)

- %endif

- BuildRequires:  pkgconfig(ffms2)

- BuildRequires:  pkgconfig(libavcodec)

-@@ -77,11 +77,11 @@ Encoder features:

- - Custom quantization matrices

- - Parallel encoding of multiple slices (currently disabled)

- 

--%package %{soname}

-+%package %{sover}

- Summary:        A free h264/avc encoder - encoder binary

- Group:          System/Libraries

- 

--%description %{soname}

-+%description %{sover}

- x264 is a free library for encoding next-generation H264/AVC video

- streams. The code is written from scratch by Laurent Aimar, Loren

- Merritt, Eric Petit (OS X), Min Chen (vfw/asm), Justin Clay (vfw), Mans

-@@ -107,7 +107,7 @@ mplayer/mencoder with H264 encoding supp

- %package devel

- Summary:        Libraries and include file for the %{name} encoder

- Group:          Development/Libraries/C and C++

--Requires:       %{name}-%{soname} = %{version}

-+Requires:       %{name}-%{sover} = %{version}

- Provides:       x264-devel = %{version}

- Obsoletes:      x264-devel < %{version}

- 

-@@ -126,11 +126,11 @@ mplayer/mencoder with H264 encoding supp

- 

- %build

- %configure \

--  --disable-lsmash \

-   --disable-opencl \

-   --enable-shared \

- %if %{with x264_binary}

- %if %{with gpac}

-+  --disable-lsmash \

- %else

-   --disable-gpac \

- %endif

-@@ -139,8 +139,8 @@ mplayer/mencoder with H264 encoding supp

-   --disable-swscale \

-   --disable-lavf \

-   --disable-ffms \

--  --disable-gpac \

- %endif

-+  --enable-lto \

-   --enable-pic

- %make_build

- 

-@@ -152,7 +152,7 @@ install -Dm 755 x264 %{buildroot}/%{_bin

- 

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

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

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

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

- %endif

- 

- %if %{with x264_binary}

-@@ -162,12 +162,12 @@ ln -s %{name}.so.%{soname} %{buildroot}%

- %attr(0755,root,root) %{_bindir}/x264

- %else

- 

--%post -n %{name}-%{soname} -p /sbin/ldconfig

--%postun -n %{name}-%{soname} -p /sbin/ldconfig

-+%post -n %{name}-%{sover} -p /sbin/ldconfig

-+%postun -n %{name}-%{sover} -p /sbin/ldconfig

- 

--%files %{soname}

-+%files %{sover}

- %defattr(0644,root,root)

--%{_libdir}/%{name}.so.%{soname}

-+%{_libdir}/%{name}.so.%{sover}

- 

- %files devel

- %defattr(0644,root,root)

---- libx264.changes.orig

-+++ libx264.changes

-@@ -1,4 +1,15 @@

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

-+Sat Nov 28 14:21:00 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>

-+

-+- Update to git version 0.161+git20200912.d198931a

-+- Bump soversion to 161

-+- Drop x264-gpac10.patch (merged upstream)

-+- Switch default muxer/demuxer library to l-smash and make gpac

-+  optional

-+- Add new update.sh helper script

-+- Enable lto via switch

-+

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

- Sat Jul 11 14:30:44 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>

- 

- - Update to git version 0.160+git20200702.cde9a933

---- libx264.spec.orig

-+++ libx264.spec

-@@ -19,11 +19,11 @@

- 

- %define _lto_cflags %{nil}

- # remember to adjust baselibs.conf

--%define soname  160

--%bcond_without  gpac

-+%define sover   161

-+%bcond_with     gpac

- %bcond_with     x264_binary

- Name:           libx264

--Version:        0.160+git20200702.cde9a933

-+Version:        0.161+git20200912.d198931a

- Release:        0

- Summary:        A free h264/avc encoder - encoder binary

- License:        GPL-2.0-or-later

-@@ -32,8 +32,6 @@ URL:            http://www.videolan.org/

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

- Source1:        baselibs.conf

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

--# PATCH-FIX-UPSTREAM x264-gpac10.patch

--Patch1:         x264-gpac10.patch

- # PATCH_FIX-OPENSUSE x264-gpac_no_static.patch

- Patch2:         x264-gpac_no_static.patch

- BuildRequires:  nasm >= 2.13

-@@ -42,6 +40,8 @@ BuildRequires:  yasm >= 1.2.0

- %if %{with x264_binary}

- %if %{with gpac}

- BuildRequires:  pkgconfig(gpac)

-+%else

-+BuildRequires:  pkgconfig(liblsmash)

- %endif

- BuildRequires:  pkgconfig(ffms2)

- BuildRequires:  pkgconfig(libavcodec)

-@@ -76,11 +76,11 @@ Encoder features:

- - Custom quantization matrices

- - Parallel encoding of multiple slices (currently disabled)

- 

​

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

-<link project="Essentials" cicount="add" baserev="5b6155f7c4baf6097e3dd898249ab81c">

-  <patches>

-    <delete name="x264-0.160+git20200702.cde9a933.tar.xz" />

-    <delete name="x264-gpac10.patch" />

-    <apply name="project.diff" />

-  </patches>

-</link>

+<link project="Essentials" cicount="add" />

​

@@ -1,10 +0,0 @@

-#!/bin/sh

-

-rm -rf x264

-git clone -b stable https://code.videolan.org/videolan/x264.git

-api="$(grep '#define X264_BUILD' < x264/x264.h | sed 's/^.* \([1-9][0-9]*\).*$/\1/')"

-echo "The new api version is:" $api

-echo "libx264-$api" > baselibs.conf

-sed -i "/^%define soname/c%define sover   $api" libx264.spec

-sed -i "/versionformat/s/>.*</>0.$api+git%cd.%h</" _service

-osc service disabledrun

​