0
0
Fork 0

Compare commits

...

2 Commits

Author SHA1 Message Date
Pascal Abresch e42609a973 Löve: bump to 11.3
Fix screenshoting windows
use macos love2d hack for getting argv from refsreceived (via sdl)
add x-love-game mimetype to open love2d games from tracker directly
2021-11-15 16:36:54 +01:00
Pascal Abresch 8845294cac libsdl2: implement SDL_SendDropFile 2021-11-15 16:34:44 +01:00
7 changed files with 103 additions and 24 deletions

View File

@ -1,5 +1,5 @@
resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY;
resource app_flags B_SINGLE_LAUNCH;
resource app_version {
major = @MAJOR@,

View File

@ -0,0 +1,26 @@
resource(0, "BEOS:TYPE") #'MIMS' "application/x-vnd.Be-meta-mime";
resource(1, "META:TYPE") "application/x-love-game";
resource(2, "META:S:DESC") #'MSDC' "LÖVE game";
resource(3, "META:L:DESC") #'MLDC' "A LÖVE based game archive";
resource(4, "META:PREF_APP") #'MSIG' "application/x-vnd.love";
resource(5, "META:ICON") #'VICN' array {
$"6E6369660403E74A9904004C0327AAE105FF040607FF1FC6D5B92DC6D5B92DC3"
$"E7B632BFB9B354C0A2B354BE55B354B382BF8BB382BE47B382C025B945C651B6"
$"52C358B982C62AB9F7C5CCB9BDC5FEBE5FC1A9C6D5B92DC38ABE34C6D5B92DB9"
$"2D0607FF1FC731B9B7C731B9B7C3E6BEBEBA53C655BEBBC233BA19C688B9A1C6"
$"DBB9DEC6B4BC6DC9AEC015CC4DBF57CC4DC1C3CC4DCC4DC015CC4DC130CC4DBF"
$"4DC731B9B7C9E5BC75C731B9B7B9B70607FF1FC6D5B92DC6D5B92DC38ABE34B9"
$"F7C5CCBE5FC1A9B9BDC5FEB945C651B982C62ABC11C925BFB9CBC3BEFBCBC3C1"
$"67CBC3CBF1BF8BCBF1C0A6CBF1BEC3C6D5B92DC989BBEBC6D5B92DB92D0608FE"
$"7FC01BBCBABCCABAE8BF08BA5FBA8CBB71BFC1C5B8B5DEC005BFC1C5B8BFBFC5"
$"B840C5B8C9A2C005C2B7BAE8C4F4BB71C079BA5FBF66BCBABF66BCBABFA2BCBA"
$"C01BBCBABFDFBCBAC01BBCBABCBA040A000100000A010101000A020102000A03"
$"010300"
};

Binary file not shown.

View File

@ -2,21 +2,21 @@ SUMMARY="A framework to make 2D games in Lua"
DESCRIPTION="LÖVE is a framework to make 2D games in Lua.
It's free, open-source, and works also on Windows, Mac OS X and Linux."
HOMEPAGE="http://love2d.org/"
COPYRIGHT="2010-2018 Löve"
COPYRIGHT="2010-2019 Löve"
LICENSE="Zlib"
REVISION="3"
SOURCE_URI="https://bitbucket.org/rude/love/downloads/love-$portVersion-linux-src.tar.gz"
CHECKSUM_SHA256="6aaf8104fc35bb8bbd7865986b98079e7564ffdb374ea4d33604b46b458444f6"
REVISION="1"
SOURCE_URI="https://github.com/love2d/love/releases/download/${portVersion}/love-${portVersion}-linux-src.tar.gz"
CHECKSUM_SHA256="649f0db7750ca121e4de7b60208703661052356df35f4cfad490b1ba14dd1455"
PATCHES="love-$portVersion.patchset"
ADDITIONAL_FILES="love.rdef.in"
ADDITIONAL_FILES="love.rdef.in
x-love-game.rsrc"
ARCHITECTURES="all !x86_gcc2"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
love$secondaryArchSuffix = $portVersion
cmd:love$secondaryArchSuffix = $portVersion
lib:liblove_11.2$secondaryArchSuffix = $portVersion
lib:liblove_${portVersion}$secondaryArchSuffix = $portVersion
"
REQUIRES="
haiku$secondaryArchSuffix
@ -45,7 +45,7 @@ REQUIRES="
PROVIDES_devel="
love${secondaryArchSuffix}_devel = $portVersion
devel:liblove$secondaryArchSuffix = $portVersion
devel:liblove_11.2$secondaryArchSuffix = $portVersion
devel:liblove_${portVersion}$secondaryArchSuffix = $portVersion
"
REQUIRES_devel="
love$secondaryArchSuffix == $portVersion base
@ -105,7 +105,12 @@ INSTALL()
rm -f $libDir/*.la
# remove not relevant files
rm -rf $dataDir/{applications,icons,pixmaps}
rm -rf $dataDir/{applications,icons,pixmaps,mime}
# copy mimetype rsrc for love2d games
mkdir -p $dataDir/mime_db/application/
resattr -o $dataDir/mime_db/application/x-love-game $portDir/additional-files/x-love-game.rsrc
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
@ -118,7 +123,7 @@ INSTALL()
addResourcesToBinaries love.rdef $binDir/love
prepareInstalledDevelLibs liblove-11.2 liblove
prepareInstalledDevelLibs liblove-${portVersion} liblove
packageEntries devel \
$developDir

View File

@ -6,7 +6,7 @@ software, emulators, and popular games."
HOMEPAGE="https://www.libsdl.org/"
COPYRIGHT="1997-2021 Sam Lantinga"
LICENSE="Zlib"
REVISION="6"
REVISION="7"
SOURCE_URI="https://www.libsdl.org/release/SDL2-$portVersion.tar.gz"
CHECKSUM_SHA256="d8215b571a581be1332d2106f8036fcb03d12a70bae01e20f424976d275432bc"
SOURCE_DIR="SDL2-$portVersion"

View File

@ -1,4 +1,4 @@
From b4d2752b7cfa3981996edb197c99d342fa7d5ae4 Mon Sep 17 00:00:00 2001
From 65893e20821c4d239b0f738cf264ed983a712362 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 2 Feb 2018 09:40:46 +0100
Subject: Fix secondary arch build.
@ -43,10 +43,10 @@ index b7e519b..8e15ca9 100644
*-ios-*)
ARCH=ios
--
2.30.0
2.30.2
From f21290d64a86de299f16809ee22ec2af9c68a302 Mon Sep 17 00:00:00 2001
From d4d08269145120bead818767940389b4d958e106 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 8 Mar 2021 14:34:02 +1000
Subject: Fix relative mode for mouse
@ -117,10 +117,10 @@ index 817fccf..234eaf0 100644
mouse->def_cursor = (SDL_Cursor*)0x2;
}
--
2.30.0
2.30.2
From e72180d6c6a05161fbb7051a3d0396a9371dd726 Mon Sep 17 00:00:00 2001
From a758ff19e19a8dcb2ce5db96a0cced8228cc01a6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 8 Mar 2021 14:34:40 +1000
Subject: Add support for system cursors
@ -239,10 +239,10 @@ index 234eaf0..0948451 100644
int HAIKU_VideoInit(_THIS)
--
2.30.0
2.30.2
From e3c8ac3ec956272129a320ff5a7347d9050d69ca Mon Sep 17 00:00:00 2001
From 5753b1fd2ee33d9baed3d45a75467dc61236a81c Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 8 Mar 2021 14:36:14 +1000
Subject: Disable direct mode for BGLView
@ -262,10 +262,10 @@ index 974c152..83bb346 100644
Unlock();
return (_SDL_GLView);
--
2.30.0
2.30.2
From 8ac03106fea9245de0b495d23e38bf4055b8df55 Mon Sep 17 00:00:00 2001
From 5c21e0a17de6400421dbd38b5b4a6c2229ba2bd3 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 8 Mar 2021 14:36:48 +1000
Subject: Fix build for gcc2
@ -306,10 +306,10 @@ index 0948451..f3c80ac 100644
// #define HAIKU_PumpEvents NULL
#define HAIKU_StartTextInput NULL
--
2.30.0
2.30.2
From 27e186cc748fb703abd03fa433c700725980e049 Mon Sep 17 00:00:00 2001
From 296cd3ae4d89e62f5ee8671cc48e734972a9df18 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 25 Apr 2021 13:35:32 +0200
Subject: Haiku: cmake build
@ -489,5 +489,53 @@ index b9b9eb6..c203236 100644
install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/aclocal")
endif()
--
2.30.0
2.30.2
From 3650ac444c3002360f74c88ed81253709133c5f5 Mon Sep 17 00:00:00 2001
From: Pascal Abresch <nep@packageloss.eu>
Date: Mon, 15 Nov 2021 16:32:58 +0100
Subject: Implement SDL_SendDropFile for opening files with RefsReceived
diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h
index ce1fc68..8c3b2e4 100644
--- a/src/main/haiku/SDL_BApp.h
+++ b/src/main/haiku/SDL_BApp.h
@@ -21,6 +21,7 @@
#ifndef SDL_BAPP_H
#define SDL_BAPP_H
+#include <Path.h>
#include <InterfaceKit.h>
#include <LocaleRoster.h>
#if SDL_VIDEO_OPENGL
@@ -93,6 +94,16 @@ public:
}
+ virtual void RefsReceived(BMessage* message) {
+ char filePath[512];
+ entry_ref entryRef;
+ if (message->FindRef("refs", &entryRef) != B_OK)
+ return;
+
+ BPath bPath = BPath(&entryRef);
+ SDL_SendDropFile(NULL, bPath.Path());
+ return;
+ }
/* Event-handling functions */
virtual void MessageReceived(BMessage* message) {
@@ -300,7 +311,7 @@ private:
}
HAIKU_SetKeyState(scancode, state);
SDL_SendKeyboardKey(state, HAIKU_GetScancodeFromBeKey(scancode));
-
+
if (state == SDL_PRESSED && SDL_EventState(SDL_TEXTINPUT, SDL_QUERY)) {
const int8 *keyUtf8;
ssize_t count;
--
2.30.2