mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-21 19:20:08 +02:00
advancemame, bump fix build for _x86 (#3962)
This commit is contained in:
Schrijvers Luc
committed by
waddlesplash
waddlesplash
parent
7e9510b8f8
commit
bccd6fba11
@@ -1,59 +0,0 @@
|
||||
SUMMARY="Unofficial MAME version with advanced video support"
|
||||
DESCRIPTION=" \
|
||||
AdvanceMAME is unofficial MAME version with advanced video support \
|
||||
for better use with TVs, Arcade monitors, PC monitors and LCD screens."
|
||||
HOMEPAGE="http://advancemame.sourceforge.net"
|
||||
COPYRIGHT="1996-2006, Nicola Salmoria and the MAME Team"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="3"
|
||||
SOURCE_URI="https://github.com/amadvance/advancemame/releases/download/advancemame-$portVersion/advancemame-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="525e0897cd41fe8d3ef563e59592da740ebe005eda0948515dca410d01624bcc"
|
||||
PATCHES="advancemame-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
advancemame$secondaryArchSuffix = $portVersion
|
||||
cmd:advj$secondaryArchSuffix
|
||||
cmd:advk$secondaryArchSuffix
|
||||
cmd:advm$secondaryArchSuffix
|
||||
cmd:advmame$secondaryArchSuffix
|
||||
cmd:advs$secondaryArchSuffix
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libexpat$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libsdl$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libexpat$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libsdl$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:find
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -fi
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
INSTALL()
|
||||
{
|
||||
make install
|
||||
}
|
||||
@@ -5,10 +5,14 @@ for better use with TVs, Arcade monitors, PC monitors and LCD screens."
|
||||
HOMEPAGE="http://advancemame.sourceforge.net"
|
||||
COPYRIGHT="1996-2006, Nicola Salmoria and the MAME Team"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="3"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/amadvance/advancemame/releases/download/v$portVersion/advancemame-$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="779b3b43e3fbdf4bb24e97c418499cd4550446494e19f5d576827242b0821814"
|
||||
PATCHES="advancemame-1.4.patchset"
|
||||
CHECKSUM_SHA256="3e4628e1577e70a1dbe104f17b1b746745b8eda80837f53fbf7b091c88be8c2b"
|
||||
PATCHES="advancemame-$portVersion.patchset"
|
||||
if [ "$effectiveTargetArchitecture" = x86 ]; then
|
||||
PATCHES="$PATCHES
|
||||
advancemame_x86-$portVersion.patchset"
|
||||
fi
|
||||
|
||||
ARCHITECTURES="!x86_gcc2 x86 x86_64"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
@@ -22,35 +26,34 @@ PROVIDES="
|
||||
cmd:advmenu$secondaryArchSuffix
|
||||
cmd:advmess$secondaryArchSuffix
|
||||
cmd:advs$secondaryArchSuffix
|
||||
"
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libexpat$secondaryArchSuffix
|
||||
lib:libfreetype$secondaryArchSuffix
|
||||
lib:libsdl$secondaryArchSuffix
|
||||
lib:libncurses$secondaryArchSuffix
|
||||
lib:libSDL_1.2$secondaryArchSuffix
|
||||
lib:libz$secondaryArchSuffix
|
||||
"
|
||||
"
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libexpat$secondaryArchSuffix
|
||||
devel:libfreetype$secondaryArchSuffix
|
||||
devel:libsdl$secondaryArchSuffix
|
||||
devel:libncurses$secondaryArchSuffix
|
||||
devel:libSDL$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:find
|
||||
cmd:awk
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:libtoolize
|
||||
cmd:make
|
||||
"
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
{
|
||||
autoreconf -fi
|
||||
runConfigure ./configure
|
||||
make $jobArgs
|
||||
}
|
||||
@@ -1,34 +1,11 @@
|
||||
From 3e4360dc01abec68741f8790fe3f631a752f93ff Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 16 May 2015 18:20:46 +0000
|
||||
Subject: don't set docdir and mandir, we do already.
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4d99d59..eeec99f 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -1145,8 +1145,6 @@ AC_SUBST([CONF_LIB_JEVENT],[$ac_lib_jevent])
|
||||
|
||||
dnl Final
|
||||
AC_SUBST([CONF_LIB_DIRECT],[$ac_lib_direct_flag])
|
||||
-AC_SUBST([mandir],['${prefix}/man'])
|
||||
-AC_SUBST([docdir],['${prefix}/doc'])
|
||||
AC_CONFIG_FILES([Makefile])
|
||||
AC_OUTPUT
|
||||
|
||||
--
|
||||
2.15.0
|
||||
|
||||
|
||||
From 2d2b76fd26b5cbd4d2e120a2e9b9ac0a2a804ca3 Mon Sep 17 00:00:00 2001
|
||||
From 08ae030d207aa16c6b59de39b5df8cee6a456ef2 Mon Sep 17 00:00:00 2001
|
||||
From: Ho Tuan Kiet <tuankiet65@gmail.com>
|
||||
Date: Tue, 26 Dec 2017 17:30:26 +0000
|
||||
Subject: Move config directory to B_USER_SETTINGS_DIRECTORY
|
||||
|
||||
|
||||
diff --git a/advance/linux/file.c b/advance/linux/file.c
|
||||
index ba4aa41..fda1e99 100644
|
||||
index 2c90582..8dfbf12 100644
|
||||
--- a/advance/linux/file.c
|
||||
+++ b/advance/linux/file.c
|
||||
@@ -34,6 +34,10 @@
|
||||
@@ -59,7 +36,7 @@ index ba4aa41..fda1e99 100644
|
||||
if (home) {
|
||||
- /* add the .advance subdirectory */
|
||||
+ /* add subdirectory */
|
||||
if (!home[0] || home[strlen(home)-1] != '/')
|
||||
if (!home[0] || home[strlen(home) - 1] != '/')
|
||||
- snprintf(FL.home_dir_buffer, sizeof(FL.home_dir_buffer), "%s/.advance", home);
|
||||
+ snprintf(FL.home_dir_buffer, sizeof(FL.home_dir_buffer), "%s/%s", home, app_folder);
|
||||
else
|
||||
@@ -69,5 +46,30 @@ index ba4aa41..fda1e99 100644
|
||||
/* use ROOT */
|
||||
snprintf(FL.home_dir_buffer, sizeof(FL.home_dir_buffer), "%s", FL.data_dir_buffer);
|
||||
--
|
||||
2.15.0
|
||||
2.21.0
|
||||
|
||||
|
||||
From fb880364815631b03c50bdc7ab310b3dd2eab130 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Sat, 16 May 2015 18:20:46 +0000
|
||||
Subject: don't set docdir and mandir, we do already
|
||||
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index 69a8ac2..bce3fbf 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -9740,10 +9740,6 @@ CONF_LIB_JEVENT=$ac_lib_jevent
|
||||
|
||||
CONF_LIB_DIRECT=$ac_lib_direct_flag
|
||||
|
||||
-mandir='${prefix}/man'
|
||||
-
|
||||
-docdir='${prefix}/doc'
|
||||
-
|
||||
ac_config_files="$ac_config_files Makefile"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
--
|
||||
2.21.0
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
From 000ddaa694f1bea354cceeef8ccc431216dc2adf Mon Sep 17 00:00:00 2001
|
||||
From: begasus <begasus@gmail.com>
|
||||
Date: Fri, 4 Oct 2019 09:20:55 +0200
|
||||
Subject: Fix conflicting int types for gcc2h
|
||||
|
||||
|
||||
diff --git a/advance/lib/extra.h b/advance/lib/extra.h
|
||||
index ee1ceb2..38e3a37 100644
|
||||
--- a/advance/lib/extra.h
|
||||
+++ b/advance/lib/extra.h
|
||||
@@ -66,8 +66,12 @@ typedef unsigned char uint8; /**< Unsigned 8 bit integer. */
|
||||
typedef signed char int8; /**< Signed 8 bit integer. */
|
||||
typedef uint16_t uint16; /**< Unsigned 16 bit integer. */
|
||||
typedef int16_t int16; /**< Signed 16 bit integer. */
|
||||
+#if defined(__HAIKU__)
|
||||
+#include <SupportDefs.h>
|
||||
+#else
|
||||
typedef uint32_t uint32; /**< Unsigned 32 bit integer. */
|
||||
typedef int32_t int32; /**< Signed 32 bit integer. */
|
||||
+#endif
|
||||
typedef uint64_t uint64; /**< Unsigned 64 bit integer. */
|
||||
typedef int64_t int64; /**< Signed 64 bit integer. */
|
||||
typedef uintptr_t uintptr; /**< Unsigned integer with pointer size. */
|
||||
--
|
||||
2.23.0
|
||||
|
||||
Reference in New Issue
Block a user