diff options
| author | Vladimír Vondruš | 2020-06-26 17:34:34 +0200 |
|---|---|---|
| committer | Vladimír Vondruš | 2020-06-26 17:34:34 +0200 |
| commit | a4561d5074865c2a293dc43d8ec8d4564b697167 (patch) | |
| tree | a5c4f76ec396a898f8f65f92eb4bf8c6a0117f57 | |
| parent | ab33cc33968c6632512cbe872ad73798f26ffebd (diff) | |
| download | aur-a4561d5074865c2a293dc43d8ec8d4564b697167.tar.gz | |
Update to a version with bundled ImGui.
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 21 |
2 files changed, 18 insertions, 8 deletions
@@ -1,6 +1,6 @@ pkgbase = magnum-integration-git pkgdesc = Integration libraries for the Magnum C++11/C++14 graphics engine (Git version) - pkgver = 2019.10.r0.g5e103b5 + pkgver = 2019.10.r62.gd7a931b pkgrel = 1 url = https://magnum.graphics arch = i686 @@ -8,6 +8,7 @@ pkgbase = magnum-integration-git license = MIT makedepends = cmake makedepends = git + makedepends = ninja depends = magnum-git depends = bullet depends = eigen @@ -15,7 +16,9 @@ pkgbase = magnum-integration-git provides = magnum-integration conflicts = magnum-integration source = git+git://github.com/mosra/magnum-integration.git + source = https://github.com/ocornut/imgui/archive/v1.76.tar.gz sha1sums = SKIP + sha1sums = 6d5d7688197e8002d916da8ddee81bfdd471176d pkgname = magnum-integration-git @@ -1,17 +1,20 @@ # Author: mosra <mosra@centrum.cz> pkgname=magnum-integration-git -pkgver=2019.10.r0.g5e103b5 +pkgver=2019.10.r62.gd7a931b +_imgui_pkgver=1.76 pkgrel=1 pkgdesc="Integration libraries for the Magnum C++11/C++14 graphics engine (Git version)" arch=('i686' 'x86_64') url="https://magnum.graphics" license=('MIT') depends=('magnum-git' 'bullet' 'eigen' 'glm') -makedepends=('cmake' 'git') +makedepends=('cmake' 'git' 'ninja') provides=('magnum-integration') conflicts=('magnum-integration') -source=("git+git://github.com/mosra/magnum-integration.git") -sha1sums=('SKIP') +source=("git+git://github.com/mosra/magnum-integration.git" + "https://github.com/ocornut/imgui/archive/v${_imgui_pkgver}.tar.gz") +sha1sums=('SKIP' + '6d5d7688197e8002d916da8ddee81bfdd471176d') pkgver() { cd "$srcdir/${pkgname%-git}" @@ -22,6 +25,9 @@ build() { mkdir -p "$srcdir/build" cd "$srcdir/build" + # Bundle ImGui + ln -sf $srcdir/imgui-${_imgui_pkgver}/ "$srcdir/${pkgname%-git}/src/MagnumExternal/ImGui" + cmake "$srcdir/${pkgname%-git}" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ @@ -29,11 +35,12 @@ build() { -DWITH_EIGEN=ON \ -DWITH_GLM=ON \ -DWITH_DART=OFF \ - -DWITH_IMGUI=OFF - make + -DWITH_IMGUI=ON \ + -G Ninja + ninja } package() { cd "$srcdir/build" - make DESTDIR="$pkgdir/" install + DESTDIR="$pkgdir/" ninja install } |