Date: Tue, 30 Jan 2024 18:16:45 GMT From: Jung-uk Kim <jkim@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: f37ba91418f4 - main - sysutils/acpica-tools: Update to 20230331 Message-ID: <202401301816.40UIGjMe001891@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jkim: URL: https://cgit.FreeBSD.org/ports/commit/?id=f37ba91418f45c6b32fa3ee726bfecf268dfa074 commit f37ba91418f45c6b32fa3ee726bfecf268dfa074 Author: Jung-uk Kim <jkim@FreeBSD.org> AuthorDate: 2024-01-30 18:14:40 +0000 Commit: Jung-uk Kim <jkim@FreeBSD.org> CommitDate: 2024-01-30 18:14:40 +0000 sysutils/acpica-tools: Update to 20230331 --- sysutils/acpica-tools/Makefile | 6 +- sysutils/acpica-tools/distinfo | 6 +- .../files/patch-source_common_dmextern.c | 24 ------- .../files/patch-source_compiler_aslrestype2s.c | 74 ---------------------- .../files/patch-source_tools_acpisrc_asconvrt.c | 35 ---------- 5 files changed, 6 insertions(+), 139 deletions(-) diff --git a/sysutils/acpica-tools/Makefile b/sysutils/acpica-tools/Makefile index 04987afc25f1..d4fec81958ee 100644 --- a/sysutils/acpica-tools/Makefile +++ b/sysutils/acpica-tools/Makefile @@ -1,14 +1,14 @@ PORTNAME= acpica -PORTVERSION= 20221020 +PORTVERSION= 20230331 CATEGORIES= sysutils devel -MASTER_SITES= https://acpica.org/sites/acpica/files/ \ +MASTER_SITES= https://downloadmirror.intel.com/776304/ \ LOCAL/jkim PKGNAMESUFFIX= -tools DISTNAME= ${PORTNAME}-unix-${PORTVERSION} MAINTAINER= jkim@FreeBSD.org COMMENT= Tools from the ACPI Component Architecture (ACPICA) project -WWW= https://acpica.org +WWW= https://www.intel.com/content/www/us/en/developer/topic-technology/open/acpica/overview.html LICENSE= BSD3CLAUSE GPLv2 LICENSE_COMB= dual diff --git a/sysutils/acpica-tools/distinfo b/sysutils/acpica-tools/distinfo index d040dde73c4a..e47a5ad2f97a 100644 --- a/sysutils/acpica-tools/distinfo +++ b/sysutils/acpica-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1666901847 -SHA256 (acpica-unix-20221020.tar.gz) = 33a2e394aca0ca57d4018afe3da340dfad5eb45b1b9300e81dd595fda07cf1c5 -SIZE (acpica-unix-20221020.tar.gz) = 1920483 +TIMESTAMP = 1706638401 +SHA256 (acpica-unix-20230331.tar.gz) = 0c5d695d605aaa61709f3c63f57a1a99b8902291723998446b0813b57ac310e2 +SIZE (acpica-unix-20230331.tar.gz) = 1942586 diff --git a/sysutils/acpica-tools/files/patch-source_common_dmextern.c b/sysutils/acpica-tools/files/patch-source_common_dmextern.c deleted file mode 100644 index 78aeb7569fd1..000000000000 --- a/sysutils/acpica-tools/files/patch-source_common_dmextern.c +++ /dev/null @@ -1,24 +0,0 @@ ---- source/common/dmextern.c.orig 2022-10-20 21:12:58 UTC -+++ source/common/dmextern.c -@@ -1493,7 +1493,6 @@ AcpiDmMarkExternalConflict ( - ACPI_EXTERNAL_LIST *ExternalList = AcpiGbl_ExternalList; - char *ExternalPath; - char *InternalPath; -- char *Temp; - ACPI_STATUS Status; - - -@@ -1526,13 +1525,6 @@ AcpiDmMarkExternalConflict ( - - while (ExternalList) - { -- Temp = ExternalList->InternalPath; -- if ((*ExternalList->InternalPath == AML_ROOT_PREFIX) && -- (ExternalList->InternalPath[1])) -- { -- Temp++; -- } -- - if (!strcmp (ExternalList->InternalPath, InternalPath)) - { - ExternalList->Flags |= ACPI_EXT_CONFLICTING_DECLARATION; diff --git a/sysutils/acpica-tools/files/patch-source_compiler_aslrestype2s.c b/sysutils/acpica-tools/files/patch-source_compiler_aslrestype2s.c deleted file mode 100644 index 352b930d4e07..000000000000 --- a/sysutils/acpica-tools/files/patch-source_compiler_aslrestype2s.c +++ /dev/null @@ -1,74 +0,0 @@ ---- source/compiler/aslrestype2s.c.orig 2022-10-20 21:12:58 UTC -+++ source/compiler/aslrestype2s.c -@@ -1550,7 +1550,6 @@ RsDoPinFunctionDescriptor ( - UINT16 PinListLength; - UINT16 DescriptorSize; - UINT32 CurrentByteOffset; -- UINT32 PinCount = 0; - UINT32 i; - - InitializerOp = Info->DescriptorTypeOp->Asl.Child; -@@ -1668,15 +1667,10 @@ RsDoPinFunctionDescriptor ( - default: - /* - * PINs come through here, repeatedly. Each PIN must be a WORD. -- * NOTE: there is no "length" field for this, so from ACPI spec: -- * The number of pins in the table can be calculated from: -- * PinCount = (Resource Source Name Offset - Pin Table Offset) / 2 -- * (implies resource source must immediately follow the pin list.) - * Name: _PIN - */ - *PinList = (UINT16) InitializerOp->Asl.Value.Integer; - PinList++; -- PinCount++; - - /* Case 8: First pin number in list */ - -@@ -1736,7 +1730,6 @@ RsDoPinConfigDescriptor ( - UINT16 PinListLength; - UINT16 DescriptorSize; - UINT32 CurrentByteOffset; -- UINT32 PinCount = 0; - UINT32 i; - - InitializerOp = Info->DescriptorTypeOp->Asl.Child; -@@ -1868,15 +1861,10 @@ RsDoPinConfigDescriptor ( - default: - /* - * PINs come through here, repeatedly. Each PIN must be a WORD. -- * NOTE: there is no "length" field for this, so from ACPI spec: -- * The number of pins in the table can be calculated from: -- * PinCount = (Resource Source Name Offset - Pin Table Offset) / 2 -- * (implies resource source must immediately follow the pin list.) - * Name: _PIN - */ - *PinList = (UINT16) InitializerOp->Asl.Value.Integer; - PinList++; -- PinCount++; - - /* Case 8: First pin number in list */ - -@@ -1936,7 +1924,6 @@ RsDoPinGroupDescriptor ( - UINT16 PinListLength; - UINT16 DescriptorSize; - UINT32 CurrentByteOffset; -- UINT32 PinCount = 0; - UINT32 i; - - InitializerOp = Info->DescriptorTypeOp->Asl.Child; -@@ -2022,15 +2009,10 @@ RsDoPinGroupDescriptor ( - default: - /* - * PINs come through here, repeatedly. Each PIN must be a WORD. -- * NOTE: there is no "length" field for this, so from ACPI spec: -- * The number of pins in the table can be calculated from: -- * PinCount = (Resource Source Name Offset - Pin Table Offset) / 2 -- * (implies resource source must immediately follow the pin list.) - * Name: _PIN - */ - *PinList = (UINT16) InitializerOp->Asl.Value.Integer; - PinList++; -- PinCount++; - - /* Case 3: First pin number in list */ - diff --git a/sysutils/acpica-tools/files/patch-source_tools_acpisrc_asconvrt.c b/sysutils/acpica-tools/files/patch-source_tools_acpisrc_asconvrt.c deleted file mode 100644 index fb4420e741bf..000000000000 --- a/sysutils/acpica-tools/files/patch-source_tools_acpisrc_asconvrt.c +++ /dev/null @@ -1,35 +0,0 @@ ---- source/tools/acpisrc/asconvrt.c.orig 2022-10-20 21:13:02 UTC -+++ source/tools/acpisrc/asconvrt.c -@@ -1230,7 +1230,6 @@ AsTabify8 ( - char *NewSubBuffer; - char *CommentEnd = NULL; - UINT32 SpaceCount = 0; -- UINT32 Column = 0; - UINT32 TabCount = 0; - UINT32 LastLineTabCount = 0; - UINT32 LastLineColumnStart = 0; -@@ -1246,7 +1245,6 @@ AsTabify8 ( - /* This is a standalone blank line */ - - FirstNonBlank = NULL; -- Column = 0; - SpaceCount = 0; - TabCount = 0; - SubBuffer++; -@@ -1285,8 +1283,6 @@ AsTabify8 ( - } - } - -- Column++; -- - /* Check if we are in a comment */ - - if ((SubBuffer[0] == '*') && -@@ -1379,7 +1375,6 @@ AsTabify8 ( - - FirstNonBlank = NULL; - LastLineColumnStart = ThisColumnStart; -- Column = 0; - SpaceCount = 0; - } - else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401301816.40UIGjMe001891>