From 9e7ae15fd4cfea04ba54d660841d2a2f49d03790 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 9 Sep 2015 15:02:27 +0200 Subject: [PATCH 01/39] Initial import --- .gitignore | 2 + CMakeLists.txt | 68 +++++++++++++++ jxrlib.spec | 95 +++++++++++++++++++++ jxrlib_warnings.patch | 193 ++++++++++++++++++++++++++++++++++++++++++ sources | 2 + 5 files changed, 360 insertions(+) create mode 100644 CMakeLists.txt create mode 100644 jxrlib.spec create mode 100644 jxrlib_warnings.patch diff --git a/.gitignore b/.gitignore index e69de29..163e228 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/JPEGXR_DPK_Spec_1.0.pdf +/jxrlib_1_1.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..406da98 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,68 @@ +cmake_minimum_required(VERSION 2.8) +project(jxrlib C) + +set(JXRLIB_MAJOR 0) +set(JXRLIB_MINOR 0) + +set(JXRLIB_LIB_VERSION ${JXRLIB_MAJOR}.${JXRLIB_MINOR}.0) +set(JXRLIB_SO_VERSION ${JXRLIB_MAJOR}) + +include(TestBigEndian) +test_big_endian(ISBIGENDIAN) +if(ISBIGENDIAN) + set(DEF_ENDIAN -D_BIG__ENDIAN_) +endif() + +add_definitions(-D__ANSI__ -DDISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}) + +include_directories( + common/include + image/sys + jxrgluelib + jxrtestlib +) + +# JXR Library +file(GLOB jpegxr_SRC image/sys/*.c image/decode/*.c image/encode/*.c) +file(GLOB jpegxr_HDR image/sys/*.h image/decode/*.h image/encode/*.h) + +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} +) + +# JXR-GLUE Library +file(GLOB jxrglue_SRC jxrgluelib/*.c jxrtestlib/*.c) +file(GLOB jxrglue_HDR jxrgluelib/*.h jxrtestlib/*.h) + +add_library(jxrglue ${jxrglue_SRC} ${jxrglue_HDR}) +set_target_properties(jxrglue PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION ${JXRLIB_SO_VERSION}) +target_link_libraries(jxrglue jpegxr m) + +install(TARGETS jxrglue + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX} +) + +# JxrEncApp Executable +add_executable(JxrEncApp jxrencoderdecoder/JxrEncApp.c) +target_link_libraries(JxrEncApp jxrglue) +install(TARGETS JxrEncApp RUNTIME DESTINATION bin) + +# JxrDecApp Executable +add_executable(JxrDecApp jxrencoderdecoder/JxrDecApp.c) +target_link_libraries(JxrDecApp jxrglue) +install(TARGETS JxrDecApp RUNTIME DESTINATION bin) + +# Headers +install(FILES jxrgluelib/JXRGlue.h jxrgluelib/JXRMeta.h jxrtestlib/JXRTest.h image/sys/windowsmediaphoto.h + DESTINATION include/jxrlib +) +install(DIRECTORY common/include/ DESTINATION include/jxrlib + FILES_MATCHING PATTERN "*.h" +) diff --git a/jxrlib.spec b/jxrlib.spec new file mode 100644 index 0000000..545b396 --- /dev/null +++ b/jxrlib.spec @@ -0,0 +1,95 @@ +Name: jxrlib +Version: 1.1 +Release: 3%{?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 +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 +# See https://jxrlib.codeplex.com/workitem/13 +Source1: CMakeLists.txt +# Converted from shipped doc/JPEGXR_DPK_Spec_1.doc +# libreoffice --headless --convert-to pdf doc/JPEGXR_DPK_Spec_1.0.doc +Source2: JPEGXR_DPK_Spec_1.0.pdf + +# Fix various warnings, upstreamable +# See https://jxrlib.codeplex.com/workitem/13 +Patch0: jxrlib_warnings.patch + +BuildRequires: cmake + + +%description +This is an open source implementation of the jpegxr image format standard. + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + + +%prep +%setup -q -n %{name} + +# Sanitize charset and line endings +for file in `find . -type f -name '*.c' -or -name '*.h' -or -name '*.txt'`; do + iconv --from=ISO-8859-15 --to=UTF-8 $file > $file.new && \ + sed -i 's|\r||g' $file.new && \ + touch -r $file $file.new && mv $file.new $file +done + +%patch0 -p1 + +# Remove shipped binaries +rm -rf bin + +cp -a %{SOURCE1} . +cp -a %{SOURCE2} doc + + +%build +%cmake . +make %{?_smp_mflags} + + +%install +%make_install + + +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + + +%files +%doc doc/readme.txt doc/JPEGXR_DPK_Spec_1.0.pdf +%{_bindir}/JxrEncApp +%{_bindir}/JxrDecApp +%{_libdir}/libjpegxr.so.* +%{_libdir}/libjxrglue.so.* + +%files devel +%{_includedir}/jxrlib/ +%{_libdir}/libjpegxr.so +%{_libdir}/libjxrglue.so + + +%changelog +* Tue Sep 08 2015 Sandro Mani - 1.1-3 +- Add Patch0 and Source1 upstream links +- Ship pdf variant of JPEGXR_DPK_Spec_1.0.doc in %%doc +- Remove bin folder + +* Tue Sep 08 2015 Sandro Mani - 1.1-2 +- Comments for Patch0 and Source1 + +* Wed Sep 02 2015 Sandro Mani - 1.1-1 +- Initial package diff --git a/jxrlib_warnings.patch b/jxrlib_warnings.patch new file mode 100644 index 0000000..de200e2 --- /dev/null +++ b/jxrlib_warnings.patch @@ -0,0 +1,193 @@ +diff -rupN jxrlib/image/sys/common.h jxrlib-new/image/sys/common.h +--- jxrlib/image/sys/common.h 2013-03-21 17:30:54.000000000 +0100 ++++ jxrlib-new/image/sys/common.h 2015-09-03 10:31:06.528657911 +0200 +@@ -124,8 +124,8 @@ Void Adapt (CAdaptiveHuffman *pAdHuff, B + Void AdaptFixed (CAdaptiveHuffman *pAdHuff); + Void AdaptDiscriminant (CAdaptiveHuffman *pAdHuff); + +-#ifndef _PREFAST_ +-#pragma warning(disable:4068) +-#endif ++// #ifndef _PREFAST_ ++// #pragma warning(disable:4068) ++// #endif + + #endif // WMI_COMMON_H +diff -rupN jxrlib/image/sys/strcodec.c jxrlib-new/image/sys/strcodec.c +--- jxrlib/image/sys/strcodec.c 2013-03-20 19:16:21.000000000 +0100 ++++ jxrlib-new/image/sys/strcodec.c 2015-09-03 10:30:31.018971760 +0200 +@@ -668,9 +668,7 @@ ERR detach_SB(SimpleBitIO* pSB) + // WinCE ARM and Desktop x86 + #else + // other platform +-#ifdef _BIG__ENDIAN_ +-#define _byteswap_ulong(x) (x) +-#else // _BIG__ENDIAN_ ++#ifndef _BIG__ENDIAN__ + U32 _byteswap_ulong(U32 bits) + { + U32 r = (bits & 0xffu) << 24; +diff -rupN jxrlib/image/sys/strcodec.h jxrlib-new/image/sys/strcodec.h +--- jxrlib/image/sys/strcodec.h 2013-03-21 19:22:34.000000000 +0100 ++++ jxrlib-new/image/sys/strcodec.h 2015-09-03 10:30:31.019971779 +0200 +@@ -64,7 +64,7 @@ + + #ifndef UNREFERENCED_PARAMETER + #define UNREFERENCED_PARAMETER(P) { (P) = (P); } +-#endif UNREFERENCED_PARAMETER ++#endif // UNREFERENCED_PARAMETER + + #ifdef UNDER_CE + #define PLATFORM_WCE +@@ -673,6 +673,16 @@ void flushToByte(BitIOInfo* pIO); + pIO->cBitsUsed &= 16 - 1;\ + pIO->uiAccumulator = LOAD16(pIO->pbCurrent) << pIO->cBitsUsed;\ + return 0; +-// pIO->uiAccumulator = LOAD16(pIO->pbCurrent) & ((U32)(-1) >> pIO->cBitsUsed);\ + + void OutputPerfTimerReport(CWMImageStrCodec *pState); ++ ++#if (defined(WIN32) && !defined(UNDER_CE)) || (defined(UNDER_CE) && defined(_ARM_)) ++// WinCE ARM and Desktop x86 ++#else ++// other platform ++#ifdef _BIG__ENDIAN_ ++#define _byteswap_ulong(x) (x) ++#else // _BIG__ENDIAN_ ++U32 _byteswap_ulong(U32 bits); ++#endif // _BIG__ENDIAN_ ++#endif +\ No newline at end of file +diff -rupN jxrlib/jxrencoderdecoder/JxrDecApp.c jxrlib-new/jxrencoderdecoder/JxrDecApp.c +--- jxrlib/jxrencoderdecoder/JxrDecApp.c 2013-05-08 18:45:08.000000000 +0200 ++++ jxrlib-new/jxrencoderdecoder/JxrDecApp.c 2015-09-03 10:30:31.019971779 +0200 +@@ -423,7 +423,7 @@ ERR WmpDecAppCreateEncoderFromExt( + Call(GetTestEncodeIID(szExt, &pIID)); + + // Create encoder +- Call(PKTestFactory_CreateCodec(pIID, ppIE)); ++ Call(PKTestFactory_CreateCodec(pIID, (void**)ppIE)); + + Cleanup: + return err; +diff -rupN jxrlib/jxrencoderdecoder/JxrEncApp.c jxrlib-new/jxrencoderdecoder/JxrEncApp.c +--- jxrlib/jxrencoderdecoder/JxrEncApp.c 2013-05-28 20:58:22.000000000 +0200 ++++ jxrlib-new/jxrencoderdecoder/JxrEncApp.c 2015-09-03 10:30:31.020971798 +0200 +@@ -578,7 +578,7 @@ main(int argc, char* argv[]) + + //================================ + Call(PKCreateCodecFactory(&pCodecFactory, WMP_SDK_VERSION)); +- Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, &pEncoder)); ++ Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, (void**)&pEncoder)); + + //---------------------------------------------------------------- + Call(PKCreateTestFactory(&pTestFactory, WMP_SDK_VERSION)); +diff -rupN jxrlib/jxrgluelib/JXRGlueJxr.c jxrlib-new/jxrgluelib/JXRGlueJxr.c +--- jxrlib/jxrgluelib/JXRGlueJxr.c 2013-03-20 20:01:13.000000000 +0100 ++++ jxrlib-new/jxrgluelib/JXRGlueJxr.c 2015-09-03 10:30:31.021971818 +0200 +@@ -28,6 +28,7 @@ + //*@@@---@@@@****************************************************************** + #include + #include ++#include + + + static const char szHDPhotoFormat[] = "image/vnd.ms-photo"; +diff -rupN jxrlib/jxrgluelib/JXRMeta.h jxrlib-new/jxrgluelib/JXRMeta.h +--- jxrlib/jxrgluelib/JXRMeta.h 2013-03-20 19:06:24.000000000 +0100 ++++ jxrlib-new/jxrgluelib/JXRMeta.h 2015-09-03 10:30:31.021971818 +0200 +@@ -34,7 +34,7 @@ + + #ifndef UNREFERENCED_PARAMETER + #define UNREFERENCED_PARAMETER(P) { (P) = (P); } +-#endif UNREFERENCED_PARAMETER ++#endif // UNREFERENCED_PARAMETER + + //================================================================ + // Container +diff -rupN jxrlib/jxrtestlib/JXRTest.c jxrlib-new/jxrtestlib/JXRTest.c +--- jxrlib/jxrtestlib/JXRTest.c 2013-03-19 20:06:18.000000000 +0100 ++++ jxrlib-new/jxrtestlib/JXRTest.c 2015-09-03 10:30:31.022971837 +0200 +@@ -198,7 +198,7 @@ ERR PKTestFactory_CreateDecoderFromFile( + ERR err = WMP_errSuccess; + + char *pExt = NULL; +- PKIID* pIID = NULL; ++ const PKIID* pIID = NULL; + + struct WMPStream* pStream = NULL; + PKImageDecode* pDecoder = NULL; +@@ -214,7 +214,7 @@ ERR PKTestFactory_CreateDecoderFromFile( + Call(CreateWS_File(&pStream, szFilename, "rb")); + + // Create decoder +- Call(PKTestFactory_CreateCodec(pIID, ppDecoder)); ++ Call(PKTestFactory_CreateCodec(pIID, (void**)ppDecoder)); + pDecoder = *ppDecoder; + + // attach stream to decoder +@@ -232,7 +232,7 @@ ERR PKCreateTestFactory(PKCodecFactory** + + UNREFERENCED_PARAMETER( uVersion ); + +- Call(PKAlloc(ppCFactory, sizeof(**ppCFactory))); ++ Call(PKAlloc((void**)ppCFactory, sizeof(**ppCFactory))); + pCFactory = *ppCFactory; + + pCFactory->CreateCodec = PKTestFactory_CreateCodec; +@@ -287,7 +287,7 @@ ERR PKTestDecode_Release( + + pID->fStreamOwner && pID->pStream->Close(&pID->pStream); + +- return PKFree(ppID); ++ return PKFree((void**)ppID); + } + + ERR PKTestDecode_Create( +@@ -296,7 +296,7 @@ ERR PKTestDecode_Create( + ERR err = WMP_errSuccess; + PKTestDecode* pID = NULL; + +- Call(PKAlloc(ppID, sizeof(**ppID))); ++ Call(PKAlloc((void**)ppID, sizeof(**ppID))); + + pID = *ppID; + pID->Initialize = PKTestDecode_Initialize; +diff -rupN jxrlib/jxrtestlib/JXRTestHdr.c jxrlib-new/jxrtestlib/JXRTestHdr.c +--- jxrlib/jxrtestlib/JXRTestHdr.c 2013-03-20 17:40:08.000000000 +0100 ++++ jxrlib-new/jxrtestlib/JXRTestHdr.c 2015-09-03 10:30:31.022971837 +0200 +@@ -27,7 +27,7 @@ + //*@@@---@@@@****************************************************************** + #ifndef ANSI + #define _CRT_SECURE_NO_WARNINGS +-#endif ANSI ++#endif // ANSI + + #include + #include +diff -rupN jxrlib/jxrtestlib/JXRTestPnm.c jxrlib-new/jxrtestlib/JXRTestPnm.c +--- jxrlib/jxrtestlib/JXRTestPnm.c 2013-03-19 22:43:44.000000000 +0100 ++++ jxrlib-new/jxrtestlib/JXRTestPnm.c 2015-09-03 10:30:31.023971856 +0200 +@@ -27,7 +27,7 @@ + //*@@@---@@@@****************************************************************** + #ifndef ANSI + #define _CRT_SECURE_NO_WARNINGS +-#endif ANSI ++#endif // ANSI + + #include + +diff -rupN jxrlib/jxrtestlib/JXRTestTif.c jxrlib-new/jxrtestlib/JXRTestTif.c +--- jxrlib/jxrtestlib/JXRTestTif.c 2013-03-19 20:17:12.000000000 +0100 ++++ jxrlib-new/jxrtestlib/JXRTestTif.c 2015-09-03 10:30:31.023971856 +0200 +@@ -909,8 +909,8 @@ ERR PKImageDecode_Release_TIF(PKTestDeco + + PKTestDecode *pID = *ppID; + +- Call(WMPFree(&pID->EXT.TIF.uStripOffsets)); +- Call(WMPFree(&pID->EXT.TIF.uStripByteCounts)); ++ Call(WMPFree((void**)&pID->EXT.TIF.uStripOffsets)); ++ Call(WMPFree((void**)&pID->EXT.TIF.uStripByteCounts)); + + Call(PKTestDecode_Release(ppID)); + diff --git a/sources b/sources index e69de29..c9867d9 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +e7e20a8afc305bf7a9c80359821abf26 JPEGXR_DPK_Spec_1.0.pdf +c0a6a4529cb687d127cf52b52f5ec848 jxrlib_1_1.tar.gz From fb474a64752ea8db73b49fadba9bc6ae6f79af87 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 11 Sep 2015 16:40:20 +0200 Subject: [PATCH 02/39] Fix typo in jxrlib_warnings.patch --- jxrlib.spec | 5 ++++- jxrlib_warnings.patch | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/jxrlib.spec b/jxrlib.spec index 545b396..8b9a193 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ make %{?_smp_mflags} %changelog +* Fri Sep 11 2015 Sandro Mani - 1.1-4 +- Fix typo in jxrlib_warnings.patch + * Tue Sep 08 2015 Sandro Mani - 1.1-3 - Add Patch0 and Source1 upstream links - Ship pdf variant of JPEGXR_DPK_Spec_1.0.doc in %%doc diff --git a/jxrlib_warnings.patch b/jxrlib_warnings.patch index de200e2..f7b8175 100644 --- a/jxrlib_warnings.patch +++ b/jxrlib_warnings.patch @@ -23,7 +23,7 @@ diff -rupN jxrlib/image/sys/strcodec.c jxrlib-new/image/sys/strcodec.c -#ifdef _BIG__ENDIAN_ -#define _byteswap_ulong(x) (x) -#else // _BIG__ENDIAN_ -+#ifndef _BIG__ENDIAN__ ++#ifndef _BIG__ENDIAN_ U32 _byteswap_ulong(U32 bits) { U32 r = (bits & 0xffu) << 24; From 99e1495f6cc58701e1fd852d87ebd6f681cd30bf Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 4 Feb 2016 01:33:34 +0000 Subject: [PATCH 03/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index 8b9a193..5571397 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ make %{?_smp_mflags} %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 1.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Fri Sep 11 2015 Sandro Mani - 1.1-4 - Fix typo in jxrlib_warnings.patch From 9c54d5c8443272530446c3fb0c5076112580dce5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 17:32:32 +0000 Subject: [PATCH 04/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index 5571397..a701d65 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ make %{?_smp_mflags} %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 1.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 04 2016 Fedora Release Engineering - 1.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From 5a764a40b9cdfdf07e8c5e8287ef8916a89d1c64 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 14:49:52 +0000 Subject: [PATCH 05/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index a701d65..f5e694b 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ make %{?_smp_mflags} %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 1.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 1.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 1c4f3f8b87dd7942d324636760703e1603590163 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 3 Aug 2017 00:05:47 +0000 Subject: [PATCH 06/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index f5e694b..0a8870e 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ make %{?_smp_mflags} %changelog +* Thu Aug 03 2017 Fedora Release Engineering - 1.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Wed Jul 26 2017 Fedora Release Engineering - 1.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From 29f4e08469878d6df118285a80a7ff4877651fe1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 19:26:01 +0000 Subject: [PATCH 07/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_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 0a8870e..0beb82a 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ make %{?_smp_mflags} %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 1.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Aug 03 2017 Fedora Release Engineering - 1.1-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild From 537403ee97b0b14bdbec06ebd560f86f1b749b12 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 18 Feb 2018 22:09:33 +0100 Subject: [PATCH 08/39] Add missing BR: gcc, make --- jxrlib.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/jxrlib.spec b/jxrlib.spec index 0beb82a..ba55f8a 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -20,6 +20,8 @@ Source2: JPEGXR_DPK_Spec_1.0.pdf Patch0: jxrlib_warnings.patch BuildRequires: cmake +BuildRequires: gcc +BuildRequires: make %description @@ -57,7 +59,7 @@ cp -a %{SOURCE2} doc %build %cmake . -make %{?_smp_mflags} +%make_build %install @@ -83,6 +85,9 @@ make %{?_smp_mflags} %changelog +* Sun Feb 18 2018 Sandro Mani - 1.1-10 +- Add missing BR: gcc, make + * Wed Feb 07 2018 Fedora Release Engineering - 1.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 529b00659d5c2e890715dbae87f12c47e4ecd814 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 06:46:48 +0000 Subject: [PATCH 09/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_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 ba55f8a..821913d 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -85,6 +85,9 @@ cp -a %{SOURCE2} doc %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 1.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Sun Feb 18 2018 Sandro Mani - 1.1-10 - Add missing BR: gcc, make From c68eda40fdc81f462aed8bcf365f8955ad8b8ebe Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 22 Jan 2019 18:39:22 +0100 Subject: [PATCH 10/39] Remove obsolete ldconfig scriptlets References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets Signed-off-by: Igor Gnatenko --- jxrlib.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/jxrlib.spec b/jxrlib.spec index 821913d..78a2ee9 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -66,9 +66,7 @@ cp -a %{SOURCE2} doc %make_install -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files From 6947edd9671fee312e8a3425c3f26202a3477697 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 04:56:34 +0000 Subject: [PATCH 11/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_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 78a2ee9..1c62b60 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 11%{?dist} +Release: 12%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ cp -a %{SOURCE2} doc %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 1.1-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 1.1-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From c6dd07f0a3a0c0b2d567cdf4fbf7c2600815a9f5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 10:59:20 +0000 Subject: [PATCH 12/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_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 1c62b60..5fa7a9f 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ cp -a %{SOURCE2} doc %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 1.1-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 1.1-12 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From dc45526b28065f584b15541e0009722e4587a26d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 06:33:50 +0000 Subject: [PATCH 13/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_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 5fa7a9f..a7f1b04 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ cp -a %{SOURCE2} doc %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 1.1-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 1.1-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From e940dc4ee03ef15ca100e81f7cc501256be0ad68 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Mon, 6 Apr 2020 08:16:24 -0500 Subject: [PATCH 14/39] "Adding package.cfg file" --- package.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 package.cfg diff --git a/package.cfg b/package.cfg new file mode 100644 index 0000000..66ea79d --- /dev/null +++ b/package.cfg @@ -0,0 +1,2 @@ +[koji] +targets = epel8 epel8-playground \ No newline at end of file From cd1d6307f2300f25a8a8b2fc9ce96780f7e7b552 Mon Sep 17 00:00:00 2001 From: Oliver Falk Date: Mon, 6 Apr 2020 16:25:14 +0200 Subject: [PATCH 15/39] RHBZ#1774955 - EPEL8 branch --- .gitignore | 2 + CMakeLists.txt | 68 +++++++++++++++ jxrlib.spec | 87 +++++++++++++++++++ jxrlib_warnings.patch | 193 ++++++++++++++++++++++++++++++++++++++++++ sources | 2 + 5 files changed, 352 insertions(+) create mode 100644 CMakeLists.txt create mode 100644 jxrlib.spec create mode 100644 jxrlib_warnings.patch diff --git a/.gitignore b/.gitignore index e69de29..163e228 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1,2 @@ +/JPEGXR_DPK_Spec_1.0.pdf +/jxrlib_1_1.tar.gz diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..406da98 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,68 @@ +cmake_minimum_required(VERSION 2.8) +project(jxrlib C) + +set(JXRLIB_MAJOR 0) +set(JXRLIB_MINOR 0) + +set(JXRLIB_LIB_VERSION ${JXRLIB_MAJOR}.${JXRLIB_MINOR}.0) +set(JXRLIB_SO_VERSION ${JXRLIB_MAJOR}) + +include(TestBigEndian) +test_big_endian(ISBIGENDIAN) +if(ISBIGENDIAN) + set(DEF_ENDIAN -D_BIG__ENDIAN_) +endif() + +add_definitions(-D__ANSI__ -DDISABLE_PERF_MEASUREMENT ${DEF_ENDIAN}) + +include_directories( + common/include + image/sys + jxrgluelib + jxrtestlib +) + +# JXR Library +file(GLOB jpegxr_SRC image/sys/*.c image/decode/*.c image/encode/*.c) +file(GLOB jpegxr_HDR image/sys/*.h image/decode/*.h image/encode/*.h) + +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} +) + +# JXR-GLUE Library +file(GLOB jxrglue_SRC jxrgluelib/*.c jxrtestlib/*.c) +file(GLOB jxrglue_HDR jxrgluelib/*.h jxrtestlib/*.h) + +add_library(jxrglue ${jxrglue_SRC} ${jxrglue_HDR}) +set_target_properties(jxrglue PROPERTIES VERSION ${JXRLIB_LIB_VERSION} SOVERSION ${JXRLIB_SO_VERSION}) +target_link_libraries(jxrglue jpegxr m) + +install(TARGETS jxrglue + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX} +) + +# JxrEncApp Executable +add_executable(JxrEncApp jxrencoderdecoder/JxrEncApp.c) +target_link_libraries(JxrEncApp jxrglue) +install(TARGETS JxrEncApp RUNTIME DESTINATION bin) + +# JxrDecApp Executable +add_executable(JxrDecApp jxrencoderdecoder/JxrDecApp.c) +target_link_libraries(JxrDecApp jxrglue) +install(TARGETS JxrDecApp RUNTIME DESTINATION bin) + +# Headers +install(FILES jxrgluelib/JXRGlue.h jxrgluelib/JXRMeta.h jxrtestlib/JXRTest.h image/sys/windowsmediaphoto.h + DESTINATION include/jxrlib +) +install(DIRECTORY common/include/ DESTINATION include/jxrlib + FILES_MATCHING PATTERN "*.h" +) diff --git a/jxrlib.spec b/jxrlib.spec new file mode 100644 index 0000000..872fd90 --- /dev/null +++ b/jxrlib.spec @@ -0,0 +1,87 @@ +Name: jxrlib +Version: 1.1 +Release: 1%{?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 +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 +# See https://jxrlib.codeplex.com/workitem/13 +Source1: CMakeLists.txt +# Converted from shipped doc/JPEGXR_DPK_Spec_1.doc +# libreoffice --headless --convert-to pdf doc/JPEGXR_DPK_Spec_1.0.doc +Source2: JPEGXR_DPK_Spec_1.0.pdf + +# Fix various warnings, upstreamable +# See https://jxrlib.codeplex.com/workitem/13 +Patch0: jxrlib_warnings.patch + +BuildRequires: cmake +BuildRequires: gcc +BuildRequires: make + + +%description +This is an open source implementation of the jpegxr image format standard. + + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + + +%prep +%setup -q -n %{name} + +# Sanitize charset and line endings +for file in `find . -type f -name '*.c' -or -name '*.h' -or -name '*.txt'`; do + iconv --from=ISO-8859-15 --to=UTF-8 $file > $file.new && \ + sed -i 's|\r||g' $file.new && \ + touch -r $file $file.new && mv $file.new $file +done + +%patch0 -p1 + +# Remove shipped binaries +rm -rf bin + +cp -a %{SOURCE1} . +cp -a %{SOURCE2} doc + + +%build +%cmake . +%make_build + + +%install +%make_install + + +%ldconfig_scriptlets + + +%files +%doc doc/readme.txt doc/JPEGXR_DPK_Spec_1.0.pdf +%{_bindir}/JxrEncApp +%{_bindir}/JxrDecApp +%{_libdir}/libjpegxr.so.* +%{_libdir}/libjxrglue.so.* + +%files devel +%{_includedir}/jxrlib/ +%{_libdir}/libjpegxr.so +%{_libdir}/libjxrglue.so + + +%changelog +* Mon Apr 06 2020 Oliver Falk - 1.1-1 +- Initial build for EPEL 8 diff --git a/jxrlib_warnings.patch b/jxrlib_warnings.patch new file mode 100644 index 0000000..f7b8175 --- /dev/null +++ b/jxrlib_warnings.patch @@ -0,0 +1,193 @@ +diff -rupN jxrlib/image/sys/common.h jxrlib-new/image/sys/common.h +--- jxrlib/image/sys/common.h 2013-03-21 17:30:54.000000000 +0100 ++++ jxrlib-new/image/sys/common.h 2015-09-03 10:31:06.528657911 +0200 +@@ -124,8 +124,8 @@ Void Adapt (CAdaptiveHuffman *pAdHuff, B + Void AdaptFixed (CAdaptiveHuffman *pAdHuff); + Void AdaptDiscriminant (CAdaptiveHuffman *pAdHuff); + +-#ifndef _PREFAST_ +-#pragma warning(disable:4068) +-#endif ++// #ifndef _PREFAST_ ++// #pragma warning(disable:4068) ++// #endif + + #endif // WMI_COMMON_H +diff -rupN jxrlib/image/sys/strcodec.c jxrlib-new/image/sys/strcodec.c +--- jxrlib/image/sys/strcodec.c 2013-03-20 19:16:21.000000000 +0100 ++++ jxrlib-new/image/sys/strcodec.c 2015-09-03 10:30:31.018971760 +0200 +@@ -668,9 +668,7 @@ ERR detach_SB(SimpleBitIO* pSB) + // WinCE ARM and Desktop x86 + #else + // other platform +-#ifdef _BIG__ENDIAN_ +-#define _byteswap_ulong(x) (x) +-#else // _BIG__ENDIAN_ ++#ifndef _BIG__ENDIAN_ + U32 _byteswap_ulong(U32 bits) + { + U32 r = (bits & 0xffu) << 24; +diff -rupN jxrlib/image/sys/strcodec.h jxrlib-new/image/sys/strcodec.h +--- jxrlib/image/sys/strcodec.h 2013-03-21 19:22:34.000000000 +0100 ++++ jxrlib-new/image/sys/strcodec.h 2015-09-03 10:30:31.019971779 +0200 +@@ -64,7 +64,7 @@ + + #ifndef UNREFERENCED_PARAMETER + #define UNREFERENCED_PARAMETER(P) { (P) = (P); } +-#endif UNREFERENCED_PARAMETER ++#endif // UNREFERENCED_PARAMETER + + #ifdef UNDER_CE + #define PLATFORM_WCE +@@ -673,6 +673,16 @@ void flushToByte(BitIOInfo* pIO); + pIO->cBitsUsed &= 16 - 1;\ + pIO->uiAccumulator = LOAD16(pIO->pbCurrent) << pIO->cBitsUsed;\ + return 0; +-// pIO->uiAccumulator = LOAD16(pIO->pbCurrent) & ((U32)(-1) >> pIO->cBitsUsed);\ + + void OutputPerfTimerReport(CWMImageStrCodec *pState); ++ ++#if (defined(WIN32) && !defined(UNDER_CE)) || (defined(UNDER_CE) && defined(_ARM_)) ++// WinCE ARM and Desktop x86 ++#else ++// other platform ++#ifdef _BIG__ENDIAN_ ++#define _byteswap_ulong(x) (x) ++#else // _BIG__ENDIAN_ ++U32 _byteswap_ulong(U32 bits); ++#endif // _BIG__ENDIAN_ ++#endif +\ No newline at end of file +diff -rupN jxrlib/jxrencoderdecoder/JxrDecApp.c jxrlib-new/jxrencoderdecoder/JxrDecApp.c +--- jxrlib/jxrencoderdecoder/JxrDecApp.c 2013-05-08 18:45:08.000000000 +0200 ++++ jxrlib-new/jxrencoderdecoder/JxrDecApp.c 2015-09-03 10:30:31.019971779 +0200 +@@ -423,7 +423,7 @@ ERR WmpDecAppCreateEncoderFromExt( + Call(GetTestEncodeIID(szExt, &pIID)); + + // Create encoder +- Call(PKTestFactory_CreateCodec(pIID, ppIE)); ++ Call(PKTestFactory_CreateCodec(pIID, (void**)ppIE)); + + Cleanup: + return err; +diff -rupN jxrlib/jxrencoderdecoder/JxrEncApp.c jxrlib-new/jxrencoderdecoder/JxrEncApp.c +--- jxrlib/jxrencoderdecoder/JxrEncApp.c 2013-05-28 20:58:22.000000000 +0200 ++++ jxrlib-new/jxrencoderdecoder/JxrEncApp.c 2015-09-03 10:30:31.020971798 +0200 +@@ -578,7 +578,7 @@ main(int argc, char* argv[]) + + //================================ + Call(PKCreateCodecFactory(&pCodecFactory, WMP_SDK_VERSION)); +- Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, &pEncoder)); ++ Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, (void**)&pEncoder)); + + //---------------------------------------------------------------- + Call(PKCreateTestFactory(&pTestFactory, WMP_SDK_VERSION)); +diff -rupN jxrlib/jxrgluelib/JXRGlueJxr.c jxrlib-new/jxrgluelib/JXRGlueJxr.c +--- jxrlib/jxrgluelib/JXRGlueJxr.c 2013-03-20 20:01:13.000000000 +0100 ++++ jxrlib-new/jxrgluelib/JXRGlueJxr.c 2015-09-03 10:30:31.021971818 +0200 +@@ -28,6 +28,7 @@ + //*@@@---@@@@****************************************************************** + #include + #include ++#include + + + static const char szHDPhotoFormat[] = "image/vnd.ms-photo"; +diff -rupN jxrlib/jxrgluelib/JXRMeta.h jxrlib-new/jxrgluelib/JXRMeta.h +--- jxrlib/jxrgluelib/JXRMeta.h 2013-03-20 19:06:24.000000000 +0100 ++++ jxrlib-new/jxrgluelib/JXRMeta.h 2015-09-03 10:30:31.021971818 +0200 +@@ -34,7 +34,7 @@ + + #ifndef UNREFERENCED_PARAMETER + #define UNREFERENCED_PARAMETER(P) { (P) = (P); } +-#endif UNREFERENCED_PARAMETER ++#endif // UNREFERENCED_PARAMETER + + //================================================================ + // Container +diff -rupN jxrlib/jxrtestlib/JXRTest.c jxrlib-new/jxrtestlib/JXRTest.c +--- jxrlib/jxrtestlib/JXRTest.c 2013-03-19 20:06:18.000000000 +0100 ++++ jxrlib-new/jxrtestlib/JXRTest.c 2015-09-03 10:30:31.022971837 +0200 +@@ -198,7 +198,7 @@ ERR PKTestFactory_CreateDecoderFromFile( + ERR err = WMP_errSuccess; + + char *pExt = NULL; +- PKIID* pIID = NULL; ++ const PKIID* pIID = NULL; + + struct WMPStream* pStream = NULL; + PKImageDecode* pDecoder = NULL; +@@ -214,7 +214,7 @@ ERR PKTestFactory_CreateDecoderFromFile( + Call(CreateWS_File(&pStream, szFilename, "rb")); + + // Create decoder +- Call(PKTestFactory_CreateCodec(pIID, ppDecoder)); ++ Call(PKTestFactory_CreateCodec(pIID, (void**)ppDecoder)); + pDecoder = *ppDecoder; + + // attach stream to decoder +@@ -232,7 +232,7 @@ ERR PKCreateTestFactory(PKCodecFactory** + + UNREFERENCED_PARAMETER( uVersion ); + +- Call(PKAlloc(ppCFactory, sizeof(**ppCFactory))); ++ Call(PKAlloc((void**)ppCFactory, sizeof(**ppCFactory))); + pCFactory = *ppCFactory; + + pCFactory->CreateCodec = PKTestFactory_CreateCodec; +@@ -287,7 +287,7 @@ ERR PKTestDecode_Release( + + pID->fStreamOwner && pID->pStream->Close(&pID->pStream); + +- return PKFree(ppID); ++ return PKFree((void**)ppID); + } + + ERR PKTestDecode_Create( +@@ -296,7 +296,7 @@ ERR PKTestDecode_Create( + ERR err = WMP_errSuccess; + PKTestDecode* pID = NULL; + +- Call(PKAlloc(ppID, sizeof(**ppID))); ++ Call(PKAlloc((void**)ppID, sizeof(**ppID))); + + pID = *ppID; + pID->Initialize = PKTestDecode_Initialize; +diff -rupN jxrlib/jxrtestlib/JXRTestHdr.c jxrlib-new/jxrtestlib/JXRTestHdr.c +--- jxrlib/jxrtestlib/JXRTestHdr.c 2013-03-20 17:40:08.000000000 +0100 ++++ jxrlib-new/jxrtestlib/JXRTestHdr.c 2015-09-03 10:30:31.022971837 +0200 +@@ -27,7 +27,7 @@ + //*@@@---@@@@****************************************************************** + #ifndef ANSI + #define _CRT_SECURE_NO_WARNINGS +-#endif ANSI ++#endif // ANSI + + #include + #include +diff -rupN jxrlib/jxrtestlib/JXRTestPnm.c jxrlib-new/jxrtestlib/JXRTestPnm.c +--- jxrlib/jxrtestlib/JXRTestPnm.c 2013-03-19 22:43:44.000000000 +0100 ++++ jxrlib-new/jxrtestlib/JXRTestPnm.c 2015-09-03 10:30:31.023971856 +0200 +@@ -27,7 +27,7 @@ + //*@@@---@@@@****************************************************************** + #ifndef ANSI + #define _CRT_SECURE_NO_WARNINGS +-#endif ANSI ++#endif // ANSI + + #include + +diff -rupN jxrlib/jxrtestlib/JXRTestTif.c jxrlib-new/jxrtestlib/JXRTestTif.c +--- jxrlib/jxrtestlib/JXRTestTif.c 2013-03-19 20:17:12.000000000 +0100 ++++ jxrlib-new/jxrtestlib/JXRTestTif.c 2015-09-03 10:30:31.023971856 +0200 +@@ -909,8 +909,8 @@ ERR PKImageDecode_Release_TIF(PKTestDeco + + PKTestDecode *pID = *ppID; + +- Call(WMPFree(&pID->EXT.TIF.uStripOffsets)); +- Call(WMPFree(&pID->EXT.TIF.uStripByteCounts)); ++ Call(WMPFree((void**)&pID->EXT.TIF.uStripOffsets)); ++ Call(WMPFree((void**)&pID->EXT.TIF.uStripByteCounts)); + + Call(PKTestDecode_Release(ppID)); + diff --git a/sources b/sources index e69de29..c9867d9 100644 --- a/sources +++ b/sources @@ -0,0 +1,2 @@ +e7e20a8afc305bf7a9c80359821abf26 JPEGXR_DPK_Spec_1.0.pdf +c0a6a4529cb687d127cf52b52f5ec848 jxrlib_1_1.tar.gz From ce90112eecb6713053010cc91a8f5833d907237f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 02:39:06 +0000 Subject: [PATCH 16/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_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 a7f1b04..4165db0 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ cp -a %{SOURCE2} doc %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 1.1-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 1.1-14 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 73c1aee4daf8a6b8496a1f66964f230cda67f06b Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 29 Jul 2020 10:30:45 +0200 Subject: [PATCH 17/39] Use %cmake_build/%cmake_install --- jxrlib.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jxrlib.spec b/jxrlib.spec index 4165db0..5c2973c 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -58,12 +58,12 @@ cp -a %{SOURCE2} doc %build -%cmake . -%make_build +%cmake +%cmake_build %install -%make_install +%cmake_install %ldconfig_scriptlets From 4d2adc59810b4c0f8c98ceb4cb2cb4f306579e76 Mon Sep 17 00:00:00 2001 From: Troy Dawson Date: Thu, 24 Sep 2020 18:01:41 +0000 Subject: [PATCH 18/39] remove package.cfg per new epel-playground policy --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 66ea79d..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel8 epel8-playground \ No newline at end of file From 45dbc7b8236afb308d7e0e6b2f1237e2e2528065 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 15:07:31 +0000 Subject: [PATCH 19/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_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 5c2973c..5ef2e7b 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ cp -a %{SOURCE2} doc %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.1-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jul 28 2020 Fedora Release Engineering - 1.1-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From fe714953a893ddfbafc2988df43a16bea7726bde Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:22:14 +0000 Subject: [PATCH 20/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_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 5ef2e7b..6fc3aa1 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ cp -a %{SOURCE2} doc %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 1.1-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue Jan 26 2021 Fedora Release Engineering - 1.1-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 84d6b338c2f1cf46fd6ebbcdde00bd577386342e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 14:04:33 +0000 Subject: [PATCH 21/39] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_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 6fc3aa1..54e3bf0 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -83,6 +83,9 @@ cp -a %{SOURCE2} doc %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 1.1-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 1.1-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 3b38fde497e26b5e5803ab44e7363368578374b1 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 24 Feb 2022 11:15:40 +0100 Subject: [PATCH 22/39] Add mingw subpackages --- jxrlib.spec | 60 +++++++++++++++++++++++++++-- jxrlib_mingw.patch | 94 +++++++++++++++++++++++++++++++++++++++++++++ jxrlib_stdint.patch | 0 3 files changed, 151 insertions(+), 3 deletions(-) create mode 100644 jxrlib_mingw.patch create mode 100644 jxrlib_stdint.patch diff --git a/jxrlib.spec b/jxrlib.spec index 54e3bf0..9818264 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -18,10 +18,19 @@ Source2: JPEGXR_DPK_Spec_1.0.pdf # Fix various warnings, upstreamable # See https://jxrlib.codeplex.com/workitem/13 Patch0: jxrlib_warnings.patch +# Mingw build fixes +Patch1: jxrlib_mingw.patch +# Fix undefined uintptr_t +Patch2: jxrlib_stdint.patch BuildRequires: cmake BuildRequires: gcc -BuildRequires: make + +BuildRequires: mingw32-filesystem >= 95 +BuildRequires: mingw32-gcc + +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-gcc %description @@ -37,6 +46,22 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. +%package -n mingw32-%{name} +Summary: MinGW Windows JPEG XR library + +%description -n mingw32-%{name} +MinGW Windows JPEG XR library. + + +%package -n mingw64-%{name} +Summary: MinGW Windows JPEG XR library + +%description -n mingw64-%{name} +MinGW Windows JPEG XR library. + + +%{?mingw_debug_package} + %prep %setup -q -n %{name} @@ -49,6 +74,8 @@ for file in `find . -type f -name '*.c' -or -name '*.h' -or -name '*.txt'`; do done %patch0 -p1 +%patch1 -p1 +%patch2 -p1 # Remove shipped binaries rm -rf bin @@ -58,15 +85,21 @@ cp -a %{SOURCE2} doc %build +# Native build %cmake %cmake_build +# MinGW build +%mingw_cmake +%mingw_make_build + %install %cmake_install +%mingw_make_install -%ldconfig_scriptlets +%mingw_debug_install_post %files @@ -81,8 +114,29 @@ cp -a %{SOURCE2} doc %{_libdir}/libjpegxr.so %{_libdir}/libjxrglue.so +%files -n mingw32-%{name} +%{mingw32_bindir}/libjpegxr.dll +%{mingw32_bindir}/libjxrglue.dll +%{mingw32_bindir}/JxrDecApp.exe +%{mingw32_bindir}/JxrEncApp.exe +%{mingw32_includedir}/jxrlib/ +%{mingw32_libdir}/libjpegxr.dll.a +%{mingw32_libdir}/libjxrglue.dll.a + +%files -n mingw64-%{name} +%{mingw64_bindir}/libjpegxr.dll +%{mingw64_bindir}/libjxrglue.dll +%{mingw64_bindir}/JxrDecApp.exe +%{mingw64_bindir}/JxrEncApp.exe +%{mingw64_includedir}/jxrlib/ +%{mingw64_libdir}/libjpegxr.dll.a +%{mingw64_libdir}/libjxrglue.dll.a + %changelog +* Sun Feb 20 2022 Sandro Mani - 1.1-19 +- Add mingw subpackege + * Thu Jan 20 2022 Fedora Release Engineering - 1.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/jxrlib_mingw.patch b/jxrlib_mingw.patch new file mode 100644 index 0000000..3b3e45d --- /dev/null +++ b/jxrlib_mingw.patch @@ -0,0 +1,94 @@ +diff -rupN jxrlib/common/include/wmspecstring.h jxrlib-new/common/include/wmspecstring.h +--- jxrlib/common/include/wmspecstring.h 2013-03-21 18:58:18.000000000 +0100 ++++ jxrlib-new/common/include/wmspecstring.h 2015-09-06 21:10:53.943039237 +0200 +@@ -334,7 +334,7 @@ void __pfx_assume(int, const char *); + + // Some CE versions don't have specstrings.h, some have very old version without + // __specstrings defined. So we handle CE separately in wmasalce.h +-#if defined(UNDER_CE) || defined(NO_WINDOWS) ++#if defined(UNDER_CE) || defined(NO_WINDOWS) || defined(MINGW) + #include "wmspecstringce.h" + #endif + +diff -rupN jxrlib/image/sys/ansi.h jxrlib-new/image/sys/ansi.h +--- jxrlib/image/sys/ansi.h 2013-03-28 18:34:06.000000000 +0100 ++++ jxrlib-new/image/sys/ansi.h 2015-09-06 21:18:54.051637086 +0200 +@@ -44,13 +44,9 @@ + //================================ + #define FORCE_INLINE + #define CDECL +-#if __LP64__ +-#define UINTPTR_T unsigned long long +-#define INTPTR_T long long +-#else +-#define UINTPTR_T unsigned int +-#define INTPTR_T int +-#endif ++#include ++#define UINTPTR_T uintptr_t ++#define INTPTR_T intptr_t + + + //================================ +diff -rupN jxrlib/image/sys/strcodec.h jxrlib-new/image/sys/strcodec.h +--- jxrlib/image/sys/strcodec.h 2015-09-06 02:21:20.337316724 +0200 ++++ jxrlib-new/image/sys/strcodec.h 2015-09-06 21:18:44.335483326 +0200 +@@ -40,7 +40,7 @@ + + //================================================================ + #ifdef ENABLE_OPTIMIZATIONS +-#if defined(WIN32) && !defined(_WIN64) ++#if defined(_MSC_VER) && !defined(_WIN64) + #define WMP_OPT_SSE2 + + #define WMP_OPT_CC_ENC +@@ -57,9 +57,9 @@ + + //================================================================ + //#ifdef WIN32 +-#if defined(WIN32) && !defined(UNDER_CE) // WIN32 seems to be defined always in VS2005 for ARM platform ++#if defined(_MSC_VER) && !defined(UNDER_CE) // WIN32 seems to be defined always in VS2005 for ARM platform + #define PLATFORM_X86 +-#include "..\x86\x86.h" ++#include "../x86/x86.h" + #endif + + #ifndef UNREFERENCED_PARAMETER +@@ -89,6 +89,7 @@ typedef unsigned __int64 U64; + + // The following macros depend on UINTPTR_T and INTPTR_T being properly defined + // so that they are equal to pointer width. Confirm and fail if our assumptions are wrong. ++ + CT_ASSERT(sizeof(UINTPTR_T) == sizeof(void*), strcodec1); + CT_ASSERT(sizeof(INTPTR_T) == sizeof(void*), strcodec2); + +@@ -450,7 +451,7 @@ typedef struct CWMImageStrCodec { + + struct WMPStream ** ppWStream; + +-#ifdef WIN32 ++#ifdef _MSC_VER + TCHAR **ppTempFile; + #else + char **ppTempFile; +diff -rupN jxrlib/jxrgluelib/JXRMeta.h jxrlib-new/jxrgluelib/JXRMeta.h +--- jxrlib/jxrgluelib/JXRMeta.h 2015-09-06 02:21:20.340316728 +0200 ++++ jxrlib-new/jxrgluelib/JXRMeta.h 2015-09-06 21:10:53.944039253 +0200 +@@ -28,7 +28,7 @@ + #pragma once + + #include +-#ifndef WIN32 ++#ifndef _MSC_VER + #include + #endif + +@@ -106,7 +106,7 @@ + #define WMP_valWMPhotoID WMP_valCompression + + +-#ifdef WIN32 ++#ifdef _MSC_VER + #define __in_win __in + #define __out_win __out + #endif diff --git a/jxrlib_stdint.patch b/jxrlib_stdint.patch new file mode 100644 index 0000000..e69de29 From 9b4976d6154dd7c8a3b71385e6ebbbab6a115cda Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 24 Feb 2022 20:08:05 +0100 Subject: [PATCH 23/39] Make mingw subpackages noarch --- jxrlib.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index 9818264..49a1c08 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -48,6 +48,7 @@ developing applications that use %{name}. %package -n mingw32-%{name} Summary: MinGW Windows JPEG XR library +BuildArch: noarch %description -n mingw32-%{name} MinGW Windows JPEG XR library. @@ -55,6 +56,7 @@ MinGW Windows JPEG XR library. %package -n mingw64-%{name} Summary: MinGW Windows JPEG XR library +BuildArch: noarch %description -n mingw64-%{name} MinGW Windows JPEG XR library. @@ -134,6 +136,9 @@ cp -a %{SOURCE2} doc %changelog +* Thu Feb 24 2022 Sandro Mani - 1.1-20 +- Make mingw subpackages noarch + * Sun Feb 20 2022 Sandro Mani - 1.1-19 - Add mingw subpackege From 40cd24bcd5d53b6271e529a8fca59e08b6b41423 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 25 Mar 2022 13:57:33 +0100 Subject: [PATCH 24/39] Rebuild with mingw-gcc-12 --- jxrlib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index 49a1c08..a3cf453 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -136,6 +136,9 @@ cp -a %{SOURCE2} doc %changelog +* Fri Mar 25 2022 Sandro Mani - 1.1-21 +- Rebuild with mingw-gcc-12 + * Thu Feb 24 2022 Sandro Mani - 1.1-20 - Make mingw subpackages noarch From 32e03a04b2f52b6730f4d0aa44643f8c6e9fd184 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:30:55 +0000 Subject: [PATCH 25/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_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 a3cf453..2faa660 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -136,6 +136,9 @@ cp -a %{SOURCE2} doc %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 1.1-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Mar 25 2022 Sandro Mani - 1.1-21 - Rebuild with mingw-gcc-12 From a8b550007f6f03aa30db4da9f19ccab520c6c023 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 5 Aug 2022 22:56:14 +0200 Subject: [PATCH 26/39] Don't install guiddef.h for mingw --- jxrlib.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jxrlib.spec b/jxrlib.spec index 2faa660..5fb47f3 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -100,6 +100,10 @@ cp -a %{SOURCE2} doc %cmake_install %mingw_make_install +# Delete guiddef.h which conflicts with guiddef.h shipped by mingw-headers +rm -f%{mingw32_includedir}/jxrlib/guiddef.h +rm -f%{mingw64_includedir}/jxrlib/guiddef.h + %mingw_debug_install_post @@ -136,6 +140,9 @@ cp -a %{SOURCE2} doc %changelog +* Fri Aug 05 2022 Sandro Mani - 1.1-23 +- Don't install guiddef.h for mingw + * Thu Jul 21 2022 Fedora Release Engineering - 1.1-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From fa77549cd748cbbbb39ac54aa7291cf9d61574cc Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Fri, 5 Aug 2022 23:03:29 +0200 Subject: [PATCH 27/39] Fix deleting guiddef.h --- jxrlib.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jxrlib.spec b/jxrlib.spec index 5fb47f3..c9edb38 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -101,8 +101,8 @@ cp -a %{SOURCE2} doc %mingw_make_install # Delete guiddef.h which conflicts with guiddef.h shipped by mingw-headers -rm -f%{mingw32_includedir}/jxrlib/guiddef.h -rm -f%{mingw64_includedir}/jxrlib/guiddef.h +rm -f %{buildroot}%{mingw32_includedir}/jxrlib/guiddef.h +rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %mingw_debug_install_post From 2a95a564f7f5883049e7a0bf584daecb654a17a2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 14:00:15 +0000 Subject: [PATCH 28/39] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_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 c9edb38..bc3dfdf 100644 --- a/jxrlib.spec +++ b/jxrlib.spec @@ -1,6 +1,6 @@ Name: jxrlib Version: 1.1 -Release: 23%{?dist} +Release: 24%{?dist} Summary: Open source implementation of jpegxr # See JPEGXR_DPK_Spec_1.0.doc. Upstream request for plain text license file at @@ -140,6 +140,9 @@ rm -f %{buildroot}%{mingw64_includedir}/jxrlib/guiddef.h %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 1.1-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Aug 05 2022 Sandro Mani - 1.1-23 - Don't install guiddef.h for mingw From 5ba940c16293b3a12a851040d3d0e88849c2e136 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Thu, 13 Apr 2023 15:46:24 +0200 Subject: [PATCH 29/39] 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 30/39] 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 31/39] 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 32/39] 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 33/39] 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 34/39] 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 35/39] 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 36/39] 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 37/39] 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 38/39] 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 39/39] 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