File 0001-Update-SDL1-references-to-SDL2.patch of Package libtuxcap
From 626702fc1963e728e88b031cf35ddfda0b5e5738 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Fri, 28 Mar 2025 14:13:49 +0100
Subject: [PATCH] Update SDL1 references to SDL2
---
src/CMakeDemo.txt | 8 ++++----
src/lib/CMakeLists.txt | 14 ++++----------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/CMakeDemo.txt b/src/CMakeDemo.txt
index 24c327b..9439fd6 100644
--- a/src/CMakeDemo.txt
+++ b/src/CMakeDemo.txt
@@ -20,19 +20,19 @@ add_compile_options(${ARCH} -Wall -g -O0 -pg -fprofile-arcs)
endif()
# These packages are absolutely necessary
-Find_Package ( SDL REQUIRED )
-Find_Package ( SDL_image REQUIRED )
+Find_Package ( SDL2 REQUIRED )
+Find_Package ( SDL2_image REQUIRED )
Find_Package ( OpenGL REQUIRED )
SET(MY_LINK_LIBS
- ${SDL_LIBRARY}
+ ${SDL2_LIBRARY}
${SDLIMAGE_LIBRARY}
${OPENGL_LIBRARIES}
)
SET(Libraries
tuxcap
- ${SDL_LIBRARY}
+ ${SDL2_LIBRARY}
${SDLIMAGE_LIBRARY}
${OPENGL_LIBRARIES}
)
diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt
index f71b620..ebaf2c8 100644
--- a/src/lib/CMakeLists.txt
+++ b/src/lib/CMakeLists.txt
@@ -96,16 +96,10 @@ IF(NOT SOUND_SYSTEM)
SET(SOUND_SYSTEM "UNDEFINED_SOUND_SYSTEM")
ENDIF(NOT SOUND_SYSTEM)
IF(${SOUND_SYSTEM} STREQUAL "SDL")
- Find_Package ( SDL_mixer REQUIRED )
- IF(SDLMIXER_FOUND)
- MESSAGE("libSDL_mixer found. ${SDLMIXER_INCLUDE_DIR} ${SDLMIXER_LIBRARY}")
- INCLUDE_DIRECTORIES(${SDLMIXER_INCLUDE_DIR})
- ELSE(SDLMIXER_FOUND)
- MESSAGE(FATAL_ERROR "libSDL_mixer requested but not found.")
- ENDIF(SDLMIXER_FOUND)
+ Find_Package ( SDL2_mixer REQUIRED )
SET(MY_LINK_LIBS
${MY_LINK_LIBS}
- ${SDLMIXER_LIBRARY}
+ SDL2_mixer::SDL2_mixer
)
ADD_DEFINITIONS(-DUSE_SDLMIXER)
ENDIF()
@@ -346,7 +340,7 @@ SET (PYCAP_HEADERS
../pycap/PycapResources.h
)
-IF(SDLMIXER_FOUND)
+IF(SDL2_mixer_FOUND)
SET(MY_SOURCES ${MY_SOURCES}
SDLMixerMusicInterface.cpp
SDLMixerSoundManager.cpp
@@ -358,7 +352,7 @@ IF(SDLMIXER_FOUND)
SDLMixerSoundInstance.h
SDLMixerSoundManager.h
)
-ENDIF(SDLMIXER_FOUND)
+ENDIF(SDL2_mixer_FOUND)
IF(AUDIERELIB_FOUND)
SET(MY_SOURCES ${MY_SOURCES}
--
2.49.0