Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[devil] Patch out deprecated use of 'register' in cpp17 (#36665)

This commit is contained in:
Frank 2024-03-14 00:30:48 +00:00 committed by GitHub
parent 4d61c5bb8a
commit 7f9f0e44db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ports/devil/0007-remove_register_keyword_cpp17.patch Normal file
View File

@ -0,0 +1,30 @@
diff --git a/DevIL/src-IL/src/il_manip.cpp b/DevIL/src-IL/src/il_manip.cpp
index 79acc99..229a692 100644
--- a/DevIL/src-IL/src/il_manip.cpp
+++ b/DevIL/src-IL/src/il_manip.cpp
@@ -37,9 +37,9 @@ ILushort ILAPIENTRY ilFloatToHalf(ILuint i) {
// of float and half (127 versus 15).
//
- register int s = (i >> 16) & 0x00008000;
- register int e = ((i >> 23) & 0x000000ff) - (127 - 15);
- register int m = i & 0x007fffff;
+ int s = (i >> 16) & 0x00008000;
+ int e = ((i >> 23) & 0x000000ff) - (127 - 15);
+ int m = i & 0x007fffff;
//
// Now reassemble s, e and m into a half:
diff --git a/DevIL/src-ILU/src/ilu_scaling.cpp b/DevIL/src-ILU/src/ilu_scaling.cpp
index c2893a3..ef35c13 100644
--- a/DevIL/src-ILU/src/ilu_scaling.cpp
+++ b/DevIL/src-ILU/src/ilu_scaling.cpp
@@ -406,7 +406,7 @@ main(argc, argv)
int argc;
char *argv[];
{
- register int c;
+ int c;
int optind;
char *optarg;
int xsize = 0, ysize = 0;

1
ports/devil/portfile.cmake
View File

@ -13,6 +13,7 @@ vcpkg_from_github(
0005-fix-pkgconfig.patch
0006-fix-ilut-header.patch
jasper-4.patch
0007-remove_register_keyword_cpp17.patch
)
file(REMOVE "${SOURCE_PATH}/DevIL/src-IL/cmake/FindOpenEXR.cmake")

2
ports/devil/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "devil",
"version": "1.8.0",
"port-version": 11,
"port-version": 12,
"description": "A full featured cross-platform image library",
"homepage": "https://github.com/DentonW/DevIL",
"supports": "!uwp",

2
versions/baseline.json
View File

@ -2198,7 +2198,7 @@
},
"devil": {
"baseline": "1.8.0",
"port-version": 11
"port-version": 12
},
"dimcli": {
"baseline": "7.2.0",

5
versions/d-/devil.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1e22a47b75583772a690e6e361fcbb3739838282",
"version": "1.8.0",
"port-version": 12
},
{
"git-tree": "03010167ad1849c5f1a8e5bc044115b3c84478a3",
"version": "1.8.0",