Index: Makefile =================================================================== RCS file: /cvs/ports/games/devilutionx/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 19 Jul 2019 13:42:33 -0000 1.1.1.1 +++ Makefile 15 Sep 2019 00:20:10 -0000 @@ -1,12 +1,12 @@ # $OpenBSD: Makefile,v 1.1.1.1 2019/07/19 13:42:33 bcallah Exp $ COMMENT = open source engine recreation for Diablo 1 game -DISTNAME = devilutionx-0.4.0pl20190715 +DISTNAME = devilutionx-0.4.0pl20190914 CATEGORIES = games x11 GH_ACCOUNT = diasurgical GH_PROJECT = devilutionX -GH_COMMIT = 10ebca4efd422bbf46bad6d12ea4cdade9038b01 +GH_COMMIT = c52464d2278660cbfe6c23ea48d31d82882d205b MAINTAINER = Brian Callahan Index: distinfo =================================================================== RCS file: /cvs/ports/games/devilutionx/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 19 Jul 2019 13:42:33 -0000 1.1.1.1 +++ distinfo 15 Sep 2019 00:20:10 -0000 @@ -1,2 +1,2 @@ -SHA256 (devilutionx-0.4.0pl20190715-10ebca4e.tar.gz) = 6WOyN6WpRoYuKpe1P24YgQ8OaYEtShyt8p1R8JrZT4U= -SIZE (devilutionx-0.4.0pl20190715-10ebca4e.tar.gz) = 1350054 +SHA256 (devilutionx-0.4.0pl20190914-c52464d2.tar.gz) = M46b84l+ZUAcj44i7c4fnYpVAHPv4isUV6qUwNuAG2g= +SIZE (devilutionx-0.4.0pl20190914-c52464d2.tar.gz) = 1163991 Index: patches/patch-CMakeLists_txt =================================================================== RCS file: /cvs/ports/games/devilutionx/patches/patch-CMakeLists_txt,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-CMakeLists_txt --- patches/patch-CMakeLists_txt 19 Jul 2019 13:42:33 -0000 1.1.1.1 +++ patches/patch-CMakeLists_txt 15 Sep 2019 00:20:10 -0000 @@ -14,7 +14,7 @@ Index: CMakeLists.txt set(ASAN OFF) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate") endif() -@@ -289,7 +289,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") +@@ -280,7 +280,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") # Silence warnings about __int64 alignment hack not always being applicable target_compile_options(devilutionx PRIVATE -Wno-ignored-attributes) # Fix: error: cast from pointer to smaller type 'unsigned char' loses information Index: patches/patch-SourceS_miniwin_h =================================================================== RCS file: /cvs/ports/games/devilutionx/patches/patch-SourceS_miniwin_h,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-SourceS_miniwin_h --- patches/patch-SourceS_miniwin_h 19 Jul 2019 13:42:33 -0000 1.1.1.1 +++ patches/patch-SourceS_miniwin_h 15 Sep 2019 00:20:10 -0000 @@ -14,8 +14,12 @@ Index: SourceS/miniwin.h #include "macos_stdarg.h" #else #include -@@ -17,6 +17,10 @@ - #if !defined(_MSC_VER) && defined(DEVILUTION_ENGINE) +@@ -15,9 +15,13 @@ + #include + // For _rotr() + // _rotl and _rotr are predeclared in Clang. +-#if !defined(_MSC_VER) && !defined(__clang__) && defined(DEVILUTION_ENGINE) ++#if !defined(_MSC_VER) && defined(DEVILUTION_ENGINE) #if defined(__x86_64__) || defined(__i386__) #include +#if defined(__clang__) Index: patches/patch-Source_engine_cpp =================================================================== RCS file: /cvs/ports/games/devilutionx/patches/patch-Source_engine_cpp,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Source_engine_cpp --- patches/patch-Source_engine_cpp 19 Jul 2019 13:42:33 -0000 1.1.1.1 +++ patches/patch-Source_engine_cpp 15 Sep 2019 00:20:10 -0000 @@ -5,7 +5,7 @@ clang Index: Source/engine.cpp --- Source/engine.cpp.orig +++ Source/engine.cpp -@@ -517,14 +517,14 @@ void CelDecDatLightTrans(BYTE *pDecodeTo, BYTE *pRLEBy +@@ -264,14 +264,14 @@ void CelDecDatLightTrans(BYTE *pDecodeTo, BYTE *pRLEBy dst = pDecodeTo; tbl = &pLightTbl[light_table_index * 256]; w = nWidth; @@ -22,7 +22,7 @@ Index: Source/engine.cpp if (!(width & 1)) { goto L_ODD; } else { -@@ -1301,7 +1301,7 @@ void Cel2DecDatLightTrans(BYTE *pDecodeTo, BYTE *pRLEB +@@ -733,7 +733,7 @@ void Cel2DecDatLightTrans(BYTE *pDecodeTo, BYTE *pRLEB dst = pDecodeTo; tbl = &pLightTbl[light_table_index * 256]; w = nWidth; @@ -31,7 +31,7 @@ Index: Source/engine.cpp for (; src != &pRLEBytes[nDataSize]; dst -= BUFFER_WIDTH + w, shift = (shift + 1) & 1) { for (i = w; i;) { -@@ -1309,7 +1309,7 @@ void Cel2DecDatLightTrans(BYTE *pDecodeTo, BYTE *pRLEB +@@ -741,7 +741,7 @@ void Cel2DecDatLightTrans(BYTE *pDecodeTo, BYTE *pRLEB if (!(width & 0x80)) { i -= width; if (dst < gpBufEnd) { Index: patches/patch-Source_fault_cpp =================================================================== RCS file: patches/patch-Source_fault_cpp diff -N patches/patch-Source_fault_cpp --- patches/patch-Source_fault_cpp 19 Jul 2019 13:42:33 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,25 +0,0 @@ -$OpenBSD: patch-Source_fault_cpp,v 1.1.1.1 2019/07/19 13:42:33 bcallah Exp $ - -clang - -Index: Source/fault.cpp ---- Source/fault.cpp.orig -+++ Source/fault.cpp -@@ -153,7 +153,7 @@ void fault_unknown_module(LPCVOID lpAddress, LPSTR lpM - if (dosHeader && dosHeader->e_magic == IMAGE_DOS_SIGNATURE) { - ntOffset = dosHeader->e_lfanew; - if (ntOffset) { -- ntHeader = (PIMAGE_NT_HEADERS)((DWORD)dosHeader + ntOffset); -+ ntHeader = (PIMAGE_NT_HEADERS)((uintptr_t)dosHeader + ntOffset); - if (ntHeader->Signature == IMAGE_NT_SIGNATURE) { - section = IMAGE_FIRST_SECTION(ntHeader); - numSections = ntHeader->FileHeader.NumberOfSections; -@@ -193,7 +193,7 @@ void fault_call_stack(void *instr, STACK_FRAME *stackF - oldStackFrame = stackFrame; - stackFrame = stackFrame->pNext; - -- if ((DWORD)stackFrame % 4 != 0) -+ if ((uintptr_t)stackFrame % 4 != 0) - break; - } while (stackFrame > oldStackFrame && !IsBadWritePtr(stackFrame, 8)); - Index: patches/patch-Source_init_cpp =================================================================== RCS file: /cvs/ports/games/devilutionx/patches/patch-Source_init_cpp,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Source_init_cpp --- patches/patch-Source_init_cpp 19 Jul 2019 13:42:33 -0000 1.1.1.1 +++ patches/patch-Source_init_cpp 15 Sep 2019 00:20:10 -0000 @@ -3,12 +3,12 @@ $OpenBSD: patch-Source_init_cpp,v 1.1.1. Index: Source/init.cpp --- Source/init.cpp.orig +++ Source/init.cpp -@@ -119,7 +119,7 @@ void init_disable_screensaver(BOOLEAN disable) +@@ -60,7 +60,7 @@ void init_disable_screensaver(BOOLEAN disable) // BUGFIX: this is probably the worst possible way to do this. Alternatives: ExtEscape() with SETPOWERMANAGEMENT, // SystemParametersInfo() with SPI_SETSCREENSAVEACTIVE/SPI_SETPOWEROFFACTIVE/SPI_SETLOWPOWERACTIVE -- if (!RegOpenKeyEx(HKEY_CURRENT_USER, "Control Panel\\Desktop", 0, KEY_READ | KEY_WRITE, (PHKEY)&phkResult)) { -+ if (!RegOpenKeyEx(HKEY_CURRENT_USER, "Control Panel\\Desktop", 0, KEY_READ | KEY_WRITE, (uintptr_t)&phkResult)) { - if (disable) { - cbData = 16; - if (!RegQueryValueEx(phkResult, "ScreenSaveActive", 0, &Type, (LPBYTE)Data, &cbData)) +- success = RegOpenKeyEx(HKEY_CURRENT_USER, "Control Panel\\Desktop", 0, KEY_READ | KEY_WRITE, (PHKEY)&phkResult); ++ success = RegOpenKeyEx(HKEY_CURRENT_USER, "Control Panel\\Desktop", 0, KEY_READ | KEY_WRITE, (uintptr_t)&phkResult); + if (success != ERROR_SUCCESS) { + return; + } Index: patches/patch-Source_render_cpp =================================================================== RCS file: patches/patch-Source_render_cpp diff -N patches/patch-Source_render_cpp --- patches/patch-Source_render_cpp 19 Jul 2019 13:42:33 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,313 +0,0 @@ -$OpenBSD: patch-Source_render_cpp,v 1.1.1.1 2019/07/19 13:42:33 bcallah Exp $ - -clang - -Index: Source/render.cpp ---- Source/render.cpp.orig -+++ Source/render.cpp -@@ -164,7 +164,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff) - } while (i); - break; - case 1: // upper (top transparent), with lighting -- WorldBoolFlag = (unsigned char)pBuff & 1; -+ WorldBoolFlag = (uintptr_t)pBuff & 1; - xx_32 = 32; - do { - yy_32 = 32; -@@ -181,7 +181,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff) - } - if (dst < gpBufEnd) - return; -- if (((unsigned char)dst & 1) == WorldBoolFlag) { -+ if (((uintptr_t)dst & 1) == WorldBoolFlag) { - asm_trans_light_cel_0_2(width, tbl, &dst, &src); - } else { - asm_trans_light_cel_1_3(width, tbl, &dst, &src); -@@ -238,7 +238,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff) - } else { - asm_trans_light_cel_1_3(32 - xx_32, tbl, &dst, &src); - } -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - if (xx_32 < 0) { -@@ -252,7 +252,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff) - } else { - asm_trans_light_cel_1_3(32 - yy_32, tbl, &dst, &src); - } -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[yy_32 - 800]; - yy_32 += 2; - } while (yy_32 != 32); -@@ -301,7 +301,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff) - } else { - asm_trans_light_cel_1_3(32 - xx_32, tbl, &dst, &src); - } -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - if (xx_32 < 0) { -@@ -359,7 +359,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff) - } while (i); - break; - case 9: // upper (top transparent), without lighting -- WorldBoolFlag = (unsigned char)pBuff & 1; -+ WorldBoolFlag = (uintptr_t)pBuff & 1; - yy_32 = 32; - LABEL_251: - xx_32 = 32; -@@ -383,7 +383,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff) - xx_32 -= width; - if (dst < gpBufEnd) - return; -- if (((unsigned char)dst & 1) == WorldBoolFlag) { -+ if (((uintptr_t)dst & 1) == WorldBoolFlag) { - chk_sh_and = width >> 1; - if (!(width & 1)) - goto LABEL_258; -@@ -775,7 +775,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff) - } while (i); - break; - case 1: // upper (top transparent), black -- WorldBoolFlag = (unsigned char)pBuff & 1; -+ WorldBoolFlag = (uintptr_t)pBuff & 1; - xx_32 = 32; - while (1) { - yy_32 = 32; -@@ -788,7 +788,7 @@ void drawTopArchesUpperScreen(BYTE *pBuff) - if (dst < gpBufEnd) - return; - src += width; -- if (((unsigned char)dst & 1) == WorldBoolFlag) { -+ if (((uintptr_t)dst & 1) == WorldBoolFlag) { - chk_sh_and = width >> 1; - if (!(width & 1)) - goto LABEL_378; -@@ -1386,7 +1386,7 @@ void drawBottomArchesUpperScreen(BYTE *pBuff, unsigned - ++dst; - --i; - } while (i); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst -= 800; - --gpDrawMask; - --yy_32; -@@ -1471,7 +1471,7 @@ void drawBottomArchesUpperScreen(BYTE *pBuff, unsigned - xx_32 = 30; - while (dst >= gpBufEnd) { - asm_cel_light_edge(32 - xx_32, tbl, &dst, &src); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - if (xx_32 < 0) { -@@ -1480,7 +1480,7 @@ void drawBottomArchesUpperScreen(BYTE *pBuff, unsigned - if (dst < gpBufEnd) - break; - asm_cel_light_edge(32 - yy_32, tbl, &dst, &src); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[yy_32 - 800]; - yy_32 += 2; - } while (yy_32 != 32); -@@ -1502,7 +1502,7 @@ void drawBottomArchesUpperScreen(BYTE *pBuff, unsigned - do { - if (dst < gpBufEnd) - break; -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - asm_trans_light_mask(32, tbl, &dst, &src, *gpDrawMask); - dst -= 800; - --gpDrawMask; -@@ -1516,7 +1516,7 @@ void drawBottomArchesUpperScreen(BYTE *pBuff, unsigned - xx_32 = 30; - while (dst >= gpBufEnd) { - asm_cel_light_edge(32 - xx_32, tbl, &dst, &src); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - if (xx_32 < 0) { -@@ -1526,7 +1526,7 @@ void drawBottomArchesUpperScreen(BYTE *pBuff, unsigned - if (dst < gpBufEnd) - break; - asm_trans_light_mask(32, tbl, &dst, &src, *gpDrawMask); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst -= 800; - --gpDrawMask; - --yy_32; -@@ -2107,7 +2107,7 @@ void drawUpperScreen(BYTE *pBuff) - xx_32 = 30; - while (dst >= gpBufEnd) { - asm_cel_light_edge(32 - xx_32, tbl, &dst, &src); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - if (xx_32 < 0) { -@@ -2116,7 +2116,7 @@ void drawUpperScreen(BYTE *pBuff) - if (dst < gpBufEnd) - break; - asm_cel_light_edge(32 - yy_32, tbl, &dst, &src); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[yy_32 - 800]; - yy_32 += 2; - } while (yy_32 != 32); -@@ -2149,7 +2149,7 @@ void drawUpperScreen(BYTE *pBuff) - xx_32 = 30; - while (dst >= gpBufEnd) { - asm_cel_light_edge(32 - xx_32, tbl, &dst, &src); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - if (xx_32 < 0) { -@@ -2465,7 +2465,7 @@ void drawTopArchesLowerScreen(BYTE *pBuff) - } while (i); - break; - case 1: // lower (top transparent), black -- WorldBoolFlag = (unsigned char)pBuff & 1; -+ WorldBoolFlag = (uintptr_t)pBuff & 1; - xx_32 = 32; - LABEL_412: - yy_32 = 32; -@@ -2489,7 +2489,7 @@ void drawTopArchesLowerScreen(BYTE *pBuff) - yy_32 -= width; - if (dst < gpBufEnd) { - src += width; -- if (((unsigned char)dst & 1) == WorldBoolFlag) { -+ if (((uintptr_t)dst & 1) == WorldBoolFlag) { - chk_sh_and = width >> 1; - if (!(width & 1)) - goto LABEL_420; -@@ -2895,7 +2895,7 @@ void drawTopArchesLowerScreen(BYTE *pBuff) - } while (i); - break; - case 1: // lower (top transparent), with lighting -- WorldBoolFlag = (unsigned char)pBuff & 1; -+ WorldBoolFlag = (uintptr_t)pBuff & 1; - xx_32 = 32; - do { - yy_32 = 32; -@@ -2912,7 +2912,7 @@ void drawTopArchesLowerScreen(BYTE *pBuff) - } - yy_32 -= width; - if (dst < gpBufEnd) { -- if (((unsigned char)dst & 1) == WorldBoolFlag) { -+ if (((uintptr_t)dst & 1) == WorldBoolFlag) { - asm_trans_light_cel_0_2(width, tbl, &dst, &src); - } else { - asm_trans_light_cel_1_3(width, tbl, &dst, &src); -@@ -3011,7 +3011,7 @@ void drawTopArchesLowerScreen(BYTE *pBuff) - } else { - asm_trans_light_cel_1_3(32 - yy_32, tbl, &dst, &src); - } -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[yy_32 - 800]; - yy_32 += 2; - } while (yy_32 != 32); -@@ -3031,7 +3031,7 @@ void drawTopArchesLowerScreen(BYTE *pBuff) - } else { - asm_trans_light_cel_1_3(32 - xx_32, tbl, &dst, &src); - } -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - } while (xx_32 >= 0); -@@ -3128,7 +3128,7 @@ void drawTopArchesLowerScreen(BYTE *pBuff) - } else { - asm_trans_light_cel_1_3(32 - xx_32, tbl, &dst, &src); - } -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - } while (xx_32 >= 0); -@@ -3175,7 +3175,7 @@ LABEL_11: - } while (i); - break; - case 9: // lower (top transparent), without lighting -- WorldBoolFlag = (unsigned char)pBuff & 1; -+ WorldBoolFlag = (uintptr_t)pBuff & 1; - xx_32 = 32; - while (1) { - yy_32 = 32; -@@ -3186,7 +3186,7 @@ LABEL_11: - break; - yy_32 -= width; - if (dst < gpBufEnd) { -- if (((unsigned char)dst & 1) == WorldBoolFlag) { -+ if (((uintptr_t)dst & 1) == WorldBoolFlag) { - chk_sh_and = width >> 1; - if (!(width & 1)) - goto LABEL_280; -@@ -4042,7 +4042,7 @@ void drawBottomArchesLowerScreen(BYTE *pBuff, unsigned - } - do { - asm_cel_light_edge(32 - xx_32, tbl, &dst, &src); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - } while (xx_32 >= 0); -@@ -4096,7 +4096,7 @@ void drawBottomArchesLowerScreen(BYTE *pBuff, unsigned - do { - if (dst < gpBufEnd) { - asm_trans_light_mask(32, tbl, &dst, &src, *gpDrawMask); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - } else { - src += 32; - dst += 32; -@@ -4114,7 +4114,7 @@ void drawBottomArchesLowerScreen(BYTE *pBuff, unsigned - } - do { - asm_cel_light_edge(32 - xx_32, tbl, &dst, &src); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - } while (xx_32 >= 0); -@@ -4396,7 +4396,7 @@ void drawBottomArchesLowerScreen(BYTE *pBuff, unsigned - ++dst; - --i; - } while (i); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - } else { - src += 32; - dst += 32; -@@ -4821,7 +4821,7 @@ void drawLowerScreen(BYTE *pBuff) - } - do { - asm_cel_light_edge(32 - yy_32, tbl, &dst, &src); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[yy_32 - 800]; - yy_32 += 2; - } while (yy_32 != 32); -@@ -4834,7 +4834,7 @@ void drawLowerScreen(BYTE *pBuff) - } - do { - asm_cel_light_edge(32 - xx_32, tbl, &dst, &src); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - } while (xx_32 >= 0); -@@ -4901,7 +4901,7 @@ void drawLowerScreen(BYTE *pBuff) - } - do { - asm_cel_light_edge(32 - xx_32, tbl, &dst, &src); -- src += (unsigned char)src & 2; -+ src += (uintptr_t)src & 2; - dst = &dst[xx_32 - 800]; - xx_32 -= 2; - } while (xx_32 >= 0); Index: patches/patch-defs_h =================================================================== RCS file: /cvs/ports/games/devilutionx/patches/patch-defs_h,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-defs_h --- patches/patch-defs_h 19 Jul 2019 13:42:33 -0000 1.1.1.1 +++ patches/patch-defs_h 15 Sep 2019 00:20:10 -0000 @@ -3,7 +3,7 @@ $OpenBSD: patch-defs_h,v 1.1.1.1 2019/07 Index: defs.h --- defs.h.orig +++ defs.h -@@ -151,7 +151,7 @@ +@@ -163,7 +163,7 @@ // Typedef for the function pointer typedef void (*_PVFV)(void);