pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/games/powder-toy
Module Name: pkgsrc
Committed By: nia
Date: Thu Dec 3 14:37:20 UTC 2020
Modified Files:
pkgsrc/games/powder-toy: Makefile distinfo
pkgsrc/games/powder-toy/patches: patch-SConscript
patch-resources_powder.appdata.xml
Log Message:
powder-toy: Update to 95.0
Cracker1000 (1):
Add .life serialization support to lsns (#652)
Ian Bastos (2):
check SDL2 framework on OSX
Implement file drop handler (#666)
Nick Renieris (2):
graphics/gldrawmethods: Fix compilation
gui/game/brush: Add smooth/organic elliptical brush
Nikolas Ostrowski (1):
include libcurl package in prerequisites
Nuno Miguel (1):
Fix namespace error
Piotr Szegda (1):
Update appdata.xml (#680)
QuanTech0 (1):
Division by Zero fix (#689)
Sebastián Mestre (1):
Use CoordStack for INST Flooding (#676)
Secundario (1):
Do a single CoordStack allocation per thread
Tamás Bálint Misius (97):
Replace http_* calls with Download calls in non-RequestBroker stuff
Turn RequestBroker::RetrieveAvatar into a request derived from Download
Turn RequestBroker::RetrieveThumbnail into a request derived from Download
Use the new thumbnail renderer task everywhere
Add RequestMonitor
Turn RequestBroker::Get/SaveUserInfoAsync into a request derived from Download
Rename Download* to Request* and move HTTP stuff inside src/client/http
Fix filename field in multipart content-disposition headers
More renaming, remove a few useless .c_str()s and fix a URL that had previously contained Download and thus fell victim to my mindless text replacement tricks
Turn ThumbnailRendererTask into an AbandonableTask
Fix dumb things that aren't necessarily lethal but are eyesores
Add curl, rework Request and RequestManager a bit
Remove spinning from AbandonableTask::Finish
Change scheme to https everywhere
Add STATICSCHEME macro to be used with requests to STATICSERVER
Fix a bunch of threading-related issues
Fix thumbnails sometimes not being resized in the save browser
Follow redirects and fix save loading by ptsave parameter
Fix AbandonableTask being utterly broken
Only use curl mime feature if it actually exists
Another curl version-dependent feature thing
Fix save buttons and probably other things not being cleaned up in FileBrowserActivity (fixed #635)
Tweak replace mode and specific delete mode (fixes #631)
Fix pavg loading behaviour of QRTZ/GLAS/TUNG (fixes #607)
Add more sign macros (fixes #578)
Fix {ctype} sign macro displaying Empty for non-element ctypes
Fix msvc compile error again
Add more SSL client error strings
Add option to redirect cout/cerr to files
Print libcurl error buffer to stderr on client error
Fix a few exceptions returning pointers to temporaries in what()
Fix Lua reference leaks (fixes #638)
Fix Element::Identifier assignment leak (closes #205)
Clean up sign-related code a bit
Use C++11 threads
Get GetUserName out of the way on Windows
Move notification out of block locking associated mutex in Gravity.cpp
Flatten include trees
Nuke using namespace std;
Add really basic VS project generator
Add new element script
Leave only the 'wants pressure' check in Simulation::Load for QRTZ/GLAS/TUNG
Fix transition properties not being validated
Fix part_change_type not being called by sim.partProperty
Add more transition type checks and fix tpt.eltransition
Expose transition constants to Lua (fixes #654)
Make elem.free rebuild menus (fixes #649)
Update README and intro text
Add missing standard include (fixes #644)
Invoke vsproject.py automatically and make newelement.py a bit more friendly
Ignore more VS crap
Get widths in order, various other things
Make Simulation.IncludePressure pref node accessible from OptionsView
Reinstate inversion of inclusion of pressure when shift is held
Use tool desc. and relevant menu desc. in tool search (fixes #289)
Fix text wrapping (fixes #166)
Allow wrapping after certain punctuation characters
Fix highlighting in ConsoleView
Purge the last traces of PositionAtCharIndex and CharIndexAtPosition
Fix selection background of formatted labels
Use current rendering modes when placing a save (fixes #446)
Make Renderer::ResetModes actually reset modes
Revise ctype-drawing (fixes #657)
Replace a few occurrences of hard-coded font height with FONT_H
Prioritise ctypeDraw functions over sparking
Okay, it wasn't functionally equivalent (see 79f9a2d6)
Prevent protocol downgrade attacks
Prevent newlines from being needlessly appended (fixes #667)
Only allow strong ciphers to be used
Fix VS warning complaining about std::fill(float *, float *, int)
Remove unused variables from Simulation::FloodINST
Don't destroy the new command being entered in ConsoleView
Nicer implementation of sim.parts
Add option to make deco tools use sRGB colour space
Add Lua API for deco tool colour space, see 51e5f2b
Add gamma = 2.2 and 1.8 modes, see 51e5f2b
Make sRGB the default colour space for deco tools, see 51e5f2b
Add link to up-to-date build instructions to README.md
Keep GameModel brush radius consistent
Incorporate Gravity property into calculation of acceleration due to newtonian gravity
Revert previous change, add NewtonianGravity element property instead
Fix unsigned integer properties being returned as signed integers from Lua functions
Blacklist SPRK in PCLN's and PBCN's ctypeDraw function
Get rid of tiny callback classes, round No.1
If you don't assign the callback, it won't be called
Ditch element and tool classes
Add HTTP API for Lua
Much good #defining ENFORCE_HTTPS does if we don't include Config.h
Make NOHTTP transparent to the Lua API
Fix random warnings from clang 8.0.0
Only make the request a POST if POST parameters are present
Fix PMAPBITS compile-time sanity check
Don't treat warnings as errors in MSVC (fixes #686)
Failure to remove a tag shouldn't be fatal
Fix crash when overwriting existing local saves
Restrict saved version to 95.0 if signs with macros are present
Catch exception by reference rather than value
iczero (1):
Fix race condition in Gravity.cpp
jacob1 (73):
allow using element names as argument 2 to tpt.set_property again
prevent weirdness when ctrl/shift/alt key event is canceled
change a bunch of virtual to override (should fix annoying mac compile warnings)
USE_SDL is no longer used
Fix stamp and local save thumbnails being stretched
Tick Client 10 times a second, makes thumbnails appear way faster
Increase local browser ui size
zoom api changes: throw errors instead of returning bools, zoomEnabled takes book as arg, some small refactoring
Fix compile error in some older versions of clang
use override in all possible places
Fix updater
Make element names a String (unicode support)
Fix msvc compile
Add CURL_STATICLIB when compiling on windows, add possibly needed msvc libraries
run curl-config on linux; remove hacks for detecting old mac compiler
Add MotD when using a broken alternate update server
Allow loading window positions on 2nd monitor
Fix sim.deleteStamp not updating stamps.def
Fix pressure / ambient heat being saved as 0 instead of not at all when shift is held
Fix msvc compile error
better capitalization
Fix POLO eating PROT ID#0 no matter where it is
Fix crash when searching in element search ui
Add sim.CELL constant + some other change I made a while ago for some reason
Add disable-network command line argument
misc whitespace changes
Fix 'l' crash
Fix stamps not saving properly to stamps.def. Make "Rescan Stamps" sort stamps by time created
Fix tpt.eltransition.<elem>.presHighType
Update gravity mask even while paused
arbitrary gravity code cleanup
Fix CELL size check when loading OPS saves
don't automatically run vsproject.py when running generator.py, update msvc version
Fix cipher list on Windows. Lock cipher changes behind a define, not going to define it for now
vsproject.py updates
LSNS: formatting changes, change if statements to switch
Fix frame # not showing properly in HUD when recording
Rewrite flood_water to use CoordStack and fix stack overflow, fixes #646
Make water equalization fill in areas slightly more naturally
Fix missing period in update notification, --no-fft compile fix
Add somewhat ugly --nohttp option
fix --nofft renderer check
Fix --nohttp
Fix static compilation
Fix deleting stamps not working
Fix off-by-one issue in sim.parts, fixes #678
Fix clang 8 compile warnings
Fix crash if any built-in scripts try to use the interface api
Fix STK2 rocket boots not saving in saves
Fix crash if error happens in ctypeDraw lua function
Fix crashes if returning invalid arguments from graphics or ctypeDraw lua functions
also allow nil here
Add DefaultProperties, replaces some of the case statements in create_part
Add Create function, handles setting default properties for elements that need randomness or special code
Add CreateAllowed and ChangeType events
Add Lua apis to interact with DefaultProperties, Create, CreateAllowed, and ChangeType
Fix MSVC compile
remove unnecessary arguments to FloodINST. Fix random warning.
Don't look at generated/ anymore (fixes compile error)
split http.request into http.get and http.post (for api reasons)
allow making POST requests with empty body
change to 1L because technically the argument is a long
Add "perfect circle brush" option (on by default), to allow using old circle brush
replace mode: reset created element back to default properties, instead of just changing type
Fix fighters sometimes loading from saves with no element
whitespace fix
Check for Security.Framework on mac
Fix bug where deco renders on EMBR in save thumbnails
Fix TextPrompt::Blocking
restrict new LSNS features to version 95.0 also
Fix --no-http compile
Version 95.0 (build 345)
Fix compilation with static SDL 2.0.10
mniip (3):
Fix --nolua compilation
Fix font editor compilation
Fix signedness warnings in String.h
moonheart08 (1):
Add shebang to python scrips used in the project.
ssccsscc (3):
Added Lua function for working with zoom
Added Lua function for working with zoom
Fixed typo
suve (3):
Add the --no-install-prompt option to Sconscript
Add a man page
Guess best scale on startup (#684)
yarek (2):
Add horizontal separator
Small UI refactor nFixed category refreshing
yareky (1):
Allows to change menu selection from hovering to mouse click
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/games/powder-toy/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/games/powder-toy/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/games/powder-toy/patches/patch-SConscript
cvs rdiff -u -r1.1 -r1.2 \
pkgsrc/games/powder-toy/patches/patch-resources_powder.appdata.xml
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/games/powder-toy/Makefile
diff -u pkgsrc/games/powder-toy/Makefile:1.6 pkgsrc/games/powder-toy/Makefile:1.7
--- pkgsrc/games/powder-toy/Makefile:1.6 Tue Aug 18 17:57:57 2020
+++ pkgsrc/games/powder-toy/Makefile Thu Dec 3 14:37:19 2020
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2020/08/18 17:57:57 leot Exp $
+# $NetBSD: Makefile,v 1.7 2020/12/03 14:37:19 nia Exp $
-DISTNAME= powder-toy-94.1
-PKGREVISION= 3
+DISTNAME= powder-toy-95.0
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_GITHUB:=ThePowderToy/}
GITHUB_PROJECT= The-Powder-Toy
@@ -13,7 +12,7 @@ COMMENT= Desktop version of the 'falling
LICENSE= gnu-gpl-v3
USE_TOOLS+= pkg-config
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++
GCC_REQD+= 4.8
SCONS_ARGS+= ${_MAKE_JOBS}
@@ -60,6 +59,8 @@ do-install:
.include "../../devel/scons/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../www/curl/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/games/powder-toy/distinfo
diff -u pkgsrc/games/powder-toy/distinfo:1.3 pkgsrc/games/powder-toy/distinfo:1.4
--- pkgsrc/games/powder-toy/distinfo:1.3 Sat Jun 20 21:05:11 2020
+++ pkgsrc/games/powder-toy/distinfo Thu Dec 3 14:37:19 2020
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.3 2020/06/20 21:05:11 nia Exp $
+$NetBSD: distinfo,v 1.4 2020/12/03 14:37:19 nia Exp $
-SHA1 (powder-toy-94.1.tar.gz) = 14249c100e38971444bb96fd31ff26fd24cc2190
-RMD160 (powder-toy-94.1.tar.gz) = 88671b2007f2f1a2ecc3a079cc961d3475742f56
-SHA512 (powder-toy-94.1.tar.gz) = ecda20d206298ff605a3a361255a0766caceece4d268355e4dbf1d56ef78bd7c43e54560d1ad71f29a8c3572d66eca875d5539e1006b260e029561ab91bf34d4
-Size (powder-toy-94.1.tar.gz) = 1254309 bytes
-SHA1 (patch-SConscript) = 73cb6c1efb0bfe7db2f8e67c3b8cff6aa93da313
-SHA1 (patch-resources_powder.appdata.xml) = e687b33b50c286ec2858bdf2024e201df4b8be8e
+SHA1 (powder-toy-95.0.tar.gz) = 34b66eca7fb5c92662125f18dc7aaaaadce67c0a
+RMD160 (powder-toy-95.0.tar.gz) = 51d796142939821f1c310689899e2e82a18c118f
+SHA512 (powder-toy-95.0.tar.gz) = e2f8230631a8ee50b3cd4b9d34cf7121663266ea1fd6ffb176b37b569b2e1566fc84ff1abc434bbfd7eb6b55264eb87c11312e8ebdc28f07210efcc9db756910
+Size (powder-toy-95.0.tar.gz) = 1250743 bytes
+SHA1 (patch-SConscript) = 0eef48dccd21eb140672a8087ac05b24f0940e09
+SHA1 (patch-resources_powder.appdata.xml) = 7185f4e51c0125c0220772bed23c8ac8a119c845
SHA1 (patch-resources_powder.desktop) = 9c77feb557afbd2e5ad4fb0b5f15be1809214555
SHA1 (patch-src_Config.h) = 01d9cced7a87b6f33b1974bf51dd9d93949d41a2
Index: pkgsrc/games/powder-toy/patches/patch-SConscript
diff -u pkgsrc/games/powder-toy/patches/patch-SConscript:1.2 pkgsrc/games/powder-toy/patches/patch-SConscript:1.3
--- pkgsrc/games/powder-toy/patches/patch-SConscript:1.2 Sat Jun 20 20:57:02 2020
+++ pkgsrc/games/powder-toy/patches/patch-SConscript Thu Dec 3 14:37:19 2020
@@ -1,10 +1,10 @@
-$NetBSD: patch-SConscript,v 1.2 2020/06/20 20:57:02 nia Exp $
+$NetBSD: patch-SConscript,v 1.3 2020/12/03 14:37:19 nia Exp $
Support NetBSD.
---- SConscript.orig 2019-02-21 05:23:45.000000000 +0000
+--- SConscript.orig 2020-02-27 03:38:53.000000000 +0000
+++ SConscript
-@@ -88,7 +88,7 @@ elif GetOption('lin'):
+@@ -90,7 +90,7 @@ elif GetOption('lin'):
platform = "Linux"
elif GetOption('mac'):
platform = "Darwin"
@@ -13,22 +13,21 @@ Support NetBSD.
FatalError("Unknown platform: {0}".format(platform))
msvc = GetOption('msvc')
-@@ -243,11 +243,11 @@ def findLibs(env, conf):
+@@ -239,12 +239,7 @@ def findLibs(env, conf):
FatalError("libSDL2main not found or not installed")
#Look for SDL
- runSdlConfig = platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD"
-+ runSdlConfig = platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD" or platform == "NetBSD"
- #if platform == "Darwin" and conf.CheckFramework("SDL"):
- # runSdlConfig = False
-- if not conf.CheckLib("SDL2"):
+- if platform == "Darwin" and conf.CheckFramework("SDL2"):
+- runSdlConfig = False
+- elif not conf.CheckLib("SDL2"):
- FatalError("SDL2 development library not found or not installed")
-+ #if not conf.CheckLib("SDL2"):
-+ # FatalError("SDL2 development library not found or not installed")
-
+-
++ runSdlConfig = platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD" or platform == "NetBSD"
if runSdlConfig:
try:
-@@ -267,10 +267,7 @@ def findLibs(env, conf):
+ env.ParseConfig('sdl2-config --cflags')
+@@ -263,10 +258,7 @@ def findLibs(env, conf):
if not GetOption('nolua') and not GetOption('renderer') and not GetOption('font'):
#Look for Lua
@@ -40,7 +39,17 @@ Support NetBSD.
if GetOption('luajit'):
if not conf.CheckLib(['luajit-5.1', 'luajit5.1', 'luajit2.0', 'luajit', 'libluajit']):
FatalError("luajit development library not found or not installed")
-@@ -289,7 +286,7 @@ def findLibs(env, conf):
+@@ -276,16 +268,13 @@ def findLibs(env, conf):
+ if not conf.CheckLib(['lua5.2', 'lua-5.2', 'lua52', 'lua']):
+ FatalError("lua5.2 development library not found or not installed")
+ env.Append(CPPDEFINES=["LUA_COMPAT_ALL"])
+- if platform == "FreeBSD":
+- luaver = "lua-5.2"
+- else:
+- luaver = "lua5.2"
++ luaver = "lua5.2"
+ else:
+ if not conf.CheckLib(['lua5.1', 'lua-5.1', 'lua51', 'lua']):
if platform != "Darwin" or not conf.CheckFramework("Lua"):
FatalError("lua5.1 development library not found or not installed")
foundpkg = False
@@ -49,7 +58,16 @@ Support NetBSD.
try:
env.ParseConfig("pkg-config --cflags {0}".format(luaver))
env.ParseConfig("pkg-config --libs {0}".format(luaver))
-@@ -346,7 +343,7 @@ def findLibs(env, conf):
+@@ -333,7 +322,7 @@ def findLibs(env, conf):
+ if useCurl and not conf.CheckLib(['curl', 'libcurl']):
+ FatalError("libcurl not found or not installed")
+
+- if useCurl and (platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD"):
++ if useCurl and (platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD" or platform == "NetBSD"):
+ if GetOption('static'):
+ env.ParseConfig("curl-config --static-libs")
+ else:
+@@ -358,7 +347,7 @@ def findLibs(env, conf):
#Look for OpenGL libraries
if GetOption('opengl'):
@@ -58,7 +76,7 @@ Support NetBSD.
if not conf.CheckLib('GL'):
FatalError("libGL not found or not installed")
try:
-@@ -363,10 +360,12 @@ def findLibs(env, conf):
+@@ -375,10 +364,12 @@ def findLibs(env, conf):
if not conf.CheckFramework("OpenGL"):
FatalError("OpenGL framework not found or not installed")
@@ -72,7 +90,7 @@ Support NetBSD.
if not conf.CheckLib('rt'):
FatalError("librt not found or not installed")
elif platform == "Windows":
-@@ -418,7 +417,7 @@ if platform == "Windows":
+@@ -426,7 +417,7 @@ if platform == "Windows":
env.Append(LINKFLAGS=['/NODEFAULTLIB:msvcrtd.lib'])
else:
env.Append(LINKFLAGS=['-mwindows'])
@@ -81,3 +99,14 @@ Support NetBSD.
env.Append(CPPDEFINES=['LIN'])
elif platform == "Darwin":
env.Append(CPPDEFINES=['MACOSX'])
+@@ -481,10 +472,6 @@ elif GetOption('release'):
+ env.Append(CCFLAGS=['/MT'])
+ else:
+ env.Append(CCFLAGS=['/MD'])
+- else:
+- env.Append(CCFLAGS=['-O3', '-ftree-vectorize', '-funsafe-math-optimizations', '-ffast-math', '-fomit-frame-pointer'])
+- if platform != "Darwin":
+- env.Append(CCFLAGS=['-funsafe-loop-optimizations'])
+
+ if GetOption('static'):
+ if platform == "Windows":
Index: pkgsrc/games/powder-toy/patches/patch-resources_powder.appdata.xml
diff -u pkgsrc/games/powder-toy/patches/patch-resources_powder.appdata.xml:1.1 pkgsrc/games/powder-toy/patches/patch-resources_powder.appdata.xml:1.2
--- pkgsrc/games/powder-toy/patches/patch-resources_powder.appdata.xml:1.1 Sat Apr 13 12:08:04 2019
+++ pkgsrc/games/powder-toy/patches/patch-resources_powder.appdata.xml Thu Dec 3 14:37:19 2020
@@ -1,14 +1,15 @@
-$NetBSD: patch-resources_powder.appdata.xml,v 1.1 2019/04/13 12:08:04 nia Exp $
+$NetBSD: patch-resources_powder.appdata.xml,v 1.2 2020/12/03 14:37:19 nia Exp $
Rename application to powder-toy.
---- resources/powder.appdata.xml.orig 2019-02-21 05:23:45.000000000 +0000
+--- resources/powder.appdata.xml.orig 2020-02-27 03:38:53.000000000 +0000
+++ resources/powder.appdata.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="UTF-8"?>
- <component type="desktop">
-- <id>powder.desktop</id>
-+ <id>powder-toy.desktop</id>
- <metadata_license>CC0-1.0</metadata_license>
- <project_license>GPL-3.0</project_license>
- <name>Powder Toy</name>
+@@ -8,7 +8,7 @@
+ <content_rating type="oars-1.1">
+ <content_attribute id="social-chat">moderate</content_attribute>
+ </content_rating>
+- <launchable type="desktop-id">powder.desktop</launchable>
++ <launchable type="desktop-id">powder-toy.desktop</launchable>
+ <description>
+ <p>
+ The Powder Toy is a free physics sandbox game, which simulates air pressure and velocity, heat, gravity and a countless number of interactions between different substances! The game provides
you with various building materials, liquids, gases and electronic components which can be used to construct complex machines, guns, bombs, realistic terrains and almost anything else. You can then
mine them and watch cool explosions, add intricate wirings, play with little stickmen or operate your machine. You can browse and play thousands of different saves made by the community or upload
your own - we welcome your creations!
Home |
Main Index |
Thread Index |
Old Index