Control: tags 1075105 + pending
Dear maintainer, I've prepared an NMU for jxrlib (versioned as 1.2~git20170615.f752187-5.3) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards.
diff -Nru jxrlib-1.2~git20170615.f752187/debian/changelog jxrlib-1.2~git20170615.f752187/debian/changelog --- jxrlib-1.2~git20170615.f752187/debian/changelog 2024-03-17 05:12:37.000000000 +0100 +++ jxrlib-1.2~git20170615.f752187/debian/changelog 2024-08-17 09:05:27.000000000 +0200 @@ -1,3 +1,11 @@ +jxrlib (1.2~git20170615.f752187-5.3) unstable; urgency=medium + + * Non-maintainer upload. + * Apply patch to fix building with GCC-14s, thanks to YOKOTA Hiroshi for + preparing it. (Closes: #1075105) + + -- Tobias Frost <t...@debian.org> Sat, 17 Aug 2024 09:05:27 +0200 + jxrlib (1.2~git20170615.f752187-5.2) unstable; urgency=medium * Non-maintainer upload. diff -Nru jxrlib-1.2~git20170615.f752187/debian/patches/0013-jxrlib-ftbfs-with-GCC-14.patch jxrlib-1.2~git20170615.f752187/debian/patches/0013-jxrlib-ftbfs-with-GCC-14.patch --- jxrlib-1.2~git20170615.f752187/debian/patches/0013-jxrlib-ftbfs-with-GCC-14.patch 1970-01-01 01:00:00.000000000 +0100 +++ jxrlib-1.2~git20170615.f752187/debian/patches/0013-jxrlib-ftbfs-with-GCC-14.patch 2024-08-17 09:00:32.000000000 +0200 @@ -0,0 +1,33 @@ +From: YOKOTA Hiroshi <yokota.h...@gmail.com> +Date: Thu, 25 Jul 2024 15:03:31 +0900 +Subject: jxrlib: ftbfs with GCC-14 +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Bug-Debian: https://bugs.debian.org/1075105 + +_byteswap_ulong() is defined in image/sys/strcodec.c + +---- +/usr/bin/cc -DDISABLE_PERF_MEASUREMENT -D__ANSI__ -Djpegxr_EXPORTS -I"/<<PKGBUILDDIR>>/common/include" -I"/<<PKGBUILDDIR>>/image/sys" -I"/<<PKGBUILDDIR>>/jxrgluelib" -I"/<<PKGBUILDDIR>>/jxrtestlib" -g -O2 -Werror=implicit-function-declaration -ffile-prefix-map=/<<PKGBUILDDIR>>=. -fstack-protector-strong -fstack-clash-protection -Wformat -Werror=format-security -fcf-protection -Wall -Wextra -Wdate-time -D_FORTIFY_SOURCE=2 -fPIC -w -MD -MT CMakeFiles/jpegxr.dir/image/encode/strenc.c.o -MF CMakeFiles/jpegxr.dir/image/encode/strenc.c.o.d -o CMakeFiles/jpegxr.dir/image/encode/strenc.c.o -c "/<<PKGBUILDDIR>>/image/encode/strenc.c" +/<<PKGBUILDDIR>>/image/decode/segdec.c: In function ‘_load4’: +/<<PKGBUILDDIR>>/image/decode/segdec.c:68:12: error: implicit declaration of function ‘_byteswap_ulong’ [-Wimplicit-function-declaration] + 68 | return _byteswap_ulong(v); + | ^~~~~~~~~~~~~~~ +--- + image/decode/segdec.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/image/decode/segdec.c b/image/decode/segdec.c +index 3c890af..5d55f06 100644 +--- a/image/decode/segdec.c ++++ b/image/decode/segdec.c +@@ -63,6 +63,7 @@ static U32 _FORCEINLINE _load4(void* pv) + v |= ((U32)((U16 *) pv)[1]) << 16; + return _byteswap_ulong(v); + #else // _M_IA64 ++ U32 _byteswap_ulong(U32 bits); // from image/sys/strcodec.c + U32 v; + memcpy(&v, pv, sizeof(U32)); + return _byteswap_ulong(v); diff -Nru jxrlib-1.2~git20170615.f752187/debian/patches/0014-FTBFS-fix-for-pointer-type-mismatch.patch jxrlib-1.2~git20170615.f752187/debian/patches/0014-FTBFS-fix-for-pointer-type-mismatch.patch --- jxrlib-1.2~git20170615.f752187/debian/patches/0014-FTBFS-fix-for-pointer-type-mismatch.patch 1970-01-01 01:00:00.000000000 +0100 +++ jxrlib-1.2~git20170615.f752187/debian/patches/0014-FTBFS-fix-for-pointer-type-mismatch.patch 2024-08-17 09:00:32.000000000 +0200 @@ -0,0 +1,88 @@ +From: YOKOTA Hiroshi <yokota.h...@gmail.com> +Date: Thu, 25 Jul 2024 16:00:12 +0900 +Subject: FTBFS fix for pointer type mismatch + +Bug-Debian: https://bugs.debian.org/1075105 +--- + jxrencoderdecoder/JxrDecApp.c | 2 +- + jxrtestlib/JXRTest.c | 10 +++++----- + jxrtestlib/JXRTestTif.c | 4 ++-- + 3 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/jxrencoderdecoder/JxrDecApp.c b/jxrencoderdecoder/JxrDecApp.c +index 5779eb8..f07b3c4 100644 +--- a/jxrencoderdecoder/JxrDecApp.c ++++ b/jxrencoderdecoder/JxrDecApp.c +@@ -428,7 +428,7 @@ ERR WmpDecAppCreateEncoderFromExt( + Call(GetTestEncodeIID(szExt, &pIID)); + + // Create encoder +- Call(PKTestFactory_CreateCodec(pIID, ppIE)); ++ Call(PKTestFactory_CreateCodec(pIID, (void **)ppIE)); + + Cleanup: + return err; +diff --git a/jxrtestlib/JXRTest.c b/jxrtestlib/JXRTest.c +index b2a9b64..790b0de 100644 +--- a/jxrtestlib/JXRTest.c ++++ b/jxrtestlib/JXRTest.c +@@ -198,7 +198,7 @@ ERR PKTestFactory_CreateDecoderFromFile(const char* szFilename, PKImageDecode** + 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(const char* szFilename, PKImageDecode** + 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** ppCFactory, U32 uVersion) + + 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 --git a/jxrtestlib/JXRTestTif.c b/jxrtestlib/JXRTestTif.c +index 39f619d..bbe5626 100644 +--- a/jxrtestlib/JXRTestTif.c ++++ b/jxrtestlib/JXRTestTif.c +@@ -909,8 +909,8 @@ ERR PKImageDecode_Release_TIF(PKTestDecode** ppID) + + 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 -Nru jxrlib-1.2~git20170615.f752187/debian/patches/0015-FTBFS-fix-for-function-prototype-error.patch jxrlib-1.2~git20170615.f752187/debian/patches/0015-FTBFS-fix-for-function-prototype-error.patch --- jxrlib-1.2~git20170615.f752187/debian/patches/0015-FTBFS-fix-for-function-prototype-error.patch 1970-01-01 01:00:00.000000000 +0100 +++ jxrlib-1.2~git20170615.f752187/debian/patches/0015-FTBFS-fix-for-function-prototype-error.patch 2024-08-17 09:00:32.000000000 +0200 @@ -0,0 +1,21 @@ +From: YOKOTA Hiroshi <yokota.h...@gmail.com> +Date: Thu, 25 Jul 2024 16:01:01 +0900 +Subject: FTBFS fix for function prototype error + +Bug-Debian: https://bugs.debian.org/1075105 +--- + jxrgluelib/JXRGlueJxr.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/jxrgluelib/JXRGlueJxr.c b/jxrgluelib/JXRGlueJxr.c +index 1745acf..741bd97 100644 +--- a/jxrgluelib/JXRGlueJxr.c ++++ b/jxrgluelib/JXRGlueJxr.c +@@ -28,6 +28,7 @@ + //*@@@---@@@@****************************************************************** + #include <limits.h> + #include <JXRGlue.h> ++#include <wchar.h> + + + static const char szHDPhotoFormat[] = "<dc:format>image/vnd.ms-photo</dc:format>"; diff -Nru jxrlib-1.2~git20170615.f752187/debian/patches/series jxrlib-1.2~git20170615.f752187/debian/patches/series --- jxrlib-1.2~git20170615.f752187/debian/patches/series 2022-01-28 12:48:31.000000000 +0100 +++ jxrlib-1.2~git20170615.f752187/debian/patches/series 2024-08-17 08:59:40.000000000 +0200 @@ -10,3 +10,6 @@ 31df7f88539b77d46ebf408b6a215930ae63bbdd.patch a684f95783f2f81bd13bf1f8b03ceb12aa87d661.patch ab9c6b78b7ad3205bdb91ef725b09ddbe3c8945d.patch +0013-jxrlib-ftbfs-with-GCC-14.patch +0014-FTBFS-fix-for-pointer-type-mismatch.patch +0015-FTBFS-fix-for-function-prototype-error.patch
