From dfc7dfd0dc8944e9c27aabeb0cb026e700b17764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Fri, 7 Oct 2016 21:46:07 +0200 Subject: [PATCH] package: added magnum-imageconverter to 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/debian/rules | 1 + package/gentoo/dev-libs/magnum/magnum-9999.ebuild | 1 + package/homebrew/magnum.rb | 2 +- 19 files changed, 21 insertions(+), 1 deletion(-) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 37e52624f..d3a836627 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -41,6 +41,7 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ -DWITH_FONTCONVERTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/archlinux/PKGBUILD-clang b/package/archlinux/PKGBUILD-clang index 210432cb0..66912ca4f 100644 --- a/package/archlinux/PKGBUILD-clang +++ b/package/archlinux/PKGBUILD-clang @@ -44,6 +44,7 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ -DWITH_FONTCONVERTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/archlinux/PKGBUILD-clang-libc++ b/package/archlinux/PKGBUILD-clang-libc++ index 709bf1906..cb00c89be 100644 --- a/package/archlinux/PKGBUILD-clang-libc++ +++ b/package/archlinux/PKGBUILD-clang-libc++ @@ -47,6 +47,7 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ -DWITH_FONTCONVERTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/archlinux/PKGBUILD-es2 b/package/archlinux/PKGBUILD-es2 index f7cc98005..3b13bc5f8 100644 --- a/package/archlinux/PKGBUILD-es2 +++ b/package/archlinux/PKGBUILD-es2 @@ -31,6 +31,7 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/archlinux/PKGBUILD-es2desktop b/package/archlinux/PKGBUILD-es2desktop index 155e00821..a85da86df 100644 --- a/package/archlinux/PKGBUILD-es2desktop +++ b/package/archlinux/PKGBUILD-es2desktop @@ -36,6 +36,7 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/archlinux/PKGBUILD-es3 b/package/archlinux/PKGBUILD-es3 index 70d571031..927a9d978 100644 --- a/package/archlinux/PKGBUILD-es3 +++ b/package/archlinux/PKGBUILD-es3 @@ -31,6 +31,7 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/archlinux/PKGBUILD-es3desktop b/package/archlinux/PKGBUILD-es3desktop index 7bc5ec800..a50298c31 100644 --- a/package/archlinux/PKGBUILD-es3desktop +++ b/package/archlinux/PKGBUILD-es3desktop @@ -36,6 +36,7 @@ build() { -DWITH_TGAIMAGECONVERTER=ON \ -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/archlinux/PKGBUILD-gcc47 b/package/archlinux/PKGBUILD-gcc47 index 49725c087..9789e14b2 100644 --- a/package/archlinux/PKGBUILD-gcc47 +++ b/package/archlinux/PKGBUILD-gcc47 @@ -49,6 +49,7 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ -DWITH_FONTCONVERTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/archlinux/PKGBUILD-mingw-w64 b/package/archlinux/PKGBUILD-mingw-w64 index f423d9c6c..61087015c 100644 --- a/package/archlinux/PKGBUILD-mingw-w64 +++ b/package/archlinux/PKGBUILD-mingw-w64 @@ -33,6 +33,7 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ -DWITH_FONTCONVERTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ @@ -60,6 +61,7 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ -DWITH_FONTCONVERTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/archlinux/PKGBUILD-release b/package/archlinux/PKGBUILD-release index d3c5a2dba..bc2afa661 100644 --- a/package/archlinux/PKGBUILD-release +++ b/package/archlinux/PKGBUILD-release @@ -37,6 +37,7 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ -DWITH_FONTCONVERTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ @@ -64,6 +65,7 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ -DWITH_FONTCONVERTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/archlinux/magnum-git/PKGBUILD b/package/archlinux/magnum-git/PKGBUILD index d46afdf97..d0d135244 100644 --- a/package/archlinux/magnum-git/PKGBUILD +++ b/package/archlinux/magnum-git/PKGBUILD @@ -38,6 +38,7 @@ build() { -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ -DWITH_FONTCONVERTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON make diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index b26c664cf..bd5ee13dc 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -35,6 +35,7 @@ cmake .. ^ -DWITH_WAVAUDIOIMPORTER=ON ^ -DWITH_DISTANCEFIELDCONVERTER=OFF ^ -DWITH_FONTCONVERTER=OFF ^ + -DWITH_IMAGECONVERTER=ON ^ -DWITH_MAGNUMINFO=ON ^ -DWITH_AL_INFO=ON ^ -DBUILD_TESTS=ON ^ diff --git a/package/ci/appveyor-desktop-mingw.bat b/package/ci/appveyor-desktop-mingw.bat index 38d69e027..f8675dbff 100644 --- a/package/ci/appveyor-desktop-mingw.bat +++ b/package/ci/appveyor-desktop-mingw.bat @@ -33,6 +33,7 @@ cmake .. ^ -DWITH_WAVAUDIOIMPORTER=ON ^ -DWITH_DISTANCEFIELDCONVERTER=ON ^ -DWITH_FONTCONVERTER=ON ^ + -DWITH_IMAGECONVERTER=ON ^ -DWITH_MAGNUMINFO=ON ^ -DWITH_AL_INFO=ON ^ -DBUILD_TESTS=ON ^ diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index 09a1918d1..8de5d0cd7 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -32,6 +32,7 @@ cmake .. ^ -DWITH_WAVAUDIOIMPORTER=ON ^ -DWITH_DISTANCEFIELDCONVERTER=ON ^ -DWITH_FONTCONVERTER=ON ^ + -DWITH_IMAGECONVERTER=ON ^ -DWITH_MAGNUMINFO=ON ^ -DWITH_AL_INFO=ON ^ -DBUILD_TESTS=ON ^ diff --git a/package/ci/travis-desktop-gles.sh b/package/ci/travis-desktop-gles.sh index 45b4e95fa..918c710ab 100755 --- a/package/ci/travis-desktop-gles.sh +++ b/package/ci/travis-desktop-gles.sh @@ -34,6 +34,7 @@ cmake .. \ -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=OFF \ -DWITH_FONTCONVERTER=OFF \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/ci/travis-desktop.sh b/package/ci/travis-desktop.sh index ba64b12de..0b3b0b155 100755 --- a/package/ci/travis-desktop.sh +++ b/package/ci/travis-desktop.sh @@ -31,6 +31,7 @@ cmake .. \ -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ -DWITH_FONTCONVERTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON \ -DBUILD_TESTS=ON \ diff --git a/package/debian/rules b/package/debian/rules index 35c5855f9..037062d7d 100755 --- a/package/debian/rules +++ b/package/debian/rules @@ -17,6 +17,7 @@ override_dh_auto_configure: -DWITH_TGAIMPORTER=ON \ -DWITH_WAVAUDIOIMPORTER=ON \ -DWITH_DISTANCEFIELDCONVERTER=ON \ + -DWITH_IMAGECONVERTER=ON \ -DWITH_FONTCONVERTER=ON \ -DWITH_MAGNUMINFO=ON \ -DWITH_AL_INFO=ON diff --git a/package/gentoo/dev-libs/magnum/magnum-9999.ebuild b/package/gentoo/dev-libs/magnum/magnum-9999.ebuild index 11801e1b7..2bd4cb643 100644 --- a/package/gentoo/dev-libs/magnum/magnum-9999.ebuild +++ b/package/gentoo/dev-libs/magnum/magnum-9999.ebuild @@ -40,6 +40,7 @@ src_configure() { -DWITH_TGAIMPORTER=ON -DWITH_WAVAUDIOIMPORTER=ON -DWITH_DISTANCEFIELDCONVERTER=ON + -DWITH_IMAGECONVERTER=ON -DWITH_FONTCONVERTER=ON -DWITH_MAGNUMINFO=ON -DWITH_AL_INFO=ON diff --git a/package/homebrew/magnum.rb b/package/homebrew/magnum.rb index 1dfdbcc92..8eb0261e0 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_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_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