aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Hale <Squareys@googlemail.com>2019-10-25 22:05:28 +0200
committerVictor Romero <romerosanchezv@gmail.com>2019-10-25 13:05:28 -0700
commit3b868ac7695942fa252001720a494457c9b88d02 (patch)
treecdf470d06b6268ac90028775e17c3a44f05e288e
parent92af850c1cf514a9045f05502392311b528e8311 (diff)
downloadvcpkg-3b868ac7695942fa252001720a494457c9b88d02.tar.gz
vcpkg-3b868ac7695942fa252001720a494457c9b88d02.zip
Update magnum ports to new version (#8742)
* [corrade/magnum-*] Remove obsolete patches Signed-off-by: Squareys <squareys@googlemail.com> * [corrade/magnum-*] Update to 2019.10 Signed-off-by: Squareys <squareys@googlemail.com> * [magnum-plugins] Add new features Signed-off-by: Squareys <squareys@googlemail.com> * [magnum-integration] Add new features Signed-off-by: Squareys <squareys@googlemail.com>
Diffstat
-rw-r--r--ports/corrade/CONTROL2
-rw-r--r--ports/corrade/fixC2666.patch16
-rw-r--r--ports/corrade/portfile.cmake5
-rw-r--r--ports/magnum-extras/CONTROL18
-rw-r--r--ports/magnum-extras/portfile.cmake4
-rw-r--r--ports/magnum-integration/CONTROL6
-rw-r--r--ports/magnum-integration/portfile.cmake4
-rw-r--r--ports/magnum-plugins/CONTROL14
-rw-r--r--ports/magnum-plugins/portfile.cmake4
-rw-r--r--ports/magnum/003-glfw-find-module.patch13
-rw-r--r--ports/magnum/CONTROL2
-rw-r--r--ports/magnum/portfile.cmake5
12 files changed, 39 insertions, 54 deletions
diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL
index 3cf18ab10..a8217b2e8 100644
--- a/ports/corrade/CONTROL
+++ b/ports/corrade/CONTROL
@@ -1,5 +1,5 @@
Source: corrade
-Version: 2019.01-1
+Version: 2019.10
Description: C++11/C++14 multiplatform utility library
Homepage: https://magnum.graphics/corrade/
Default-Features: interconnect, pluginmanager, testsuite, utility
diff --git a/ports/corrade/fixC2666.patch b/ports/corrade/fixC2666.patch
deleted file mode 100644
index e6e2ffccc..000000000
--- a/ports/corrade/fixC2666.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/modules/UseCorrade.cmake b/modules/UseCorrade.cmake
-index 744d5a1..129e75f 100644
---- a/modules/UseCorrade.cmake
-+++ b/modules/UseCorrade.cmake
-@@ -164,7 +164,10 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "
- # "dllexport and extern are incompatible on an explicit instantiation".
- # Why the error is emitted only on classes? Functions are okay with
- # dllexport extern?!
-- "/wd4910")
-+ "/wd4910"
-+
-+ #Add the /permissive- option
-+ "/permissive-")
- set(CORRADE_PEDANTIC_COMPILER_DEFINITIONS
- # Disabling warning for not using "secure-but-not-standard" STL algos
- "_CRT_SECURE_NO_WARNINGS" "_SCL_SECURE_NO_WARNINGS"
diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake
index 40011f3d0..76f76959b 100644
--- a/ports/corrade/portfile.cmake
+++ b/ports/corrade/portfile.cmake
@@ -2,10 +2,9 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/corrade
- REF v2019.01
- SHA512 63468ee0a9362d92d61e2bc77fb8c3e455761894998393910f6bce4111b0ec74db8fe2a8658cec1292c5ceb26e57e005324b34f1ec343d4216abf3a955eaa97e
+ REF v2019.10
+ SHA512 5d161f78844b06e1a9979c7e244968a691012e7212e05df3ee3572f5df9aa69e86309f426a89f356f483f6de3871366a8e11b1701a578f865ea738cc8eee515b
HEAD_REF master
- PATCHES fixC2666.patch
)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC)
diff --git a/ports/magnum-extras/CONTROL b/ports/magnum-extras/CONTROL
index e065088af..d1d889d20 100644
--- a/ports/magnum-extras/CONTROL
+++ b/ports/magnum-extras/CONTROL
@@ -1,9 +1,9 @@
-Source: magnum-extras
-Version: 2019.01-2
-Build-Depends: magnum[core]
-Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization
-Homepage: https://magnum.graphics/
-
-Feature: ui
-Description: Ui library
-Build-Depends: corrade[interconnect], magnum[text]
+Source: magnum-extras
+Version: 2019.10
+Build-Depends: magnum[core]
+Description: Extras for magnum, C++11/C++14 graphics middleware for games and data visualization
+Homepage: https://magnum.graphics/
+
+Feature: ui
+Description: Ui library
+Build-Depends: corrade[interconnect], magnum[text]
diff --git a/ports/magnum-extras/portfile.cmake b/ports/magnum-extras/portfile.cmake
index 41faca02c..f5075fdaa 100644
--- a/ports/magnum-extras/portfile.cmake
+++ b/ports/magnum-extras/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/magnum-extras
- REF v2019.01
- SHA512 b7116e53a6132c937ad1dc10d251d0b98884375a14e947c5ddfa046cd7a8e7e60eddf2802e1c945168fcb42d78fb13639fe65ea259c6a44f064e6065ee5ae3af
+ REF v2019.10
+ SHA512 75335a75f1662e6223d2be7bc2f3cdb12af0e13ed11f3551dbd68a9488ab2e37ba9cd7ee786cc13e545689ed213558b305bfaffbaf8fa7d3be61eb21eeeeba4a
HEAD_REF master
)
diff --git a/ports/magnum-integration/CONTROL b/ports/magnum-integration/CONTROL
index 68a481b8c..05fce1f61 100644
--- a/ports/magnum-integration/CONTROL
+++ b/ports/magnum-integration/CONTROL
@@ -1,5 +1,5 @@
Source: magnum-integration
-Version: 2019.01-2
+Version: 2019.10
Build-Depends: magnum[core]
Description: Integrations for magnum, C++11/C++14 graphics middleware for games and data visualization
Homepage: https://magnum.graphics/
@@ -8,6 +8,10 @@ Feature: bullet
Description: BulletIntegration library
Build-Depends: bullet3
+Feature: eigen
+Description: EigenIntegration library
+Build-Depends: eigen3
+
Feature: glm
Description: GlmIntegration library
Build-Depends: glm
diff --git a/ports/magnum-integration/portfile.cmake b/ports/magnum-integration/portfile.cmake
index 60231be97..c079ee445 100644
--- a/ports/magnum-integration/portfile.cmake
+++ b/ports/magnum-integration/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/magnum-integration
- REF v2019.01
- SHA512 4f892c30c3824aea5d51b9178ca5001b97eb89659b45ac6f5f2182ea2a3a8ff54d80e6b143679ea7f5a07c408afb480d11895c6e7afdc9003951f68e14000f9f
+ REF v2019.10
+ SHA512 be8b21da07b9720ad19263d6ee0a234ff97ee4a1d5770e3ab33047bc54711689532945b099431c24f6ae863bb55a0883b3ba34a48d7d17768082b26651a9621e
HEAD_REF master
)
diff --git a/ports/magnum-plugins/CONTROL b/ports/magnum-plugins/CONTROL
index 00327ec6f..c298e9417 100644
--- a/ports/magnum-plugins/CONTROL
+++ b/ports/magnum-plugins/CONTROL
@@ -1,5 +1,5 @@
Source: magnum-plugins
-Version: 2019.01-2
+Version: 2019.10
Build-Depends: magnum[core]
Description: Plugins for magnum, C++11/C++14 graphics middleware for games and data visualization
Homepage: https://magnum.graphics/
@@ -12,6 +12,14 @@ Build-Depends: assimp, magnum[anyimageimporter], magnum[trade]
Feature: openddl
Description: OpenDdl library
+Feature: basisimageconverter
+Description: BasisImageConverter plugin
+Build-Depends: magnum[trade], basisu
+
+Feature: basisimporter
+Description: BasisImporter plugin
+Build-Depends: magnum[trade], basisu
+
Feature: ddsimporter
Description: DdsImporter plugin
Build-Depends: magnum[trade]
@@ -24,6 +32,10 @@ Feature: drflacaudioimporter
Description: DrFlacAudioImporter plugin
Build-Depends: magnum[audio]
+Feature: drmp3audioimporter
+Description: DrMp3AudioImporter plugin
+Build-Depends: magnum[audio]
+
Feature: drwavaudioimporter
Description: DrWavAudioImporter plugin
Build-Depends: magnum[audio]
diff --git a/ports/magnum-plugins/portfile.cmake b/ports/magnum-plugins/portfile.cmake
index 1c2b856b1..96c87e77e 100644
--- a/ports/magnum-plugins/portfile.cmake
+++ b/ports/magnum-plugins/portfile.cmake
@@ -2,8 +2,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/magnum-plugins
- REF v2019.01
- SHA512 482131372671ce0b86b6643f8c584f000db4324fe0f7e32bf9a31febded7b97ab7e947028fe21ce649554d2cff2bc11dfd94fad0006c465911c9f44b28c2d2a5
+ REF v2019.10
+ SHA512 702c43b0d323dc5b903ffee3dd9aaecf2de3b6bb00e7b243880e433df12efe337e512aac75a6f38adce02eb94f3065770ff6a03b7241198f27b5c46de63e5750
HEAD_REF master
PATCHES
001-tools-path.patch
diff --git a/ports/magnum/003-glfw-find-module.patch b/ports/magnum/003-glfw-find-module.patch
deleted file mode 100644
index 8dd37d010..000000000
--- a/ports/magnum/003-glfw-find-module.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules/FindGLFW.cmake b/modules/FindGLFW.cmake
-index 5e13798f7..d7cb12b03 100644
---- a/modules/FindGLFW.cmake
-+++ b/modules/FindGLFW.cmake
-@@ -64,7 +64,7 @@ if(TARGET glfw)
- endif()
-
- # In case no config file was found, try manually finding the library.
--find_library(GLFW_LIBRARY NAMES glfw glfw3)
-+find_library(GLFW_LIBRARY NAMES glfw glfw3 glfw3dll)
-
- # Include dir
- find_path(GLFW_INCLUDE_DIR
diff --git a/ports/magnum/CONTROL b/ports/magnum/CONTROL
index 3e99db730..0570cb4dc 100644
--- a/ports/magnum/CONTROL
+++ b/ports/magnum/CONTROL
@@ -1,5 +1,5 @@
Source: magnum
-Version: 2019.01-2
+Version: 2019.10
Build-Depends: corrade[utility]
Description: C++11/C++14 graphics middleware for games and data visualization
Homepage: https://magnum.graphics/
diff --git a/ports/magnum/portfile.cmake b/ports/magnum/portfile.cmake
index 3d77bcd23..113698702 100644
--- a/ports/magnum/portfile.cmake
+++ b/ports/magnum/portfile.cmake
@@ -2,13 +2,12 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO mosra/magnum
- REF v2019.01
- SHA512 1edce0a38af90bd456a827b073d30d470a13b47797d62ba22001643be7519722c6886498a63be5e2ee65b8649a7eb2c217bbe2cd36ab4f4523d91aaee573ffd5
+ REF v2019.10
+ SHA512 b1c991199fa9b09b780ea822de4b2251c70fcc95e7f28bb14a6184861d92fcd4c6e6fe43ad21acfbfd191cd46e79bf58b867240ad6f706b07cd1fbe145b8eaff
HEAD_REF master
PATCHES
001-sdl-includes.patch
002-tools-path.patch
- 003-glfw-find-module.patch
)
if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
generated by cgit v1.2.3 (git 2.25.1) at 2026-02-14 22:36:51 +0000