From f47ea91e0a0990073e01820351d6c7e7ed95a25e Mon Sep 17 00:00:00 2001
From: Martin Natano <natano@natano.net>
Date: Mon, 6 Jun 2022 12:09:01 +0200
Subject: [PATCH] Stop looking for bundled libraries

---
 .github/workflows/ci.yml       | 3 +--
 StepmaniaCore.cmake            | 4 ----
 extern/CMakeProject-glew.cmake | 2 +-
 src/CMakeLists.txt             | 4 ----
 4 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f9a535a872..f77a72ed70 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,14 +14,13 @@ jobs:
         run: sudo apt-get update && sudo apt-get install -y
           libasound2-dev
           libgl-dev
-          libglew-dev
+          libglu1-mesa-dev
           libgtk-3-dev
           libjack-dev
           libmad0-dev
           libpulse-dev
           libudev-dev
           libva-dev
-          libvorbis-dev
           libxinerama-dev
           libx11-dev
           libxrandr-dev
diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake
index a7800619a1..a6257b5b5c 100644
--- a/StepmaniaCore.cmake
+++ b/StepmaniaCore.cmake
@@ -324,9 +324,6 @@ elseif(LINUX)
     set(HAS_X11 TRUE)
   endif()
 
-  find_package("ZLIB" REQUIRED)
-  find_package("JPEG" REQUIRED)
-
   find_package(Dl)
 
   set(HAS_XRANDR FALSE)
@@ -394,7 +391,6 @@ elseif(LINUX)
 
   set(OpenGL_GL_PREFERENCE GLVND)
   find_package(OpenGL REQUIRED)
-  find_package(GLEW REQUIRED)
 endif(WIN32) # LINUX, APPLE
 
 configure_file("${SM_SRC_DIR}/config.in.hpp"
diff --git a/extern/CMakeProject-glew.cmake b/extern/CMakeProject-glew.cmake
index 3786f64ec2..2a0431abea 100644
--- a/extern/CMakeProject-glew.cmake
+++ b/extern/CMakeProject-glew.cmake
@@ -11,7 +11,7 @@ add_library("glew" STATIC ${GLEW_SRC} ${GLEW_HPP})
 
 set_property(TARGET "glew" PROPERTY FOLDER "External Libraries")
 
-target_compile_definitions("glew" PRIVATE GLEW_STATIC)
+target_compile_definitions("glew" PUBLIC GLEW_STATIC)
 
 if(MSVC)
   target_compile_definitions("glew" PRIVATE _MBCS)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 84e8d6e3df..09fbaadeaf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -152,7 +152,6 @@ if(WIN32)
   target_compile_definitions("${SM_EXE_NAME}" PRIVATE _WINDOWS) # TODO: Remove this potential duplicate.
   target_compile_definitions("${SM_EXE_NAME}" PRIVATE _CRT_SECURE_NO_WARNINGS)
   target_compile_definitions("${SM_EXE_NAME}" PRIVATE _WINSOCK_DEPRECATED_NO_WARNINGS)
-  target_compile_definitions("${SM_EXE_NAME}" PRIVATE GLEW_STATIC)
 
   set_target_properties("${SM_EXE_NAME}"
                         PROPERTIES RUNTIME_OUTPUT_DIRECTORY
@@ -451,9 +450,6 @@ else()
     add_dependencies("${SM_EXE_NAME}" "ffmpeg")
     list(APPEND SM_INCLUDE_DIRS "${SM_FFMPEG_INCLUDE}")
 
-    if(HAS_GTK3)
-      list(APPEND SM_INCLUDE_DIRS "${GTK3_INCLUDE_DIRS}")
-    endif()
     if(X11_FOUND)
       list(APPEND SM_INCLUDE_DIRS "${X11_INCLUDE_DIR}")
     endif()