| 1 |
commit: 40533cc0b25627c2d4e2f90143fa6f9f4e6c1e43 |
| 2 |
Author: Adel KARA SLIMANE <adel.ks <AT> zegrapher <DOT> com> |
| 3 |
AuthorDate: Wed Sep 7 20:54:32 2022 +0000 |
| 4 |
Commit: Ronny Gutbrod <gentoo <AT> tastytea <DOT> de> |
| 5 |
CommitDate: Wed Sep 7 20:55:20 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=40533cc0 |
| 7 |
|
| 8 |
games-util/mangohud: improve ebuilds + add 0.6.8 and 9999 |
| 9 |
|
| 10 |
Fixed pkgcheck warnings |
| 11 |
|
| 12 |
Signed-off-by: Adel KARA SLIMANE <adel.ks <AT> zegrapher.com> |
| 13 |
|
| 14 |
games-util/mangohud/Manifest | 1 + |
| 15 |
games-util/mangohud/mangohud-0.6.6.1-r3.ebuild | 6 ++-- |
| 16 |
games-util/mangohud/mangohud-0.6.7.1.ebuild | 6 ++-- |
| 17 |
...hud-0.6.6.1-r3.ebuild => mangohud-0.6.8.ebuild} | 40 ++++++++++++---------- |
| 18 |
...ohud-0.6.6.1-r3.ebuild => mangohud-9999.ebuild} | 40 ++++++++++++---------- |
| 19 |
5 files changed, 49 insertions(+), 44 deletions(-) |
| 20 |
|
| 21 |
diff --git a/games-util/mangohud/Manifest b/games-util/mangohud/Manifest |
| 22 |
index 16dbf2e48..97ecf7cc5 100644 |
| 23 |
--- a/games-util/mangohud/Manifest |
| 24 |
+++ b/games-util/mangohud/Manifest |
| 25 |
@@ -2,3 +2,4 @@ DIST imgui-1.81-1-meson-wrap.zip 1850 BLAKE2B 325f84fd57a896ec9aceb83a54752e8dba |
| 26 |
DIST imgui-1.81.tar.gz 1413443 BLAKE2B 6f2e63777821b2767da92d9f40f4de7b4313c38817413e959e612c0ce67701645cf29f0748a3b86cfbd41e0b4b2c8099e9a0ca786c637ca1661fffd7b0de0629 SHA512 d7a2b66dea77359f78068a595607d7668e09ddd0b91910f67fc6463cb920b91b0cc1855984bd4d41e6a880b69ca7cd5e3adc064dcf461c0629b9f8c845a4fc3e |
| 27 |
DIST mangohud-0.6.6.1.tar.gz 14839055 BLAKE2B e0e27e62bf688b80611461ecab1bf4cf2c39f8359a9dc2cc1362555bfca55db30a72684da4e07e03970d8e5dee1d26f1d7a1fa30ff47aa86ec653dba273f24cf SHA512 c097dede7e534641f12a9c7f0a2ce049611e17732c7d232251b38d5c50bbcee53b2b22e548ff27f514fa57a45c563d883a1a9382c2c0ee9ac6832a2775e8f221 |
| 28 |
DIST mangohud-0.6.7.1.tar.gz 14834501 BLAKE2B 6fdd91309531f32d663a0bec4f3edd26095781290ce40294f4ea87297855ce210efbc57443710aa180652bc555887519a12166c76dec19cdf3037bbdc384db15 SHA512 7d5250cc6a50215430cc79c7d11ad18219be374966383ab3f6cba9626fa045c973245d74bc32d75649adebf0fdc7acd086f5afdf5e1708e35da1f7a920a54f1d |
| 29 |
+DIST mangohud-0.6.8.tar.gz 14844076 BLAKE2B 0da41ecac5e608e755cd1f3bbb3cff698e55a59adb3a5e5c42d1b8b19b1c0666c572016c29db11992ff72abaa80b756bbd50687ce17409380e89a2554f13dee1 SHA512 c2344c21dedebce0c56e88db476177eef29bab9e418a3c5ba13d1059d81f3ee23718e2f9257e32f9f62dcaf6554c65cbf36dac691b2bb3c355def2c9de0a52cc |
| 30 |
|
| 31 |
diff --git a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild |
| 32 |
index 99f91b86a..9dc290fbc 100644 |
| 33 |
--- a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild |
| 34 |
+++ b/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild |
| 35 |
@@ -3,7 +3,7 @@ |
| 36 |
|
| 37 |
EAPI=8 |
| 38 |
|
| 39 |
-PYTHON_COMPAT=( python3_{8..10} ) |
| 40 |
+PYTHON_COMPAT=( python3_{8..11} ) |
| 41 |
|
| 42 |
inherit python-any-r1 meson |
| 43 |
|
| 44 |
@@ -67,11 +67,11 @@ S="${WORKDIR}/MangoHud-${PV}" |
| 45 |
|
| 46 |
src_unpack() { |
| 47 |
default |
| 48 |
- [[ -n "${MY_PV_REV}" ]] && ( mv ${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV} ${WORKDIR}/MangoHud-${PV} || die ) |
| 49 |
+ [[ -n "${MY_PV_REV}" ]] && ( mv "${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV}" "${WORKDIR}/MangoHud-${PV}" || die ) |
| 50 |
|
| 51 |
unpack imgui-${IMGUI_VER}.tar.gz |
| 52 |
unpack imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip |
| 53 |
- mv ${WORKDIR}/imgui-${IMGUI_VER} ${S}/subprojects/imgui || die |
| 54 |
+ mv "${WORKDIR}/imgui-${IMGUI_VER}" "${S}/subprojects/imgui" || die |
| 55 |
} |
| 56 |
|
| 57 |
src_configure() { |
| 58 |
|
| 59 |
diff --git a/games-util/mangohud/mangohud-0.6.7.1.ebuild b/games-util/mangohud/mangohud-0.6.7.1.ebuild |
| 60 |
index 3e0b6e177..71d738e08 100644 |
| 61 |
--- a/games-util/mangohud/mangohud-0.6.7.1.ebuild |
| 62 |
+++ b/games-util/mangohud/mangohud-0.6.7.1.ebuild |
| 63 |
@@ -3,7 +3,7 @@ |
| 64 |
|
| 65 |
EAPI=8 |
| 66 |
|
| 67 |
-PYTHON_COMPAT=( python3_{8..10} ) |
| 68 |
+PYTHON_COMPAT=( python3_{8..11} ) |
| 69 |
|
| 70 |
inherit python-any-r1 meson |
| 71 |
|
| 72 |
@@ -69,11 +69,11 @@ S="${WORKDIR}/MangoHud-${PV}" |
| 73 |
|
| 74 |
src_unpack() { |
| 75 |
default |
| 76 |
- [[ -n "${MY_PV_REV}" ]] && ( mv ${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV} ${WORKDIR}/MangoHud-${PV} || die ) |
| 77 |
+ [[ -n "${MY_PV_REV}" ]] && ( mv "${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV}" "${WORKDIR}/MangoHud-${PV}" || die ) |
| 78 |
|
| 79 |
unpack imgui-${IMGUI_VER}.tar.gz |
| 80 |
unpack imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip |
| 81 |
- mv ${WORKDIR}/imgui-${IMGUI_VER} ${S}/subprojects/imgui || die |
| 82 |
+ mv "${WORKDIR}/imgui-${IMGUI_VER}" "${S}/subprojects/imgui" || die |
| 83 |
} |
| 84 |
|
| 85 |
src_configure() { |
| 86 |
|
| 87 |
diff --git a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild b/games-util/mangohud/mangohud-0.6.8.ebuild |
| 88 |
similarity index 65% |
| 89 |
copy from games-util/mangohud/mangohud-0.6.6.1-r3.ebuild |
| 90 |
copy to games-util/mangohud/mangohud-0.6.8.ebuild |
| 91 |
index 99f91b86a..0325714a5 100644 |
| 92 |
--- a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild |
| 93 |
+++ b/games-util/mangohud/mangohud-0.6.8.ebuild |
| 94 |
@@ -3,26 +3,23 @@ |
| 95 |
|
| 96 |
EAPI=8 |
| 97 |
|
| 98 |
-PYTHON_COMPAT=( python3_{8..10} ) |
| 99 |
+PYTHON_COMPAT=( python3_{8..11} ) |
| 100 |
|
| 101 |
inherit python-any-r1 meson |
| 102 |
|
| 103 |
MY_PV=$(ver_cut 1-3) |
| 104 |
[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)" |
| 105 |
|
| 106 |
-IMGUI_VER="1.81" |
| 107 |
-IMGUI_MESON_WRAP_VER="1" |
| 108 |
- |
| 109 |
DESCRIPTION="A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more" |
| 110 |
HOMEPAGE="https://github.com/flightlessmango/MangoHud" |
| 111 |
|
| 112 |
-SRC_URI=" |
| 113 |
- https://github.com/flightlessmango/MangoHud/archive/v${MY_PV}${MY_PV_REV}.tar.gz -> ${P}.tar.gz |
| 114 |
- https://github.com/ocornut/imgui/archive/v${IMGUI_VER}.tar.gz -> imgui-${IMGUI_VER}.tar.gz |
| 115 |
- https://wrapdb.mesonbuild.com/v2/imgui_${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}/get_patch -> imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip |
| 116 |
-" |
| 117 |
- |
| 118 |
-KEYWORDS="~amd64 ~x86" |
| 119 |
+if [[ ${PV} == 9999 ]]; then |
| 120 |
+ inherit git-r3 |
| 121 |
+ EGIT_REPO_URI="https://github.com/flightlessmango/MangoHud.git" |
| 122 |
+else |
| 123 |
+ SRC_URI="https://github.com/flightlessmango/MangoHud/archive/v${MY_PV}${MY_PV_REV}.tar.gz -> ${P}.tar.gz" |
| 124 |
+ KEYWORDS="~amd64" |
| 125 |
+fi |
| 126 |
|
| 127 |
LICENSE="MIT" |
| 128 |
SLOT="0" |
| 129 |
@@ -42,6 +39,7 @@ python_check_deps() { |
| 130 |
} |
| 131 |
|
| 132 |
DEPEND=" |
| 133 |
+ ~media-libs/imgui-1.81[opengl,vulkan] |
| 134 |
dev-libs/spdlog |
| 135 |
dev-util/glslang |
| 136 |
>=dev-util/vulkan-headers-1.2 |
| 137 |
@@ -59,19 +57,23 @@ DEPEND=" |
| 138 |
|
| 139 |
RDEPEND="${DEPEND}" |
| 140 |
|
| 141 |
-S="${WORKDIR}/MangoHud-${PV}" |
| 142 |
+[[ "$PV" != "9999" ]] && S="${WORKDIR}/MangoHud-${PV}" |
| 143 |
|
| 144 |
-# PATCHES=( |
| 145 |
-# "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch" |
| 146 |
-# ) |
| 147 |
+PATCHES=( |
| 148 |
+ "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch" |
| 149 |
+) |
| 150 |
|
| 151 |
src_unpack() { |
| 152 |
default |
| 153 |
- [[ -n "${MY_PV_REV}" ]] && ( mv ${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV} ${WORKDIR}/MangoHud-${PV} || die ) |
| 154 |
+ [[ $PV == 9999 ]] && git-r3_src_unpack |
| 155 |
+ [[ $PV != 9999 && -n "${MY_PV_REV}" ]] && ( mv "${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV}" "${WORKDIR}/MangoHud-${PV}" || die ) |
| 156 |
+} |
| 157 |
|
| 158 |
- unpack imgui-${IMGUI_VER}.tar.gz |
| 159 |
- unpack imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip |
| 160 |
- mv ${WORKDIR}/imgui-${IMGUI_VER} ${S}/subprojects/imgui || die |
| 161 |
+src_prepare() { |
| 162 |
+ default |
| 163 |
+ # replace all occurences of "#include <imgui.h>" to "#include <imgui/imgui.h>" |
| 164 |
+ find . -type f -exec sed -i 's/#include <imgui.h>/#include <imgui\/imgui.h>/g' {} \; |
| 165 |
+ find . -type f -exec sed -i 's/#include "imgui.h"/#include <imgui\/imgui.h>/g' {} \; |
| 166 |
} |
| 167 |
|
| 168 |
src_configure() { |
| 169 |
|
| 170 |
diff --git a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild b/games-util/mangohud/mangohud-9999.ebuild |
| 171 |
similarity index 65% |
| 172 |
copy from games-util/mangohud/mangohud-0.6.6.1-r3.ebuild |
| 173 |
copy to games-util/mangohud/mangohud-9999.ebuild |
| 174 |
index 99f91b86a..0325714a5 100644 |
| 175 |
--- a/games-util/mangohud/mangohud-0.6.6.1-r3.ebuild |
| 176 |
+++ b/games-util/mangohud/mangohud-9999.ebuild |
| 177 |
@@ -3,26 +3,23 @@ |
| 178 |
|
| 179 |
EAPI=8 |
| 180 |
|
| 181 |
-PYTHON_COMPAT=( python3_{8..10} ) |
| 182 |
+PYTHON_COMPAT=( python3_{8..11} ) |
| 183 |
|
| 184 |
inherit python-any-r1 meson |
| 185 |
|
| 186 |
MY_PV=$(ver_cut 1-3) |
| 187 |
[[ -n "$(ver_cut 4)" ]] && MY_PV_REV="-$(ver_cut 4)" |
| 188 |
|
| 189 |
-IMGUI_VER="1.81" |
| 190 |
-IMGUI_MESON_WRAP_VER="1" |
| 191 |
- |
| 192 |
DESCRIPTION="A Vulkan and OpenGL overlay for monitoring FPS, temperatures, CPU/GPU load and more" |
| 193 |
HOMEPAGE="https://github.com/flightlessmango/MangoHud" |
| 194 |
|
| 195 |
-SRC_URI=" |
| 196 |
- https://github.com/flightlessmango/MangoHud/archive/v${MY_PV}${MY_PV_REV}.tar.gz -> ${P}.tar.gz |
| 197 |
- https://github.com/ocornut/imgui/archive/v${IMGUI_VER}.tar.gz -> imgui-${IMGUI_VER}.tar.gz |
| 198 |
- https://wrapdb.mesonbuild.com/v2/imgui_${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}/get_patch -> imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip |
| 199 |
-" |
| 200 |
- |
| 201 |
-KEYWORDS="~amd64 ~x86" |
| 202 |
+if [[ ${PV} == 9999 ]]; then |
| 203 |
+ inherit git-r3 |
| 204 |
+ EGIT_REPO_URI="https://github.com/flightlessmango/MangoHud.git" |
| 205 |
+else |
| 206 |
+ SRC_URI="https://github.com/flightlessmango/MangoHud/archive/v${MY_PV}${MY_PV_REV}.tar.gz -> ${P}.tar.gz" |
| 207 |
+ KEYWORDS="~amd64" |
| 208 |
+fi |
| 209 |
|
| 210 |
LICENSE="MIT" |
| 211 |
SLOT="0" |
| 212 |
@@ -42,6 +39,7 @@ python_check_deps() { |
| 213 |
} |
| 214 |
|
| 215 |
DEPEND=" |
| 216 |
+ ~media-libs/imgui-1.81[opengl,vulkan] |
| 217 |
dev-libs/spdlog |
| 218 |
dev-util/glslang |
| 219 |
>=dev-util/vulkan-headers-1.2 |
| 220 |
@@ -59,19 +57,23 @@ DEPEND=" |
| 221 |
|
| 222 |
RDEPEND="${DEPEND}" |
| 223 |
|
| 224 |
-S="${WORKDIR}/MangoHud-${PV}" |
| 225 |
+[[ "$PV" != "9999" ]] && S="${WORKDIR}/MangoHud-${PV}" |
| 226 |
|
| 227 |
-# PATCHES=( |
| 228 |
-# "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch" |
| 229 |
-# ) |
| 230 |
+PATCHES=( |
| 231 |
+ "${FILESDIR}/mangohud-0.6.6-meson-fix-imgui-dep.patch" |
| 232 |
+) |
| 233 |
|
| 234 |
src_unpack() { |
| 235 |
default |
| 236 |
- [[ -n "${MY_PV_REV}" ]] && ( mv ${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV} ${WORKDIR}/MangoHud-${PV} || die ) |
| 237 |
+ [[ $PV == 9999 ]] && git-r3_src_unpack |
| 238 |
+ [[ $PV != 9999 && -n "${MY_PV_REV}" ]] && ( mv "${WORKDIR}/MangoHud-${MY_PV}${MY_PV_REV}" "${WORKDIR}/MangoHud-${PV}" || die ) |
| 239 |
+} |
| 240 |
|
| 241 |
- unpack imgui-${IMGUI_VER}.tar.gz |
| 242 |
- unpack imgui-${IMGUI_VER}-${IMGUI_MESON_WRAP_VER}-meson-wrap.zip |
| 243 |
- mv ${WORKDIR}/imgui-${IMGUI_VER} ${S}/subprojects/imgui || die |
| 244 |
+src_prepare() { |
| 245 |
+ default |
| 246 |
+ # replace all occurences of "#include <imgui.h>" to "#include <imgui/imgui.h>" |
| 247 |
+ find . -type f -exec sed -i 's/#include <imgui.h>/#include <imgui\/imgui.h>/g' {} \; |
| 248 |
+ find . -type f -exec sed -i 's/#include "imgui.h"/#include <imgui\/imgui.h>/g' {} \; |
| 249 |
} |
| 250 |
|
| 251 |
src_configure() { |
Archives