pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

frogatto: Update, build tested on Linux



Module Name:	pkgsrc-wip
Committed By:	Charlotte Koch <charlotte%NetBSD.org@localhost>
Pushed By:	cfkoch
Date:		Thu Dec 29 00:33:30 2022 -0800
Changeset:	3fc03b149c1b5db3e623ee792e8d4563d5870cb9

Modified Files:
	frogatto/Makefile
	frogatto/PLIST
	frogatto/TODO
	frogatto/distinfo
Removed Files:
	frogatto/patches/patch-imgui_imgui_draw.cpp

Log Message:
frogatto: Update, build tested on Linux

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3fc03b149c1b5db3e623ee792e8d4563d5870cb9

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 frogatto/Makefile                           |  1 +
 frogatto/PLIST                              | 13 +++++++++++--
 frogatto/TODO                               |  1 +
 frogatto/distinfo                           |  1 -
 frogatto/patches/patch-imgui_imgui_draw.cpp | 15 ---------------
 5 files changed, 13 insertions(+), 18 deletions(-)

diffs:
diff --git a/frogatto/Makefile b/frogatto/Makefile
index a76ed96d11..0af991e758 100644
--- a/frogatto/Makefile
+++ b/frogatto/Makefile
@@ -93,6 +93,7 @@ do-install:
 .include "../../graphics/SDL2_image/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/glm/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../textproc/icu/buildlink3.mk"
diff --git a/frogatto/PLIST b/frogatto/PLIST
index 3d61169737..55ff30fe59 100644
--- a/frogatto/PLIST
+++ b/frogatto/PLIST
@@ -88,12 +88,12 @@ share/frogatto/data/gui-elements.cfg
 share/frogatto/data/gui.cfg
 share/frogatto/data/gui/null.cfg
 share/frogatto/data/languages.cfg
-share/frogatto/data/level/empty.cfg
-share/frogatto/data/level/kstest1.cfg
+share/frogatto/data/level/titlescreen.cfg
 share/frogatto/data/music.cfg
 share/frogatto/data/object_templates/bat.cfg
 share/frogatto/data/object_templates/controller.cfg
 share/frogatto/data/object_templates/fish.cfg
+share/frogatto/data/objects/dummy_player.cfg
 share/frogatto/data/objects/hud-elements/dummy_gui_object.cfg
 share/frogatto/data/preload.cfg
 share/frogatto/data/shaders.cfg
@@ -132,6 +132,7 @@ share/frogatto/images/slider_handle.svg
 share/frogatto/images/white2x2.png
 share/frogatto/images/window-icon-large.png
 share/frogatto/images/window-icon.png
+share/frogatto/modules/empty_test_module/module.cfg
 share/frogatto/modules/frogatto4/data/achievements.cfg
 share/frogatto/modules/frogatto4/data/backgrounds/air-stage1.cfg
 share/frogatto/modules/frogatto4/data/backgrounds/arcade.cfg
@@ -407,6 +408,8 @@ share/frogatto/modules/frogatto4/data/level/Unused/Test/test-forest-interior.cfg
 share/frogatto/modules/frogatto4/data/level/Unused/Test/test-fragment-shader.cfg
 share/frogatto/modules/frogatto4/data/level/Unused/Test/test-gate.cfg
 share/frogatto/modules/frogatto4/data/level/Unused/Test/test-gate2.cfg
+share/frogatto/modules/frogatto4/data/level/Unused/Test/test-liquids-mini-whitewater.cfg
+share/frogatto/modules/frogatto4/data/level/Unused/Test/test-liquids-whitewater.cfg
 share/frogatto/modules/frogatto4/data/level/Unused/Test/test-liquids.cfg
 share/frogatto/modules/frogatto4/data/level/Unused/Test/test-multiplayer.cfg
 share/frogatto/modules/frogatto4/data/level/Unused/Test/test-npc-turning.cfg
@@ -516,6 +519,7 @@ share/frogatto/modules/frogatto4/data/objects/effects/attaches/hp_bar_attache.cf
 share/frogatto/modules/frogatto4/data/objects/effects/attaches/legacy_particle_attache.cfg
 share/frogatto/modules/frogatto4/data/objects/effects/attaches/light_source_attache.cfg
 share/frogatto/modules/frogatto4/data/objects/effects/attaches/particle_attache.cfg
+share/frogatto/modules/frogatto4/data/objects/effects/attaches/particle_attache_slicer.cfg
 share/frogatto/modules/frogatto4/data/objects/effects/attaches/particle_system_holder.cfg
 share/frogatto/modules/frogatto4/data/objects/effects/attaches/shadow_attache.cfg
 share/frogatto/modules/frogatto4/data/objects/effects/attaches/sprite_attache.cfg
@@ -634,6 +638,7 @@ share/frogatto/modules/frogatto4/data/objects/effects/silhouettes/silhouette_rin
 share/frogatto/modules/frogatto4/data/objects/effects/silhouettes/silhouette_star.cfg
 share/frogatto/modules/frogatto4/data/objects/effects/solidity/heightmap_platform_controller.cfg
 share/frogatto/modules/frogatto4/data/objects/effects/solidity/nonsecret_passage_controller.cfg
+share/frogatto/modules/frogatto4/data/objects/effects/solidity/platform_elimination_controller.cfg
 share/frogatto/modules/frogatto4/data/objects/effects/solidity/secret_passage_controller.cfg
 share/frogatto/modules/frogatto4/data/objects/effects/solidity/solid_area_controller.cfg
 share/frogatto/modules/frogatto4/data/objects/effects/sounds/sound_emitter_intermittent.cfg
@@ -1348,6 +1353,8 @@ share/frogatto/modules/frogatto4/data/objects/props/nutty-factory/bottle_acorn_b
 share/frogatto/modules/frogatto4/data/objects/props/nutty-factory/bottle_acorn_butter_ripe.cfg
 share/frogatto/modules/frogatto4/data/objects/props/nutty-factory/bottle_frogatto.cfg
 share/frogatto/modules/frogatto4/data/objects/props/ocean/coral_background1.cfg
+share/frogatto/modules/frogatto4/data/objects/props/ocean/coral_background2.cfg
+share/frogatto/modules/frogatto4/data/objects/props/ocean/coral_background3.cfg
 share/frogatto/modules/frogatto4/data/objects/props/seaside/decor/seaside_decor_fence1.cfg
 share/frogatto/modules/frogatto4/data/objects/props/seaside/decor/seaside_decor_fence2.cfg
 share/frogatto/modules/frogatto4/data/objects/props/seaside/decor/seaside_decor_fence3.cfg
@@ -1961,6 +1968,7 @@ share/frogatto/modules/frogatto4/images/liquids/water copy 1.png
 share/frogatto/modules/frogatto4/images/liquids/water copy 2.png
 share/frogatto/modules/frogatto4/images/liquids/water copy 3.png
 share/frogatto/modules/frogatto4/images/liquids/water copy 4.png
+share/frogatto/modules/frogatto4/images/liquids/water-texture-lights-opaque.png
 share/frogatto/modules/frogatto4/images/liquids/water-texture-lights.png
 share/frogatto/modules/frogatto4/images/liquids/water-texture.png
 share/frogatto/modules/frogatto4/images/liquids/water-texture2.png
@@ -4972,6 +4980,7 @@ share/frogatto/modules/frogatto4/sounds_wav/wingflap2.wav
 share/frogatto/modules/frogatto4/sounds_wav/wingflap3.wav
 share/frogatto/modules/frogatto4/sounds_wav/wingflap4.wav
 share/frogatto/modules/frogatto4/sounds_wav/wingflap5.wav
+share/frogatto/modules/frogatto4_dependant_test_module/module.cfg
 share/frogatto/modules/gui/data/classes/easing.cfg
 share/frogatto/modules/gui/data/classes/font.cfg
 share/frogatto/modules/gui/data/classes/gui.cfg
diff --git a/frogatto/TODO b/frogatto/TODO
index f2498c51f5..3fdc315d20 100644
--- a/frogatto/TODO
+++ b/frogatto/TODO
@@ -1,3 +1,4 @@
 frogatto TODO:
 
 - relies on wip/git-package.mk
+- anura repo's "imgui" submodule is NOT pinned to a specific version
diff --git a/frogatto/distinfo b/frogatto/distinfo
index 313fd8f519..282e58aa03 100644
--- a/frogatto/distinfo
+++ b/frogatto/distinfo
@@ -4,4 +4,3 @@ SHA1 (frogatto-0-8b0351854518af25b553c7fd50f6f2afb6d5e71b.tar.gz) = 043d711ebd5a
 RMD160 (frogatto-0-8b0351854518af25b553c7fd50f6f2afb6d5e71b.tar.gz) = a890fe1e95a318da9769d95d7d15c366fe7705b8
 SHA512 (frogatto-0-8b0351854518af25b553c7fd50f6f2afb6d5e71b.tar.gz) = 15c33d298ee038e28c6a39c63d2058d2b6182b1463fb35015d029e07377b8b33e01340a07b338f9cd990bc66a4685b609055c530adb0192815bb02c75eb0e79b
 Size (frogatto-0-8b0351854518af25b553c7fd50f6f2afb6d5e71b.tar.gz) = 606979149 bytes
-SHA1 (patch-imgui_imgui_draw.cpp) = 142b360239573899a3a58f5279e0d568a37a6379
diff --git a/frogatto/patches/patch-imgui_imgui_draw.cpp b/frogatto/patches/patch-imgui_imgui_draw.cpp
deleted file mode 100644
index 14ea72ce4b..0000000000
--- a/frogatto/patches/patch-imgui_imgui_draw.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-NetBSD's alloca(3) can be found in stdlib.h.
-
---- imgui/imgui_draw.cpp.orig	2021-04-26 19:27:27.434449487 -0700
-+++ imgui/imgui_draw.cpp	2021-04-26 19:28:18.554672461 -0700
-@@ -21,7 +21,7 @@
- #if !defined(alloca)
- #ifdef _WIN32
- #include <malloc.h>     // alloca
--#elif (defined(__FreeBSD__) || defined(FreeBSD_kernel) || defined(__DragonFly__)) && !defined(__GLIBC__)
-+#elif (defined(__FreeBSD__) || defined(FreeBSD_kernel) || defined(__DragonFly__) || defined(__NetBSD__)) && !defined(__GLIBC__)
- #include <stdlib.h>     // alloca. FreeBSD uses stdlib.h unless GLIBC
- #else
- #include <alloca.h>     // alloca


Home | Main Index | Thread Index | Old Index