Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/allegro/, media-libs/allegro/files/
Date: Thu, 03 Oct 2019 20:48:36
Message-Id: 1570135680.361616ee4d919fd2c898f673cb50ea0ee2d8ba7c.chewi@gentoo
1 commit: 361616ee4d919fd2c898f673cb50ea0ee2d8ba7c
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Thu Oct 3 20:47:19 2019 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 3 20:48:00 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=361616ee
7
8 media-libs/allegro: Patch against undefined ref to get_value in 4.4.2
9
10 Closes: https://bugs.gentoo.org/696034
11 Package-Manager: Portage-2.3.76, Repoman-2.3.17
12 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
13
14 media-libs/allegro/allegro-4.4.2-r2.ebuild | 1 +
15 media-libs/allegro/files/allegro-4.4.2-static-func.patch | 13 +++++++++++++
16 2 files changed, 14 insertions(+)
17
18 diff --git a/media-libs/allegro/allegro-4.4.2-r2.ebuild b/media-libs/allegro/allegro-4.4.2-r2.ebuild
19 index e808173e2f3..08dd7f1068c 100644
20 --- a/media-libs/allegro/allegro-4.4.2-r2.ebuild
21 +++ b/media-libs/allegro/allegro-4.4.2-r2.ebuild
22 @@ -47,6 +47,7 @@ PATCHES=(
23 "${FILESDIR}"/${P}-Werror-format-security.patch # bug 540470
24 "${FILESDIR}"/${P}-glibc228.patch # bug 670781
25 "${FILESDIR}"/${P}-GLX_RGBA_FLOAT_BIT.patch # bug 672858
26 + "${FILESDIR}"/${P}-static-func.patch # bug 696034
27 )
28
29 src_prepare() {
30
31 diff --git a/media-libs/allegro/files/allegro-4.4.2-static-func.patch b/media-libs/allegro/files/allegro-4.4.2-static-func.patch
32 new file mode 100644
33 index 00000000000..ac107d387d5
34 --- /dev/null
35 +++ b/media-libs/allegro/files/allegro-4.4.2-static-func.patch
36 @@ -0,0 +1,13 @@
37 +https://sourceforge.net/p/alleg/bugs/398/
38 +
39 +--- a/addons/jpgalleg/src/decode.c 2008-02-13 14:04:57.000000000 +0100
40 ++++ b/addons/jpgalleg/src/decode.c 2015-09-03 14:57:57.888485546 +0200
41 +@@ -477,7 +477,7 @@
42 + * Reads a string of bits from the input stream and returns a properly signed
43 + * number given the category.
44 + */
45 +-INLINE int
46 ++static INLINE int
47 + get_value(int category)
48 + {
49 + int result = get_bits(category);