From d5ffa81fe2d306fa0265685a5abadd1db20dd1f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= <mosra@centrum.cz>
Date: Wed, 23 Oct 2024 19:53:45 +0200
Subject: [PATCH] package/ci: build w/ deprecated APIs enabled by default.

And have a dedicated non-deprecated build instead. Because that's the
default, and that's more important to have working, especially
given the recently discovered MSVC warts in
1c80a7a6f21bfb86caf0d7f491c3baf449bcc32d.
---
 package/ci/appveyor-desktop-gles.bat |  2 --
 package/ci/appveyor-desktop.bat      |  2 --
 package/ci/circleci.yml              | 28 ++++++++++++++++++++++++++++
 package/ci/unix-desktop-gles.sh      |  2 --
 package/ci/unix-desktop.sh           |  4 ++--
 5 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat
index e0729c7..42e49d2 100644
--- a/package/ci/appveyor-desktop-gles.bat
+++ b/package/ci/appveyor-desktop-gles.bat
@@ -21,7 +21,6 @@ mkdir build && cd build || exit /b
 cmake .. ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-    -DCORRADE_BUILD_DEPRECATED=OFF ^
     -DCORRADE_BUILD_STATIC=%BUILD_STATIC% ^
     -DCORRADE_WITH_INTERCONNECT=OFF ^
     -DCORRADE_WITH_PLUGINMANAGER=ON ^
@@ -39,7 +38,6 @@ mkdir build && cd build || exit /b
 cmake .. ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-    -DMAGNUM_BUILD_DEPRECATED=OFF ^
     -DMAGNUM_BUILD_STATIC=%BUILD_STATIC% ^
     -DMAGNUM_TARGET_GLES=ON ^
     -DMAGNUM_TARGET_GLES2=%TARGET_GLES2% ^
diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat
index 1b54039..1013547 100644
--- a/package/ci/appveyor-desktop.bat
+++ b/package/ci/appveyor-desktop.bat
@@ -33,7 +33,6 @@ mkdir build && cd build || exit /b
 cmake .. ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
-    -DCORRADE_BUILD_DEPRECATED=OFF ^
     -DCORRADE_BUILD_STATIC=%BUILD_STATIC% ^
     -DCORRADE_WITH_INTERCONNECT=OFF ^
     -DCORRADE_WITH_PLUGINMANAGER=ON ^
@@ -52,7 +51,6 @@ cmake .. ^
     -DCMAKE_BUILD_TYPE=Release ^
     -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^
     -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^
-    -DMAGNUM_BUILD_DEPRECATED=OFF ^
     -DMAGNUM_BUILD_STATIC=%BUILD_STATIC% %STATIC_PLUGIN_PATH% ^
     -DMAGNUM_WITH_AUDIO=OFF ^
     -DMAGNUM_WITH_DEBUGTOOLS=OFF ^
diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml
index e342008..7fd5f2d 100644
--- a/package/ci/circleci.yml
+++ b/package/ci/circleci.yml
@@ -329,6 +329,29 @@ jobs:
         script: unix-desktop.sh
     - lcov
 
+  linux-nondeprecated:
+    executor: ubuntu-18_04
+    environment:
+      # STUPID yml interprets unquoted OFF as a boolean
+      BUILD_DEPRECATED: "OFF"
+      CMAKE_CXX_FLAGS: --coverage
+      LCOV_EXTRA_OPTS: --gcov-tool /usr/bin/gcov-4.8
+      PLATFORM_GL_API: GLX
+      # It crashes (OOM, probably) with the default setting
+      NINJA_JOBS: -j2
+    steps:
+    - install-base-linux:
+        extra: libgl1-mesa-dev libsdl2-dev libglfw3-dev
+    - install-gcc-4_8
+    - install-cmake:
+        version: "3.5.2"
+    - install-python-3_6
+    - install-pybind11
+    - install-meshoptimizer
+    - build:
+        script: unix-desktop.sh
+    - lcov
+
   macos-gl:
     executor: xcode-13_4
     environment:
@@ -384,18 +407,23 @@ workflows:
     # dependencies especially for the macOS jobs that take the most credits.
     jobs:
     - linux-gl
+    - linux-nondeprecated
     - linux-gles2:
         requires:
         - linux-gl
+        - linux-nondeprecated
     - linux-gles3:
         requires:
         - linux-gl
+        - linux-nondeprecated
     - linux-static:
         requires:
         - linux-gl
+        - linux-nondeprecated
     - macos-gl:
         requires:
         - linux-gl
+        - linux-nondeprecated
     - macos-gles3:
         requires:
         - linux-gles3
diff --git a/package/ci/unix-desktop-gles.sh b/package/ci/unix-desktop-gles.sh
index 356bfce..d59229d 100755
--- a/package/ci/unix-desktop-gles.sh
+++ b/package/ci/unix-desktop-gles.sh
@@ -9,7 +9,6 @@ cmake .. \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCORRADE_BUILD_DEPRECATED=OFF \
     -DCORRADE_WITH_INTERCONNECT=OFF \
     -DCORRADE_WITH_PLUGINMANAGER=ON \
     -DCORRADE_WITH_TESTSUITE=ON \
@@ -26,7 +25,6 @@ cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_PREFIX_PATH="$HOME/swiftshader;$HOME/pybind11" \
     -DCMAKE_INSTALL_RPATH="$HOME/deps/lib;$HOME/swiftshader/lib" \
-    -DMAGNUM_BUILD_DEPRECATED=OFF \
     -DMAGNUM_TARGET_GLES=ON \
     -DMAGNUM_TARGET_GLES2=$TARGET_GLES2 \
     -DMAGNUM_WITH_AUDIO=OFF \
diff --git a/package/ci/unix-desktop.sh b/package/ci/unix-desktop.sh
index c01bc9b..1b77aaf 100755
--- a/package/ci/unix-desktop.sh
+++ b/package/ci/unix-desktop.sh
@@ -9,7 +9,7 @@ cmake .. \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCORRADE_BUILD_DEPRECATED=OFF \
+    -DMAGNUM_BUILD_DEPRECATED=$BUILD_DEPRECATED \
     -DCORRADE_BUILD_STATIC=$BUILD_STATIC \
     -DCORRADE_WITH_INTERCONNECT=OFF \
     -DCORRADE_WITH_PLUGINMANAGER=ON \
@@ -26,7 +26,7 @@ cmake .. \
     -DCMAKE_INSTALL_PREFIX=$HOME/deps \
     -DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
     -DCMAKE_BUILD_TYPE=Release \
-    -DMAGNUM_BUILD_DEPRECATED=OFF \
+    -DMAGNUM_BUILD_DEPRECATED=$BUILD_DEPRECATED \
     -DMAGNUM_BUILD_STATIC=$BUILD_STATIC \
     -DMAGNUM_WITH_AUDIO=OFF \
     -DMAGNUM_WITH_DEBUGTOOLS=OFF \