summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfardragon2020-12-24 14:14:14 +0100
committerfardragon2020-12-24 14:14:14 +0100
commitc44d60d5c7bddba01ec056bfdae6b08875e6b86e (patch)
tree51c30f7bd19769d8c837ead96ded8d0fa8cc64e1
parent3c4f5ddc7a1f3c50da6eb38ad91607df00c4afa6 (diff)
downloadaur-c44d60d5c7bddba01ec056bfdae6b08875e6b86e.tar.gz
strip build directory info from .so, fix FindImGui.cmake
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD20
-rw-r--r--package.patch11
3 files changed, 28 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 07e4373dda8b..840783f192dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = imgui-sfml
pkgdesc = Library which allows you to use ImGui with SFML
pkgver = 2.1
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/eliasdaler/imgui-sfml/
arch = any
license = MIT
@@ -9,8 +9,10 @@ pkgbase = imgui-sfml
depends = sfml
source = https://github.com/eliasdaler/imgui-sfml/archive/v2.1.tar.gz
source = https://github.com/ocornut/imgui/archive/v1.79.tar.gz
+ source = package.patch
md5sums = 6e7fc0bd05372e668c786f7e25591302
md5sums = 88db45beef022784690eef0665c6021d
+ md5sums = 7e2a85494a0987e44e44ddaf79adb152
pkgname = imgui-sfml
diff --git a/PKGBUILD b/PKGBUILD
index 7552dc983c2d..d651e9fd0b99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,30 @@
pkgname=imgui-sfml
pkgver=2.1
-pkgrel=3
-imguiver=1.79
+pkgrel=4
+_imguiver=1.79
pkgdesc="Library which allows you to use ImGui with SFML"
arch=("any")
url="https://github.com/eliasdaler/imgui-sfml/"
license=("MIT")
source=("https://github.com/eliasdaler/${pkgname}/archive/v${pkgver}.tar.gz"
- "https://github.com/ocornut/imgui/archive/v${imguiver}.tar.gz")
-md5sums=("6e7fc0bd05372e668c786f7e25591302"
- "88db45beef022784690eef0665c6021d")
+ "https://github.com/ocornut/imgui/archive/v${_imguiver}.tar.gz"
+ "package.patch")
+md5sums=('6e7fc0bd05372e668c786f7e25591302'
+ '88db45beef022784690eef0665c6021d'
+ '7e2a85494a0987e44e44ddaf79adb152')
depends=("sfml")
makedepends=("cmake")
+
+prepare() {
+ cd ${srcdir}
+ patch --strip=1 --input=package.patch
+}
+
build() {
cd ${srcdir}/${pkgname}-${pkgver}
- cmake -DCMAKE_INSTALL_PREFIX=${pkgdir}/usr -DBUILD_SHARED_LIBS=ON -DIMGUI_DIR=${srcdir}/imgui-${imguiver} .
+ cmake -DCMAKE_CXX_FLAGS="-ffile-prefix-map=${srcdir}=." -DCMAKE_INSTALL_PREFIX=${pkgdir}/usr -DBUILD_SHARED_LIBS=ON -DIMGUI_DIR=${srcdir}/imgui-${_imguiver} .
cmake --build .
}
diff --git a/package.patch b/package.patch
new file mode 100644
index 000000000000..5c6bbe4c9417
--- /dev/null
+++ b/package.patch
@@ -0,0 +1,11 @@
+diff --unified --recursive --text package.orig/imgui-sfml-2.1/cmake/FindImGui.cmake package.new/imgui-sfml-2.1/cmake/FindImGui.cmake
+--- package.orig/imgui-sfml-2.1/cmake/FindImGui.cmake 2020-12-24 13:59:15.205227545 +0100
++++ package.new/imgui-sfml-2.1/cmake/FindImGui.cmake 2020-12-24 13:59:53.242797220 +0100
+@@ -16,6 +16,7 @@
+ find_path(IMGUI_INCLUDE_DIR
+ NAMES imgui.h
+ PATHS ${IMGUI_SEARCH_PATH}
++ NO_DEFAULT_PATH
+ )
+
+ if(NOT IMGUI_INCLUDE_DIR)