From bd6791e0512180f89161826b54021b8415e2f14d Mon Sep 17 00:00:00 2001 From: Squareys Date: Sun, 25 Aug 2019 17:30:56 +0200 Subject: [PATCH] package: Disable WITH_BASISIMORTER in all packages Signed-off-by: Squareys --- package/archlinux/PKGBUILD | 1 + package/archlinux/PKGBUILD-android-arm64 | 1 + package/archlinux/PKGBUILD-clang | 1 + package/archlinux/PKGBUILD-clang-addesssanitizer | 1 + package/archlinux/PKGBUILD-coverage | 1 + package/archlinux/PKGBUILD-emscripten | 1 + package/archlinux/PKGBUILD-emscripten-wasm | 1 + package/archlinux/PKGBUILD-emscripten-wasm-webgl2 | 1 + package/archlinux/PKGBUILD-gcc48 | 1 + package/archlinux/PKGBUILD-mingw-w64 | 1 + package/archlinux/PKGBUILD-release | 1 + package/archlinux/magnum-plugins-git/PKGBUILD | 1 + package/archlinux/magnum-plugins/PKGBUILD | 1 + package/debian/rules | 1 + .../gentoo/dev-libs/magnum-plugins/magnum-plugins-9999.ebuild | 1 + package/homebrew/magnum-plugins.rb | 2 +- package/msys/PKGBUILD | 1 + package/msys/magnum-plugins/PKGBUILD | 1 + 18 files changed, 18 insertions(+), 1 deletion(-) diff --git a/package/archlinux/PKGBUILD b/package/archlinux/PKGBUILD index 8ab84b554..a7e8398c9 100644 --- a/package/archlinux/PKGBUILD +++ b/package/archlinux/PKGBUILD @@ -23,6 +23,7 @@ build() { -DBUILD_TESTS=ON \ -DBUILD_GL_TESTS=ON \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-android-arm64 b/package/archlinux/PKGBUILD-android-arm64 index 26e0c2601..75d91ecff 100644 --- a/package/archlinux/PKGBUILD-android-arm64 +++ b/package/archlinux/PKGBUILD-android-arm64 @@ -33,6 +33,7 @@ build() { -DCMAKE_INSTALL_PREFIX=/opt/android-ndk/platforms/android-22/arch-arm64/usr \ -DMAGNUM_INCLUDE_INSTALL_PREFIX=/opt/android-ndk/sysroot/usr \ -DWITH_ASSIMPIMPORTER=OFF \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=OFF \ -DWITH_DRFLACAUDIOIMPORTER=OFF \ diff --git a/package/archlinux/PKGBUILD-clang b/package/archlinux/PKGBUILD-clang index 214d2e720..cba99bd27 100644 --- a/package/archlinux/PKGBUILD-clang +++ b/package/archlinux/PKGBUILD-clang @@ -35,6 +35,7 @@ build() { -DBUILD_TESTS=ON \ -DBUILD_GL_TESTS=ON \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-clang-addesssanitizer b/package/archlinux/PKGBUILD-clang-addesssanitizer index 8b5d2b5cd..773799621 100644 --- a/package/archlinux/PKGBUILD-clang-addesssanitizer +++ b/package/archlinux/PKGBUILD-clang-addesssanitizer @@ -25,6 +25,7 @@ build() { -DBUILD_TESTS=ON \ -DBUILD_GL_TESTS=ON \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-coverage b/package/archlinux/PKGBUILD-coverage index 27ef98cf6..2fdad256c 100644 --- a/package/archlinux/PKGBUILD-coverage +++ b/package/archlinux/PKGBUILD-coverage @@ -29,6 +29,7 @@ build() { -DBUILD_TESTS=ON \ -DBUILD_GL_TESTS=ON \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-emscripten b/package/archlinux/PKGBUILD-emscripten index cda198451..b9ddc08e4 100644 --- a/package/archlinux/PKGBUILD-emscripten +++ b/package/archlinux/PKGBUILD-emscripten @@ -28,6 +28,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \ -DWITH_ASSIMPIMPORTER=OFF \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=OFF \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-emscripten-wasm b/package/archlinux/PKGBUILD-emscripten-wasm index 8e19deda3..9e2d868bb 100644 --- a/package/archlinux/PKGBUILD-emscripten-wasm +++ b/package/archlinux/PKGBUILD-emscripten-wasm @@ -27,6 +27,7 @@ build() { cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=OFF \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 index 4eadd94f8..58d116131 100644 --- a/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 +++ b/package/archlinux/PKGBUILD-emscripten-wasm-webgl2 @@ -27,6 +27,7 @@ build() { cmake .. \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/lib/emscripten/system \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=OFF \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-gcc48 b/package/archlinux/PKGBUILD-gcc48 index 185ebeea8..93335367b 100644 --- a/package/archlinux/PKGBUILD-gcc48 +++ b/package/archlinux/PKGBUILD-gcc48 @@ -35,6 +35,7 @@ build() { -DBUILD_TESTS=ON \ -DBUILD_GL_TESTS=ON \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-mingw-w64 b/package/archlinux/PKGBUILD-mingw-w64 index bef6a3284..ba7ef01e9 100644 --- a/package/archlinux/PKGBUILD-mingw-w64 +++ b/package/archlinux/PKGBUILD-mingw-w64 @@ -21,6 +21,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr/i686-w64-mingw32 \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=OFF \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/archlinux/PKGBUILD-release b/package/archlinux/PKGBUILD-release index 7b053bdc2..1d5898db7 100644 --- a/package/archlinux/PKGBUILD-release +++ b/package/archlinux/PKGBUILD-release @@ -23,6 +23,7 @@ build() { -DBUILD_TESTS=ON \ -DBUILD_GL_TESTS=ON \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/archlinux/magnum-plugins-git/PKGBUILD b/package/archlinux/magnum-plugins-git/PKGBUILD index 92895dffe..71407fe35 100644 --- a/package/archlinux/magnum-plugins-git/PKGBUILD +++ b/package/archlinux/magnum-plugins-git/PKGBUILD @@ -26,6 +26,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/archlinux/magnum-plugins/PKGBUILD b/package/archlinux/magnum-plugins/PKGBUILD index f6fe66f34..738467491 100644 --- a/package/archlinux/magnum-plugins/PKGBUILD +++ b/package/archlinux/magnum-plugins/PKGBUILD @@ -20,6 +20,7 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/debian/rules b/package/debian/rules index 324ebd8a4..a5d297f3c 100755 --- a/package/debian/rules +++ b/package/debian/rules @@ -16,6 +16,7 @@ override_dh_auto_configure: dh_auto_configure -- \ -DCMAKE_BUILD_TYPE=Release \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/gentoo/dev-libs/magnum-plugins/magnum-plugins-9999.ebuild b/package/gentoo/dev-libs/magnum-plugins/magnum-plugins-9999.ebuild index 033a6d0eb..d1df9946f 100644 --- a/package/gentoo/dev-libs/magnum-plugins/magnum-plugins-9999.ebuild +++ b/package/gentoo/dev-libs/magnum-plugins/magnum-plugins-9999.ebuild @@ -30,6 +30,7 @@ src_configure() { -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" -DCMAKE_BUILD_TYPE=Release -DWITH_ASSIMPIMPORTER=ON + -DWITH_BASISIMPORTER=OFF -DWITH_DDSIMPORTER=ON -DWITH_DEVILIMAGEIMPORTER=ON -DWITH_DRFLACAUDIOIMPORTER=ON diff --git a/package/homebrew/magnum-plugins.rb b/package/homebrew/magnum-plugins.rb index e84b4616b..7a0d756db 100644 --- a/package/homebrew/magnum-plugins.rb +++ b/package/homebrew/magnum-plugins.rb @@ -19,7 +19,7 @@ class MagnumPlugins < Formula def install system "mkdir build" cd "build" do - system "cmake", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DWITH_ASSIMPIMPORTER=ON", "-DWITH_DDSIMPORTER=ON", "-DWITH_DEVILIMAGEIMPORTER=ON", "-DWITH_DRFLACAUDIOIMPORTER=ON", "-DWITH_DRMP3AUDIOIMPORTER=ON", "-DWITH_DRWAVAUDIOIMPORTER=ON", "-DWITH_FAAD2AUDIOIMPORTER=ON", "-DWITH_FREETYPEFONT=ON", "-DWITH_HARFBUZZFONT=ON", "-DWITH_JPEGIMAGECONVERTER=ON", "-DWITH_JPEGIMPORTER=ON", "-DWITH_MINIEXRIMAGECONVERTER=ON", "-DWITH_OPENGEXIMPORTER=ON", "-DWITH_PNGIMAGECONVERTER=ON", "-DWITH_PNGIMPORTER=ON", "-DWITH_STANFORDIMPORTER=ON", "-DWITH_STBIMAGECONVERTER=ON", "-DWITH_STBIMAGEIMPORTER=ON", "-DWITH_STBTRUETYPEFONT=ON", "-DWITH_STBVORBISAUDIOIMPORTER=ON", "-DWITH_TINYGLTFIMPORTER=ON", ".." + system "cmake", "-DCMAKE_BUILD_TYPE=Release", "-DCMAKE_INSTALL_PREFIX=#{prefix}", "-DWITH_ASSIMPIMPORTER=ON", "-DWITH_BASISIMPORTER=OFF", "-DWITH_DDSIMPORTER=ON", "-DWITH_DEVILIMAGEIMPORTER=ON", "-DWITH_DRFLACAUDIOIMPORTER=ON", "-DWITH_DRMP3AUDIOIMPORTER=ON", "-DWITH_DRWAVAUDIOIMPORTER=ON", "-DWITH_FAAD2AUDIOIMPORTER=ON", "-DWITH_FREETYPEFONT=ON", "-DWITH_HARFBUZZFONT=ON", "-DWITH_JPEGIMAGECONVERTER=ON", "-DWITH_JPEGIMPORTER=ON", "-DWITH_MINIEXRIMAGECONVERTER=ON", "-DWITH_OPENGEXIMPORTER=ON", "-DWITH_PNGIMAGECONVERTER=ON", "-DWITH_PNGIMPORTER=ON", "-DWITH_STANFORDIMPORTER=ON", "-DWITH_STBIMAGECONVERTER=ON", "-DWITH_STBIMAGEIMPORTER=ON", "-DWITH_STBTRUETYPEFONT=ON", "-DWITH_STBVORBISAUDIOIMPORTER=ON", "-DWITH_TINYGLTFIMPORTER=ON", ".." system "cmake", "--build", "." system "cmake", "--build", ".", "--target", "install" end diff --git a/package/msys/PKGBUILD b/package/msys/PKGBUILD index f1135bc94..f3dd7efa3 100644 --- a/package/msys/PKGBUILD +++ b/package/msys/PKGBUILD @@ -34,6 +34,7 @@ build() { -DCMAKE_BUILD_TYPE=Debug \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \ diff --git a/package/msys/magnum-plugins/PKGBUILD b/package/msys/magnum-plugins/PKGBUILD index a22d1aec6..e0ddbed3d 100644 --- a/package/msys/magnum-plugins/PKGBUILD +++ b/package/msys/magnum-plugins/PKGBUILD @@ -42,6 +42,7 @@ build() { -G'Ninja' \ -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \ -DWITH_ASSIMPIMPORTER=ON \ + -DWITH_BASISIMPORTER=OFF \ -DWITH_DDSIMPORTER=ON \ -DWITH_DEVILIMAGEIMPORTER=ON \ -DWITH_DRFLACAUDIOIMPORTER=ON \