Control: tags 1002610 + pending Control: tags 1040259 + patch Control: tags 1040259 + pending
Dear maintainer, I've prepared an NMU for freeimage (versioned as 3.18.0+ds2-9.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru freeimage-3.18.0+ds2/debian/changelog freeimage-3.18.0+ds2/debian/changelog --- freeimage-3.18.0+ds2/debian/changelog 2023-02-14 09:56:16.000000000 +0200 +++ freeimage-3.18.0+ds2/debian/changelog 2023-07-10 00:29:00.000000000 +0300 @@ -1,3 +1,11 @@ +freeimage (3.18.0+ds2-9.1) unstable; urgency=medium + + * Non-maintainer upload. + * Add upstream fix for FTBFS with LibRaw 0.21. (Closes: #1040259) + * Add upstream fix for compilation on big endian. (Closes: #1002610) + + -- Adrian Bunk <b...@debian.org> Mon, 10 Jul 2023 00:29:00 +0300 + freeimage (3.18.0+ds2-9) unstable; urgency=medium * Team upload. diff -Nru freeimage-3.18.0+ds2/debian/patches/Fix-big-endian.patch freeimage-3.18.0+ds2/debian/patches/Fix-big-endian.patch --- freeimage-3.18.0+ds2/debian/patches/Fix-big-endian.patch 1970-01-01 02:00:00.000000000 +0200 +++ freeimage-3.18.0+ds2/debian/patches/Fix-big-endian.patch 2023-07-10 00:29:00.000000000 +0300 @@ -0,0 +1,63 @@ +Description: Fix FTBFS on some big-endian targets +Bug-Debian: https://bugs.debian.org/1002610 +Origin: backport, https://sourceforge.net/p/freeimage/svn/1809/ + +Index: freeimage-3.18.0+ds2/Source/FreeImage/PluginBMP.cpp +=================================================================== +--- freeimage-3.18.0+ds2.orig/Source/FreeImage/PluginBMP.cpp ++++ freeimage-3.18.0+ds2/Source/FreeImage/PluginBMP.cpp +@@ -518,7 +518,7 @@ LoadWindowsBMP(FreeImageIO *io, fi_handl + io->read_proc(FreeImage_GetPalette(dib), used_colors * sizeof(RGBQUAD), 1, handle); + #if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB + RGBQUAD *pal = FreeImage_GetPalette(dib); +- for(int i = 0; i < used_colors; i++) { ++ for(unsigned i = 0; i < used_colors; i++) { + INPLACESWAP(pal[i].rgbRed, pal[i].rgbBlue); + } + #endif +@@ -1419,7 +1419,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_ + + free(buffer); + #ifdef FREEIMAGE_BIGENDIAN +- } else if (bpp == 16) { ++ } else if (dst_bpp == 16) { + int padding = dst_pitch - dst_width * sizeof(WORD); + WORD pad = 0; + WORD pixel; +@@ -1440,7 +1440,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_ + } + #endif + #if FREEIMAGE_COLORORDER == FREEIMAGE_COLORORDER_RGB +- } else if (bpp == 24) { ++ } else if (dst_bpp == 24) { + int padding = dst_pitch - dst_width * sizeof(FILE_BGR); + DWORD pad = 0; + FILE_BGR bgr; +@@ -1461,7 +1461,7 @@ Save(FreeImageIO *io, FIBITMAP *dib, fi_ + } + } + } +- } else if (bpp == 32) { ++ } else if (dst_bpp == 32) { + FILE_BGRA bgra; + for(unsigned y = 0; y < dst_height; y++) { + BYTE *line = FreeImage_GetScanLine(dib, y); +Index: freeimage-3.18.0+ds2/Source/FreeImage/PluginDDS.cpp +=================================================================== +--- freeimage-3.18.0+ds2.orig/Source/FreeImage/PluginDDS.cpp ++++ freeimage-3.18.0+ds2/Source/FreeImage/PluginDDS.cpp +@@ -356,14 +356,6 @@ SwapHeader(DDSHEADER *header) { + for(int i=0; i<11; i++) { + SwapLong(&header->surfaceDesc.dwReserved1[i]); + } +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwSize); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFlags); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwFourCC); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBBitCount); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRBitMask); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwGBitMask); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwBBitMask); +- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask); + SwapLong(&header->surfaceDesc.ddsCaps.dwCaps1); + SwapLong(&header->surfaceDesc.ddsCaps.dwCaps2); + SwapLong(&header->surfaceDesc.ddsCaps.dwReserved[0]); diff -Nru freeimage-3.18.0+ds2/debian/patches/Fix-libraw-compilation-2.patch freeimage-3.18.0+ds2/debian/patches/Fix-libraw-compilation-2.patch --- freeimage-3.18.0+ds2/debian/patches/Fix-libraw-compilation-2.patch 1970-01-01 02:00:00.000000000 +0200 +++ freeimage-3.18.0+ds2/debian/patches/Fix-libraw-compilation-2.patch 2023-07-10 00:27:16.000000000 +0300 @@ -0,0 +1,13 @@ +Index: Source/FreeImage/PluginRAW.cpp +=================================================================== +--- a/Source/FreeImage/PluginRAW.cpp (revision 1894) ++++ b/Source/FreeImage/PluginRAW.cpp (revision 1895) +@@ -701,7 +701,7 @@ + // -------------------------------------------- + + // (-s [0..N-1]) Select one raw image from input file +- RawProcessor->imgdata.params.shot_select = 0; ++ RawProcessor->imgdata.rawparams.shot_select = 0; + // (-w) Use camera white balance, if possible (otherwise, fallback to auto_wb) + RawProcessor->imgdata.params.use_camera_wb = 1; + // (-M) Use any color matrix from the camera metadata. This option only affects Olympus, Leaf, and Phase One cameras. diff -Nru freeimage-3.18.0+ds2/debian/patches/series freeimage-3.18.0+ds2/debian/patches/series --- freeimage-3.18.0+ds2/debian/patches/series 2023-02-14 09:54:06.000000000 +0200 +++ freeimage-3.18.0+ds2/debian/patches/series 2023-07-10 00:29:00.000000000 +0300 @@ -11,3 +11,5 @@ Fix_compilation_external-static.patch Fix-libraw-compilation.patch Use-system-jpeg_read_icc_profile.patch +Fix-libraw-compilation-2.patch +Fix-big-endian.patch
