Gentoo Archives: gentoo-commits

From: Ionen Wolkens <ionen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/desmume/files/, games-emulation/desmume/
Date: Sun, 19 Sep 2021 00:38:50
Message-Id: 1632011897.9bf0d9a9e6c1c4f4d56b731b77dabc728f0889c8.ionen@gentoo
1 commit: 9bf0d9a9e6c1c4f4d56b731b77dabc728f0889c8
2 Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
3 AuthorDate: Sat Sep 18 23:48:09 2021 +0000
4 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 19 00:38:17 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bf0d9a9
7
8 games-emulation/desmume: fix build with clang
9
10 Closes: https://bugs.gentoo.org/739144
11 Package-Manager: Portage-3.0.20, Repoman-3.0.3
12 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
13 Closes: https://github.com/gentoo/gentoo/pull/22331
14 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
15
16 .../desmume/desmume-0.9.11_p20210409-r1.ebuild | 1 +
17 .../desmume/files/desmume-0.9.11_p20210409-clang.patch | 15 +++++++++++++++
18 2 files changed, 16 insertions(+)
19
20 diff --git a/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
21 index c3a84760618..9cc9dd36624 100644
22 --- a/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
23 +++ b/games-emulation/desmume/desmume-0.9.11_p20210409-r1.ebuild
24 @@ -36,6 +36,7 @@ DEPEND="
25 PATCHES=(
26 "${FILESDIR}"/${P}-fix-gtk-cliopts.patch
27 "${FILESDIR}"/${P}-openal-automagic.patch
28 + "${FILESDIR}"/${P}-clang.patch
29 )
30
31 DOCS=( ${PN}/{AUTHORS,ChangeLog,README,README.LIN,doc/.} )
32
33 diff --git a/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch b/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch
34 new file mode 100644
35 index 00000000000..e80cebced38
36 --- /dev/null
37 +++ b/games-emulation/desmume/files/desmume-0.9.11_p20210409-clang.patch
38 @@ -0,0 +1,15 @@
39 +Fix build with clang https://bugs.gentoo.org/739144
40 +
41 +--- a/desmume/src/texcache.cpp
42 ++++ b/desmume/src/texcache.cpp
43 +@@ -1165,8 +1165,8 @@ void NDSTextureUnpack4x4(const size_t sr
44 +
45 + for (size_t y = 0, d = 0; y < yTmpSize; y++)
46 + {
47 +- u32 tmpPos[4]={(y<<2)*sizeX,((y<<2)+1)*sizeX,
48 +- ((y<<2)+2)*sizeX,((y<<2)+3)*sizeX};
49 ++ u32 tmpPos[4]={u32(y<<2)*sizeX,u32((y<<2)+1)*sizeX,
50 ++ u32((y<<2)+2)*sizeX,u32((y<<2)+3)*sizeX};
51 + for (size_t x = 0; x < xTmpSize; x++, d++)
52 + {
53 + if (d >= limit)