From nobody Tue Sep 13 17:14:23 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MRqnq6Cz9z4bvPs; Tue, 13 Sep 2022 17:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MRqnq5n31z3MGD; Tue, 13 Sep 2022 17:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663089263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8mzdRaq11to3Zdf9iz60ggt2Xe2KdC6/N3fdnYjNCH0=; b=p5+QGGBOchwzeyZFOFsX5I7JY6J3QVWgFCVjCdT1cNC6Cgj8pagx3htZMAZQlFPg44jr+x vVc6ybeik3hRs6k4DcrX8ebF4m2o70YHbKj8oGTA43XrX9iktqDJqj2oYnkCWvllFX7v4v 02QaTTGUDaPabVU131dMbzAYA0QClf6NV/nimVqoja14ZUE2xHeX8/P3IVB2bW1epGpbrQ SA+d/BF3/WvCiG7NKzUtvle+GviBrSTt78MmolHa+QL0d7mSvbW+U60gXqKFJ121JGPojG wS9v6Io8KKoR9eqV+VEJgSisv0aG3+68YuYpE/QqonqVk3cYOd15s+2CfZJAYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MRqnq4sjyzPPh; Tue, 13 Sep 2022 17:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28DHENL0023835; Tue, 13 Sep 2022 17:14:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28DHENnq023834; Tue, 13 Sep 2022 17:14:23 GMT (envelope-from git) Date: Tue, 13 Sep 2022 17:14:23 GMT Message-Id: <202209131714.28DHENnq023834@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 93f1d97256b7 - main - graphics/freeimage: fix endianness issues better List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93f1d97256b70d753929ef0ada17ffec64a373f5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663089263; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8mzdRaq11to3Zdf9iz60ggt2Xe2KdC6/N3fdnYjNCH0=; b=RIdhHWh8gf4inCrMJHNoY1IKdlOApC0OrKSOg6TStuQSxi0kIEW7NtdKRmhdrdGJYwW4Si HpUi+RAErjypBnPL5OT3jmRaTP1q533bh2MixPYowqCcDQNOfq+yE/U7mJcJaueLmJd/ba zboZT7WtZ/fOQH5ek8IT59QKfBG3z3xreT2+RXsQXewdybsBMLQCV5PGQdYD8vd9IoQ8wQ 5/BeU+SEzo7kCAzyV/RZ3v302+axACKJw9Q2yHTITy2Kb1yPf3xDKqlERcWL9jKohJaxVs Xgv/lZGvnZsMqtiNgAZhoXnz0Cw/NOmXt1BIOvEERVT4n1m77BLLNZR/y57bcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663089263; a=rsa-sha256; cv=none; b=ey+ibxcafnF+m95Jh0kuyPZPLUzJ7TsxsNy0BWrDP/eTjYScVG45oTsG1B44fKFAEY7KLI 0A36QtZ3TQsKHzHALR6dfVEDCkOzyFmuH1zdyhcN0vRi3psuzuhQP15/R1lyyrlC1IwVJx XOk7iPdB8xeXzI7EMmo51xotVVE1Z81V0/dgW7O8ez9usHgNCTdbXRIYuPIvifzhwUCLy+ RTMrLhM2b35HQL+N6iBUQ7v8qap7zIKoM7+m84y8Uk+u5QX11zKPqojcFUp3+6sJDxkkvf yxcL4fgVptbrcjcdPlFsDBHek7Tj+KMwZNSiKgMIRAlFrzE0NpK3KaJ/edGS0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=93f1d97256b70d753929ef0ada17ffec64a373f5 commit 93f1d97256b70d753929ef0ada17ffec64a373f5 Author: Piotr Kubaj AuthorDate: 2022-09-13 17:04:36 +0000 Commit: Piotr Kubaj 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]);