haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

circuslinux, fix references to libSDL* (#3958)

Browse Source
This commit is contained in:
Schrijvers Luc
2019-06-29 14:12:58 +02:00
committed by Jérôme Duval
parent f28746d8f9
commit 1bf0965dac
3 changed files with 57 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
games-arcade/circuslinux/circuslinux-1.0.3.recipe
View File

@@ -5,27 +5,27 @@ pop rows of balloons and then fall back down."
HOMEPAGE="http://www.newbreedsoftware.com/circus-linux/"
COPYRIGHT="2000 Bill Kendrik, Jarkko Rotsten"
LICENSE="GNU GPL v2"
REVISION="1"
REVISION="2"
SOURCE_URI="ftp://ftp.tuxpaint.org/unix/x/circus-linux/src/circuslinux-$portVersion.tar.gz"
CHECKSUM_SHA256="bf9550ebd598a9e7d93a20d80ff466475122f8b023314bb1e07c31e8c608ce8a"
PATCHES="circuslinux-$portVersion.patch"
PATCHES="circuslinux-$portVersion.patchset"
ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
PROVIDES="
circuslinux = $portVersion
app:circuslinux = $portVersion
app:CircusLinux = $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
devel:libSDL_image
devel:libSDL_mixer
"
@@ -38,14 +38,14 @@ BUILD_PREREQUIRES="
BUILD()
{
libtoolize -fci
./configure --prefix=$appsDir/CircusLinux
runConfigure --omit-dirs "binDir docDir dataRootDir" \
./configure --bindir=$appsDir
make $jobArgs
}
INSTALL()
{
mkdir -p $appsDir/CircusLinux
make install
ln -s $appsDir/CircusLinux/bin/circuslinux $appsDir/CircusLinux/CircusLinux
addAppDeskbarSymlink $appsDir/CircusLinux/bin/circuslinux CircusLinux
mv $appsDir/circuslinux $appsDir/CircusLinux
addAppDeskbarSymlink $appsDir/CircusLinux
}

11
games-arcade/circuslinux/patches/circuslinux-1.0.3.patch
View File

@@ -1,11 +0,0 @@
--- circuslinux-1.0.3/Makefile.in_org 2014-10-13 21:55:14.330563584 +0200
+++ circuslinux-1.0.3/Makefile.in 2014-10-13 21:47:12.418906112 +0200
@@ -85,7 +85,7 @@
JOY = @JOY@
TARGET_DEF = @TARGET_DEF@
-CFLAGS = @CFLAGS@ -Wall -O2 -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(TARGET_DEF) -DJOY_$(JOY)
+CFLAGS = @CFLAGS@ -Wall -O2 -DDATA_PREFIX=\"$(DATA_PREFIX)\"
LIBS = @LIBS@

45
games-arcade/circuslinux/patches/circuslinux-1.0.3.patchset Normal file
View File

@@ -0,0 +1,45 @@
From 5f6f302a20cbc19fb51f47d33e92e12fb012ac02 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Sat, 29 Jun 2019 10:40:54 +0200
Subject: applying patch circuslinux-1.0.3.patch
diff --git a/Makefile.in b/Makefile.in
index 0611db5..389657b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -85,7 +85,7 @@ DATA_PREFIX = $(pkgdatadir)/data/
JOY = @JOY@
TARGET_DEF = @TARGET_DEF@
-CFLAGS = @CFLAGS@ -Wall -O2 -DDATA_PREFIX=\"$(DATA_PREFIX)\" -D$(TARGET_DEF) -DJOY_$(JOY)
+CFLAGS = @CFLAGS@ -Wall -O2 -DDATA_PREFIX=\"$(DATA_PREFIX)\"
LIBS = @LIBS@
--
2.21.0
From a777a6dfb88a37ed997d23bc3692bf3c4efd27fe Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Sat, 29 Jun 2019 10:41:35 +0200
Subject: Fix documentation path
diff --git a/Makefile.in b/Makefile.in
index 389657b..2d91eec 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -95,7 +95,7 @@ circuslinux_SOURCES = circuslinux.c
circuslinux_CFLAGS = CFLAGS
circuslinux_LIBS = LIBS
-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+docdir = $(prefix)/documentation/packages/$(PACKAGE)-$(VERSION)
doc_DATA = AUTHORS.txt COPYING.txt INSTALL.txt CHANGES.txt FAQ.txt README.txt README-SDL.txt TODO.txt
--
2.21.0