1 |
commit: e6edf4db508c9d80eb285fcbff4be119ea96edfa |
2 |
Author: Alexander Barker <alex <AT> 1stleg <DOT> com> |
3 |
AuthorDate: Mon Mar 30 16:12:11 2020 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 28 22:54:53 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6edf4db |
7 |
|
8 |
games-emulation/advancemame-3.9: Version Bump |
9 |
|
10 |
Bug: https://bugs.gentoo.org/665770 |
11 |
Closes: https://bugs.gentoo.org/665770 |
12 |
Signed-off-by: Alex Barker <alex <AT> 1stleg.com> |
13 |
Closes: https://github.com/gentoo/gentoo/pull/15173 |
14 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
15 |
|
16 |
games-emulation/advancemame/Manifest | 3 +- |
17 |
...vancemame-3.7.ebuild => advancemame-3.9.ebuild} | 40 +++-- |
18 |
...advancemame-3.7-move_aclocal_to_acinclude.patch | 78 --------- |
19 |
...cemame-3.7-remove_static_configure_option.patch | 41 ----- |
20 |
...emame-3.9-pkgconfig_for_ncurses_and_slang.patch | 184 +++++++++++++++++++++ |
21 |
...ncemame-1.2-pic.patch => advancemame-pic.patch} | 0 |
22 |
...rboselog.patch => advancemame-verboselog.patch} | 0 |
23 |
7 files changed, 207 insertions(+), 139 deletions(-) |
24 |
|
25 |
diff --git a/games-emulation/advancemame/Manifest b/games-emulation/advancemame/Manifest |
26 |
index 43195af9296..828db889759 100644 |
27 |
--- a/games-emulation/advancemame/Manifest |
28 |
+++ b/games-emulation/advancemame/Manifest |
29 |
@@ -1,2 +1 @@ |
30 |
-DIST advancemame-3.7-use_pkgconfig_for_freetype_and_sdl.patch 21144 BLAKE2B ba374d664db45f938d3b054820868b5aaa63a7461938f5e8a320dc607ef3444c8fc5f87cdd3ef9db130c1048ef9e75afed4f856997f048bcb44eb99d3bcbaefc SHA512 80136d71117329997846fe0f03a3cf3439ee8ff3db649f50a3008595ed2d82cd0e3dcd9c6908edf30e19d516943eeed129eb994a6326effaf94a7eaa5d1b8fa2 |
31 |
-DIST advancemame-3.7.tar.gz 25616260 BLAKE2B 455004ff7ce3f7517c6b06767e9d1656bff6b93f822d363cbd42738e0f9ba988c243f600db5f20e24897c27faaf5c458072e2bc9c97cf92803f76299cf3010b8 SHA512 b5af59cdd3cf70dfae0769ed35eb6ce00a6f01d05eefcb687f322420faa2ee5aabf83394249c2ab7f7f1241d3fd09c2f0412666b2dbd27b91e7bc3622f925f74 |
32 |
+DIST advancemame-3.9.tar.gz 27287755 BLAKE2B 020a10a9b9fa207a733747273e749b4d9adabbd50104ae10b1568144bcdcb3694fe19e4ca5fd31119a02c64bca9872b1b3d1eb3ce305a611f006a8168f5bcb89 SHA512 43f9ba746f222b17ade2d213d6af7cc8fe6b3ee6008633f02b8877f4c7f75628bdf1cc9718db09f5f9a482d194c8ba94f9047334e8012d23c598454e5dab2eb3 |
33 |
|
34 |
diff --git a/games-emulation/advancemame/advancemame-3.7.ebuild b/games-emulation/advancemame/advancemame-3.9.ebuild |
35 |
similarity index 73% |
36 |
rename from games-emulation/advancemame/advancemame-3.7.ebuild |
37 |
rename to games-emulation/advancemame/advancemame-3.9.ebuild |
38 |
index c371c14107c..08968fbd325 100644 |
39 |
--- a/games-emulation/advancemame/advancemame-3.7.ebuild |
40 |
+++ b/games-emulation/advancemame/advancemame-3.9.ebuild |
41 |
@@ -1,51 +1,53 @@ |
42 |
-# Copyright 1999-2018 Gentoo Foundation |
43 |
+# Copyright 1999-2020 Gentoo Authors |
44 |
# Distributed under the terms of the GNU General Public License v2 |
45 |
|
46 |
-EAPI=6 |
47 |
+EAPI=7 |
48 |
inherit autotools flag-o-matic |
49 |
|
50 |
DESCRIPTION="GNU/Linux port of the MAME emulator with GUI menu" |
51 |
HOMEPAGE="http://www.advancemame.it/" |
52 |
SRC_URI="https://github.com/amadvance/advancemame/releases/download/v${PV}/${P}.tar.gz" |
53 |
|
54 |
-# Fetch too big upstream patch |
55 |
-SRC_URI+=" https://github.com/amadvance/advancemame/commit/70f099ac49786a287ebd3949ce8f8670a5731abd.patch -> ${PN}-3.7-use_pkgconfig_for_freetype_and_sdl.patch" |
56 |
- |
57 |
LICENSE="GPL-2 XMAME" |
58 |
SLOT="0" |
59 |
KEYWORDS="~amd64 ~x86" |
60 |
-IUSE="alsa fbcon oss truetype" |
61 |
+IUSE="alsa fbcon ncurses oss slang truetype" |
62 |
|
63 |
# sdl is required (bug #158417) |
64 |
-RDEPEND=" |
65 |
- app-arch/unzip |
66 |
- app-arch/zip |
67 |
+DEPEND=" |
68 |
dev-libs/expat |
69 |
- media-libs/libsdl2 |
70 |
+ media-libs/libsdl2[video] |
71 |
sys-libs/zlib |
72 |
alsa? ( media-libs/alsa-lib ) |
73 |
+ ncurses? ( sys-libs/ncurses ) |
74 |
+ slang? ( sys-libs/slang ) |
75 |
truetype? ( media-libs/freetype:2 ) |
76 |
" |
77 |
-DEPEND="${RDEPEND} |
78 |
- virtual/os-headers |
79 |
+RDEPEND=" |
80 |
+ ${DEPEND} |
81 |
+ app-arch/unzip |
82 |
+ app-arch/zip |
83 |
+" |
84 |
+BDEPEND=" |
85 |
virtual/pkgconfig |
86 |
x86? ( >=dev-lang/nasm-0.98 ) |
87 |
" |
88 |
|
89 |
PATCHES=( |
90 |
- "${FILESDIR}/${PN}-1.2-pic.patch" |
91 |
- "${FILESDIR}"/${PN}-1.2-verboselog.patch |
92 |
+ "${FILESDIR}"/${PN}-pic.patch |
93 |
+ "${FILESDIR}"/${PN}-verboselog.patch |
94 |
|
95 |
# Patches from upstream |
96 |
- "${FILESDIR}/${P}-move_aclocal_to_acinclude.patch" |
97 |
- "${DISTDIR}/${P}-use_pkgconfig_for_freetype_and_sdl.patch" |
98 |
- "${FILESDIR}/${P}-remove_static_configure_option.patch" |
99 |
+ "${FILESDIR}"/${P}-pkgconfig_for_ncurses_and_slang.patch |
100 |
) |
101 |
|
102 |
src_prepare() { |
103 |
default |
104 |
- eautoreconf |
105 |
|
106 |
+ # AC_CHECK_CC_OPT is obsolete, superseded by AX_CHECK_COMPILE_FLAG |
107 |
+ sed -i -e 's/AC_CHECK_CC_OPT/AX_CHECK_COMPILE_FLAG/' configure.ac || die |
108 |
+ |
109 |
+ eautoreconf |
110 |
sed -i -e 's/"-s"//' configure || die |
111 |
|
112 |
use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm" |
113 |
@@ -68,7 +70,9 @@ src_configure() { |
114 |
--disable-svgalib \ |
115 |
$(use_enable alsa) \ |
116 |
$(use_enable fbcon fb) \ |
117 |
+ $(use_enable ncurses) \ |
118 |
$(use_enable oss) \ |
119 |
+ $(use_enable slang) \ |
120 |
$(use_enable truetype freetype) \ |
121 |
$(use_enable x86 asm) |
122 |
} |
123 |
|
124 |
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 |
125 |
deleted file mode 100644 |
126 |
index 4a30e179ae2..00000000000 |
127 |
--- a/games-emulation/advancemame/files/advancemame-3.7-move_aclocal_to_acinclude.patch |
128 |
+++ /dev/null |
129 |
@@ -1,78 +0,0 @@ |
130 |
-From b0edfe1e5bb1a705fad539e5ab1c299d38dcf9d4 Mon Sep 17 00:00:00 2001 |
131 |
-From: Andrea Mazzoleni <amadvance@×××××.com> |
132 |
-Date: Tue, 8 May 2018 18:55:39 +0200 |
133 |
-Subject: [PATCH 1/3] Use acinclude instead of aclocal |
134 |
- |
135 |
-aclocal.m4 is generated automatically, and we don't have to lose the content. |
136 |
---- |
137 |
- acinclude.m4 | 20 ++++++++++++++++++++ |
138 |
- aclocal.m4 | 29 ++++++++++++----------------- |
139 |
- 2 files changed, 32 insertions(+), 17 deletions(-) |
140 |
- create mode 100644 acinclude.m4 |
141 |
- |
142 |
-diff --git a/acinclude.m4 b/acinclude.m4 |
143 |
-new file mode 100644 |
144 |
-index 00000000..ceed823a |
145 |
---- /dev/null |
146 |
-+++ b/acinclude.m4 |
147 |
-@@ -0,0 +1,20 @@ |
148 |
-+dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno) |
149 |
-+dnl |
150 |
-+dnl Shows a message as like "checking wether gcc accepts flag ... no" |
151 |
-+dnl and executess ifyes or ifno. |
152 |
-+ |
153 |
-+AC_DEFUN([AC_CHECK_CC_OPT], |
154 |
-+[ |
155 |
-+AC_MSG_CHECKING([whether ${CC-cc} accepts $1]) |
156 |
-+echo 'void f(){}' > conftest.c |
157 |
-+if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then |
158 |
-+ AC_MSG_RESULT([yes]) |
159 |
-+ $2 |
160 |
-+else |
161 |
-+ AC_MSG_RESULT([no]) |
162 |
-+ $3 |
163 |
-+fi |
164 |
-+rm -f conftest* |
165 |
-+]) |
166 |
-+ |
167 |
-+ |
168 |
-diff --git a/aclocal.m4 b/aclocal.m4 |
169 |
-index d6e7b527..56e944be 100644 |
170 |
---- a/aclocal.m4 |
171 |
-+++ b/aclocal.m4 |
172 |
-@@ -1,20 +1,15 @@ |
173 |
--dnl @synopsis AC_CHECK_CC_OPT(flag, ifyes, ifno) |
174 |
--dnl |
175 |
--dnl Shows a message as like "checking wether gcc accepts flag ... no" |
176 |
--dnl and executess ifyes or ifno. |
177 |
-+# generated automatically by aclocal 1.15 -*- Autoconf -*- |
178 |
- |
179 |
--AC_DEFUN(AC_CHECK_CC_OPT, |
180 |
--[ |
181 |
--AC_MSG_CHECKING([whether ${CC-cc} accepts $1]) |
182 |
--echo 'void f(){}' > conftest.c |
183 |
--if test -z "`${CC-cc} -c $1 conftest.c 2>&1`"; then |
184 |
-- AC_MSG_RESULT([yes]) |
185 |
-- $2 |
186 |
--else |
187 |
-- AC_MSG_RESULT([no]) |
188 |
-- $3 |
189 |
--fi |
190 |
--rm -f conftest* |
191 |
--]) |
192 |
-+# Copyright (C) 1996-2014 Free Software Foundation, Inc. |
193 |
- |
194 |
-+# This file is free software; the Free Software Foundation |
195 |
-+# gives unlimited permission to copy and/or distribute it, |
196 |
-+# with or without modifications, as long as this notice is preserved. |
197 |
- |
198 |
-+# This program is distributed in the hope that it will be useful, |
199 |
-+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without |
200 |
-+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
201 |
-+# PARTICULAR PURPOSE. |
202 |
-+ |
203 |
-+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) |
204 |
-+m4_include([acinclude.m4]) |
205 |
--- |
206 |
-2.17.0 |
207 |
- |
208 |
|
209 |
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 |
210 |
deleted file mode 100644 |
211 |
index 342ba1c5c07..00000000000 |
212 |
--- a/games-emulation/advancemame/files/advancemame-3.7-remove_static_configure_option.patch |
213 |
+++ /dev/null |
214 |
@@ -1,41 +0,0 @@ |
215 |
-From 890af36a3939f0978af779caa878ddeb44183d8d Mon Sep 17 00:00:00 2001 |
216 |
-From: Andrea Mazzoleni <amadvance@×××××.com> |
217 |
-Date: Tue, 8 May 2018 19:32:44 +0200 |
218 |
-Subject: [PATCH 3/3] Remove the --enable-static configure option |
219 |
- |
220 |
-I doubt it still work and it doesn't make sense anymore. |
221 |
---- |
222 |
- configure.ac | 10 ---------- |
223 |
- 1 file changed, 10 deletions(-) |
224 |
- |
225 |
-diff --git a/configure.ac b/configure.ac |
226 |
-index 4e609993..1c94e037 100644 |
227 |
---- a/configure.ac |
228 |
-+++ b/configure.ac |
229 |
-@@ -139,13 +139,6 @@ AC_ARG_ENABLE( |
230 |
- ) |
231 |
- AC_SUBST([CONF_DEBUG],[$ac_enable_debug]) |
232 |
- |
233 |
--AC_ARG_ENABLE( |
234 |
-- [static], |
235 |
-- AC_HELP_STRING([--enable-static],[enable static compilation. (default no)]), |
236 |
-- [ac_enable_static=$enableval], |
237 |
-- [ac_enable_static=no] |
238 |
--) |
239 |
-- |
240 |
- AC_ARG_ENABLE( |
241 |
- [bare], |
242 |
- AC_HELP_STRING([--enable-bare],[enable compilation without drivers. (default no)]), |
243 |
-@@ -232,9 +225,6 @@ if test $ac_auto_ldflags = yes ; then |
244 |
- else |
245 |
- LDFLAGS="-s" |
246 |
- fi |
247 |
-- if test $ac_enable_static = yes ; then |
248 |
-- LDFLAGS="-static $LDFLAGS" |
249 |
-- fi |
250 |
- if test ! -z $ac_host_ldflags; then |
251 |
- LDFLAGS="$ac_host_ldflags $LDFLAGS" |
252 |
- fi |
253 |
--- |
254 |
-2.17.0 |
255 |
- |
256 |
|
257 |
diff --git a/games-emulation/advancemame/files/advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch b/games-emulation/advancemame/files/advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch |
258 |
new file mode 100644 |
259 |
index 00000000000..b91c887e030 |
260 |
--- /dev/null |
261 |
+++ b/games-emulation/advancemame/files/advancemame-3.9-pkgconfig_for_ncurses_and_slang.patch |
262 |
@@ -0,0 +1,184 @@ |
263 |
+diff --git a/Makefile.in b/Makefile.in |
264 |
+index 4e30ada3..e92a1072 100644 |
265 |
+--- a/Makefile.in |
266 |
++++ b/Makefile.in |
267 |
+@@ -27,6 +27,8 @@ CONF_LIB_ALSA=@CONF_LIB_ALSA@ |
268 |
+ CONF_LIB_OSS=@CONF_LIB_OSS@ |
269 |
+ CONF_LIB_SDL=@CONF_LIB_SDL@ |
270 |
+ CONF_LIB_FREETYPE=@CONF_LIB_FREETYPE@ |
271 |
++CONF_LIB_SLANG=@CONF_LIB_SLANG@ |
272 |
++CONF_LIB_NCURSES=@CONF_LIB_NCURSES@ |
273 |
+ CONF_LIB_SVGAWIN=@CONF_LIB_SVGAWIN@ |
274 |
+ CONF_LIB_PTHREAD=@CONF_LIB_PTHREAD@ |
275 |
+ CONF_LIB_SLANG=@CONF_LIB_SLANG@ |
276 |
+@@ -97,6 +99,10 @@ SDLCFLAGS=@SDLCFLAGS@ |
277 |
+ SDLLIBS=@SDLLIBS@ |
278 |
+ FREETYPECFLAGS=@FREETYPECFLAGS@ |
279 |
+ FREETYPELIBS=@FREETYPELIBS@ |
280 |
++SLANGCFLAGS=@SLANGCFLAGS@ |
281 |
++SLANGLIBS=@SLANGLIBS@ |
282 |
++NCURSESCFLAGS=@NCURSESCFLAGS@ |
283 |
++NCURSESLIBS=@NCURSESLIBS@ |
284 |
+ VCCFLAGS=@VCCFLAGS@ |
285 |
+ VCLIBS=@VCLIBS@ |
286 |
+ ASMFLAGS=@ASMFLAGS@ |
287 |
+diff --git a/advance/cfg.mak b/advance/cfg.mak |
288 |
+index 222533ff..d2f83233 100644 |
289 |
+--- a/advance/cfg.mak |
290 |
++++ b/advance/cfg.mak |
291 |
+@@ -57,15 +57,17 @@ CFGOBJS += \ |
292 |
+ $(CFGOBJ)/linux/os.o |
293 |
+ ifeq ($(CONF_LIB_SLANG),yes) |
294 |
+ CFGCFLAGS += \ |
295 |
++ $(SLANGCFLAGS) \ |
296 |
+ -DUSE_VIDEO_SLANG |
297 |
+-CFGLIBS += -lslang |
298 |
++CFGLIBS += $(SLANGLIBS) |
299 |
+ CFGOBJS += \ |
300 |
+ $(CFGOBJ)/linux/vslang.o |
301 |
+ endif |
302 |
+ ifeq ($(CONF_LIB_NCURSES),yes) |
303 |
+ CFGCFLAGS += \ |
304 |
++ $(NCURSESCFLAGS) \ |
305 |
+ -DUSE_VIDEO_CURSES |
306 |
+-CFGLIBS += -lncurses |
307 |
++CFGLIBS += $(NCURSESLIBS) |
308 |
+ CFGOBJS += \ |
309 |
+ $(CFGOBJ)/linux/vcurses.o |
310 |
+ endif |
311 |
+diff --git a/advance/v.mak b/advance/v.mak |
312 |
+index 4ffe708f..451f0d55 100644 |
313 |
+--- a/advance/v.mak |
314 |
++++ b/advance/v.mak |
315 |
+@@ -53,15 +53,17 @@ VOBJS += \ |
316 |
+ $(VOBJ)/linux/os.o |
317 |
+ ifeq ($(CONF_LIB_SLANG),yes) |
318 |
+ VCFLAGS += \ |
319 |
++ $(SLANGCFLAGS) \ |
320 |
+ -DUSE_VIDEO_SLANG |
321 |
+-VLIBS += -lslang |
322 |
++VLIBS += $(SLANGLIBS) |
323 |
+ VOBJS += \ |
324 |
+ $(VOBJ)/linux/vslang.o |
325 |
+ endif |
326 |
+ ifeq ($(CONF_LIB_NCURSES),yes) |
327 |
+ VCFLAGS += \ |
328 |
++ $(NCURSESCFLAGS) \ |
329 |
+ -DUSE_VIDEO_CURSES |
330 |
+-VLIBS += -lncurses |
331 |
++VLIBS += $(NCURSESLIBS) |
332 |
+ VOBJS += \ |
333 |
+ $(VOBJ)/linux/vcurses.o |
334 |
+ endif |
335 |
+diff --git a/configure.ac b/configure.ac |
336 |
+index 063c407a..f8ba989a 100644 |
337 |
+--- a/configure.ac |
338 |
++++ b/configure.ac |
339 |
+@@ -717,29 +717,41 @@ AC_ARG_ENABLE( |
340 |
+ [ac_lib_slang=auto] |
341 |
+ ) |
342 |
+ if test $ac_lib_slang = auto; then |
343 |
+- AC_CHECK_LIB( |
344 |
+- [slang], |
345 |
+- [SLang_init_tty], |
346 |
+- [ac_lib_slang=yes], |
347 |
+- [ac_lib_slang=no], |
348 |
+- [] |
349 |
+- ) |
350 |
++ PKG_CHECK_MODULES([SLANG], [slang], [ac_lib_slang=yes], [ac_lib_slang=no]) |
351 |
++ if test $ac_lib_slang = yes; then |
352 |
++ ac_save_CFLAGS="$CFLAGS" |
353 |
++ ac_save_LIBS="$LIBS" |
354 |
++ CFLAGS="SLANG_CFLAGS $CFLAGS" |
355 |
++ LIBS="$SLANG_LIBS $LIBS" |
356 |
++ AC_MSG_CHECKING([for linking slang]) |
357 |
++ AC_TRY_LINK([ |
358 |
++ #include <slang.h> |
359 |
++ ], [ |
360 |
++ if (SLang_init_tty(-1, 0, 0) < 0) { |
361 |
++ perror("SLang_init_tty"); |
362 |
++ return 1; |
363 |
++ } |
364 |
++ |
365 |
++ SLang_reset_tty(); |
366 |
++ return 0; |
367 |
++ ],[ac_lib_slang=yes],[ac_lib_slang=no]) |
368 |
++ AC_MSG_RESULT([$ac_lib_slang]) |
369 |
++ CFLAGS="$ac_save_CFLAGS" |
370 |
++ LIBS="$ac_save_LIBS" |
371 |
++ fi |
372 |
+ elif test $ac_lib_slang = yes; then |
373 |
+- AC_CHECK_LIB( |
374 |
+- [slang], |
375 |
+- [SLang_init_tty], |
376 |
+- [], |
377 |
+- [AC_MSG_ERROR([the sLang library is missing])], |
378 |
+- [] |
379 |
+- ) |
380 |
++ PKG_CHECK_MODULES([SLANG], [slang], [], AC_MSG_ERROR([the slang library is missing])) |
381 |
+ fi |
382 |
+ if test $ac_lib_slang = yes; then |
383 |
+ AC_CHECK_HEADERS([slang.h slang/slang.h], [break]) |
384 |
+ ac_lib_video="$ac_lib_video slang" |
385 |
+ ac_lib_text_flag=yes |
386 |
+ fi |
387 |
++AC_SUBST([SLANGCFLAGS],[$SLANG_CFLAGS]) |
388 |
++AC_SUBST([SLANGLIBS],[$SLANG_LIBS]) |
389 |
+ AC_SUBST([CONF_LIB_SLANG],[$ac_lib_slang]) |
390 |
+ |
391 |
++ |
392 |
+ dnl Checks for ncurses |
393 |
+ AC_ARG_ENABLE( |
394 |
+ [ncurses], |
395 |
+@@ -748,28 +760,37 @@ AC_ARG_ENABLE( |
396 |
+ [ac_lib_ncurses=auto] |
397 |
+ ) |
398 |
+ if test $ac_lib_ncurses = auto; then |
399 |
+- AC_CHECK_LIB( |
400 |
+- [ncurses], |
401 |
+- [endwin], |
402 |
+- [ac_lib_ncurses=yes], |
403 |
+- [ac_lib_ncurses=no], |
404 |
+- [] |
405 |
+- ) |
406 |
++ PKG_CHECK_MODULES([NCURSES], [ncurses], [ac_lib_ncurses=yes], [ac_lib_ncurses=no]) |
407 |
++ if test $ac_lib_ncurses = yes; then |
408 |
++ ac_save_CFLAGS="$CFLAGS" |
409 |
++ ac_save_LIBS="$LIBS" |
410 |
++ CFLAGS="$NCURSES_CFLAGS $CFLAGS" |
411 |
++ LIBS="$NCURSES_LIBS $LIBS" |
412 |
++ AC_MSG_CHECKING([for linking ncurses]) |
413 |
++ AC_TRY_LINK([ |
414 |
++ #include <ncurses.h> |
415 |
++ ], [ |
416 |
++ initscr(); |
417 |
++ noecho(); |
418 |
++ curs_set(FALSE); |
419 |
++ endwin(); |
420 |
++ ],[ac_lib_ncurses=yes],[ac_lib_ncurses=no]) |
421 |
++ AC_MSG_RESULT([$ac_lib_ncurses]) |
422 |
++ CFLAGS="$ac_save_CFLAGS" |
423 |
++ LIBS="$ac_save_LIBS" |
424 |
++ fi |
425 |
+ elif test $ac_lib_ncurses = yes; then |
426 |
+- AC_CHECK_LIB( |
427 |
+- [ncurses], |
428 |
+- [endwin], |
429 |
+- [], |
430 |
+- [AC_MSG_ERROR([the sLang library is missing])], |
431 |
+- [] |
432 |
+- ) |
433 |
++ PKG_CHECK_MODULES([NCURSES], [ncurses], [], AC_MSG_ERROR([the ncurses library is missing])) |
434 |
+ fi |
435 |
+ if test $ac_lib_ncurses = yes; then |
436 |
+ ac_lib_video="$ac_lib_video ncurses" |
437 |
+ ac_lib_text_flag=yes |
438 |
+ fi |
439 |
++AC_SUBST([NCURSESCFLAGS],[$NCURSES_CFLAGS]) |
440 |
++AC_SUBST([NCURSESLIBS],[$NCURSES_LIBS]) |
441 |
+ AC_SUBST([CONF_LIB_NCURSES],[$ac_lib_ncurses]) |
442 |
+ |
443 |
++ |
444 |
+ dnl Checks for freetype |
445 |
+ AC_ARG_ENABLE( |
446 |
+ [freetype], |
447 |
|
448 |
diff --git a/games-emulation/advancemame/files/advancemame-1.2-pic.patch b/games-emulation/advancemame/files/advancemame-pic.patch |
449 |
similarity index 100% |
450 |
rename from games-emulation/advancemame/files/advancemame-1.2-pic.patch |
451 |
rename to games-emulation/advancemame/files/advancemame-pic.patch |
452 |
|
453 |
diff --git a/games-emulation/advancemame/files/advancemame-1.2-verboselog.patch b/games-emulation/advancemame/files/advancemame-verboselog.patch |
454 |
similarity index 100% |
455 |
rename from games-emulation/advancemame/files/advancemame-1.2-verboselog.patch |
456 |
rename to games-emulation/advancemame/files/advancemame-verboselog.patch |