Fixes for sdl2_image and sdl2_ttf (#1135)

* Add title to sdllopan window
* Fixes for sdl2_image and sdl2_ttf
* WIP recipes for box2d and numptyphysics
This commit is contained in:
Scott McCreary
2017-02-02 10:14:05 -08:00
committed by GitHub
parent b10a2a3746
commit 4963185249
7 changed files with 104 additions and 69 deletions

View File

@@ -10,8 +10,8 @@ SOURCE_URI="https://github.com/erincatto/Box2D/archive/v$portVersion.zip"
CHECKSUM_SHA256="1f04be518804a9879281a105a3c1511840371c96194b156eea5ad040d2805b46"
SOURCE_DIR="Box2D-$portVersion"
ARCHITECTURES="x86_gcc2 ?x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
ARCHITECTURES="!x86_gcc2 !x86 x86_64"
SECONDARY_ARCHITECTURES="!x86"
PROVIDES="
box2d$secondaryArchSuffix = $portVersion compat >= 2.0
@@ -59,4 +59,5 @@ INSTALL()
prepareInstalledDevelLib libBox2D
packageEntries devel $developDir $libDir/cmake
# Box2d is failing to make _x86 library, need to figure out correct fix here
}

View File

@@ -1,57 +0,0 @@
SUMMARY="A drawing puzzle game in the spirit (and style?) of Crayon Physics"
DESCRIPTION="Harness gravity with your crayon and set about creating blocks, ramps, \
levers, pulleys and whatever else you fancy to get the little red thing to \
the little yellow thing."
HOMEPAGE="http://numptyphysics.garage.maemo.org"
COPYRIGHT="2008 Tim Edmonds"
LICENSE="GNU GPL v3"
REVISION="2"
SOURCE_URI="https://github.com/thp/numptyphysics/archive/08697dc48f0a58d69728856264856700dc567e4f.tar.gz"
CHECKSUM_SHA256="e76c961ba242572d452084e31251781b99e875d685ece393afbca40a2f135303"
SOURCE_DIR="numptyphysics-08697dc48f0a58d69728856264856700dc567e4f"
ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
PROVIDES="
numptyphysics = $portVersion
"
REQUIRES="
haiku
lib:libsdl
lib:libSDL_image
lib:libSDL_ttf
#box2d
"
BUILD_REQUIRES="
haiku_devel
devel:libsdl
devel:libSDL_image
devel:libSDL_ttf
#box2d
"
BUILD_PREREQUIRES="
cmd:gcc
cmd:ld
cmd:libtoolize
cmd:aclocal
cmd:autoconf
cmd:make
"
BUILD()
{
libtoolize --force --copy --install
aclocal
autoconf
./configure --prefix=$prefix \
--bindir=$appsDir/numptyphysics \
--datarootdir=$appsDir
# TODO: figure out how to move the ~/.numptyphysics directory to ~/config/settings/numptyphysics
make
}
INSTALL()
{
make install
}

View File

@@ -0,0 +1,66 @@
SUMMARY="A drawing puzzle game in the spirit (and style?) of Crayon Physics"
DESCRIPTION="Harness gravity with your crayon and set about creating blocks, ramps, \
levers, pulleys and whatever else you fancy to get the little red thing to \
the little yellow thing."
HOMEPAGE="http://numptyphysics.garage.maemo.org"
COPYRIGHT="2008-2010 Tim Edmonds
2008, 2012, 2014-2016 Thomas Perl"
LICENSE="GNU GPL v3"
REVISION="2"
SOURCE_URI="https://github.com/thp/numptyphysics/archive/0.3.4.tar.gz"
CHECKSUM_SHA256="e00e1535c8246f3f1c3bab37d2e6f01259a14f59b38382299457b4b8447d2bc9"
SOURCE_DIR=""
ARCHITECTURES="!x86_gcc2 !x86 !x86_64"
SECONDARY_ARCHITECTURES="!x86_gcc2 !x86"
# numptphysics needs a working box2d recipe before it will build correctly
# and probably needs a bit more work as well to get building and working right
PROVIDES="
numptyphysics = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libsdl2$secondaryArchSuffix
lib:libSDL2_image$secondaryArchSuffix
lib:libSDL2_ttf$secondaryArchSuffix
lib:libBox2D$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libz$secondaryArchSuffix
devel:libsdl2$secondaryArchSuffix
devel:libSDL2_image$secondaryArchSuffix
devel:libSDL2_ttf$secondaryArchSuffix
devel:libBox2D$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:libtoolize$secondaryArchSuffix
cmd:aclocal$secondaryArchSuffix
cmd:autoconf$secondaryArchSuffix
cmd:automake$secondaryArchSuffix
cmd:make
"
BUILD()
{
libtoolize --force --copy --install
aclocal
autoconf
# ./configure --prefix=$prefix \
# --bindir=$appsDir/numptyphysics \
# --datarootdir=$appsDir
# TODO: figure out how to move the ~/.numptyphysics directory to ~/config/settings/numptyphysics
runConfigure ./configure
make
}
INSTALL()
{
make install
}

View File

@@ -1,3 +1,28 @@
From 213275e0a82538697cadc569a30a9e2516596708 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Wed, 1 Feb 2017 21:23:54 -0800
Subject: [PATCH] Add Window title
---
gfx.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/gfx.c b/gfx.c
index 4a5e1bc..81935d1 100644
--- a/gfx.c
+++ b/gfx.c
@@ -295,6 +295,7 @@ unsigned char r,g,b;
}
stride=thescreen->pitch;
videomem=(void *)thescreen->pixels;
+ SDL_WM_SetCaption("SDL Lopan", "SDL Lopan");
// SDL_ShowCursor(0);
for(i=0;i<65536;++i)
--
2.7.0
From 6aaf58f76675bf2ad86b72206aceffd825b26778 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Thu, 28 Nov 2013 20:44:31 +0100
@@ -16,13 +41,13 @@ index d653914..a597b9f 100644
@@ -543,6 +544,8 @@ int code;
unsigned char redraw;
int backup;
+ chdir(dirname(argv[0]));
+
bgsetnumber=tilesetnumber=-1;
randomize();
opendisplay(640,400);
--
--
1.8.3.4
@@ -119,7 +144,7 @@ index 0000000..78d07c4
+ $"8400040A010101000A020102000A030103000A0501052021210A050106100117"
+ $"830004"
+};
--
--
1.8.3.4
@@ -1031,6 +1056,6 @@ ffB*RS_;<gv9vJdU1Bk7EeEtK0t0VB@#f$$3`==Qd
literal 0
HcmV?d00001
--
--
1.8.3.4

View File

@@ -12,7 +12,7 @@ In both cases, number files beginnging with 0."
HOMEPAGE="http://www.linuxmotors.com/sdllopan/"
COPYRIGHT="1999-2008 Dave Ashley"
LICENSE="GNU GPL v2"
REVISION="3"
REVISION="4"
SOURCE_URI="http://www.linuxmotors.com/sdllopan/downloads/sdllopan-10.tgz"
CHECKSUM_SHA256="386de065bc8c3449c3b0b5e5651cb035cb1bdc242b425c865dd387c54ce708c3"
PATCHES="sdllopan-10.patchset"

View File

@@ -8,7 +8,7 @@ on both libz and libjpeg."
HOMEPAGE="https://www.libsdl.org/projects/SDL_image"
COPYRIGHT="1997-2013 Sam Lantinga"
LICENSE="Zlib"
REVISION="2"
REVISION="3"
SOURCE_URI="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-$portVersion.tar.gz"
CHECKSUM_SHA256="3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64"
SOURCE_DIR="SDL2_image-$portVersion"
@@ -25,7 +25,7 @@ REQUIRES="
haiku${secondaryArchSuffix}
lib:libSDL2_2.0${secondaryArchSuffix}
lib:libjpeg$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libgif$secondaryArchSuffix
lib:libwebp$secondaryArchSuffix
@@ -46,7 +46,7 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libsdl2${secondaryArchSuffix}
devel:libjpeg$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libgif$secondaryArchSuffix
devel:libwebp$secondaryArchSuffix

View File

@@ -9,13 +9,13 @@ without much effort."
HOMEPAGE="http://www.libsdl.org/projects/SDL_ttf"
COPYRIGHT="1997-2013 Sam Lantinga"
LICENSE="Zlib"
REVISION="3"
REVISION="4"
SOURCE_URI="http://www.libsdl.org/projects/SDL_ttf/release/SDL2_ttf-$portVersion.tar.gz"
CHECKSUM_SHA256="34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276"
SOURCE_DIR="SDL2_ttf-$portVersion"
ARCHITECTURES="x86 x86_gcc2 x86_64"
SECONDARY_ARCHITECTURES="?x86 ?x86_gcc2"
SECONDARY_ARCHITECTURES="x86 x86_gcc2"
PROVIDES="
sdl2_ttf$secondaryArchSuffix = $portVersion compat >= 2.0