From 3300f0601773c7b7fcb7b79401e34f284793f5a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Mon, 23 Jan 2017 17:17:39 +0100 Subject: [PATCH] package: enabled OpenGLTester in all packages and CIs. --- package/archlinux/PKGBUILD | 1 + package/archlinux/PKGBUILD-clang | 1 + package/archlinux/PKGBUILD-clang-libc++ | 1 + package/archlinux/PKGBUILD-es2 | 1 + package/archlinux/PKGBUILD-es2desktop | 1 + package/archlinux/PKGBUILD-es3 | 1 + package/archlinux/PKGBUILD-es3desktop | 1 + package/archlinux/PKGBUILD-gcc47 | 1 + package/archlinux/PKGBUILD-mingw-w64 | 2 ++ package/archlinux/PKGBUILD-release | 2 ++ package/archlinux/magnum-git/PKGBUILD | 1 + package/ci/appveyor-desktop-gles.bat | 1 + package/ci/appveyor-desktop-mingw.bat | 1 + package/ci/appveyor-desktop.bat | 1 + package/ci/travis-desktop-gles.sh | 1 + package/ci/travis-desktop.sh | 1 + package/ci/travis-ios-simulator.sh | 1 + package/debian/rules | 1 + package/gentoo/dev-libs/magnum/magnum-9999.ebuild | 1 + package/homebrew/magnum.rb | 2 +- 20 files changed, 22 insertions(+), 1 deletion(-) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 21ed731db..ff5e2c82b 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -34,6 +34,7 @@ build() { -DWITH_WINDOWLESSEGLAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ -DWITH_GLXCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-clang b/package/archlinux/PKGBUILD-clang index a90240cc7..155a0d81c 100644 --- a/package/archlinux/PKGBUILD-clang +++ b/package/archlinux/PKGBUILD-clang @@ -37,6 +37,7 @@ build() { -DWITH_WINDOWLESSEGLAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ -DWITH_GLXCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-clang-libc++ b/package/archlinux/PKGBUILD-clang-libc++ index 12ee67ea4..527c9116b 100644 --- a/package/archlinux/PKGBUILD-clang-libc++ +++ b/package/archlinux/PKGBUILD-clang-libc++ @@ -40,6 +40,7 @@ build() { -DWITH_WINDOWLESSEGLAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ -DWITH_GLXCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-es2 b/package/archlinux/PKGBUILD-es2 index 3b13bc5f8..d7dbdbb9c 100644 --- a/package/archlinux/PKGBUILD-es2 +++ b/package/archlinux/PKGBUILD-es2 @@ -26,6 +26,7 @@ build() { -DWITH_XEGLAPPLICATION=ON \ -DWITH_WINDOWLESSEGLAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_OBJIMPORTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ diff --git a/package/archlinux/PKGBUILD-es2desktop b/package/archlinux/PKGBUILD-es2desktop index a85da86df..6b3ae8d3a 100644 --- a/package/archlinux/PKGBUILD-es2desktop +++ b/package/archlinux/PKGBUILD-es2desktop @@ -31,6 +31,7 @@ build() { -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ -DWITH_GLXCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_OBJIMPORTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ diff --git a/package/archlinux/PKGBUILD-es3 b/package/archlinux/PKGBUILD-es3 index 927a9d978..995ff02c1 100644 --- a/package/archlinux/PKGBUILD-es3 +++ b/package/archlinux/PKGBUILD-es3 @@ -26,6 +26,7 @@ build() { -DWITH_XEGLAPPLICATION=ON \ -DWITH_WINDOWLESSEGLAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_OBJIMPORTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ diff --git a/package/archlinux/PKGBUILD-es3desktop b/package/archlinux/PKGBUILD-es3desktop index a50298c31..c74975c60 100644 --- a/package/archlinux/PKGBUILD-es3desktop +++ b/package/archlinux/PKGBUILD-es3desktop @@ -31,6 +31,7 @@ build() { -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ -DWITH_GLXCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_OBJIMPORTER=ON \ -DWITH_TGAIMAGECONVERTER=ON \ diff --git a/package/archlinux/PKGBUILD-gcc47 b/package/archlinux/PKGBUILD-gcc47 index 9789e14b2..5714bd45c 100644 --- a/package/archlinux/PKGBUILD-gcc47 +++ b/package/archlinux/PKGBUILD-gcc47 @@ -41,6 +41,7 @@ build() { -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ -DWITH_GLXCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-mingw-w64 b/package/archlinux/PKGBUILD-mingw-w64 index 61087015c..6652a8e84 100644 --- a/package/archlinux/PKGBUILD-mingw-w64 +++ b/package/archlinux/PKGBUILD-mingw-w64 @@ -25,6 +25,7 @@ build() { -DWITH_SDL2APPLICATION=ON \ -DWITH_WINDOWLESSWGLAPPLICATION=ON \ -DWITH_WGLCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ @@ -53,6 +54,7 @@ build() { -DWITH_SDL2APPLICATION=ON \ -DWITH_WINDOWLESSWGLAPPLICATION=ON \ -DWITH_WGLCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-release b/package/archlinux/PKGBUILD-release index bc2afa661..4ef5bef34 100644 --- a/package/archlinux/PKGBUILD-release +++ b/package/archlinux/PKGBUILD-release @@ -29,6 +29,7 @@ build() { -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ -DWITH_GLXCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ @@ -57,6 +58,7 @@ build() { -DWITH_SDL2APPLICATION=ON \ -DWITH_XEGLAPPLICATION=ON \ -DWITH_WINDOWLESSGLXAPPLICATION=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ diff --git a/package/archlinux/magnum-git/PKGBUILD b/package/archlinux/magnum-git/PKGBUILD index d0d135244..2ebc6a4b0 100644 --- a/package/archlinux/magnum-git/PKGBUILD +++ b/package/archlinux/magnum-git/PKGBUILD @@ -30,6 +30,7 @@ build() { -DWITH_GLXAPPLICATION=ON \ -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_GLXCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index 3dda4e281..755cb6397 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -27,6 +27,7 @@ cmake .. ^ -DWITH_SDL2APPLICATION=OFF ^ -DWITH_WINDOWLESSWGLAPPLICATION=ON ^ -DWITH_WGLCONTEXT=ON ^ + -DWITH_OPENGLTESTER=ON ^ -DWITH_MAGNUMFONT=ON ^ -DWITH_MAGNUMFONTCONVERTER=ON ^ -DWITH_OBJIMPORTER=ON ^ diff --git a/package/ci/appveyor-desktop-mingw.bat b/package/ci/appveyor-desktop-mingw.bat index f8675dbff..dd3fc9445 100644 --- a/package/ci/appveyor-desktop-mingw.bat +++ b/package/ci/appveyor-desktop-mingw.bat @@ -25,6 +25,7 @@ cmake .. ^ -DWITH_SDL2APPLICATION=ON ^ -DWITH_WINDOWLESSWGLAPPLICATION=ON ^ -DWITH_WGLCONTEXT=ON ^ + -DWITH_OPENGLTESTER=ON ^ -DWITH_MAGNUMFONT=ON ^ -DWITH_MAGNUMFONTCONVERTER=ON ^ -DWITH_OBJIMPORTER=ON ^ diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index a7d55890e..510be3284 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -24,6 +24,7 @@ cmake .. ^ -DWITH_SDL2APPLICATION=ON ^ -DWITH_WINDOWLESSWGLAPPLICATION=ON ^ -DWITH_WGLCONTEXT=ON ^ + -DWITH_OPENGLTESTER=ON ^ -DWITH_MAGNUMFONT=ON ^ -DWITH_MAGNUMFONTCONVERTER=ON ^ -DWITH_OBJIMPORTER=ON ^ diff --git a/package/ci/travis-desktop-gles.sh b/package/ci/travis-desktop-gles.sh index fb98c3746..6451aa290 100755 --- a/package/ci/travis-desktop-gles.sh +++ b/package/ci/travis-desktop-gles.sh @@ -25,6 +25,7 @@ cmake .. \ -DWITH_SDL2APPLICATION=OFF \ -DWITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=ON \ -DWITH_${PLATFORM_GL_API}CONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh index f1cc52d26..60bb293ca 100755 --- a/package/ci/travis-desktop.sh +++ b/package/ci/travis-desktop.sh @@ -24,6 +24,7 @@ cmake .. \ -DWITH_SDL2APPLICATION=ON \ -DWITH_WINDOWLESS${PLATFORM_GL_API}APPLICATION=ON \ -DWITH_${PLATFORM_GL_API}CONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ diff --git a/package/ci/travis-ios-simulator.sh b/package/ci/travis-ios-simulator.sh index e770a1999..d5b68d50a 100755 --- a/package/ci/travis-ios-simulator.sh +++ b/package/ci/travis-ios-simulator.sh @@ -47,6 +47,7 @@ cmake .. \ -DWITH_SDL2APPLICATION=ON \ -DWITH_WINDOWLESSIOSAPPLICATION=ON \ -DWITH_EGLCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ diff --git a/package/debian/rules b/package/debian/rules index 037062d7d..ab303e6e4 100755 --- a/package/debian/rules +++ b/package/debian/rules @@ -10,6 +10,7 @@ override_dh_auto_configure: -DWITH_SDL2APPLICATION=ON \ -DWITH_WINDOWLESSGLXAPPLICATION=ON \ -DWITH_GLXCONTEXT=ON \ + -DWITH_OPENGLTESTER=ON \ -DWITH_MAGNUMFONT=ON \ -DWITH_MAGNUMFONTCONVERTER=ON \ -DWITH_OBJIMPORTER=ON \ diff --git a/package/gentoo/dev-libs/magnum/magnum-9999.ebuild b/package/gentoo/dev-libs/magnum/magnum-9999.ebuild index 2bd4cb643..ed08a258a 100644 --- a/package/gentoo/dev-libs/magnum/magnum-9999.ebuild +++ b/package/gentoo/dev-libs/magnum/magnum-9999.ebuild @@ -33,6 +33,7 @@ src_configure() { -DWITH_WINDOWLESSGLXAPPLICATION=ON -DWITH_EGLCONTEXT=ON -DWITH_GLXCONTEXT=ON + -DWITH_OPENGLTESTER=ON -DWITH_MAGNUMFONT=ON -DWITH_MAGNUMFONTCONVERTER=ON -DWITH_OBJIMPORTER=ON diff --git a/package/homebrew/magnum.rb b/package/homebrew/magnum.rb index 8eb0261e0..78602d095 100644 --- a/package/homebrew/magnum.rb +++ b/package/homebrew/magnum.rb @@ -12,7 +12,7 @@ class Magnum < Formula def install system "mkdir build" cd "build" do - system "cmake", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DWITH_AUDIO=ON", "-DWITH_SDL2APPLICATION=ON", "-DWITH_WINDOWLESSCGLAPPLICATION=ON", "-DWITH_CGLCONTEXT=ON", "-DWITH_MAGNUMFONT=ON", "-DWITH_MAGNUMFONTCONVERTER=ON", "-DWITH_OBJIMPORTER=ON", "-DWITH_TGAIMAGECONVERTER=ON", "-DWITH_TGAIMPORTER=ON", "-DWITH_WAVAUDIOIMPORTER=ON", "-DWITH_DISTANCEFIELDCONVERTER=ON", "-DWITH_FONTCONVERTER=ON", "-DWITH_IMAGECONVERTER=ON", "-DWITH_MAGNUMINFO=ON", "-DWITH_AL_INFO=ON", ".." + system "cmake", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DWITH_AUDIO=ON", "-DWITH_SDL2APPLICATION=ON", "-DWITH_WINDOWLESSCGLAPPLICATION=ON", "-DWITH_CGLCONTEXT=ON", "-DWITH_OPENGLTESTER=ON", "-DWITH_MAGNUMFONT=ON", "-DWITH_MAGNUMFONTCONVERTER=ON", "-DWITH_OBJIMPORTER=ON", "-DWITH_TGAIMAGECONVERTER=ON", "-DWITH_TGAIMPORTER=ON", "-DWITH_WAVAUDIOIMPORTER=ON", "-DWITH_DISTANCEFIELDCONVERTER=ON", "-DWITH_FONTCONVERTER=ON", "-DWITH_IMAGECONVERTER=ON", "-DWITH_MAGNUMINFO=ON", "-DWITH_AL_INFO=ON", ".." system "cmake", "--build", "." system "cmake", "--build", ".", "--target", "install" end