From d99093fb4bb5652015c06274d64083daa2439e4f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 3 Mar 2021 10:28:17 +0000 Subject: gentoo resync : 03.03.2021 --- games-sports/dustrac/Manifest | 10 ++- games-sports/dustrac/dustrac-1.11.0-r1.ebuild | 68 ---------------- games-sports/dustrac/dustrac-1.13.0.ebuild | 79 +++++++++++++++++++ .../dustrac/files/dustrac-1.11.0-cmake.patch | 23 ------ .../dustrac/files/dustrac-1.13.0-appdata.patch | 27 +++++++ .../dustrac-1.13.0-cmake-add_library-static.patch | 31 ++++++++ .../dustrac/files/dustrac-1.13.0-cmake.patch | 69 ++++++++++++++++ .../dustrac/files/dustrac-1.13.0-gcc10.patch | 48 ++++++++++++ .../dustrac/files/dustrac-1.13.0-opengl.patch | 91 ++++++++++++++++++++++ 9 files changed, 352 insertions(+), 94 deletions(-) delete mode 100644 games-sports/dustrac/dustrac-1.11.0-r1.ebuild create mode 100644 games-sports/dustrac/dustrac-1.13.0.ebuild delete mode 100644 games-sports/dustrac/files/dustrac-1.11.0-cmake.patch create mode 100644 games-sports/dustrac/files/dustrac-1.13.0-appdata.patch create mode 100644 games-sports/dustrac/files/dustrac-1.13.0-cmake-add_library-static.patch create mode 100644 games-sports/dustrac/files/dustrac-1.13.0-cmake.patch create mode 100644 games-sports/dustrac/files/dustrac-1.13.0-gcc10.patch create mode 100644 games-sports/dustrac/files/dustrac-1.13.0-opengl.patch (limited to 'games-sports/dustrac') diff --git a/games-sports/dustrac/Manifest b/games-sports/dustrac/Manifest index bfe897b9cf26..f73f343749aa 100644 --- a/games-sports/dustrac/Manifest +++ b/games-sports/dustrac/Manifest @@ -1,4 +1,8 @@ -AUX dustrac-1.11.0-cmake.patch 1194 BLAKE2B d908401bbd0f89ad8dff63628b386642bb27f498fc89f97059c82848de88bda12b98b1e65048d35c0667f46f756b614d65d31aeed47ee18abcc57394a96ae6d4 SHA512 e614de1c2e0fdd8880876831ec39d525c5cd8c9bcc7bb90b95313aa8c394abd1120c139bb3a73691aa168d5e4ac537511227660b5e6b28515aa3a52e36377aba -DIST dustrac-1.11.0.tar.gz 27505282 BLAKE2B a42de406e388e13f1829e10248899f47cf98333a972eb4ce978116a706d9786840c4c6ec9107403aad25bd538453a7595c35cab33b0643968133710db2a3c66c SHA512 af67b76a815543d41cf8e5681ede11bfd63a2d6be7e4a21986d495d77b2673f5a145bb1c9cd5237d2caf64a4e77f221ae48b97a38a883dcd4e5bb0ef8c55f839 -EBUILD dustrac-1.11.0-r1.ebuild 1406 BLAKE2B af911883ecba1c1aa2d895a1f0e354d5494442feab0c32e53633f918bb83fb0efb48e26603329e125422e5ecfa071dee9ad8c8692a2685a5ede2351b58bd0a4d SHA512 4540337bd03354350b50199ebc4a784f328f1e7dc749f722c886b017fbfeffda0b6a2adc45df23f0a293ee2e657d9098b77464c03dea0cad1f1522241fba99d6 +AUX dustrac-1.13.0-appdata.patch 1146 BLAKE2B 45219e2536b0c919d8684b296fba378420894cb74335cddf395e6a61279db3c64a0b111fb4fb3c8c83efc0e7a14446bc74aebb0a0193fa2aed86623585c424c2 SHA512 b7c72e4f90d3f9c70c89c57f639cb72709fc89a028b9ebf202e3f38fe71a42401e163b986313c5c04d26589dd1b49f5aafa8a5396ea8dfe17484b26ba39642be +AUX dustrac-1.13.0-cmake-add_library-static.patch 984 BLAKE2B 0c874deae53422ef92410c27aa920e91780cf7a0598d64864463d7df683405c2e53f3bbfca7ed5cd686cf165698145656741a31b3b1b708a12146e9540f97875 SHA512 2cefa65c78c58b68f360c541e8ea3f64a4bb78877ed2a43b551308a69ecbeda8f332f55a8aa5fcb1192d2589d50072ed8322e55555105b9996c00511ebc98dc4 +AUX dustrac-1.13.0-cmake.patch 2506 BLAKE2B 76ed0ef500da88c1ca0e27b157e8855853453d47ed2ab8cf4292795539908275c0fadff21e5a519aa466ed56cf7e28cf35e9b0e41ad065cdde1ae704acd38b77 SHA512 2ab2a5a1f21fb00aaf27ebdfed0f07ed7d0faa1757419310ba79275b7675a63861e19bf5e97a9343f0f735a1308e64ba0dea96596a3cf02a60632e21c07ddde4 +AUX dustrac-1.13.0-gcc10.patch 1266 BLAKE2B d122c6de670e23f18547fcb014ba86f781b186dbf6732dfeba033a039bc1bc3537ab5605540da7a9449e69c7ede80e5458a475e5b23d5322df5998642f1ba1e6 SHA512 53b7cdf27cac11eb7cb4d80ed704034c9ba9973dfe7ad36f3592c2b993cd2092cc4b1656646cbbbac2faca7b8e09888aa86616ad1c98d03cfd6b3b61f6ba09b5 +AUX dustrac-1.13.0-opengl.patch 2922 BLAKE2B a6918529793ae7db347162f0fdd3037e39471d06221cabf4c300762add09b03bd63939975327bcac2783ad4722572ac32f03c4c0251608ef538d00de5f853d62 SHA512 2822a90c6bf5277218451d1e9eff32c18a75d43322180ab15d68f470df80b4645284ff693985d91dc740fb8163f54a51030f5447b1c4f85c6b63145f7401815c +DIST dustrac-1.13.0.tar.gz 18466297 BLAKE2B 694b879755125f273864f16ebb889d39d1dc690aa0f79e6cc3f8b5e64eec64209f32065dd2c88eb7b82e246837a0217ee284fb529b9e1e3149f2adeb5e54d2d1 SHA512 afb7a361771e5c19ef6ef26dd273a4b5df2b0ae7d7dd8292d2c875ac6a3109d2ff50f37f83006505c68486c50b4f6b371ba1f76cdedbe99652637508d86d7b49 +EBUILD dustrac-1.13.0.ebuild 1707 BLAKE2B 7e6ec56c71aed076b26b28675ed6c78c64bde955935aea2cf59880259c9a32db3b7d8f23763b3709ac5e36c9ae5c68ee5df8cb8b6c63978dee906a3e308ca48b SHA512 94c460bcae6c9508567744ab2bf934433f9347cb7e7bc9e7ef8d20daffa1acb93f0c96109d0b0013475b4d585f89f91e297e199d2c661bec70c9e5c768214019 MISC metadata.xml 682 BLAKE2B 08391e9c66de45fa14889b85c2d52008d7012ddbb2a1685baf6057be4c8faa4cadf863d110826b97745164869556d123544bbfe5391d42fc190cd2406c9d8bca SHA512 355e91033f2e318fbb9163cd6e2eca8babe47ce495aca9c9e0b533284e38cbe51331b194d9a905ee6b056bcdf7ba38bcb6d1b968b8ba801832253f216d41b7de diff --git a/games-sports/dustrac/dustrac-1.11.0-r1.ebuild b/games-sports/dustrac/dustrac-1.11.0-r1.ebuild deleted file mode 100644 index 550cbced1e66..000000000000 --- a/games-sports/dustrac/dustrac-1.11.0-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils gnome2-utils cmake-utils - -DESCRIPTION="Tile-based, cross-platform 2D racing game" -HOMEPAGE="http://dustrac.sourceforge.net/" -SRC_URI="mirror://sourceforge/dustrac/${P}.tar.gz" - -LICENSE="GPL-3+ CC-BY-SA-3.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND=" - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtopengl:5 - dev-qt/qtxml:5 - media-libs/libvorbis - media-libs/openal - virtual/opengl" -DEPEND="${RDEPEND} - dev-qt/linguist-tools:5 - dev-qt/qttest:5 - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-cmake.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 - -DDATA_PATH="/usr/share/${PN}" - -DBIN_PATH="/usr/bin" - -DDOC_PATH=/usr/share/doc/${PF} - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - - # FIXME: where should these come from? - dosym /usr/share/fonts/ubuntu-font-family/UbuntuMono-B.ttf "/usr/share/${PN}/fonts/UbuntuMono-B.ttf" - dosym /usr/share/fonts/ubuntu-font-family/UbuntuMono-R.ttf "/usr/share/${PN}/fonts/UbuntuMono-R.ttf" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-sports/dustrac/dustrac-1.13.0.ebuild b/games-sports/dustrac/dustrac-1.13.0.ebuild new file mode 100644 index 000000000000..051ce9898659 --- /dev/null +++ b/games-sports/dustrac/dustrac-1.13.0.ebuild @@ -0,0 +1,79 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake xdg-utils virtualx + +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 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl: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}-gcc10.patch # bug 722524 + "${FILESDIR}"/${P}-opengl.patch + "${FILESDIR}"/${P}-appdata.patch + # downstream patches + "${FILESDIR}"/${P}-cmake.patch + "${FILESDIR}"/${P}-cmake-add_library-static.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 + -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() { + virtx 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 +} + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/games-sports/dustrac/files/dustrac-1.11.0-cmake.patch b/games-sports/dustrac/files/dustrac-1.11.0-cmake.patch deleted file mode 100644 index 6f497e4969ef..000000000000 --- a/games-sports/dustrac/files/dustrac-1.11.0-cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- dustrac-1.11.0.orig/CMakeLists.txt -+++ dustrac-1.11.0/CMakeLists.txt -@@ -68,8 +68,7 @@ - endif() - - if(CMAKE_COMPILER_IS_GNUCXX OR MINGW OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") -- add_compile_options(-std=c++11 -W -Wall -O3 -pedantic) -- add_compile_options(-fomit-frame-pointer -finline-functions -ffast-math) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -W -Wall -fomit-frame-pointer -finline-functions") - elseif(MSVC) - add_definitions(-DNOMINMAX) - endif() ---- dustrac-1.11.0.orig/InstallLinux.cmake -+++ dustrac-1.11.0/InstallLinux.cmake -@@ -58,7 +58,7 @@ - install(FILES data/fonts.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 DESTINATION ${DOC_PATH}) -+ install(FILES AUTHORS CHANGELOG README 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/games-sports/dustrac/files/dustrac-1.13.0-appdata.patch b/games-sports/dustrac/files/dustrac-1.13.0-appdata.patch new file mode 100644 index 000000000000..e932a411fd62 --- /dev/null +++ b/games-sports/dustrac/files/dustrac-1.13.0-appdata.patch @@ -0,0 +1,27 @@ +From 5c5c437c2634572da21a22e1f64fac1dc1b296ea Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Sun, 24 Sep 2017 16:19:51 +0200 +Subject: [PATCH] Install AppData file to the right location + +According to the specs [1], the location is now /usr/share/metainfo, +with appdata left as legacy directory. Hence, install the AppData file +to the non-legacy directory. + +[1] https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html +--- + InstallLinux.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/InstallLinux.cmake b/InstallLinux.cmake +index 15e69855..3e0443d1 100644 +--- a/InstallLinux.cmake ++++ b/InstallLinux.cmake +@@ -74,7 +74,7 @@ function(setup_install_targets BIN_PATH DATA_PATH DOC_PATH) + install(FILES ${CMAKE_BINARY_DIR}/dustrac-editor.desktop DESTINATION share/applications) + + # Install app store meta data +- install(FILES src/dustrac.appdata.xml DESTINATION share/appdata) ++ install(FILES src/dustrac.appdata.xml DESTINATION share/metainfo) + + # Install icons + install(FILES data/icons/dustrac-game.png DESTINATION share/pixmaps) diff --git a/games-sports/dustrac/files/dustrac-1.13.0-cmake-add_library-static.patch b/games-sports/dustrac/files/dustrac-1.13.0-cmake-add_library-static.patch new file mode 100644 index 000000000000..f6b2cc612cc1 --- /dev/null +++ b/games-sports/dustrac/files/dustrac-1.13.0-cmake-add_library-static.patch @@ -0,0 +1,31 @@ +Fix linking with BUILD_SHARED_LIBS=ON default in EAPI-7. + +--- a/src/game/STFH/CMakeLists.txt 2017-08-28 21:43:54.000000000 +0200 ++++ b/src/game/STFH/CMakeLists.txt 2021-02-27 20:58:35.523503983 +0100 +@@ -10,5 +10,5 @@ + source.cpp + ) + +-add_library(STFH ${STFHSRC}) ++add_library(STFH STATIC ${STFHSRC}) + +--- a/src/game/MTFH/CMakeLists.txt 2017-08-28 21:43:54.000000000 +0200 ++++ b/src/game/MTFH/CMakeLists.txt 2021-02-27 20:58:48.451565823 +0100 +@@ -9,5 +9,5 @@ + menumanager.cpp + menuitemview.cpp) + +-add_library(MTFH ${MTFHSRC}) ++add_library(MTFH STATIC ${MTFHSRC}) + +--- a/src/game/MiniCore/CMakeLists.txt 2017-08-28 21:43:54.000000000 +0200 ++++ b/src/game/MiniCore/CMakeLists.txt 2021-02-27 20:59:01.267627130 +0100 +@@ -82,7 +82,7 @@ + set(MiniCoreSRC ${MiniCoreSRC} Graphics/contrib/glew/glew.c) + endif() + +-add_library(MiniCore ${MiniCoreSRC}) ++add_library(MiniCore STATIC ${MiniCoreSRC}) + + target_link_libraries(MiniCore Qt5::Core Qt5::OpenGL Qt5::Xml OpenGL::GL) + diff --git a/games-sports/dustrac/files/dustrac-1.13.0-cmake.patch b/games-sports/dustrac/files/dustrac-1.13.0-cmake.patch new file mode 100644 index 000000000000..57a00c0068fa --- /dev/null +++ b/games-sports/dustrac/files/dustrac-1.13.0-cmake.patch @@ -0,0 +1,69 @@ +Rebase CFLAGS and COPYING removal patch onto 1.13.0 +Use CTest module for standard BUILD_TESTING switch and make Qt5Test optional + +--- a/CMakeLists.txt 2017-08-28 21:43:54.000000000 +0200 ++++ b/CMakeLists.txt 2021-02-27 19:21:04.090117623 +0100 +@@ -57,6 +57,9 @@ + add_definitions(-DGLEW_STATIC) + add_definitions(-DGLEW_NO_GLU) + ++# Enable CMake's unit test framework ++include(CTest) ++ + if(UNIX) + include("InstallLinux.cmake") + elseif(WIN32) +@@ -64,8 +67,7 @@ + endif() + + if(CMAKE_COMPILER_IS_GNUCXX OR MINGW OR ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") +- add_compile_options(-std=c++11 -W -Wall -O3 -pedantic) +- add_compile_options(-fomit-frame-pointer -finline-functions -ffast-math) ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -W -Wall -fomit-frame-pointer -finline-functions") + elseif(MSVC) + add_definitions(-DNOMINMAX) + endif() +@@ -83,7 +85,10 @@ + find_package(Qt5Xml ${QT_MIN_VER} REQUIRED) + find_package(Qt5Widgets ${QT_MIN_VER} REQUIRED) + find_package(Qt5LinguistTools ${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) +@@ -109,9 +114,6 @@ + pkg_check_modules(VORBISFILE REQUIRED vorbisfile) + endif() + +-# Enable CMake's unit test framework +-enable_testing() +- + # Install paths depend on the build type and target platform + resolve_install_paths() + +--- a/InstallLinux.cmake 2017-08-28 21:43:54.000000000 +0200 ++++ b/InstallLinux.cmake 2021-02-27 19:21:23.760211724 +0100 +@@ -58,7 +58,7 @@ + install(FILES data/fonts.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") +--- a/src/game/MiniCore/CMakeLists.txt 2017-08-28 21:43:54.000000000 +0200 ++++ b/src/game/MiniCore/CMakeLists.txt 2021-02-27 19:17:29.616848751 +0100 +@@ -86,5 +86,7 @@ + + target_link_libraries(MiniCore Qt5::OpenGL Qt5::Xml) + +-add_subdirectory(UnitTests) ++if(BUILD_TESTING) ++ add_subdirectory(UnitTests) ++endif() + diff --git a/games-sports/dustrac/files/dustrac-1.13.0-gcc10.patch b/games-sports/dustrac/files/dustrac-1.13.0-gcc10.patch new file mode 100644 index 000000000000..1a3f51896bdb --- /dev/null +++ b/games-sports/dustrac/files/dustrac-1.13.0-gcc10.patch @@ -0,0 +1,48 @@ +From d41a46ac32038055bfc9fe9a907e199ed74e371c Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Fri, 17 Apr 2020 13:25:12 +0200 +Subject: [PATCH] Include for std::runtime_error + +It was implicitly pulled before, and in GCC 10 it will not be anymore. +--- + src/game/openaloggdata.cpp | 1 + + src/game/openalsource.cpp | 1 + + src/game/openalwavdata.cpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/src/game/openaloggdata.cpp b/src/game/openaloggdata.cpp +index 56634c20..4a2ab882 100644 +--- a/src/game/openaloggdata.cpp ++++ b/src/game/openaloggdata.cpp +@@ -19,6 +19,7 @@ + + #include + #include ++#include + + #include + +diff --git a/src/game/openalsource.cpp b/src/game/openalsource.cpp +index 9d2bb7f5..37a4272a 100644 +--- a/src/game/openalsource.cpp ++++ b/src/game/openalsource.cpp +@@ -19,6 +19,7 @@ + #include + + #include ++#include + + static bool checkError() + { +diff --git a/src/game/openalwavdata.cpp b/src/game/openalwavdata.cpp +index 3a9fc20a..015a11d3 100644 +--- a/src/game/openalwavdata.cpp ++++ b/src/game/openalwavdata.cpp +@@ -25,6 +25,7 @@ + + #include + #include ++#include + + static bool checkError() + { diff --git a/games-sports/dustrac/files/dustrac-1.13.0-opengl.patch b/games-sports/dustrac/files/dustrac-1.13.0-opengl.patch new file mode 100644 index 000000000000..5251169b46ef --- /dev/null +++ b/games-sports/dustrac/files/dustrac-1.13.0-opengl.patch @@ -0,0 +1,91 @@ +From acde4499b4a4d014d95668269797a272fd53bf86 Mon Sep 17 00:00:00 2001 +From: Jussi Lind +Date: Thu, 15 Nov 2018 01:35:58 +0200 +Subject: [PATCH] CMake: Default to GLVND, use the recommended way to link to + GL + +--- + CMakeLists.txt | 7 +++++++ + src/game/CMakeLists.txt | 2 +- + src/game/MiniCore/src/CMakeLists.txt | 2 +- + 3 files changed, 9 insertions(+), 2 deletions(-) + +From 7d6d2213d10ea96d25b5b9f18b42cace5bf0fbfd Mon Sep 17 00:00:00 2001 +From: Jussi Lind +Date: Sun, 18 Nov 2018 21:12:20 +0200 +Subject: [PATCH] Fix linking to OpenGL libs on CMake < 3.11.0 + +--- + CMakeLists.txt | 5 +++++ + src/game/CMakeLists.txt | 4 +--- + src/game/MiniCore/CMakeLists.txt | 5 +++++ + src/game/MiniCore/src/CMakeLists.txt | 2 +- + 4 files changed, 12 insertions(+), 4 deletions(-) + +From edc1825110f80377af51226a686731bf17d1de52 Mon Sep 17 00:00:00 2001 +From: Jussi Lind +Date: Tue, 30 Jul 2019 23:14:20 +0300 +Subject: [PATCH] Use OpenGL::GL instead of OpenGL::OpenGL + +- For more info: https://cmake.org/cmake/help/v3.10/module/FindOpenGL.html +--- + CMakeLists.txt | 2 +- + src/game/MiniCore/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff -u a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,6 +3,8 @@ + cmake_minimum_required(VERSION 2.8.12) + cmake_policy(VERSION 2.8.12) + ++# Use cmake --help-policy [POLICY] for more information about these: ++ + if(POLICY CMP0005) + cmake_policy(SET CMP0005 NEW) + endif() +@@ -11,6 +13,11 @@ + cmake_policy(SET CMP0020 NEW) + endif() + ++# Default to GLVND ++if(POLICY CMP0072) ++ cmake_policy(SET CMP0072 OLD) ++endif() ++ + # Global game version + set(VERSION_MAJOR "2") + set(VERSION_MINOR "0") +diff -u a/src/game/CMakeLists.txt b/src/game/CMakeLists.txt +--- a/src/game/CMakeLists.txt ++++ b/src/game/CMakeLists.txt +@@ -157,15 +157,13 @@ + MiniCore + MTFH + STFH +- ${OPENGL_gl_LIBRARY} +- ${OPENGL_glu_LIBRARY} + ${OPENAL_LIBRARY} + ${VORBISFILE_LIBRARIES} + ${VORBISFILE_LIB} # Valid only with MSVC + ${VORBIS_LIB} # Valid only with MSVC + ${OGG_LIB}) # Valid only with MSVC + +-target_link_libraries(${GAME_BINARY_NAME} ${COMMON_LIBS} Qt5::OpenGL Qt5::Xml) ++target_link_libraries(${GAME_BINARY_NAME} ${COMMON_LIBS} Qt5::OpenGL Qt5::Xml OpenGL::GL) + + foreach(TS_FILE ${TS}) + # Make targets to copy generated qm files to data dir. This is done the hard +diff -u a/src/game/MiniCore/CMakeLists.txt b/src/game/MiniCore/CMakeLists.txt +--- a/src/game/MiniCore/CMakeLists.txt ++++ b/src/game/MiniCore/CMakeLists.txt +@@ -88,7 +88,7 @@ + + add_library(MiniCore ${MiniCoreSRC}) + +-target_link_libraries(MiniCore Qt5::OpenGL Qt5::Xml) ++target_link_libraries(MiniCore Qt5::Core Qt5::OpenGL Qt5::Xml OpenGL::GL) + + if(BUILD_TESTING) + add_subdirectory(UnitTests) -- cgit v1.2.3