From d0151dc8b737397cd708dd8309b93a4059c1b6df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sun, 21 Nov 2021 23:57:12 +0100 Subject: [PATCH 1/5] Set explicit soname MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also implement bootstrap logic for soname bumps Signed-off-by: Björn Esser --- jpegxl.spec | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/jpegxl.spec b/jpegxl.spec index 48efe74..f7a9afe 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -1,3 +1,8 @@ +# Uncomment for special build to rebuild aom on bumped soname. +%global new_soname 1 +%global sover_old 0 + +%global sover 0.6 %global gdk_pixbuf_moduledir $(pkgconf gdk-pixbuf-2.0 --variable=gdk_pixbuf_moduledir) # https://github.com/libjxl/libjxl/issues/63 @@ -9,7 +14,7 @@ decoder).} Name: jpegxl Version: 0.6.1 -Release: %autorelease +Release: %autorelease%{?new_soname:~sonamebump} Summary: JPEG XL image format reference implementation # Main library: BSD @@ -52,6 +57,9 @@ BuildRequires: pkgconfig(OpenEXR) BuildRequires: pkgconfig(Qt5) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(zlib) +%if 0%{?new_soname} +BuildRequires: jpegxl < %{version} +%endif # Header-only library to be directly included in the project's source tree Provides: bundled(lodepng) = 0-0.1.20210522git48e5364 @@ -142,6 +150,12 @@ rm -rf third_party/ %cmake_install rm -v %{buildroot}%{_libdir}/*.a +%if 0%{?new_soname} +cp -p %{_libdir}/libjxl.so.%{sover_old}* \ + %{_libdir}/libjxl_threads.so.%{sover_old}* \ + %{buildroot}%{_libdir} +%endif + %files -n libjxl-utils %doc CONTRIBUTING.md CONTRIBUTORS README.md %{_bindir}/cjxl @@ -156,8 +170,12 @@ rm -v %{buildroot}%{_libdir}/*.a %files -n libjxl %license LICENSE -%{_libdir}/libjxl.so.0* -%{_libdir}/libjxl_threads.so.0* +%{_libdir}/libjxl.so.%{sover}* +%{_libdir}/libjxl_threads.so.%{sover}* +%if 0%{?new_soname} +%{_libdir}/libjxl.so.%{sover_old}* +%{_libdir}/libjxl_threads.so.%{sover_old}* +%endif %dir %{_datadir}/thumbnailers %{_datadir}/thumbnailers/jxl.thumbnailer %{_datadir}/mime/packages/image-jxl.xml From 295b6ba24c3c07f910330eab417caae90b751884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 22 Nov 2021 00:10:11 +0100 Subject: [PATCH 2/5] Fix BuildRequires when bumping soname MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- jpegxl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jpegxl.spec b/jpegxl.spec index f7a9afe..cf80c9e 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -58,7 +58,7 @@ BuildRequires: pkgconfig(Qt5) BuildRequires: pkgconfig(Qt5X11Extras) BuildRequires: pkgconfig(zlib) %if 0%{?new_soname} -BuildRequires: jpegxl < %{version} +BuildRequires: libjxl < %{version} %endif # Header-only library to be directly included in the project's source tree From 0eea445e9553b8a769f47d9e8080e605e425555e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 22 Nov 2021 00:14:25 +0100 Subject: [PATCH 3/5] Rebuild without soname bootstrap MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- jpegxl.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jpegxl.spec b/jpegxl.spec index cf80c9e..c3cdeb2 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -1,8 +1,8 @@ # Uncomment for special build to rebuild aom on bumped soname. -%global new_soname 1 -%global sover_old 0 - +#global new_soname 1 +%global sover_old 0.6 %global sover 0.6 + %global gdk_pixbuf_moduledir $(pkgconf gdk-pixbuf-2.0 --variable=gdk_pixbuf_moduledir) # https://github.com/libjxl/libjxl/issues/63 From 3aea26e66705f6c24276304d990851aba1b97df7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 22 Nov 2021 00:48:52 +0100 Subject: [PATCH 4/5] Add manual release override MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- jpegxl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jpegxl.spec b/jpegxl.spec index c3cdeb2..7a5cf0b 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -14,7 +14,7 @@ decoder).} Name: jpegxl Version: 0.6.1 -Release: %autorelease%{?new_soname:~sonamebump} +Release: %autorelease -b 2 %{?new_soname:-e 0~sonamebump} Summary: JPEG XL image format reference implementation # Main library: BSD From 173256dcdf6b071180cbe0283575304816fb5f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Mon, 22 Nov 2021 00:52:33 +0100 Subject: [PATCH 5/5] Drop manual release override MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- jpegxl.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jpegxl.spec b/jpegxl.spec index 7a5cf0b..e830d46 100644 --- a/jpegxl.spec +++ b/jpegxl.spec @@ -14,7 +14,7 @@ decoder).} Name: jpegxl Version: 0.6.1 -Release: %autorelease -b 2 %{?new_soname:-e 0~sonamebump} +Release: %autorelease %{?new_soname:-p -e 0~sonamebump} Summary: JPEG XL image format reference implementation # Main library: BSD