Received: by mail.netbsd.org (Postfix, from userid 605) id E0A8884D75; Sat, 30 May 2020 20:47:09 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 68A1384D3C for ; Sat, 30 May 2020 20:47:09 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id 2fRd3--ntfBH for ; Sat, 30 May 2020 20:47:08 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id C5AD684D2A for ; Sat, 30 May 2020 20:47:08 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id C339CFB27; Sat, 30 May 2020 20:47:08 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1590871628238680" MIME-Version: 1.0 Date: Sat, 30 May 2020 20:47:08 +0000 From: "Joerg Sonnenberger" Subject: CVS commit: pkgsrc/games/openrct2 To: pkgsrc-changes@NetBSD.org Reply-To: joerg@netbsd.org X-Mailer: log_accum Message-Id: <20200530204708.C339CFB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1590871628238680 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: joerg Date: Sat May 30 20:47:08 UTC 2020 Modified Files: pkgsrc/games/openrct2: distinfo Added Files: pkgsrc/games/openrct2/patches: patch-src_openrct2_CMakeLists.txt patch-src_openrct2_util_Util.cpp Log Message: Don't force GCC libraries. Don't use broken AVX detection with clang. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 pkgsrc/games/openrct2/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt \ pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1590871628238680 Content-Disposition: inline Content-Length: 3975 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/games/openrct2/distinfo diff -u pkgsrc/games/openrct2/distinfo:1.1 pkgsrc/games/openrct2/distinfo:1.2 --- pkgsrc/games/openrct2/distinfo:1.1 Sun Nov 17 16:19:57 2019 +++ pkgsrc/games/openrct2/distinfo Sat May 30 20:47:08 2020 @@ -1,13 +1,15 @@ -$NetBSD: distinfo,v 1.1 2019/11/17 16:19:57 nia Exp $ +$NetBSD: distinfo,v 1.2 2020/05/30 20:47:08 joerg Exp $ SHA1 (openrct2-0.2.4.tar.gz) = 625b106d6b1eeefd5e979bf5f92b80e19e47739b RMD160 (openrct2-0.2.4.tar.gz) = f49860012f1b7ef39452d87821ca178045e768bb SHA512 (openrct2-0.2.4.tar.gz) = 956044b5fa5e55256a33f352d2d1e8a4eb6738b98dc9894807b3628b5c5c08f3229c952fbf8b33ad867771f88c6d7e17ad1a8a4e050f8f269a6152d013afce03 Size (openrct2-0.2.4.tar.gz) = 6805976 bytes SHA1 (patch-src_openrct2-ui_UiContext.Linux.cpp) = 36bd777ed772a0f18d76f699214223cc4011da6c +SHA1 (patch-src_openrct2_CMakeLists.txt) = a0553c147661396405a607f5ef62f10fc9b55f6c SHA1 (patch-src_openrct2_Version.h) = 5402d56aaedcac51d333d95c49f88472d9de7e91 SHA1 (patch-src_openrct2_core_FileStream.hpp) = b1b69a0cb86207fd0c9d25beda3a063ee232b4fe SHA1 (patch-src_openrct2_platform_Linux.cpp) = 9562e6a0314a1c37192e8715bac39e1d9fd7faba SHA1 (patch-src_openrct2_platform_Platform.Linux.cpp) = 426b2bcbb6bf59d5093cbc27ef3f638a054cf1e8 SHA1 (patch-src_openrct2_platform_Platform2.h) = 36da0bf860735b771837a949e67bcfe95380c684 SHA1 (patch-src_openrct2_platform_Posix.cpp) = 103299bf299ccc347154ebad5d8ca1b1f26a34e3 +SHA1 (patch-src_openrct2_util_Util.cpp) = 4086d3a99c24581f82f950ad87b7a0e5f94b9e40 Added files: Index: pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt diff -u /dev/null pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt:1.1 --- /dev/null Sat May 30 20:47:08 2020 +++ pkgsrc/games/openrct2/patches/patch-src_openrct2_CMakeLists.txt Sat May 30 20:47:08 2020 @@ -0,0 +1,18 @@ +$NetBSD: patch-src_openrct2_CMakeLists.txt,v 1.1 2020/05/30 20:47:08 joerg Exp $ + +--- src/openrct2/CMakeLists.txt.orig 2020-05-27 23:23:58.110984083 +0000 ++++ src/openrct2/CMakeLists.txt +@@ -143,13 +143,6 @@ if (NOT MINGW AND NOT MSVC) + endif () + endif () + +-if (NOT APPLE AND NOT MINGW AND NOT MSVC) +- # This is ugly hack to work around https://bugs.launchpad.net/ubuntu/+source/gcc-5/+bug/1568899. +- # Once C++17 is enabled (and thus old compilers are no longer supported, this needs to be gone. +- # We cannot simply detect the _compiler_ version, as the bug exists with the C++ _library_ +- target_link_libraries(${PROJECT_NAME} gcc_s gcc) +-endif () +- + if (NOT DISABLE_TTF) + if (STATIC) + target_link_libraries(${PROJECT_NAME} ${FREETYPE_STATIC_LIBRARIES}) Index: pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp diff -u /dev/null pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp:1.1 --- /dev/null Sat May 30 20:47:08 2020 +++ pkgsrc/games/openrct2/patches/patch-src_openrct2_util_Util.cpp Sat May 30 20:47:08 2020 @@ -0,0 +1,22 @@ +$NetBSD: patch-src_openrct2_util_Util.cpp,v 1.1 2020/05/30 20:47:08 joerg Exp $ + +--- src/openrct2/util/Util.cpp.orig 2020-05-27 23:27:33.350998119 +0000 ++++ src/openrct2/util/Util.cpp +@@ -184,7 +184,7 @@ int32_t bitscanforward(int32_t source) + #endif + } + +-#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) ++#if defined(__GNUC__) && (defined(__x86_64__) || defined(__i386__)) && !defined(__clang__) + # include + # define OpenRCT2_CPUID_GNUC_X86 + #elif defined(_MSC_VER) && (_MSC_VER >= 1500) && (defined(_M_X64) || defined(_M_IX86)) // VS2008 +@@ -223,7 +223,7 @@ bool sse41_available() + + bool avx2_available() + { +-#ifdef OPENRCT2_X86 ++#if defined(OPENRCT2_X86) && !defined(__clang__) + // For GCC and similar use the builtin function, as cpuid changed its semantics in + // https://github.com/gcc-mirror/gcc/commit/132fa33ce998df69a9f793d63785785f4b93e6f1 + // which causes it to ignore subleafs, but the new function is unavailable on --_----------=_1590871628238680--