From 5ba940c16293b3a12a851040d3d0e88849c2e136 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 13 Apr 2023 15:46:24 +0200 Subject: [PATCH 01/11] Drop empty patch --- jxrlib.spec | 2 -- jxrlib_stdint.patch | 0 2 files changed, 2 deletions(-) delete mode 100644 jxrlib_stdint.patch diff --git a/jxrlib.spec b/jxrlib.spec index bc3dfdf..006da35 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -20,8 +20,6 @@ Source2: JPEGXR_DPK_Spec_1.0.pdf Patch0: jxrlib_warnings.patch # Mingw build fixes Patch1: jxrlib_mingw.patch -# Fix undefined uintptr_t -Patch2: jxrlib_stdint.patch BuildRequires: cmake BuildRequires: gcc diff --git a/jxrlib_stdint.patch b/jxrlib_stdint.patch deleted file mode 100644 index e69de29..0000000 From a1da824c62e6328b0e1654a5316d3b22ed899aee Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 13 Apr 2023 15:52:49 +0200 Subject: [PATCH 02/11] Drop reference to patch2 --- jxrlib.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index 006da35..b195b95 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -75,7 +75,6 @@ done %patch0 -p1 %patch1 -p1 -%patch2 -p1 # Remove shipped binaries rm -rf bin From 5ef79223b9ebb58e4ed11e1ce882f0e3ceb017f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:18:39 +0000 Subject: [PATCH 03/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index b195b95..1d747c0 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -137,6 +137,9 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 1.1-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 1.1-24 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f612d149636b62e76ba09338ed893bc071d60a97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:53:34 +0000 Subject: [PATCH 04/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index 1d747c0..4202144 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -137,6 +137,9 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %changelog +* Sat Jan 20 2024 Fedora Release Engineering - 1.1-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Jul 20 2023 Fedora Release Engineering - 1.1-25 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 9a07827453b53a9b3f061ecbad0b99f71b06046e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:33:50 +0000 Subject: [PATCH 05/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index 4202144..4ac9875 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -137,6 +137,9 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %changelog +* Wed Jan 24 2024 Fedora Release Engineering - 1.1-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sat Jan 20 2024 Fedora Release Engineering - 1.1-26 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From af1c8fb892c2c3717e9c610547a0feacdad33a74 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 06/11] Eliminate use of obsolete %patchN syntax (#2283636) --- jxrlib.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jxrlib.spec b/jxrlib.spec index 4ac9875..52f011b 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -73,8 +73,8 @@ for file in `find . -type f -name '*.c' -or -name '*.h' -or -name '*.txt'`; do touch -r $file $file.new && mv $file.new $file done -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 # Remove shipped binaries rm -rf bin From 360209275946c6b639c5569fbdfbf83af6a26c76 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 11:15:34 +0000 Subject: [PATCH 07/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index 52f011b..4dc4d3e 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -137,6 +137,9 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.1-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jan 24 2024 Fedora Release Engineering - 1.1-27 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 88cd28788d9b025858d7f506de9ed5af55b08721 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Mon, 2 Sep 2024 09:08:01 +0200 Subject: [PATCH 08/11] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- jxrlib.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jxrlib.spec b/jxrlib.spec index 4dc4d3e..e97a7dd 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,11 +1,12 @@ Name: jxrlib Version: 1.1 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at # https://jxrlib.codeplex.com/workitem/13 -License: BSD +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: https://jxrlib.codeplex.com/ Source0: http://jxrlib.codeplex.com/downloads/get/685249#/jxrlib_%(echo %{version} | tr . _).tar.gz # Use CMake to build to facilitate creation of shared libraries @@ -137,6 +138,9 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %changelog +* Mon Sep 02 2024 Miroslav Suchý - 1.1-29 +- convert license to SPDX + * Thu Jul 18 2024 Fedora Release Engineering - 1.1-28 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From b64338227b67b68a9674e9d5a80911f6bc59b567 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 08:09:46 +0000 Subject: [PATCH 09/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index e97a7dd..eecb697 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 29%{?dist} +Release: 30%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -138,6 +138,9 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 1.1-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Sep 02 2024 Miroslav Suchý - 1.1-29 - convert license to SPDX From 03ea84bb9a3b01933144e06874aa76601d4c3a9d Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 16 Jul 2025 23:38:35 +0200 Subject: [PATCH 10/11] Increase minimum cmake version to 3.5, use GNUInstallDirs --- CMakeLists.txt | 23 ++++++++++++----------- jxrlib.spec | 6 +++++- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 406da98..ed58ca8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) project(jxrlib C) +include(GNUInstallDirs) set(JXRLIB_MAJOR 0) set(JXRLIB_MINOR 0) @@ -30,9 +31,9 @@ add_library(jpegxr ${jpegxr_SRC} ${jpegxr_HDR}) set_target_properties(jpegxr PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION ${JXRLIB_SO_VERSION}) install(TARGETS jpegxr - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # JXR-GLUE Library @@ -44,25 +45,25 @@ set_target_properties(jxrglue PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION target_link_libraries(jxrglue jpegxr m) install(TARGETS jxrglue - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ) # JxrEncApp Executable add_executable(JxrEncApp jxrencoderdecoder/JxrEncApp.c) target_link_libraries(JxrEncApp jxrglue) -install(TARGETS JxrEncApp RUNTIME DESTINATION bin) +install(TARGETS JxrEncApp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # JxrDecApp Executable add_executable(JxrDecApp jxrencoderdecoder/JxrDecApp.c) target_link_libraries(JxrDecApp jxrglue) -install(TARGETS JxrDecApp RUNTIME DESTINATION bin) +install(TARGETS JxrDecApp RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # Headers install(FILES jxrgluelib/JXRGlue.h jxrgluelib/JXRMeta.h jxrtestlib/JXRTest.h image/sys/windowsmediaphoto.h - DESTINATION include/jxrlib + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jxrlib ) -install(DIRECTORY common/include/ DESTINATION include/jxrlib +install(DIRECTORY common/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jxrlib FILES_MATCHING PATTERN "*.h" ) diff --git a/jxrlib.spec b/jxrlib.spec index eecb697..012512d 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -138,6 +138,10 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %changelog +* Wed Jul 16 2025 Sandro Mani - 1.1-31 +- Increase minimum cmake version to 3.5 +- Port CMakeLists.txt to GNUInstallDirs + * Fri Jan 17 2025 Fedora Release Engineering - 1.1-30 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9fc71d170bfb8643f038b4594b0dce8146a0e21d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 18:09:33 +0000 Subject: [PATCH 11/11] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index 012512d..85602f1 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 31%{?dist} +Release: 32%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -138,6 +138,9 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 1.1-32 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 16 2025 Sandro Mani - 1.1-31 - Increase minimum cmake version to 3.5 - Port CMakeLists.txt to GNUInstallDirs