From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0160D15827B for ; Wed, 27 Aug 2025 18:16:49 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id E0B10340D3A for ; Wed, 27 Aug 2025 18:16:48 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id D4DA3110560; Wed, 27 Aug 2025 18:16:47 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id CB184110560 for ; Wed, 27 Aug 2025 18:16:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 73008340D3A for ; Wed, 27 Aug 2025 18:16:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DB8443352 for ; Wed, 27 Aug 2025 18:16:45 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1756318582.9b59b8a68a353910f00a549052b062eb5be0939f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-sports/dustrac/, games-sports/dustrac/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-sports/dustrac/Manifest games-sports/dustrac/dustrac-2.1.1.ebuild games-sports/dustrac/files/dustrac-2.1.1-cmake-add_library-static.patch games-sports/dustrac/files/dustrac-2.1.1-cmake.patch games-sports/dustrac/files/dustrac-2.1.1-cmake4.patch games-sports/dustrac/files/dustrac-2.1.1-cmake_policy_0100.patch X-VCS-Directories: games-sports/dustrac/ games-sports/dustrac/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 9b59b8a68a353910f00a549052b062eb5be0939f X-VCS-Branch: master Date: Wed, 27 Aug 2025 18:16:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a404c500-6f86-4d56-b12d-ee137dc1231f X-Archives-Hash: 5e379bebb1f2f09882dae3e2dcf65014 commit: 9b59b8a68a353910f00a549052b062eb5be0939f Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 27 18:12:02 2025 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 27 18:16:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b59b8a6 games-sports/dustrac: add 2.1.1, fix w/ cmake-4, use xdg, bump EAPI 7 -> 8 Add missing deps Bug: https://bugs.gentoo.org/739382 Closes: https://bugs.gentoo.org/725516 Closes: https://bugs.gentoo.org/957691 Closes: https://bugs.gentoo.org/957692 Signed-off-by: Andreas Sturmlechner gentoo.org> games-sports/dustrac/Manifest | 1 + games-sports/dustrac/dustrac-2.1.1.ebuild | 74 +++++++++++ .../dustrac-2.1.1-cmake-add_library-static.patch | 49 +++++++ .../dustrac/files/dustrac-2.1.1-cmake.patch | 118 +++++++++++++++++ .../dustrac/files/dustrac-2.1.1-cmake4.patch | 143 +++++++++++++++++++++ .../files/dustrac-2.1.1-cmake_policy_0100.patch | 25 ++++ 6 files changed, 410 insertions(+) diff --git a/games-sports/dustrac/Manifest b/games-sports/dustrac/Manifest index 4acfc195402b..2e04f66a11fc 100644 --- a/games-sports/dustrac/Manifest +++ b/games-sports/dustrac/Manifest @@ -1 +1,2 @@ DIST dustrac-1.13.0.tar.gz 18466297 BLAKE2B 694b879755125f273864f16ebb889d39d1dc690aa0f79e6cc3f8b5e64eec64209f32065dd2c88eb7b82e246837a0217ee284fb529b9e1e3149f2adeb5e54d2d1 SHA512 afb7a361771e5c19ef6ef26dd273a4b5df2b0ae7d7dd8292d2c875ac6a3109d2ff50f37f83006505c68486c50b4f6b371ba1f76cdedbe99652637508d86d7b49 +DIST dustrac-2.1.1.tar.gz 17392345 BLAKE2B 2efc82b0552f202aa1f248278f61d4ea17ac9d3d652b17de69a1888e09147c0c2659c90ce6bdced9cd361d99ff4fc179f4a6aa703c45f8eabf25aa69fb516bbf SHA512 9a49cd0302ab47b12ee587a33cc74c1df2bf6cf7925141cbf957fc90a5c1a34423d4420be28bcb6909a862daa12d6214b397fd0fc77e9e18fa649f3ca5c2e1ab diff --git a/games-sports/dustrac/dustrac-2.1.1.ebuild b/games-sports/dustrac/dustrac-2.1.1.ebuild new file mode 100644 index 000000000000..316100b2692f --- /dev/null +++ b/games-sports/dustrac/dustrac-2.1.1.ebuild @@ -0,0 +1,74 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Tile-based, cross-platform 2D racing game" +HOMEPAGE="https://juzzlin.github.io/DustRacing2D/" +SRC_URI="https://github.com/juzzlin/DustRacing2D/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/DustRacing2D-${PV}" + +LICENSE="GPL-3+ CC-BY-SA-3.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtsql:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-fonts/ubuntu-font-family + media-libs/libvorbis + media-libs/openal + virtual/opengl +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) +" +BDEPEND=" + dev-qt/linguist-tools:5 + virtual/pkgconfig +" + +PATCHES=( + # upstream backports + "${FILESDIR}"/${P}-cmake_policy_0100.patch + # downstream patches + "${FILESDIR}"/${P}-cmake.patch + "${FILESDIR}"/${P}-cmake-add_library-static.patch + "${FILESDIR}"/${P}-cmake4.patch +) + +src_configure() { + # -DGLES=ON didn't build for me but maybe just need use flags on some Qt package? + # Maybe add a local gles use flag + local mycmakeargs=( + -DReleaseBuild=ON + -DSystemFonts=ON + -DOpenGL_GL_PREFERENCE=GLVND + -DDATA_PATH=/usr/share/${PN} + -DBIN_PATH=/usr/bin + -DDOC_PATH=/usr/share/doc/${PF} + -DBUILD_TESTING=$(usex test) + ) + cmake_src_configure +} + +src_test() { + local -x QT_QPA_PLATFORM=offscreen + cmake_src_test +} + +src_install() { + cmake_src_install + + dosym ../../fonts/ubuntu-font-family/UbuntuMono-B.ttf /usr/share/${PN}/fonts/UbuntuMono-B.ttf + dosym ../../fonts/ubuntu-font-family/UbuntuMono-R.ttf /usr/share/${PN}/fonts/UbuntuMono-R.ttf +} diff --git a/games-sports/dustrac/files/dustrac-2.1.1-cmake-add_library-static.patch b/games-sports/dustrac/files/dustrac-2.1.1-cmake-add_library-static.patch new file mode 100644 index 000000000000..41673036f9ed --- /dev/null +++ b/games-sports/dustrac/files/dustrac-2.1.1-cmake-add_library-static.patch @@ -0,0 +1,49 @@ +From 9ba17dd402db811a89ea3b77b13898ee2c5a8de1 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 27 Aug 2025 19:38:33 +0200 +Subject: [PATCH] Fix linking with BUILD_SHARED_LIBS=ON default in EAPI-7 + +--- + src/game/MTFH/CMakeLists.txt | 2 +- + src/game/MiniCore/src/CMakeLists.txt | 2 +- + src/game/STFH/CMakeLists.txt | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/game/MTFH/CMakeLists.txt b/src/game/MTFH/CMakeLists.txt +index 613d786..689b08e 100644 +--- a/src/game/MTFH/CMakeLists.txt ++++ b/src/game/MTFH/CMakeLists.txt +@@ -10,5 +10,5 @@ set(MTFHSRC + menumanager.cpp + menuitemview.cpp) + +-add_library(MTFH ${MTFHSRC}) ++add_library(MTFH STATIC ${MTFHSRC}) + set_property(TARGET MTFH PROPERTY CXX_STANDARD 11) +diff --git a/src/game/MiniCore/src/CMakeLists.txt b/src/game/MiniCore/src/CMakeLists.txt +index 68e5653..de19d0f 100644 +--- a/src/game/MiniCore/src/CMakeLists.txt ++++ b/src/game/MiniCore/src/CMakeLists.txt +@@ -88,7 +88,7 @@ set(MiniCoreSRC ${MiniCoreSRC} Graphics/contrib/glew/glew.c) + endif() + + set(MiniCoreTargetName MiniCore) +-add_library(${MiniCoreTargetName} ${MiniCoreSRC}) ++add_library(${MiniCoreTargetName} STATIC ${MiniCoreSRC}) + target_link_libraries(${MiniCoreTargetName} Qt5::Core Qt5::OpenGL Qt5::Xml ${MINICORE_OPENGL_LIBS}) + set_property(TARGET ${MiniCoreTargetName} PROPERTY CXX_STANDARD 14) + +diff --git a/src/game/STFH/CMakeLists.txt b/src/game/STFH/CMakeLists.txt +index 1f50ce1..2674a6c 100644 +--- a/src/game/STFH/CMakeLists.txt ++++ b/src/game/STFH/CMakeLists.txt +@@ -10,5 +10,5 @@ set(STFHSRC + source.cpp + ) + +-add_library(STFH ${STFHSRC}) ++add_library(STFH STATIC ${STFHSRC}) + set_property(TARGET STFH PROPERTY CXX_STANDARD 11) +-- +2.51.0 + diff --git a/games-sports/dustrac/files/dustrac-2.1.1-cmake.patch b/games-sports/dustrac/files/dustrac-2.1.1-cmake.patch new file mode 100644 index 000000000000..28c0585be709 --- /dev/null +++ b/games-sports/dustrac/files/dustrac-2.1.1-cmake.patch @@ -0,0 +1,118 @@ +From 463844b7742c98e336bdbeaf30026b27e62cbde7 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 27 Aug 2025 19:32:52 +0200 +Subject: [PATCH] Fix CMake for our purpose + +Do not override CFLAGS +Drop COPYING file +Use CTest module for standard BUILD_TESTING switch and make Qt5Test optional + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 14 ++++++++------ + InstallLinux.cmake | 2 +- + src/game/CMakeLists.txt | 4 +++- + src/game/MiniCore/CMakeLists.txt | 3 --- + src/game/MiniCore/src/CMakeLists.txt | 4 +++- + 5 files changed, 15 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ef09505..d2457ac 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -101,6 +101,9 @@ endif() + add_definitions(-DGLEW_STATIC) + add_definitions(-DGLEW_NO_GLU) + ++# Enable CMake's unit test framework ++include(CTest) ++ + if(UNIX) + include("InstallLinux.cmake") + elseif(WIN32) +@@ -108,8 +111,7 @@ elseif(WIN32) + endif() + + if(CMAKE_COMPILER_IS_GNUCXX OR MINGW OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") +- add_compile_options("$<$:-W;-Wall;-O3;-pedantic;-fomit-frame-pointer>") +- add_compile_options("$<$:-W;-Wall;-O0;-pedantic>") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -W -Wall -fomit-frame-pointer -finline-functions") + + # Automatically use ccache if found + find_program(CCACHE_FOUND ccache) +@@ -136,7 +138,10 @@ find_package(Qt5Xml ${QT_MIN_VER} REQUIRED) + find_package(Qt5Widgets ${QT_MIN_VER} REQUIRED) + find_package(Qt5LinguistTools ${QT_MIN_VER} REQUIRED) + find_package(Qt5Sql ${QT_MIN_VER} REQUIRED) +-find_package(Qt5Test ${QT_MIN_VER} REQUIRED) ++ ++if(BUILD_TESTING) ++ find_package(Qt5Test ${QT_MIN_VER} REQUIRED) ++endif() + + # Find OpenGL + find_package(OpenGL REQUIRED) +@@ -173,9 +178,6 @@ include_directories(src/contrib/SimpleLogger/src) + add_subdirectory(src/contrib/Argengine EXCLUDE_FROM_ALL) + include_directories(src/contrib/Argengine/src) + +-# Enable CMake's unit test framework +-enable_testing() +- + # Install paths depend on the build type and target platform + resolve_install_paths() + +diff --git a/InstallLinux.cmake b/InstallLinux.cmake +index 3c4806f..346305f 100644 +--- a/InstallLinux.cmake ++++ b/InstallLinux.cmake +@@ -78,7 +78,7 @@ function(setup_install_targets BIN_PATH DATA_PATH DOC_PATH) + install(FILES data/editorModels.conf DESTINATION ${DATA_PATH}) + install(FILES data/meshes.conf DESTINATION ${DATA_PATH}) + install(FILES data/surfaces.conf DESTINATION ${DATA_PATH}) +- install(FILES AUTHORS CHANGELOG COPYING README.md DESTINATION ${DOC_PATH}) ++ install(FILES AUTHORS CHANGELOG README.md DESTINATION ${DOC_PATH}) + install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.jpg") + install(DIRECTORY data/images DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.png") + install(DIRECTORY data/levels DESTINATION ${DATA_PATH} FILES_MATCHING PATTERN "*.trk") +diff --git a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt +index 8368e2c..b8a5a61 100644 +--- a/src/game/CMakeLists.txt ++++ b/src/game/CMakeLists.txt +@@ -169,4 +169,6 @@ set(COMMON_LIBS + target_link_libraries(${GAME_BINARY_NAME} ${COMMON_LIBS} Qt5::OpenGL Qt5::Sql Qt5::Xml ${DUSTRAC_OPENGL_LIBS} SimpleLogger_static Argengine_static) + set_property(TARGET ${GAME_BINARY_NAME} PROPERTY CXX_STANDARD 14) + +-add_subdirectory(unittests) ++if(BUILD_TESTING) ++ add_subdirectory(unittests) ++endif() +diff --git a/src/game/MiniCore/CMakeLists.txt b/src/game/MiniCore/CMakeLists.txt +index 2707310..ff983d3 100644 +--- a/src/game/MiniCore/CMakeLists.txt ++++ b/src/game/MiniCore/CMakeLists.txt +@@ -63,8 +63,5 @@ else() + set(MINICORE_OPENGL_LIBS OpenGL::GL) + endif() + +-# Enable CMake's unit test framework +-enable_testing() +- + add_subdirectory(src) + +diff --git a/src/game/MiniCore/src/CMakeLists.txt b/src/game/MiniCore/src/CMakeLists.txt +index 5c4d05f..68e5653 100644 +--- a/src/game/MiniCore/src/CMakeLists.txt ++++ b/src/game/MiniCore/src/CMakeLists.txt +@@ -92,5 +92,7 @@ add_library(${MiniCoreTargetName} ${MiniCoreSRC}) + target_link_libraries(${MiniCoreTargetName} Qt5::Core Qt5::OpenGL Qt5::Xml ${MINICORE_OPENGL_LIBS}) + set_property(TARGET ${MiniCoreTargetName} PROPERTY CXX_STANDARD 14) + +-add_subdirectory(UnitTests) ++if(BUILD_TESTING) ++ add_subdirectory(UnitTests) ++endif() + +-- +2.51.0 + diff --git a/games-sports/dustrac/files/dustrac-2.1.1-cmake4.patch b/games-sports/dustrac/files/dustrac-2.1.1-cmake4.patch new file mode 100644 index 000000000000..4b4e1cce9cb0 --- /dev/null +++ b/games-sports/dustrac/files/dustrac-2.1.1-cmake4.patch @@ -0,0 +1,143 @@ +From 8cf9a0b40918ff1c53630779c584164b0c2d9d8a Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Wed, 27 Aug 2025 20:00:42 +0200 +Subject: [PATCH] Raise CMake minimum to 3.11 + +Use BUILD_TESTING also in bundled libs. + +Signed-off-by: Andreas Sturmlechner +--- + CMakeLists.txt | 11 +++-------- + src/contrib/Argengine/CMakeLists.txt | 12 +++--------- + src/contrib/SimpleLogger/CMakeLists.txt | 12 +++--------- + src/game/MiniCore/CMakeLists.txt | 9 ++------- + 4 files changed, 11 insertions(+), 33 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d2457ac..0cc8369 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,7 +1,6 @@ +-project(DustRacing2D) ++cmake_minimum_required(VERSION 3.11) + +-cmake_minimum_required(VERSION 2.8.12) +-cmake_policy(VERSION 2.8.12) ++project(DustRacing2D) + + # Use cmake --help-policy [POLICY] for more information about these: + +@@ -145,11 +144,7 @@ endif() + + # Find OpenGL + find_package(OpenGL REQUIRED) +-if(${CMAKE_VERSION} VERSION_LESS "3.11.0") +- set(DUSTRAC_OPENGL_LIBS ${OPENGL_gl_LIBRARY}) +-else() +- set(DUSTRAC_OPENGL_LIBS OpenGL::GL) +-endif() ++set(DUSTRAC_OPENGL_LIBS OpenGL::GL) + + # OpenAL for sounds. OpenAL directory can be given by -DOPENALDIR=... + set(ENV{OPENALDIR} ${OpenALDir}) +diff --git a/src/contrib/Argengine/CMakeLists.txt b/src/contrib/Argengine/CMakeLists.txt +index 8d4705e..7bf8caf 100644 +--- a/src/contrib/Argengine/CMakeLists.txt ++++ b/src/contrib/Argengine/CMakeLists.txt +@@ -1,9 +1,8 @@ + project(Argengine) + +-cmake_minimum_required(VERSION 2.8.12) +-cmake_policy(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.11) + +-option(BUILD_TESTS "Build unit tests" OFF) ++option(BUILD_TESTING "Build unit tests" OFF) + + option(BUILD_EXAMPLES "Build example apps" OFF) + +@@ -18,18 +17,13 @@ set(CMAKE_CXX_STANDARD 11) + + if(CMAKE_COMPILER_IS_GNUCXX OR MINGW OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic") +- +- # CMAKE_CXX_STANDARD supported only by versions >= 3.1 +- if (CMAKE_VERSION VERSION_LESS "3.1") +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") +- endif () + endif() + + set(LIBRARY_NAME "Argengine") + + set(CMAKE_INCLUDE_CURRENT_DIR ON) + +-if(BUILD_TESTS) ++if(BUILD_TESTING) + enable_testing() + add_subdirectory(src/tests) + endif() +diff --git a/src/contrib/SimpleLogger/CMakeLists.txt b/src/contrib/SimpleLogger/CMakeLists.txt +index 810a17a..9db40db 100644 +--- a/src/contrib/SimpleLogger/CMakeLists.txt ++++ b/src/contrib/SimpleLogger/CMakeLists.txt +@@ -1,9 +1,8 @@ + project(SimpleLogger) + +-cmake_minimum_required(VERSION 2.8.12) +-cmake_policy(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.11) + +-option(BUILD_TESTS "Build unit tests" OFF) ++option(BUILD_TESTING "Build unit tests" OFF) + + # Default to release C++ flags if CMAKE_BUILD_TYPE not set + if(NOT CMAKE_BUILD_TYPE) +@@ -17,18 +16,13 @@ set(CMAKE_CXX_STANDARD 11) + if(CMAKE_COMPILER_IS_GNUCXX OR MINGW OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") +- +- # CMAKE_CXX_STANDARD supported only by versions >= 3.1 +- if (CMAKE_VERSION VERSION_LESS "3.1") +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") +- endif () + endif() + + set(LIBRARY_NAME "SimpleLogger") + + set(CMAKE_INCLUDE_CURRENT_DIR ON) + +-if(BUILD_TESTS) ++if(BUILD_TESTING) + enable_testing() + add_subdirectory(src/tests) + endif() +diff --git a/src/game/MiniCore/CMakeLists.txt b/src/game/MiniCore/CMakeLists.txt +index ff983d3..ae5b0e7 100644 +--- a/src/game/MiniCore/CMakeLists.txt ++++ b/src/game/MiniCore/CMakeLists.txt +@@ -1,7 +1,6 @@ + project(MiniCore) + +-cmake_minimum_required(VERSION 2.8.12) +-cmake_policy(VERSION 2.8.12) ++cmake_minimum_required(VERSION 3.11) + + if(POLICY CMP0005) + cmake_policy(SET CMP0005 NEW) +@@ -57,11 +56,7 @@ find_package(Qt5Widgets ${QT_MIN_VER} REQUIRED) + + # Find OpenGL + find_package(OpenGL REQUIRED) +-if(${CMAKE_VERSION} VERSION_LESS "3.11.0") +- set(MINICORE_OPENGL_LIBS ${OPENGL_gl_LIBRARY}) +-else() +- set(MINICORE_OPENGL_LIBS OpenGL::GL) +-endif() ++set(MINICORE_OPENGL_LIBS OpenGL::GL) + + add_subdirectory(src) + +-- +2.51.0 + diff --git a/games-sports/dustrac/files/dustrac-2.1.1-cmake_policy_0100.patch b/games-sports/dustrac/files/dustrac-2.1.1-cmake_policy_0100.patch new file mode 100644 index 000000000000..88c5fd2e8dd1 --- /dev/null +++ b/games-sports/dustrac/files/dustrac-2.1.1-cmake_policy_0100.patch @@ -0,0 +1,25 @@ +From 2c00334135aa004213758a0121a23a872660aa79 Mon Sep 17 00:00:00 2001 +From: Jussi Lind +Date: Sat, 28 Jan 2023 12:55:15 +0200 +Subject: [PATCH] Set CMake policy CMP0100 to NEW + +--- + src/game/MiniCore/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/game/MiniCore/CMakeLists.txt b/src/game/MiniCore/CMakeLists.txt +index 27073103..07430201 100644 +--- a/src/game/MiniCore/CMakeLists.txt ++++ b/src/game/MiniCore/CMakeLists.txt +@@ -19,6 +19,11 @@ if(POLICY CMP0054) + cmake_policy(SET CMP0054 NEW) + endif() + ++# Automoc for .hh ++if(POLICY CMP0100) ++ cmake_policy(SET CMP0100 NEW) ++endif() ++ + option(GLES "Build for OpenGL ES 2.0" OFF) + + option(NO_GLEW "Don't use GLEW to resolve OpenGL extensions if enabled." ON)