Gentoo Archives: gentoo-commits

From: Ronny Gutbrod <gentoo@××××××××.de>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-libs/imgui/files/, media-libs/imgui/
Date: Thu, 08 Sep 2022 01:46:50
Message-Id: 1662571569.3dbd028826ddaa32b5da8af35bc848ac93f98a68.tastytea@gentoo
1 commit: 3dbd028826ddaa32b5da8af35bc848ac93f98a68
2 Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com>
3 AuthorDate: Wed Sep 7 17:26:09 2022 +0000
4 Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de>
5 CommitDate: Wed Sep 7 17:26:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3dbd0288
7
8 media-libs/imgui: 1.81: fix ebuild
9
10 wrapdb's meson.build file needs some tweaks so the library gets
11 properly installed.
12
13 Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com>
14
15 .../imgui/files/imgui-1.81-wrapdb-meson-fix.patch | 45 ++++++++++++++++++++++
16 media-libs/imgui/imgui-1.81.ebuild | 4 ++
17 2 files changed, 49 insertions(+)
18
19 diff --git a/media-libs/imgui/files/imgui-1.81-wrapdb-meson-fix.patch b/media-libs/imgui/files/imgui-1.81-wrapdb-meson-fix.patch
20 new file mode 100644
21 index 000000000..a80319e9c
22 --- /dev/null
23 +++ b/media-libs/imgui/files/imgui-1.81-wrapdb-meson-fix.patch
24 @@ -0,0 +1,45 @@
25 +# Meson wrapdb's meson.build file doesn't handle installing the library, we patch that here
26 +
27 +diff --git a/meson.build b/imgui-1.81-meson.build
28 +index 3343dd4ad..804f84227 100644
29 +--- a/meson.build
30 ++++ b/imgui-1.81-meson.build
31 +@@ -80,6 +80,38 @@ imgui = library('imgui',
32 + sources,
33 + dependencies: dependencies,
34 + include_directories: include_dirs,
35 ++ version: meson.project_version(),
36 ++ install: true
37 + )
38 +
39 ++pkg_mod = import('pkgconfig')
40 ++pkg_mod.generate(imgui,
41 ++ description : 'Dear ImGui: Bloat-free Graphical User interface for C++ with minimal dependencies'
42 ++)
43 ++
44 ++install_headers(
45 ++ 'imconfig.h',
46 ++ 'imgui.h',
47 ++ 'imgui_internal.h',
48 ++ 'imstb_rectpack.h',
49 ++ 'imstb_textedit.h',
50 ++ 'imstb_truetype.h',
51 ++ 'backends/imgui_impl_dx9.h',
52 ++ 'backends/imgui_impl_osx.h',
53 ++ 'backends/imgui_impl_sdl.h',
54 ++ 'backends/imgui_impl_dx10.h',
55 ++ 'backends/imgui_impl_dx11.h',
56 ++ 'backends/imgui_impl_dx12.h',
57 ++ 'backends/imgui_impl_glfw.h',
58 ++ 'backends/imgui_impl_glut.h',
59 ++ 'backends/imgui_impl_wgpu.h',
60 ++ 'backends/imgui_impl_metal.h',
61 ++ 'backends/imgui_impl_win32.h',
62 ++ 'backends/imgui_impl_vulkan.h',
63 ++ 'backends/imgui_impl_opengl2.h',
64 ++ 'backends/imgui_impl_opengl3.h',
65 ++ 'backends/imgui_impl_allegro5.h',
66 ++ 'backends/imgui_impl_marmalade.h',
67 ++ subdir: 'imgui')
68 ++
69 + imgui_dep = declare_dependency(include_directories: include_dirs, link_with: imgui)
70
71 diff --git a/media-libs/imgui/imgui-1.81.ebuild b/media-libs/imgui/imgui-1.81.ebuild
72 index 3ff8437c9..22929f29b 100644
73 --- a/media-libs/imgui/imgui-1.81.ebuild
74 +++ b/media-libs/imgui/imgui-1.81.ebuild
75 @@ -40,6 +40,10 @@ BDEPEND="
76 app-arch/unzip
77 "
78
79 +PATCHES=(
80 + "${FILESDIR}/imgui-1.81-wrapdb-meson-fix.patch"
81 +)
82 +
83 src_unpack() {
84 default