now with 100% more patch.
Time to stop playing the game and go to bed.
On 09/03/14 23:39, Martijn van Duren wrote:
Hello ports@,
This simple diff updates solarus+games to their latest version.
It switches to SDL2, so it suffers the same regression mentioned before
[1].
With 1.34 pulled out it works like a dream, so might not be the best
time to put it in tree, but maybe someone wishes to play with it.
Sincerely,
Martijn van Duren
[1]http://marc.info/?t=140837718500002&r=1&w=2
Index: solarus/Makefile
===================================================================
RCS file: /cvs/ports/games/solarus/solarus/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- solarus/Makefile 5 Dec 2013 17:37:54 -0000 1.5
+++ solarus/Makefile 3 Sep 2014 21:36:46 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.5 2013/12/05 17:37:54 bcallah Exp $
-V = 1.1.1
+V = 1.3.1
COMMENT = open-source Zelda-like 2D game engine
DISTNAME = solarus-${V}-src
PKGNAME = solarus-${V}
@@ -10,7 +10,7 @@ HOMEPAGE = http://www.solarus-games.org/
# GPLv3+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += SDL SDL_image SDL_ttf c m modplug ogg openal physfs
+WANTLIB += SDL2 SDL2_image SDL2_ttf c m modplug ogg openal physfs
WANTLIB += pthread stdc++ vorbisfile ${MODLUA_WANTLIB}
MASTER_SITES = http://www.solarus-games.org/downloads/solarus/
@@ -22,8 +22,9 @@ LIB_DEPENDS = audio/libmodplug \
audio/libvorbis \
audio/openal \
devel/physfs \
- devel/sdl-image \
- devel/sdl-ttf
+ devel/sdl2-image \
+ devel/sdl2-ttf \
+ lang/luajit
WRKDIST = ${WRKDIR}/solarus-${V}
Index: solarus/distinfo
===================================================================
RCS file: /cvs/ports/games/solarus/solarus/distinfo,v
retrieving revision 1.5
diff -u -p -u -r1.5 distinfo
--- solarus/distinfo 5 Dec 2013 17:37:54 -0000 1.5
+++ solarus/distinfo 3 Sep 2014 21:36:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (solarus-1.1.1-src.tar.gz) = U1XpXtvVI09XqHSNFBfKNGRo5YBORCk9JSO1c2frVhU=
-SIZE (solarus-1.1.1-src.tar.gz) = 2394595
+SHA256 (solarus-1.3.1-src.tar.gz) = bfdbd909b817722985393869b1e8c18f18081fd0c68b4c3189c50ef0bbc8f55c
+SIZE (solarus-1.3.1-src.tar.gz) = 2450599
Index: zsdx/Makefile
===================================================================
RCS file: /cvs/ports/games/solarus/zsdx/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- zsdx/Makefile 5 Dec 2013 17:37:54 -0000 1.4
+++ zsdx/Makefile 3 Sep 2014 21:36:46 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.4 2013/12/05 17:37:54 bcallah Exp $
-V = 1.7.1
+V = 1.9.0
COMMENT = fan made Zelda game for Solarus engine
DISTNAME = zsdx-${V}
Index: zsdx/distinfo
===================================================================
RCS file: /cvs/ports/games/solarus/zsdx/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- zsdx/distinfo 5 Dec 2013 17:37:54 -0000 1.4
+++ zsdx/distinfo 3 Sep 2014 21:36:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (zsdx-1.7.1.tar.gz) = dfl42iO6OBS3RYkDx1ZfqjdVJH1gHT428X6J+O7Vvto=
-SIZE (zsdx-1.7.1.tar.gz) = 22987929
+SHA256 (zsdx-1.9.0.tar.gz) = 300f5679681fcece29623e61580266f47c12e890a468f227276463b22eac1c77
+SIZE (zsdx-1.9.0.tar.gz) = 20760682
Index: zsdx/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/games/solarus/zsdx/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-CMakeLists_txt
--- zsdx/patches/patch-CMakeLists_txt 1 Jul 2013 04:44:42 -0000 1.1
+++ zsdx/patches/patch-CMakeLists_txt 3 Sep 2014 21:36:46 -0000
@@ -1,12 +1,11 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2013/07/01 04:44:42 bcallah Exp $
---- CMakeLists.txt.orig Sun Jun 23 17:46:22 2013
-+++ CMakeLists.txt Sun Jun 23 17:46:38 2013
-@@ -47,7 +47,7 @@ add_custom_target(${quest_name}_data
+--- ./CMakeLists.txt.orig Thu Aug 21 17:57:04 2014
++++ ./CMakeLists.txt Wed Sep 3 22:34:55 2014
+@@ -57,7 +57,7 @@
add_custom_command(
OUTPUT ${quest_name}
COMMAND echo '\#!/bin/sh' > ${quest_name}
-- COMMAND echo 'solarus ${CMAKE_INSTALL_PREFIX}/share/solarus/${quest_name} $*' >> ${quest_name}
-+ COMMAND echo 'solarus ${CMAKE_INSTALL_PREFIX}/share/solarus/${quest_name}' >> ${quest_name}
+- COMMAND echo 'solarus ${SOLARUS_INSTALL_ABSOLUTE_DATADIR}/${quest_name} $*' >> ${quest_name}
++ COMMAND echo 'solarus ${SOLARUS_INSTALL_ABSOLUTE_DATADIR}/${quest_name}' >> ${quest_name}
)
add_custom_target(${quest_name}_command
ALL
Index: zsxd/Makefile
===================================================================
RCS file: /cvs/ports/games/solarus/zsxd/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- zsxd/Makefile 5 Dec 2013 17:37:54 -0000 1.4
+++ zsxd/Makefile 3 Sep 2014 21:36:46 -0000
@@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.4 2013/12/05 17:37:54 bcallah Exp $
-V = 1.7.1
+V = 1.9.0
COMMENT = fan made parody Zelda game for Solarus engine
DISTNAME = zsxd-${V}
Index: zsxd/distinfo
===================================================================
RCS file: /cvs/ports/games/solarus/zsxd/distinfo,v
retrieving revision 1.4
diff -u -p -u -r1.4 distinfo
--- zsxd/distinfo 5 Dec 2013 17:37:54 -0000 1.4
+++ zsxd/distinfo 3 Sep 2014 21:36:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (zsxd-1.7.1.tar.gz) = KozSfLCiSOeNh8IlEV7b54o8ytmZHTSfhSTyPAzHczI=
-SIZE (zsxd-1.7.1.tar.gz) = 3679498
+SHA256 (zsxd-1.9.0.tar.gz) = e617f3a64a5bbd2bcd1f247d1739a3e072d2c04747645024f85a5ad5644a0dfb
+SIZE (zsxd-1.9.0.tar.gz) = 3690390
Index: zsxd/patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/games/solarus/zsxd/patches/patch-CMakeLists_txt,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-CMakeLists_txt
--- zsxd/patches/patch-CMakeLists_txt 1 Jul 2013 04:46:24 -0000 1.1
+++ zsxd/patches/patch-CMakeLists_txt 3 Sep 2014 21:36:46 -0000
@@ -1,12 +1,11 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2013/07/01 04:46:24 bcallah Exp $
---- CMakeLists.txt.orig Sun Jun 23 17:46:22 2013
-+++ CMakeLists.txt Sun Jun 23 17:46:38 2013
-@@ -47,7 +47,7 @@ add_custom_target(${quest_name}_data
+--- ./CMakeLists.txt.orig Thu Aug 21 17:57:07 2014
++++ ./CMakeLists.txt Wed Sep 3 22:39:23 2014
+@@ -57,7 +57,7 @@
add_custom_command(
OUTPUT ${quest_name}
COMMAND echo '\#!/bin/sh' > ${quest_name}
-- COMMAND echo 'solarus ${CMAKE_INSTALL_PREFIX}/share/solarus/${quest_name} $*' >> ${quest_name}
-+ COMMAND echo 'solarus ${CMAKE_INSTALL_PREFIX}/share/solarus/${quest_name}' >> ${quest_name}
+- COMMAND echo 'solarus ${SOLARUS_INSTALL_ABSOLUTE_DATADIR}/${quest_name} $*' >> ${quest_name}
++ COMMAND echo 'solarus ${SOLARUS_INSTALL_ABSOLUTE_DATADIR}/${quest_name}' >> ${quest_name}
)
add_custom_target(${quest_name}_command
ALL
