1 |
commit: 9b025698b3eaa01d5c717e5c9e2a9a1e202d6358 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 9 05:53:08 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 9 05:53:25 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b025698 |
7 |
|
8 |
games-emulation/advancemame: Use pkg-config to find freetype and sdl |
9 |
|
10 |
Closes: https://bugs.gentoo.org/655040 |
11 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
12 |
|
13 |
games-emulation/advancemame/Manifest | 1 + |
14 |
games-emulation/advancemame/advancemame-3.7.ebuild | 22 ++++-- |
15 |
...advancemame-3.7-move_aclocal_to_acinclude.patch | 78 ++++++++++++++++++++++ |
16 |
...cemame-3.7-remove_static_configure_option.patch | 41 ++++++++++++ |
17 |
4 files changed, 136 insertions(+), 6 deletions(-) |
18 |
|
19 |
diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest |
20 |
index 5c414d0ed64..43195af9296 100644 |
21 |
--- a/games-emulation/advancemame/Manifest |
22 |
+++ b/games-emulation/advancemame/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
+DIST advancemame-3.7-use_pkgconfig_for_freetype_and_sdl.patch 21144 BLAKE2B ba374d664db45f938d3b054820868b5aaa63a7461938f5e8a320dc607ef3444c8fc5f87cdd3ef9db130c1048ef9e75afed4f856997f048bcb44eb99d3bcbaefc SHA512 80136d71117329997846fe0f03a3cf3439ee8ff3db649f50a3008595ed2d82cd0e3dcd9c6908edf30e19d516943eeed129eb994a6326effaf94a7eaa5d1b8fa2 |
25 |
DIST advancemame-3.7.tar.gz 25616260 BLAKE2B 455004ff7ce3f7517c6b06767e9d1656bff6b93f822d363cbd42738e0f9ba988c243f600db5f20e24897c27faaf5c458072e2bc9c97cf92803f76299cf3010b8 SHA512 b5af59cdd3cf70dfae0769ed35eb6ce00a6f01d05eefcb687f322420faa2ee5aabf83394249c2ab7f7f1241d3fd09c2f0412666b2dbd27b91e7bc3622f925f74 |
26 |
|
27 |
diff --git a/games-emulation/advancemame/advancemame-3.7.ebuild b/games-emulation/advancemame/advancemame-3.7.ebuild |
28 |
index 37773715f8e..c371c14107c 100644 |
29 |
--- a/games-emulation/advancemame/advancemame-3.7.ebuild |
30 |
+++ b/games-emulation/advancemame/advancemame-3.7.ebuild |
31 |
@@ -2,12 +2,15 @@ |
32 |
# Distributed under the terms of the GNU General Public License v2 |
33 |
|
34 |
EAPI=6 |
35 |
-inherit flag-o-matic |
36 |
+inherit autotools flag-o-matic |
37 |
|
38 |
DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu" |
39 |
HOMEPAGE="http://www.advancemame.it/" |
40 |
SRC_URI="https://github.com/amadvance/advancemame/releases/download/v${PV}/${P}.tar.gz" |
41 |
|
42 |
+# Fetch too big upstream patch |
43 |
+SRC_URI+=" https://github.com/amadvance/advancemame/commit/70f099ac49786a287ebd3949ce8f8670a5731abd.patch -> ${PN}-3.7-use_pkgconfig_for_freetype_and_sdl.patch" |
44 |
+ |
45 |
LICENSE="GPL-2 XMAME" |
46 |
SLOT="0" |
47 |
KEYWORDS="~amd64 ~x86" |
48 |
@@ -25,20 +28,28 @@ RDEPEND=" |
49 |
" |
50 |
DEPEND="${RDEPEND} |
51 |
virtual/os-headers |
52 |
+ virtual/pkgconfig |
53 |
x86? ( >=dev-lang/nasm-0.98 ) |
54 |
" |
55 |
|
56 |
+PATCHES=( |
57 |
+ "${FILESDIR}/${PN}-1.2-pic.patch" |
58 |
+ "${FILESDIR}"/${PN}-1.2-verboselog.patch |
59 |
+ |
60 |
+ # Patches from upstream |
61 |
+ "${FILESDIR}/${P}-move_aclocal_to_acinclude.patch" |
62 |
+ "${DISTDIR}/${P}-use_pkgconfig_for_freetype_and_sdl.patch" |
63 |
+ "${FILESDIR}/${P}-remove_static_configure_option.patch" |
64 |
+) |
65 |
+ |
66 |
src_prepare() { |
67 |
default |
68 |
- |
69 |
- eapply "${FILESDIR}/${PN}-1.2-pic.patch" \ |
70 |
- "${FILESDIR}"/${PN}-1.2-verboselog.patch |
71 |
+ eautoreconf |
72 |
|
73 |
sed -i -e 's/"-s"//' configure || die |
74 |
|
75 |
use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm" |
76 |
ln -s $(type -P sdl2-config) "${T}/${CHOST}-sdl2-config" |
77 |
- use truetype && ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config" |
78 |
} |
79 |
|
80 |
src_configure() { |
81 |
@@ -55,7 +66,6 @@ src_configure() { |
82 |
--enable-zlib \ |
83 |
--disable-slang \ |
84 |
--disable-svgalib \ |
85 |
- --disable-static \ |
86 |
$(use_enable alsa) \ |
87 |
$(use_enable fbcon fb) \ |
88 |
$(use_enable oss) \ |
89 |
|
90 |
diff --git a/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch b/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch |
91 |
new file mode 100644 |
92 |
index 00000000000..4a30e179ae2 |
93 |
--- /dev/null |
94 |
+++ b/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch |
95 |
@@ -0,0 +1,78 @@ |
96 |
+From b0edfe1e5bb1a705fad539e5ab1c299d38dcf9d4 Mon Sep 17 00:00:00 2001 |
97 |
+From: Andrea Mazzoleni <amadvance@×××××.com> |
98 |
+Date: Tue, 8 May 2018 18:55:39 +0200 |
99 |
+Subject: [PATCH 1/3] Use acinclude instead of aclocal |
100 |
+ |
101 |
+aclocal.m4 is generated automatically, and we don't have to lose the content. |
102 |
+--- |
103 |
+ acinclude.m4 | 20 ++++++++++++++++++++ |
104 |
+ aclocal.m4 | 29 ++++++++++++----------------- |
105 |
+ 2 files changed, 32 insertions(+), 17 deletions(-) |
106 |
+ create mode 100644 acinclude.m4 |
107 |
+ |
108 |
+diff --git a/acinclude.m4 b/acinclude.m4 |
109 |
+new file mode 100644 |
110 |
+index 00000000..ceed823a |
111 |
+--- /dev/null |
112 |
++++ b/acinclude.m4 |
113 |
+@@ -0,0 +1,20 @@ |
114 |
++dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno) |
115 |
++dnl |
116 |
++dnl Shows a message as like "checking wether gcc accepts flag ... no" |
117 |
++dnl and executess ifyes or ifno. |
118 |
++ |
119 |
++AC_DEFUN([AC_CHECK_CC_OPT], |
120 |
++[ |
121 |
++AC_MSG_CHECKING([whether ${CC-cc} accepts $1]) |
122 |
++echo 'void f(){}' > conftest.c |
123 |
++if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then |
124 |
++ AC_MSG_RESULT([yes]) |
125 |
++ $2 |
126 |
++else |
127 |
++ AC_MSG_RESULT([no]) |
128 |
++ $3 |
129 |
++fi |
130 |
++rm -f conftest* |
131 |
++]) |
132 |
++ |
133 |
++ |
134 |
+diff --git a/aclocal.m4 b/aclocal.m4 |
135 |
+index d6e7b527..56e944be 100644 |
136 |
+--- a/aclocal.m4 |
137 |
++++ b/aclocal.m4 |
138 |
+@@ -1,20 +1,15 @@ |
139 |
+-dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno) |
140 |
+-dnl |
141 |
+-dnl Shows a message as like "checking wether gcc accepts flag ... no" |
142 |
+-dnl and executess ifyes or ifno. |
143 |
++# generated automatically by aclocal 1.15 -*- Autoconf -*- |
144 |
+ |
145 |
+-AC_DEFUN(AC_CHECK_CC_OPT, |
146 |
+-[ |
147 |
+-AC_MSG_CHECKING([whether ${CC-cc} accepts $1]) |
148 |
+-echo 'void f(){}' > conftest.c |
149 |
+-if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then |
150 |
+- AC_MSG_RESULT([yes]) |
151 |
+- $2 |
152 |
+-else |
153 |
+- AC_MSG_RESULT([no]) |
154 |
+- $3 |
155 |
+-fi |
156 |
+-rm -f conftest* |
157 |
+-]) |
158 |
++# Copyright (C) 1996-2014 Free Software Foundation, Inc. |
159 |
+ |
160 |
++# This file is free software; the Free Software Foundation |
161 |
++# gives unlimited permission to copy and/or distribute it, |
162 |
++# with or without modifications, as long as this notice is preserved. |
163 |
+ |
164 |
++# This program is distributed in the hope that it will be useful, |
165 |
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
166 |
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
167 |
++# PARTICULAR PURPOSE. |
168 |
++ |
169 |
++m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) |
170 |
++m4_include([acinclude.m4]) |
171 |
+-- |
172 |
+2.17.0 |
173 |
+ |
174 |
|
175 |
diff --git a/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch b/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch |
176 |
new file mode 100644 |
177 |
index 00000000000..342ba1c5c07 |
178 |
--- /dev/null |
179 |
+++ b/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch |
180 |
@@ -0,0 +1,41 @@ |
181 |
+From 890af36a3939f0978af779caa878ddeb44183d8d Mon Sep 17 00:00:00 2001 |
182 |
+From: Andrea Mazzoleni <amadvance@×××××.com> |
183 |
+Date: Tue, 8 May 2018 19:32:44 +0200 |
184 |
+Subject: [PATCH 3/3] Remove the --enable-static configure option |
185 |
+ |
186 |
+I doubt it still work and it doesn't make sense anymore. |
187 |
+--- |
188 |
+ configure.ac | 10 ---------- |
189 |
+ 1 file changed, 10 deletions(-) |
190 |
+ |
191 |
+diff --git a/configure.ac b/configure.ac |
192 |
+index 4e609993..1c94e037 100644 |
193 |
+--- a/configure.ac |
194 |
++++ b/configure.ac |
195 |
+@@ -139,13 +139,6 @@ AC_ARG_ENABLE( |
196 |
+ ) |
197 |
+ AC_SUBST([CONF_DEBUG],[$ac_enable_debug]) |
198 |
+ |
199 |
+-AC_ARG_ENABLE( |
200 |
+- [static], |
201 |
+- AC_HELP_STRING([--enable-static],[enable static compilation. (default no)]), |
202 |
+- [ac_enable_static=$enableval], |
203 |
+- [ac_enable_static=no] |
204 |
+-) |
205 |
+- |
206 |
+ AC_ARG_ENABLE( |
207 |
+ [bare], |
208 |
+ AC_HELP_STRING([--enable-bare],[enable compilation without drivers. (default no)]), |
209 |
+@@ -232,9 +225,6 @@ if test $ac_auto_ldflags = yes ; then |
210 |
+ else |
211 |
+ LDFLAGS="-s" |
212 |
+ fi |
213 |
+- if test $ac_enable_static = yes ; then |
214 |
+- LDFLAGS="-static $LDFLAGS" |
215 |
+- fi |
216 |
+ if test ! -z $ac_host_ldflags; then |
217 |
+ LDFLAGS="$ac_host_ldflags $LDFLAGS" |
218 |
+ fi |
219 |
+-- |
220 |
+2.17.0 |
221 |
+ |