pachi, fix references to libSDL*, fix build (#4052)

* pachi, fix references to libSDL*, fix build
This commit is contained in:
Schrijvers Luc
2019-07-26 15:23:57 +02:00
committed by GitHub
parent 0476c7a1ff
commit c80ea6b5c9
2 changed files with 67 additions and 51 deletions

View File

@@ -4,53 +4,55 @@ Manic Miner, Jet set Willy and more from the 80s."
HOMEPAGE="http://dragontech.sourceforge.net/index.php?lang=en&main=about"
COPYRIGHT="2004 Santiago Radeff, Nicolas Radeff, Peter Hajba"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="http://sourceforge.net/projects/dragontech/files/Pachi%20el%20marciano/Pachi%20el%20marciano%201.0/pachi_source.tgz"
CHECKSUM_SHA256="134a51773d5e441dc31aed4e57b3543afdefe2d8efedeaa05acb85cac0fa9c52"
SOURCE_DIR="Pachi"
PATCHES="pachi-$portVersion.patch"
PATCHES="pachi-$portVersion.patchset"
ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
GLOBAL_WRITABLE_FILES="
settings/pachi/data/scores.dat auto-merge
"
PROVIDES="
pachi = $portVersion
app:pachi = $portVersion
cmd:pachi = $portVersion
"
REQUIRES="
haiku
lib:libsdl
lib:libsdl_image
lib:libsdl_mixer
lib:libSDL_1.2
lib:libSDL_image_1.2
lib:libSDL_mixer_1.2
"
BUILD_REQUIRES="
haiku_devel
devel:libsdl
devel:libsdl_image
devel:libsdl_mixer
devel:libSDL
devel:libSDL_image
devel:libSDL_mixer
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:autoreconf
cmd:automake
cmd:awk
cmd:gcc
cmd:libtoolize
cmd:ld
cmd:make
"
BUILD()
{
libtoolize -fci
aclocal -I m4
automake --add-missing --force-missing
./configure --prefix=$appsDir/Pachi
autoreconf -vfi
runConfigure --omit-dirs localStateDir ./configure \
--localstatedir=$settingsDir
make $jobArgs
}
INSTALL()
{
mkdir -p $appsDir/Pachi
make install
ln -s $appsDir/Pachi/bin/pachi $appsDir/Pachi/Pachi
addAppDeskbarSymlink $appsDir/Pachi/bin/pachi Pachi
addAppDeskbarSymlink $binDir/pachi Pachi
}

View File

@@ -1,11 +1,48 @@
--- Pachi/Makefile.am.org 2014-12-13 14:43:32.076021760 +0100
+++ Pachi/Makefile.am 2014-12-13 14:41:07.499646464 +0100
From d89ce4b8fafa0e06bd5390aa12ea80e1fc8ab3db Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Fri, 26 Jul 2019 08:40:53 +0200
Subject: Import previous patch
diff --git a/Makefile.am b/Makefile.am
index 2fd2517..47a324c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,2 @@
SUBDIRS = src Tgfx data fonts music sounds docs
+ACLOCAL_AMFLAGS = -I m4
--- Pachi/data/Makefile.am.org 2002-12-08 14:30:17.000000000 +0100
+++ Pachi/data/Makefile.am 2014-12-13 14:46:22.102236160 +0100
@@ -14,9 +14,3 @@
diff --git a/configure.in b/configure.in
index 756db76..b6b101f 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_INIT(src/faes.cpp, 0.1, T-1000@Bigfoot.com)
AM_INIT_AUTOMAKE(pachi, 0.1)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(config.h)
# Checks for programs.
AC_PROG_CC
@@ -44,7 +44,7 @@ if test "$enable_devel" = "yes"; then
SCOREDIR="."
else
DATADIR="$datadir/$PACKAGE"
- SCOREDIR="/var/lib/games/$PACKAGE"
+ SCOREDIR="$localstatedir/$PACKAGE"
fi
eval DATAPATH=`eval echo "$DATADIR"`
@@ -55,3 +55,4 @@ AC_SUBST(DATAPATH)
AC_SUBST(SCOREPATH)
AC_OUTPUT(Makefile src/Makefile Tgfx/Makefile data/Makefile fonts/Makefile music/Makefile sounds/Makefile docs/Makefile)
+AC_CONFIG_MACRO_DIR([m4])
diff --git a/data/Makefile.am b/data/Makefile.am
index a61da49..0b60b90 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -14,9 +14,3 @@ score_DATA = \
scores.dat
EXTRA_DIST = $(dat_DATA) $(score_DATA)
@@ -14,30 +51,7 @@
- for file in $(score_DATA); do\
- chgrp $(group) $(scoredir)/$$file; \
- chmod $(perms) $(scoredir)/$$file; \
- done
--- Pachi/configure.in.org 2014-12-14 10:34:54.227278848 +0100
+++ Pachi/configure.in 2014-12-14 10:31:37.060555264 +0100
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script.
AC_INIT(src/faes.cpp, 0.1, T-1000@Bigfoot.com)
AM_INIT_AUTOMAKE(pachi, 0.1)
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Checks for programs.
AC_PROG_CC
@@ -44,7 +44,7 @@
SCOREDIR="."
else
DATADIR="$datadir/$PACKAGE"
- SCOREDIR="/var/lib/games/$PACKAGE"
+ SCOREDIR="$datadir /$PACKAGE"
fi
eval DATAPATH=`eval echo "$DATADIR"`
@@ -55,3 +55,5 @@
AC_SUBST(SCOREPATH)
AC_OUTPUT(Makefile src/Makefile Tgfx/Makefile data/Makefile fonts/Makefile music/Makefile sounds/Makefile docs/Makefile)
+
+AC_CONFIG_MACRO_DIR([m4])
- done
--
2.21.0