buildsys: Remove SDL2 from dependencies.

heinezen · heinezen · commit 4f72edbdeaf4 · 2023-09-24T16:11:53.000+02:00
diff --git a/.github/workflows/macosx-ci.yml b/.github/workflows/macosx-ci.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Install environment helpers with homebrew
         run: brew install ccache
       - name: Install dependencies with homebrew
-        run: brew install libepoxy freetype fontconfig harfbuzz sdl2 sdl2_image opus opusfile qt6 libogg libpng toml11 eigen
+        run: brew install libepoxy freetype fontconfig harfbuzz opus opusfile qt6 libogg libpng toml11 eigen
       - name: Install nyan dependencies with homebrew
         run: brew install flex make
       - name: Install python3 packages
diff --git a/buildsystem/modules/FindSDL2Image.cmake b/buildsystem/modules/FindSDL2Image.cmake
diff --git a/doc/build_instructions/arch_linux.md b/doc/build_instructions/arch_linux.md
@@ -4,7 +4,7 @@
 
 This command should provide required packages for Arch Linux installation:
 
-`sudo pacman -S --needed eigen python python-mako python-pillow python-numpy python-lz4 python-pygments cython libepoxy libogg libpng ttf-dejavu freetype2 fontconfig harfbuzz cmake sdl2 sdl2_image opusfile opus python-pylint python-toml qt6-declarative qt6-multimedia`
+`sudo pacman -S --needed eigen python python-mako python-pillow python-numpy python-lz4 python-pygments cython libepoxy libogg libpng ttf-dejavu freetype2 fontconfig harfbuzz cmake opusfile opus python-pylint python-toml qt6-declarative qt6-multimedia`
 
 If you don't have a compiler installed, you can select between these commands to install it:
  - `sudo pacman -S --needed gcc`
diff --git a/doc/build_instructions/debian.md b/doc/build_instructions/debian.md
@@ -1,6 +1,6 @@
 # Prerequisite steps for Debian users
 
  - `sudo apt-get update`
- - `sudo apt-get install cmake cython3 libeigen3-dev libepoxy-dev libfontconfig1-dev libfreetype-dev libharfbuzz-dev libogg-dev libopus-dev libopusfile-dev libpng-dev libsdl2-dev libsdl2-image-dev libtoml11-dev python3-dev python3-mako python3-numpy python3-lz4 python3-pil python3-pip python3-pygments python3-toml qml6-module-qtquick-controls qt6-declarative-dev qt6-multimedia-dev  qml6-module-qtquick3d-spatialaudio`
+ - `sudo apt-get install cmake cython3 libeigen3-dev libepoxy-dev libfontconfig1-dev libfreetype-dev libharfbuzz-dev libogg-dev libopus-dev libopusfile-dev libpng-dev libtoml11-dev python3-dev python3-mako python3-numpy python3-lz4 python3-pil python3-pip python3-pygments python3-toml qml6-module-qtquick-controls qt6-declarative-dev qt6-multimedia-dev  qml6-module-qtquick3d-spatialaudio`
 
 You will also need [nyan](https://github.com/SFTtech/nyan/blob/master/doc/building.md) and its dependencies.
diff --git a/doc/build_instructions/fedora.md b/doc/build_instructions/fedora.md
@@ -2,6 +2,6 @@
 
 Run the following command:
 
-`sudo dnf install clang cmake eigen3-devel fontconfig-devel gcc-c harfbuzz-devel libepoxy-devel libogg-devel libopusenc-devel libpng-devel  opusfile-devel python3-Cython python3-devel python3-mako python3-numpy python3-lz4 python3-pillow python3-pygments python3-toml SDL2-devel SDL2_image-devel++ toml11-devel qt6-qtdeclarative-devel qt6-qtmultimedia-devel`
+`sudo dnf install clang cmake eigen3-devel fontconfig-devel gcc-c harfbuzz-devel libepoxy-devel libogg-devel libopusenc-devel libpng-devel  opusfile-devel python3-Cython python3-devel python3-mako python3-numpy python3-lz4 python3-pillow python3-pygments python3-toml toml11-devel qt6-qtdeclarative-devel qt6-qtmultimedia-devel`
 
 You will also need [nyan](https://github.com/SFTtech/nyan/blob/master/doc/building.md) and its dependencies.
diff --git a/doc/build_instructions/freebsd.md b/doc/build_instructions/freebsd.md
@@ -2,7 +2,7 @@
 
 This command should provide required packages for FreeBSD installation:
 
-`sudo pkg install cmake cython eigen3 harfbuzz opus-tools opusfile png py-mako py-numpy py-lz4 py-pillow py-pygments py-toml pylint python qt6 sdl2 sdl2_image toml11`
+`sudo pkg install cmake cython eigen3 harfbuzz opus-tools opusfile png py-mako py-numpy py-lz4 py-pillow py-pygments py-toml pylint python qt6 toml11`
 
 You will also need [nyan](https://github.com/SFTtech/nyan/blob/master/doc/building.md) and its dependencies.
 
diff --git a/doc/build_instructions/macos.md b/doc/build_instructions/macos.md
@@ -8,7 +8,7 @@
 brew update-reset && brew update
 brew tap homebrew/cask-fonts
 brew install font-dejavu
-brew install cmake python3 libepoxy freetype fontconfig harfbuzz sdl2 sdl2_image opus opusfile qt6 libogg libpng toml11 eigen
+brew install cmake python3 libepoxy freetype fontconfig harfbuzz opus opusfile qt6 libogg libpng toml11 eigen
 brew install llvm
 pip3 install cython numpy mako lz4 pillow pygments toml
 
diff --git a/doc/build_instructions/opensuse.md b/doc/build_instructions/opensuse.md
@@ -1,5 +1,5 @@
 # Prerequisite steps for openSUSE users
 
-- `zypper install --no-recommends cmake doxygen eigen3-devel fontconfig-devel gcc-c graphviz++ harfbuzz-devel libSDL2-devel libSDL2_image-devel libepoxy-devel libfreetype-dev libogg-devel libopus-devel libpng-devel libtoml11-dev qt6-declarative-dev qt6-quickcontrols2 qt6-multimedia-dev opusfile-devel python3-Cython python3-Mako python3-lz4 python3-Pillow python3-Pygments python3-toml python3-devel`
+- `zypper install --no-recommends cmake doxygen eigen3-devel fontconfig-devel gcc-c graphviz++ harfbuzz-devel libepoxy-devel libfreetype-dev libogg-devel libopus-devel libpng-devel libtoml11-dev qt6-declarative-dev qt6-quickcontrols2 qt6-multimedia-dev opusfile-devel python3-Cython python3-Mako python3-lz4 python3-Pillow python3-Pygments python3-toml python3-devel`
 
 You will also need [nyan](https://github.com/SFTtech/nyan/blob/master/doc/building.md) and its dependencies.
diff --git a/doc/build_instructions/ubuntu.md b/doc/build_instructions/ubuntu.md
@@ -3,7 +3,7 @@
 Run the following commands:
 
  - `sudo apt-get update`
- - `sudo apt-get install g++ cmake cython3 libeigen3-dev libepoxy-dev libfontconfig1-dev libfreetype-dev libharfbuzz-dev libogg-dev libopus-dev libopusfile-dev libpng-dev libsdl2-dev libsdl2-image-dev libtoml11-dev python3-dev python3-mako python3-numpy python3-lz4 python3-pil python3-pip python3-pygments python3-toml qml6-module-qtquick-controls qt6-declarative-dev qt6-multimedia-dev  qml6-module-qtquick3d-spatialaudio`
+ - `sudo apt-get install g++ cmake cython3 libeigen3-dev libepoxy-dev libfontconfig1-dev libfreetype-dev libharfbuzz-dev libogg-dev libopus-dev libopusfile-dev libpng-dev libtoml11-dev python3-dev python3-mako python3-numpy python3-lz4 python3-pil python3-pip python3-pygments python3-toml qml6-module-qtquick-controls qt6-declarative-dev qt6-multimedia-dev  qml6-module-qtquick3d-spatialaudio`
 
 You will also need [nyan](https://github.com/SFTtech/nyan/blob/master/doc/building.md) and its dependencies.
 
diff --git a/doc/build_instructions/windows_msvc.md b/doc/build_instructions/windows_msvc.md
@@ -45,7 +45,7 @@ _Note:_ Also ensure that `python` and `python3` both point to the correct and th
 ### vcpkg packages
  Set up [vcpkg](https://github.com/Microsoft/vcpkg#quick-start). Open a command prompt at `<vcpkg directory>`
 
-    vcpkg install dirent eigen3 fontconfig freetype harfbuzz libepoxy libogg libpng opus opusfile qtbase qtdeclarative qtmultimedia sdl2 sdl2-image toml11
+    vcpkg install dirent eigen3 fontconfig freetype harfbuzz libepoxy libogg libpng opus opusfile qtbase qtdeclarative qtmultimedia toml11
 
  _Note:_ The `qt6` port in vcpkg has been split into multiple packages, build times are acceptable now.
  If you want, you can still use [the prebuilt version](https://www.qt.io/download-open-source/) instead.
diff --git a/doc/building.md b/doc/building.md
@@ -47,8 +47,6 @@ Dependency list:
     CR    nyan  (https://github.com/SFTtech/nyan)
     CR  O ncurses
     C     mako
-    CR    sdl2
-    CR    sdl2_image
     CR    opusfile
     CRA   opus
     CRA   ogg
@@ -166,10 +164,10 @@ The reference package is [created for Gentoo](https://github.com/SFTtech/gentoo-
 
 - I wanna see compiler invocations
   - `make VERBOSE=1`
-- My `SDL2_Image`/`Python`/whatever is installed somewhere, but `cmake` can't find it!
+- My `Qt`/`Python`/whatever is installed somewhere, but `cmake` can't find it!
   - Run `ccmake` or `cmake-gui` in the build directory to see and change config variables.
   - You can manually tell `cmake` where to look. Try something along the lines of
-    - `./configure -- -DSDL2IMAGE_INCLUDE_DIRS=/whereever/sdl2_image/include/`
+    - `./configure -- -DPYTHON_INCLUDE_DIRS=/whereever/python/include/`
     - `-DPython3_EXECUTABLE=/your/py3/directory/`
 
 - I get compiler errors about missing header files
diff --git a/doc/code_style/mom.cpp b/doc/code_style/mom.cpp
@@ -17,13 +17,16 @@
 // The associated header file comes first!
 #include "mom.h"
 
-// System includes follow, sorted alphabetically
+// C++ std library includes follow, sorted alphabetically
 #include <cmath>
 #include <cstdio>
 #include <iostream>
-#include <SDL/SDL.h>
 
-// Local includes next, sorted alphabetically
+// External libraries are next, sorted alphabetically
+#include <eigen3/Eigen/Dense>
+#include <epoxy/gl.h>
+
+// Local includes come last, sorted alphabetically
 #include "../valve.h"
 #include "half_life.h"
 #include "log/log.h"
@@ -59,25 +62,24 @@
  * Will be parsed by Doxygen.
  */
 struct another_stupid_type {
-	rofl_t blergh_gnampf;  //!< variables and functions in lowercase
-	                       //   with _ as word separator.
-	epictype42_t løl;      //!< no question, we use UTF-8 encoding.
-	ub0rtype røfëlkøptør;  //!< proper documentation is Doxygen parsable.
+	rofl_t blergh_gnampf; //!< variables and functions in lowercase
+		//   with _ as word separator.
+	epictype42_t løl; //!< no question, we use UTF-8 encoding.
+	ub0rtype røfëlkøptør; //!< proper documentation is Doxygen parsable.
 };
 
 
 /**
  * Yet another Valve game. Go on, nothing to see here.
  */
 class HalfLife3 : public ValveGame {
-// vvv The access modifier is at the same indent level as the class definition:
+	// vvv The access modifier is at the same indent level as the class definition:
 public:
 	void release_game(const ValveTeam &team,
 	                  uint128_t passed_time,
 	                  const std::shared_ptr<Engine> &game_engine,
 	                  const std::shared_ptr<Internet> &community,
 	                  bool keep_secret = true) {
-
 		// ^ you can insert a empty line here to make it more readable.
 
 		// http://www.abstrusegoose.com/440
@@ -87,7 +89,6 @@ class HalfLife3 : public ValveGame {
 		if (not keep_secret
 		    and (this->story->awesomeness > 9000)
 		    and (game_engine->quality_points > min_quality)) {
-
 			// ^ This empty line may help, too.
 			team->start_ARG(community);
 
@@ -110,8 +111,7 @@ class HalfLife3 : public ValveGame {
 			// and then indent with a tab:
 			team.relocate(
 				game_engine->get_team()->get_current_hq_location(),
-				gaben.get_table_location()
-			);
+				gaben.get_table_location());
 
 			community->criticize(passed_time);
 			team.continue_selling_hats();
@@ -185,7 +185,8 @@ bool YourMom::tick() {
 		}
 		else if (this->stupidity > 100) {
 			this->die();
-		} else { // Both styles are allowed: '} else {' and '} \n else {'
+		}
+		else { // Both styles are allowed: '} else {' and '} \n else {'
 			// your mom eats a bit.
 			this->mass += 1;
 			// ^ We're not using var++, except in for (..)
diff --git a/doc/troubleshooting.md b/doc/troubleshooting.md
@@ -26,18 +26,3 @@ A workaround would be to make a backup of your AGE2 directory and let the conver
 backup at subfolder `AGE2/resources` delete all files ***except*** folders. Another workaround would be to
 backup your AGE2 folder and redownload it to have a clean install. After conversion you can replace
 it with the backup.
-
-## Installation
-
-### Cannot specify compile definitions for target "SDL2::SDL2" which is not built by this project
-
-This error is specific to a few operating systems. The main cause is that your SDL2 version is too old and does not
-include the necessary CMake files defining the target. There is an indepth discussion about this
-[here](https://discourse.libsdl.org/t/how-is-sdl2-supposed-to-be-used-with-cmake/31275/16).
-As a solution, you should update your SDL packages to SDL >=2.0.12 or **compile the latest SDL2 and SDL2-image from
-source**. The latest version includes the necessary CMake files to expose the `SDL2::SDL2` target.
-
-## Building on Debian 12
-On Debian you might get an error saying that it couldn't find SDL2 library. This happens because the CMAKE prefix and SDL2 path are not set correctly.
-The solution is to append at the end of the `./configure` command the cmake variables for both the prefix and SDL2 path, like so:
-`./configure <your configure opts> -- -DCMAKE_PREFIX_PATH=/usr -DSDL2_DIR=/usr/include/SDL2` (you can use `find` to look for the correct paths)
diff --git a/libopenage/CMakeLists.txt b/libopenage/CMakeLists.txt
@@ -53,9 +53,6 @@ find_library(FONTCONFIG_LIB fontconfig)
 find_package(toml11 REQUIRED)
 find_package(Freetype REQUIRED)
 find_package(PNG REQUIRED)
-find_package(SDL2 CONFIG REQUIRED)
-target_compile_definitions(SDL2::SDL2 INTERFACE SDL_MAIN_HANDLED)
-find_package(SDL2Image REQUIRED)
 find_package(Opusfile REQUIRED)
 find_package(Epoxy REQUIRED)
 find_package(HarfBuzz 1.0.0 REQUIRED)
@@ -268,7 +265,6 @@ target_include_directories(libopenage
 	${EPOXY_INCLUDE_DIRS}
 	${OPUS_INCLUDE_DIRS}
 	${PNG_INCLUDE_DIRS}
-	${SDL2IMAGE_INCLUDE_DIRS}
 	${HarfBuzz_INCLUDE_DIRS}
 	${QTPLATFORM_INCLUDE_DIRS}
 )
@@ -292,8 +288,6 @@ target_link_libraries(libopenage
 		${FREETYPE_LIBRARIES}
 		${EPOXY_LIBRARIES}
 		${MATH_LIB}
-		${SDL2IMAGE_LIBRARIES}
-		SDL2::SDL2
 		${UTIL_LIB}
 		${HarfBuzz_LIBRARIES}
 		${RT_LIB}
diff --git a/libopenage/audio/audio_manager.cpp b/libopenage/audio/audio_manager.cpp
@@ -1,4 +1,4 @@
-// Copyright 2014-2019 the openage authors. See copying.md for legal info.
+// Copyright 2014-2023 the openage authors. See copying.md for legal info.
 
 #include "audio_manager.h"
 
diff --git a/libopenage/gui/guisys/private/gui_ctx_setup.h b/libopenage/gui/guisys/private/gui_ctx_setup.h
@@ -1,4 +1,4 @@
-// Copyright 2017-2017 the openage authors. See copying.md for legal info.
+// Copyright 2017-2023 the openage authors. See copying.md for legal info.
 
 #pragma once
 
diff --git a/libopenage/gui/guisys/private/gui_input_impl.h b/libopenage/gui/guisys/private/gui_input_impl.h
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 the openage authors. See copying.md for legal info.
+// Copyright 2015-2023 the openage authors. See copying.md for legal info.
 
 #pragma once
 
diff --git a/libopenage/gui/guisys/private/gui_rendering_setup_routines.cpp b/libopenage/gui/guisys/private/gui_rendering_setup_routines.cpp
@@ -1,4 +1,4 @@
-// Copyright 2017-2019 the openage authors. See copying.md for legal info.
+// Copyright 2017-2023 the openage authors. See copying.md for legal info.
 
 #include "gui_rendering_setup_routines.h"
 
diff --git a/libopenage/gui/guisys/private/gui_rendering_setup_routines.h b/libopenage/gui/guisys/private/gui_rendering_setup_routines.h
@@ -1,4 +1,4 @@
-// Copyright 2017-2017 the openage authors. See copying.md for legal info.
+// Copyright 2017-2023 the openage authors. See copying.md for legal info.
 
 #pragma once
 
diff --git a/libopenage/gui/guisys/private/platforms/context_extraction.h b/libopenage/gui/guisys/private/platforms/context_extraction.h
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 the openage authors. See copying.md for legal info.
+// Copyright 2015-2023 the openage authors. See copying.md for legal info.
 
 #pragma once
 
diff --git a/libopenage/gui/guisys/private/platforms/context_extraction_win32.cpp b/libopenage/gui/guisys/private/platforms/context_extraction_win32.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 the openage authors. See copying.md for legal info.
+// Copyright 2015-2023 the openage authors. See copying.md for legal info.
 
 #include <cassert>
 
diff --git a/libopenage/gui/guisys/public/gui_input.cpp b/libopenage/gui/guisys/public/gui_input.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 the openage authors. See copying.md for legal info.
+// Copyright 2015-2023 the openage authors. See copying.md for legal info.
 
 #include "../public/gui_input.h"
 
diff --git a/libopenage/gui/guisys/public/gui_input.h b/libopenage/gui/guisys/public/gui_input.h
@@ -1,4 +1,4 @@
-// Copyright 2015-2016 the openage authors. See copying.md for legal info.
+// Copyright 2015-2023 the openage authors. See copying.md for legal info.
 
 #pragma once
 
diff --git a/libopenage/gui/guisys/public/gui_renderer.cpp b/libopenage/gui/guisys/public/gui_renderer.cpp
@@ -1,4 +1,4 @@
-// Copyright 2015-2019 the openage authors. See copying.md for legal info.
+// Copyright 2015-2023 the openage authors. See copying.md for legal info.
 
 #include "../public/gui_renderer.h"
 
diff --git a/libopenage/gui/guisys/public/gui_renderer.h b/libopenage/gui/guisys/public/gui_renderer.h
@@ -1,4 +1,4 @@
-// Copyright 2015-2017 the openage authors. See copying.md for legal info.
+// Copyright 2015-2023 the openage authors. See copying.md for legal info.
 
 #pragma once
 
diff --git a/libopenage/versions/versions.cpp b/libopenage/versions/versions.cpp
@@ -1,4 +1,4 @@
-// Copyright 2020-2020 the openage authors. See copying.md for legal info.
+// Copyright 2020-2023 the openage authors. See copying.md for legal info.
 
 #include "versions.h"
 
diff --git a/shell.nix b/shell.nix
@@ -9,7 +9,7 @@ pkgs.mkShell {
     #pkgs.gdb
     pkgs.cmake
     pkgs.gnumake
-    pkgs.qt5.full
+    pkgs.qt6.full
     #pkgs.qtcreator
 
     pkgs.eigen
@@ -27,13 +27,12 @@ pkgs.mkShell {
     pkgs.ftgl
     pkgs.fontconfig
     pkgs.harfbuzz
-    pkgs.SDL2
-    pkgs.SDL2_image
     pkgs.opusfile
     pkgs.libopus
     pkgs.python39Packages.pylint
     pkgs.python39Packages.toml
     pkgs.libsForQt6.qt6.qtdeclarative
     pkgs.libsForQt6.qt6.qtquickcontrols
+    pkgs.libsForQt6.qt6.qtmultimedia
   ];
 }
