package: enable both SDL2 and GLFW apps in all packages.

Because people like to use either of them.
mosra · May 26, 2019 · 8110de3 · 8110de3
1 parent 5bb6878
commit 8110de3
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 8 deletions.
diff --git a/package/archlinux/magnum-git/PKGBUILD b/package/archlinux/magnum-git/PKGBUILD
@@ -6,7 +6,7 @@ pkgdesc="C++11/C++14 graphics middleware for games and data visualization (Git v
 arch=('i686' 'x86_64')
 url="https://magnum.graphics"
 license=('MIT')
-depends=('corrade-git' 'openal' 'sdl2' 'vulkan-icd-loader')
+depends=('corrade-git' 'openal' 'glfw' 'sdl2' 'vulkan-icd-loader')
 makedepends=('cmake' 'git')
 provides=('magnum')
 conflicts=('magnum')
@@ -27,7 +27,7 @@ build() {
         -DCMAKE_INSTALL_PREFIX=/usr \
         -DWITH_AUDIO=ON \
         -DWITH_VK=ON \
-        -DWITH_GLFWAPPLICATION=OFF \
+        -DWITH_GLFWAPPLICATION=ON \
         -DWITH_SDL2APPLICATION=ON \
         -DWITH_GLXAPPLICATION=ON \
         -DWITH_WINDOWLESSGLXAPPLICATION=ON \

diff --git a/package/archlinux/magnum/PKGBUILD b/package/archlinux/magnum/PKGBUILD
@@ -8,7 +8,7 @@ pkgdesc='C++11/C++14 graphics middleware for games and data visualization'
 arch=('x86_64')
 url='https://magnum.graphics'
 license=('MIT')
-depends=("corrade>=$pkgver" 'openal' 'sdl2' 'vulkan-icd-loader')
+depends=("corrade>=$pkgver" 'openal' 'glfw' 'sdl2' 'vulkan-icd-loader')
 optdepends=('magnum-plugins: import and export features')
 makedepends=('cmake' 'git' 'ninja')
 source=("git+https://github.com/mosra/magnum.git#tag=v$pkgver")
@@ -36,6 +36,7 @@ build() {
     -DWITH_OBJIMPORTER=ON \
     -DWITH_FONTCONVERTER=ON \
     -DWITH_GL_INFO=ON \
+    -DWITH_GLFWAPPLICATION=ON \
     -DWITH_SDL2APPLICATION=ON \
     -DWITH_TGAIMAGECONVERTER=ON \
     -DWITH_TGAIMPORTER=ON \

diff --git a/package/debian/control b/package/debian/control
@@ -1,7 +1,7 @@
 Source: magnum
 Priority: optional
 Maintainer: Vladimír Vondruš <mosra@centrum.cz>
-Build-Depends: debhelper (>= 9), cmake (>= 3.1), corrade-dev, libgl-dev, libopenal-dev, libsdl2-dev
+Build-Depends: debhelper (>= 9), cmake (>= 3.1), corrade-dev, libgl-dev, libopenal-dev, libglfw3-dev, libsdl2-dev
 Standards-Version: 3.9.2
 Section: libs
 Homepage: https://magnum.graphics
@@ -11,14 +11,14 @@ Vcs-Browser: https://github.com/mosra/magnum
 Package: magnum-dev
 Section: libdevel
 Architecture: any
-Depends: magnum (= ${binary:Version}), corrade-dev, libgl-dev, libopenal-dev, libsdl2-dev
+Depends: magnum (= ${binary:Version}), corrade-dev, libgl-dev, libopenal-dev, libglfw3-dev, libsdl2-dev
 Description: Magnum development files
  Headers and tools needed for developing with Magnum.
 
 Package: magnum
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, corrade, libgl1, libopenal1, libsdl2-2.0-0
+Depends: ${shlibs:Depends}, ${misc:Depends}, corrade, libgl1, libopenal1, libglfw3, libsdl2-2.0-0
 Description: C++11/C++14 graphics middleware for games and data visualization
  Magnum is 2D/3D graphics engine written in C++11 and modern OpenGL. Its goal
  is to simplify low-level graphics development and interaction with OpenGL

diff --git a/package/debian/rules b/package/debian/rules
@@ -18,7 +18,7 @@ override_dh_auto_configure:
 		-DCMAKE_BUILD_TYPE=Release \
 		-DWITH_AUDIO=ON \
 		-DWITH_GLXAPPLICATION=ON \
-		-DWITH_GLFWAPPLICATION=OFF \
+		-DWITH_GLFWAPPLICATION=ON \
 		-DWITH_SDL2APPLICATION=ON \
 		-DWITH_WINDOWLESSGLXAPPLICATION=ON \
 		-DWITH_GLXCONTEXT=ON \

diff --git a/package/gentoo/dev-libs/magnum/magnum-9999.ebuild b/package/gentoo/dev-libs/magnum/magnum-9999.ebuild
@@ -15,6 +15,7 @@ IUSE=""
 RDEPEND="
 	dev-libs/corrade
 	media-libs/openal
+	media-libs/glfw
 	media-libs/libsdl2
 "
 DEPEND="${RDEPEND}"
@@ -25,7 +26,7 @@ src_configure() {
 		-DCMAKE_BUILD_TYPE=Release
 		-DWITH_AUDIO=ON
 		-DWITH_GLXAPPLICATION=ON
-		-DWITH_GLFWAPPLICATION=OFF
+		-DWITH_GLFWAPPLICATION=ON
 		-DWITH_SDL2APPLICATION=ON
 		-DWITH_WINDOWLESSGLXAPPLICATION=ON
 		-DWITH_EGLCONTEXT=ON

diff --git a/package/msys/magnum/PKGBUILD b/package/msys/magnum/PKGBUILD
@@ -14,6 +14,7 @@ license=('MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-corrade>=$pkgver"
          "${MINGW_PACKAGE_PREFIX}-openal"
          "${MINGW_PACKAGE_PREFIX}-SDL2"
+         "${MINGW_PACKAGE_PREFIX}-glfw"
          "${MINGW_PACKAGE_PREFIX}-vulkan-loader")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake" "${MINGW_PACKAGE_PREFIX}-ninja" 'git')
 optdepends=("${MINGW_PACKAGE_PREFIX}-magnum-plugins: import and export features"
@@ -53,6 +54,7 @@ build() {
             -DWITH_OBJIMPORTER=ON \
             -DWITH_FONTCONVERTER=ON \
             -DWITH_GL_INFO=ON \
+            -DWITH_GLFWAPPLICATION=ON \
             -DWITH_SDL2APPLICATION=ON \
             -DWITH_TGAIMAGECONVERTER=ON \
             -DWITH_TGAIMPORTER=ON \