diff --git a/games-puzzle/neverball/neverball-1.6.0.recipe b/games-puzzle/neverball/neverball-1.6.1~20190609.recipe similarity index 66% rename from games-puzzle/neverball/neverball-1.6.0.recipe rename to games-puzzle/neverball/neverball-1.6.1~20190609.recipe index 544ed88be..8b28367bd 100644 --- a/games-puzzle/neverball/neverball-1.6.0.recipe +++ b/games-puzzle/neverball/neverball-1.6.1~20190609.recipe @@ -1,13 +1,17 @@ -SUMMARY="Clone of Super Monkey Ball using SDL/OpenGL" -DESCRIPTION="Tilt the floor to roll a ball through an obstacle course within the \ -given time. If the ball falls or time expires, a ball is lost. \ -Collect coins to unlock the exit and earn extra balls." +SUMMARY="Clone of Super Monkey Ball using SDL2/OpenGL" +DESCRIPTION="Tilt the floor to roll a ball through an obstacle course within \ +the given time. If the ball falls or time expires, a ball is lost. \ +Collect coins to unlock the exit and earn extra balls. Red coins are worth 5. \ +Blue coins are worth 10. A ball is awarded for 100 coins." HOMEPAGE="https://neverball.org" -COPYRIGHT="2002-2014 The Neverball Team" +COPYRIGHT="2002-2019 The Neverball Team" LICENSE="GNU GPL v2" -REVISION="5" -SOURCE_URI="https://neverball.org/neverball-$portVersion.tar.gz" -CHECKSUM_SHA256="73fe63cca4f96e2d355480d03bc0b2904e83a0abdf65fe8c52db5cc3cca88fa0" +REVISION="1" +srcGitRev="cd7dfc9464e242f100dabe711863f3a943cec1d5" +SOURCE_URI="https://github.com/Neverball/neverball/archive/$srcGitRev.tar.gz" +CHECKSUM_SHA256="ee1b9ffb4c32d0e1c0993f5900c94bbc35d5b9e836e487c7a4aa71c547c1e87a" +SOURCE_FILENAME="neverball-$portVersion-$srcGitRev.tar.gz" +SOURCE_DIR="neverball-$srcGitRev" PATCHES="neverball-$portVersion.patchset" ADDITIONAL_FILES=" neverball.rdef.in @@ -31,10 +35,10 @@ REQUIRES=" lib:libjpeg$secondaryArchSuffix lib:libogg$secondaryArchSuffix lib:libphysfs$secondaryArchSuffix - lib:libpng$secondaryArchSuffix - lib:libsdl2_2.0$secondaryArchSuffix - lib:libsdl2_mixer_2.0$secondaryArchSuffix - lib:libsdl2_ttf_2.0$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix + lib:libSDL2_2.0$secondaryArchSuffix + lib:libSDL2_mixer_2.0$secondaryArchSuffix + lib:libSDL2_ttf_2.0$secondaryArchSuffix lib:libvorbis$secondaryArchSuffix " @@ -42,17 +46,17 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libfreetype$secondaryArchSuffix devel:libGL$secondaryArchSuffix + devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:libogg$secondaryArchSuffix devel:libphysfs$secondaryArchSuffix devel:libpng$secondaryArchSuffix - devel:libsdl2_2.0$secondaryArchSuffix - devel:libsdl2_mixer_2.0$secondaryArchSuffix - devel:libsdl2_ttf_2.0$secondaryArchSuffix + devel:libSDL2$secondaryArchSuffix + devel:libSDL2_mixer$secondaryArchSuffix + devel:libSDL2_ttf$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix " BUILD_PREREQUIRES=" - gettext$secondaryArchSuffix # it's needed cmd:find cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix @@ -60,9 +64,15 @@ BUILD_PREREQUIRES=" cmd:make " +PATCH() +{ + mv share/version.in.h share/version.h + sed -i 's/0.0.0/1.6.0/g' share/version.h +} + BUILD() { - make + make $jobArgs } INSTALL() @@ -75,7 +85,7 @@ INSTALL() local APP_SIGNATURE="application/x-vnd.the-neverball" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" + local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`" local LONG_INFO="$SUMMARY" sed \ -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ @@ -91,7 +101,7 @@ INSTALL() local APP_SIGNATURE="application/x-vnd.the-neverputt" local MAJOR="`echo "$portVersion" | cut -d. -f1`" local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" + local MINOR="`echo "$portVersion" | cut -d. -f3 | cut -d~ -f1`" local LONG_INFO="$SUMMARY" sed \ -e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \ diff --git a/games-puzzle/neverball/patches/neverball-1.6.0.patchset b/games-puzzle/neverball/patches/neverball-1.6.0.patchset deleted file mode 100644 index 9b81211a4..000000000 --- a/games-puzzle/neverball/patches/neverball-1.6.0.patchset +++ /dev/null @@ -1,67 +0,0 @@ -From 663d56b68aeaaad06dbf701fb80d0d5382e13cf8 Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Thu, 7 Aug 2014 17:17:36 +0000 -Subject: haiku patch - - -diff --git a/Makefile b/Makefile -index 815e50c..39a5dd6 100644 ---- a/Makefile -+++ b/Makefile -@@ -168,7 +168,7 @@ ifeq ($(PLATFORM),darwin) - OGL_LIBS := -framework OpenGL - endif - --BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm -+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lintl - - ifeq ($(PLATFORM),darwin) - BASE_LIBS += $(patsubst %, -L%, $(wildcard /opt/local/lib \ -@@ -176,7 +176,7 @@ ifeq ($(PLATFORM),darwin) - endif - - OGG_LIBS := -lvorbisfile --TTF_LIBS := -lSDL2_ttf -+TTF_LIBS := -lSDL2_ttf -lfreetype - - ALL_LIBS := $(HMD_LIBS) $(TILT_LIBS) $(INTL_LIBS) $(TTF_LIBS) \ - $(OGG_LIBS) $(SDL_LIBS) $(OGL_LIBS) $(BASE_LIBS) --- -2.19.0 - - -From f9ae82ef990d2c24c92c6841a032a23bf55074a7 Mon Sep 17 00:00:00 2001 -From: Gerasim Troeglazov <3dEyes@gmail.com> -Date: Tue, 18 Sep 2018 22:04:56 +1000 -Subject: Fix settings path - - -diff --git a/Makefile b/Makefile -index 39a5dd6..820bb7d 100644 ---- a/Makefile -+++ b/Makefile -@@ -17,6 +17,10 @@ ifeq ($(shell uname), Darwin) - PLATFORM := darwin - endif - -+ifeq ($(shell uname), Haiku) -+ PLATFORM := haiku -+endif -+ - #------------------------------------------------------------------------------ - # Paths (packagers might want to set DATADIR and LOCALEDIR) - -@@ -24,6 +28,10 @@ USERDIR := .neverball - DATADIR := ./data - LOCALEDIR := ./locale - -+ifeq ($(PLATFORM),haiku) -+ USERDIR := /config/settings/neverball -+endif -+ - ifeq ($(PLATFORM),mingw) - USERDIR := Neverball - endif --- -2.19.0 - diff --git a/games-puzzle/neverball/patches/neverball-1.6.1~20190609.patchset b/games-puzzle/neverball/patches/neverball-1.6.1~20190609.patchset new file mode 100644 index 000000000..c8c26e7c7 --- /dev/null +++ b/games-puzzle/neverball/patches/neverball-1.6.1~20190609.patchset @@ -0,0 +1,83 @@ +From 889b59fd59f497632247369f0b3ff4def3573050 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 7 Aug 2014 17:17:36 +0000 +Subject: haiku patch + + +diff --git a/Makefile b/Makefile +index b124cd0..fcff3cf 100644 +--- a/Makefile ++++ b/Makefile +@@ -11,7 +11,7 @@ $(info Will make a "$(BUILD)" build of Neverball $(VERSION).) + + #------------------------------------------------------------------------------ + # Provide a target system hint for the Makefile. +-# Recognized PLATFORM values: darwin, mingw. ++# Recognized PLATFORM values: darwin, mingw, haiku. + + ifeq ($(shell uname), Darwin) + PLATFORM := darwin +@@ -21,6 +21,10 @@ ifeq ($(shell uname -o),Msys) + PLATFORM := mingw + endif + ++ifeq ($(shell uname), Haiku) ++ PLATFORM := haiku ++endif ++ + #------------------------------------------------------------------------------ + # Paths (packagers might want to set DATADIR and LOCALEDIR) + +@@ -186,6 +190,15 @@ ifeq ($(PLATFORM),darwin) + OGL_LIBS := -framework OpenGL + endif + ++ifeq ($(PLATFORM),haiku) ++ ifneq ($(ENABLE_NLS),0) ++ INTL_LIBS := -lintl ++ endif ++ ++ TILT_LIBS := ++ OGL_LIBS := -lGL ++endif ++ + BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm + + ifeq ($(PLATFORM),darwin) +@@ -194,7 +207,7 @@ ifeq ($(PLATFORM),darwin) + endif + + OGG_LIBS := -lvorbisfile +-TTF_LIBS := -lSDL2_ttf ++TTF_LIBS := -lSDL2_ttf -lfreetype + + ALL_LIBS := $(HMD_LIBS) $(TILT_LIBS) $(INTL_LIBS) $(TTF_LIBS) \ + $(OGG_LIBS) $(SDL_LIBS) $(OGL_LIBS) $(BASE_LIBS) +-- +2.21.0 + + +From 8be8ffd64944344f76264a5b4f02de67c2ad76a5 Mon Sep 17 00:00:00 2001 +From: Gerasim Troeglazov <3dEyes@gmail.com> +Date: Tue, 18 Sep 2018 22:04:56 +1000 +Subject: Fix settings path + + +diff --git a/Makefile b/Makefile +index fcff3cf..20804dc 100644 +--- a/Makefile ++++ b/Makefile +@@ -40,6 +40,10 @@ ifneq ($(BUILD),release) + USERDIR := $(USERDIR)-dev + endif + ++ifeq ($(PLATFORM),haiku) ++ USERDIR := /config/settings/neverball ++endif ++ + #------------------------------------------------------------------------------ + # Optional flags (CFLAGS, CPPFLAGS, ...) + +-- +2.21.0 +