git: 93f1d97256b7 - main - graphics/freeimage: fix endianness issues better
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 13 Sep 2022 17:14:23 UTC
The branch main has been updated by pkubaj:
URL: https://cgit.FreeBSD.org/ports/commit/?id=93f1d97256b70d753929ef0ada17ffec64a373f5
commit 93f1d97256b70d753929ef0ada17ffec64a373f5
Author: Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-09-13 17:04:36 +0000
Commit: Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-09-13 17:04:36 +0000
graphics/freeimage: fix endianness issues better
---
graphics/freeimage/Makefile | 2 +-
graphics/freeimage/files/patch-Source_FreeImage_PluginDDS.cpp | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/graphics/freeimage/Makefile b/graphics/freeimage/Makefile
index 48ffe704b95b..04ac430f0d73 100644
--- a/graphics/freeimage/Makefile
+++ b/graphics/freeimage/Makefile
@@ -1,6 +1,6 @@
PORTNAME= freeimage
PORTVERSION= 3.18.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Source%20Distribution/${PORTVERSION}
DISTNAME= FreeImage${PORTVERSION:S/.//g}
diff --git a/graphics/freeimage/files/patch-Source_FreeImage_PluginDDS.cpp b/graphics/freeimage/files/patch-Source_FreeImage_PluginDDS.cpp
index 874045df1529..8f80affd8f0c 100644
--- a/graphics/freeimage/files/patch-Source_FreeImage_PluginDDS.cpp
+++ b/graphics/freeimage/files/patch-Source_FreeImage_PluginDDS.cpp
@@ -1,6 +1,6 @@
--- Source/FreeImage/PluginDDS.cpp.orig 2018-11-18 16:17:59 UTC
+++ Source/FreeImage/PluginDDS.cpp
-@@ -356,14 +356,6 @@ SwapHeader(DDSHEADER *header) {
+@@ -356,14 +356,14 @@ SwapHeader(DDSHEADER *header) {
for(int i=0; i<11; i++) {
SwapLong(&header->surfaceDesc.dwReserved1[i]);
}
@@ -12,6 +12,14 @@
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwGBitMask);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwBBitMask);
- SwapLong(&header->surfaceDesc.ddpfPixelFormat.dwRGBAlphaBitMask);
++ SwapLong(&header->surfaceDesc.ddspf.dwSize);
++ SwapLong(&header->surfaceDesc.ddspf.dwFlags);
++ SwapLong(&header->surfaceDesc.ddspf.dwFourCC);
++ SwapLong(&header->surfaceDesc.ddspf.dwRGBBitCount);
++ SwapLong(&header->surfaceDesc.ddspf.dwRBitMask);
++ SwapLong(&header->surfaceDesc.ddspf.dwGBitMask);
++ SwapLong(&header->surfaceDesc.ddspf.dwBBitMask);
++ SwapLong(&header->surfaceDesc.ddspf.dwRGBAlphaBitMask);
SwapLong(&header->surfaceDesc.ddsCaps.dwCaps1);
SwapLong(&header->surfaceDesc.ddsCaps.dwCaps2);
SwapLong(&header->surfaceDesc.ddsCaps.dwReserved[0]);