Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/visualboyadvance/, games-emulation/visualboyadvance/files/
Date: Fri, 25 Dec 2015 16:36:56
Message-Id: 1451061397.a9e29982478d9c4479e66cbf94edc1b19b3724e5.pacho@gentoo
1 commit: a9e29982478d9c4479e66cbf94edc1b19b3724e5
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 25 16:35:11 2015 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 25 16:36:37 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9e29982
7
8 games-emulation/visualboyadvance: Fix building with latest glibmm/libsigc++ (#566694)
9
10 Package-Manager: portage-2.2.26
11
12 .../files/visualboyadvance-1.7.2-libsigc26.patch | 17 +++++
13 .../visualboyadvance-1.7.2-r4.ebuild | 86 ++++++++++++++++++++++
14 2 files changed, 103 insertions(+)
15
16 diff --git a/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libsigc26.patch b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libsigc26.patch
17 new file mode 100644
18 index 0000000..bd98676
19 --- /dev/null
20 +++ b/games-emulation/visualboyadvance/files/visualboyadvance-1.7.2-libsigc26.patch
21 @@ -0,0 +1,17 @@
22 +From: Etienne Millon <me@×××××××.org>
23 +Subject: Remove deprecated header in sigccompat.h
24 +
25 +libsigc++ 2.5.2 removed the <sigc++/object.h> header as it was useless.
26 +Removing the #include directive makes the build succeed with later versions of
27 +libsigc++.
28 +
29 +--- a/src/gtk/sigccompat.h
30 ++++ b/src/gtk/sigccompat.h
31 +@@ -25,7 +25,6 @@
32 + #include <sigc++/connection.h>
33 +
34 + #include <sigc++/slot.h>
35 +-#include <sigc++/object.h>
36 + #include <sigc++/functors/mem_fun.h>
37 +
38 +
39
40 diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
41 new file mode 100644
42 index 0000000..a2090db
43 --- /dev/null
44 +++ b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r4.ebuild
45 @@ -0,0 +1,86 @@
46 +# Copyright 1999-2015 Gentoo Foundation
47 +# Distributed under the terms of the GNU General Public License v2
48 +# $Id$
49 +
50 +EAPI=5
51 +inherit eutils flag-o-matic autotools games
52 +
53 +DESCRIPTION="gameboy, gameboy color, and gameboy advance emulator"
54 +HOMEPAGE="http://vba.ngemu.com/"
55 +SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz
56 + mirror://gentoo/${P}-deprecatedsigc++.patch.bz2"
57 +
58 +LICENSE="GPL-2"
59 +SLOT="0"
60 +KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
61 +IUSE="gtk cpu_flags_x86_mmx nls"
62 +
63 +RDEPEND="media-libs/libpng:0
64 + media-libs/libsdl[sound,video]
65 + sys-libs/zlib[minizip]
66 + gtk? (
67 + >=x11-libs/gtk+-2.4:2
68 + >=dev-cpp/gtkmm-2.4:2.4
69 + >=dev-cpp/libglademm-2.4:2.4
70 + >=dev-libs/libsigc++-2.6:2
71 + )
72 + nls? ( virtual/libintl )"
73 +DEPEND="${RDEPEND}
74 + virtual/pkgconfig
75 + cpu_flags_x86_mmx? ( dev-lang/nasm )
76 + nls? ( sys-devel/gettext )"
77 +
78 +S=${WORKDIR}/VisualBoyAdvance-${PV}
79 +
80 +src_prepare() {
81 + cat >> src/i386/2xSaImmx.asm <<-EOF
82 + %ifidn __OUTPUT_FORMAT__,elf
83 + section .note.GNU-stack noalloc noexec nowrite progbits
84 + %endif
85 + EOF
86 +
87 + epatch \
88 + "${FILESDIR}"/${PV}-homedir.patch \
89 + "${FILESDIR}"/${PV}-gcc34.patch \
90 + "${FILESDIR}"/${PV}-gcc41.patch \
91 + "${FILESDIR}"/${P}-gcc47.patch \
92 + "${WORKDIR}"/${P}-deprecatedsigc++.patch \
93 + "${FILESDIR}"/${P}-uninit.patch \
94 + "${FILESDIR}"/${P}-glibc2.10.patch \
95 + "${FILESDIR}"/${P}-ovflfix.patch \
96 + "${FILESDIR}"/${P}-libpng15.patch \
97 + "${FILESDIR}"/${P}-zlib.patch \
98 + "${FILESDIR}"/${P}-zlib-1.2.6.patch \
99 + "${FILESDIR}"/${P}-sys-types.patch \
100 + "${FILESDIR}"/${P}-libsigc26.patch
101 +
102 + mv configure.in configure.ac || die
103 + eautoreconf
104 +
105 + sed -i \
106 + -e 's:$(localedir):/usr/share/locale:' \
107 + -e 's:$(datadir)/locale:/usr/share/locale:' \
108 + $(find . -name 'Makefile.in*') || die
109 +}
110 +
111 +src_configure() {
112 + # -O3 causes GCC to behave badly and hog memory, bug #64670.
113 + replace-flags -O3 -O2
114 +
115 + append-cxxflags -std=c++11
116 +
117 + # Removed --enable-c-core as it *should* determine this based on arch
118 + egamesconf \
119 + $(use_with cpu_flags_x86_mmx mmx) \
120 + $(use_enable gtk gtk 2.4) \
121 + $(use_enable nls)
122 +}
123 +
124 +src_install() {
125 + default
126 + if use gtk ; then
127 + newicon src/gtk/images/vba-64.png ${PN}.png
128 + make_desktop_entry gvba VisualBoyAdvance
129 + fi
130 + prepgamesdirs
131 +}