Merge branch 'scummvm-openjazz' into 'master'

Add ScummVM and OpenJazz See merge request redox-os/cookbook!187
2026-06-24 13:54:19 +08:00 · 2018-11-28 21:10:15 +00:00 · 2018-11-28 21:10:15 +00:00 · 707f10e096
commit 707f10e096
parent 9a78a52ca0 bf291a5e40
4 changed files with 118 additions and 2 deletions
--- a/recipes/openjazz/recipe.sh
+++ b/recipes/openjazz/recipe.sh
@ -0,0 +1,43 @@
+VERSION=0.1
+GIT=https://github.com/AlisterT/openjazz
+BUILD_DEPENDS=(sdl liborbital zlib)
+
+export CFLAGS="-I$PWD/sysroot/include/ -I$PWD/sysroot/include/SDL/ -UUSE_SOCKETS -UUSE_SDL_NET"
+export CPPFLAGS="$CFLAGS"
+export LDFLAGS="-L$PWD/sysroot/lib/"
+
+function recipe_version {
+    echo "$VERSION"
+    skip=1
+}
+
+function recipe_update {
+    echo "skipping update"
+    skip=1
+}
+
+function recipe_build {
+    touch INSTALL NEWS README AUTHORS ChangeLog COPYING
+    autoreconf -fvi
+    autoconf
+    wget -O build-aux/config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+    ./configure --host=${HOST} --prefix=''
+    make
+    skip=1
+}
+
+function recipe_test {
+    echo "skipping test"
+    skip=1
+}
+
+function recipe_clean {
+    make clean
+    skip=1
+}
+
+function recipe_stage {
+    dest="$(realpath $1)"
+    make DESTDIR="$dest" install
+    skip=1
+}
--- a/recipes/scummvm/01_redox.patch
+++ b/recipes/scummvm/01_redox.patch
@ -0,0 +1,24 @@
+diff -rupNw source-original/common/stream.cpp source/common/stream.cpp
+--- source-original/common/stream.cpp	2017-12-08 23:21:10.000000000 +0100
+++ source/common/stream.cpp	2018-11-28 00:36:53.474637267 +0100
+@@ -95,7 +95,7 @@ bool MemoryReadStream::seek(int32 offs,
+ 		break;
+ 	}
+ 	// Post-Condition
+-	assert(_pos <= _size);
+	//assert(_pos <= _size);
+ 
+ 	// Reset end-of-stream flag on a successful seek
+ 	_eos = false;
+diff -rupNw source-original/configure source/configure
+--- source-original/configure	2017-12-08 23:21:13.000000000 +0100
+++ source/configure	2018-11-28 00:35:33.000000000 +0100
+@@ -3610,7 +3610,7 @@ case $_host_os in
+ 	amigaos* | cygwin* | dreamcast | ds | gamecube | mingw* | n64 | ps2 | ps3 | psp2 | psp | wii | wince)
+ 		_posix=no
+ 		;;
+-	3ds | android | androidsdl | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | riscos | solaris* | sunos* | uclinux* | webos)
+	3ds | android | androidsdl | beos* | bsd* | darwin* | freebsd* | gnu* | gph-linux | haiku* | hpux* | iphone | ios7 | irix*| k*bsd*-gnu* | linux* | maemo | mint* | netbsd* | openbsd* | riscos | redox* | solaris* | sunos* | uclinux* | webos)
+ 		_posix=yes
+ 		;;
+ 	os2-emx*)
--- a/recipes/scummvm/recipe.sh
+++ b/recipes/scummvm/recipe.sh
@ -0,0 +1,46 @@
+VERSION=2.0.0
+TAR=https://www.scummvm.org/frs/scummvm/$VERSION/scummvm-$VERSION.tar.xz
+BUILD_DEPENDS=(sdl liborbital freetype zlib libpng)
+
+function recipe_version {
+    echo "$VERSION"
+    skip=1
+}
+
+function recipe_update {
+    echo "skipping update"
+    skip=1
+}
+
+function recipe_build {
+    wget -O config.sub http://git.savannah.gnu.org/cgit/config.git/plain/config.sub
+    sysroot="${PWD}/../sysroot"
+
+    ./configure \
+        --host=${HOST} \
+        --prefix='' \
+        --with-sdl-prefix="$sysroot" \
+        --with-freetype2-prefix="$sysroot" \
+        --with-png-prefix="$sysroot" \
+        --with-zlib-prefix="$sysroot" \
+        --disable-timidity \
+        --disable-mt32emu
+    make
+    skip=1
+}
+
+function recipe_test {
+    echo "skipping test"
+    skip=1
+}
+
+function recipe_clean {
+    make clean
+    skip=1
+}
+
+function recipe_stage {
+    dest="$(realpath $1)"
+    make DESTDIR="$dest" install
+    skip=1
+}
--- a/recipes/sdl/01_orbital.patch
+++ b/recipes/sdl/01_orbital.patch
@ -373,7 +373,7 @@ diff -rupNw source-original/src/video/orbital/SDL_orbitalmouse_c.h source/src/vi
 diff -rupNw source-original/src/video/orbital/SDL_orbitalvideo.c source/src/video/orbital/SDL_orbitalvideo.c
 --- source-original/src/video/orbital/SDL_orbitalvideo.c	1970-01-01 01:00:00.000000000 +0100
 +++ source/src/video/orbital/SDL_orbitalvideo.c	2018-05-01 17:32:53.000320923 +0200
-@@ -0,0 +1,249 @@
+@@ -0,0 +1,252 @@
 +/*
 +    SDL - Simple DirectMedia Layer
 +    Copyright (C) 1997-2012 Sam Lantinga
@ -524,7 +524,10 @@ diff -rupNw source-original/src/video/orbital/SDL_orbitalvideo.c source/src/vide
 +
 +SDL_Rect **ORBITAL_ListModes(_THIS, SDL_PixelFormat *format, Uint32 flags)
 +{
-+   	 return (SDL_Rect **) -1;
+	if (format->BitsPerPixel != 32)
+		return NULL;
+
+	return (SDL_Rect **) -1;
 +}
 +
 +SDL_Surface *ORBITAL_SetVideoMode(_THIS, SDL_Surface *current,