summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVito Caputo <vcaputo@pengaru.com>2022-03-19 10:05:31 -0700
committerVito Caputo <vcaputo@pengaru.com>2022-03-19 12:11:23 -0700
commit60625de67efa1d35b415c2409a5279b4d02c51ef (patch)
treef21d24f2f8fb3e1ecad67f2912da350a220d78a6 /src
parent1f3640f85c4fb811aaad9b500298c8a585a10ad8 (diff)
*: drop til_module_t.license
Originally the thinking was that rototiller modules would become dlopen()ed shared objects, and that it would make sense to let them be licensed differently. At this time only some modules I have written were gplv3, Phil's modules are all gplv2, and I'm not inclined to pivot towards a dlopen model. So this commit drops the license field from til_module_t, relicenses my v3 code to v2, and adds a gplv2 LICENSE file to the source root dir. As of now rototiller+libtil and all its modules are simply gplv2, and anything linking in libtil must use a gplv2 compatible license - the expectation is that you just use gplv2.
Diffstat (limited to 'src')
-rw-r--r--src/libs/puddle/puddle.c2
-rw-r--r--src/libs/puddle/puddle.h2
-rw-r--r--src/modules/drizzle/drizzle.c3
-rw-r--r--src/modules/flui2d/flui2d.c1
-rw-r--r--src/modules/julia/julia.c1
-rw-r--r--src/modules/meta2d/meta2d.c3
-rw-r--r--src/modules/pixbounce/pixbounce.c1
-rw-r--r--src/modules/plasma/plasma.c1
-rw-r--r--src/modules/plato/plato.c3
-rw-r--r--src/modules/ray/ray.c1
-rw-r--r--src/modules/roto/roto.c1
-rw-r--r--src/modules/rtv/rtv.c4
-rw-r--r--src/modules/snow/snow.c1
-rw-r--r--src/modules/sparkler/sparkler.c1
-rw-r--r--src/modules/spiro/spiro.c1
-rw-r--r--src/modules/stars/stars.c1
-rw-r--r--src/modules/submit/submit.c3
-rw-r--r--src/modules/swab/swab.c3
-rw-r--r--src/modules/swarm/swarm.c3
-rw-r--r--src/til.h1
20 files changed, 9 insertions, 28 deletions
diff --git a/src/libs/puddle/puddle.c b/src/libs/puddle/puddle.c
index c6833f7..3b6733d 100644
--- a/src/libs/puddle/puddle.c
+++ b/src/libs/puddle/puddle.c
@@ -2,7 +2,7 @@
* Copyright (C) 2020 - Vito Caputo - <vcaputo@pengaru.com>
*
* This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 as published
+ * under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/libs/puddle/puddle.h b/src/libs/puddle/puddle.h
index cc8988e..7358b23 100644
--- a/src/libs/puddle/puddle.h
+++ b/src/libs/puddle/puddle.h
@@ -2,7 +2,7 @@
* Copyright (C) 2020 - Vito Caputo - <vcaputo@pengaru.com>
*
* This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 as published
+ * under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
diff --git a/src/modules/drizzle/drizzle.c b/src/modules/drizzle/drizzle.c
index b634a5e..26d1ac8 100644
--- a/src/modules/drizzle/drizzle.c
+++ b/src/modules/drizzle/drizzle.c
@@ -2,7 +2,7 @@
* Copyright (C) 2020 - Vito Caputo - <vcaputo@pengaru.com>
*
* This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 as published
+ * under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
@@ -194,6 +194,5 @@ til_module_t drizzle_module = {
.name = "drizzle",
.description = "Classic 2D rain effect (threaded (poorly))",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv3",
.setup = drizzle_setup,
};
diff --git a/src/modules/flui2d/flui2d.c b/src/modules/flui2d/flui2d.c
index ff0b6a4..8536d90 100644
--- a/src/modules/flui2d/flui2d.c
+++ b/src/modules/flui2d/flui2d.c
@@ -375,6 +375,5 @@ til_module_t flui2d_module = {
.name = "flui2d",
.description = "Fluid dynamics simulation in 2D (threaded (poorly))",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "Unknown",
.setup = flui2d_setup,
};
diff --git a/src/modules/julia/julia.c b/src/modules/julia/julia.c
index 5e7a350..f00c44c 100644
--- a/src/modules/julia/julia.c
+++ b/src/modules/julia/julia.c
@@ -168,5 +168,4 @@ til_module_t julia_module = {
.name = "julia",
.description = "Julia set fractal morpher (threaded)",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv2",
};
diff --git a/src/modules/meta2d/meta2d.c b/src/modules/meta2d/meta2d.c
index 18af219..c1b2a8a 100644
--- a/src/modules/meta2d/meta2d.c
+++ b/src/modules/meta2d/meta2d.c
@@ -2,7 +2,7 @@
* Copyright (C) 2019 - Vito Caputo - <vcaputo@pengaru.com>
*
* This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 as published
+ * under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
@@ -232,5 +232,4 @@ til_module_t meta2d_module = {
.name = "meta2d",
.description = "Classic 2D metaballs (threaded)",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv3",
};
diff --git a/src/modules/pixbounce/pixbounce.c b/src/modules/pixbounce/pixbounce.c
index ff397be..3efa797 100644
--- a/src/modules/pixbounce/pixbounce.c
+++ b/src/modules/pixbounce/pixbounce.c
@@ -199,5 +199,4 @@ til_module_t pixbounce_module = {
.name = "pixbounce",
.description = "Pixmap bounce",
.author = "Philip J Freeman <elektron@halo.nu>",
- .license = "GPLv2",
};
diff --git a/src/modules/plasma/plasma.c b/src/modules/plasma/plasma.c
index b970205..7598fe3 100644
--- a/src/modules/plasma/plasma.c
+++ b/src/modules/plasma/plasma.c
@@ -169,5 +169,4 @@ til_module_t plasma_module = {
.name = "plasma",
.description = "Oldskool plasma effect (threaded)",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv2",
};
diff --git a/src/modules/plato/plato.c b/src/modules/plato/plato.c
index d5c1357..05d80cb 100644
--- a/src/modules/plato/plato.c
+++ b/src/modules/plato/plato.c
@@ -2,7 +2,7 @@
* Copyright (C) 2020 - Vito Caputo - <vcaputo@pengaru.com>
*
* This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 as published
+ * under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
@@ -674,5 +674,4 @@ til_module_t plato_module = {
.name = "plato",
.description = "Platonic solids rendered in 3D",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv3",
};
diff --git a/src/modules/ray/ray.c b/src/modules/ray/ray.c
index 07e1f99..06b0180 100644
--- a/src/modules/ray/ray.c
+++ b/src/modules/ray/ray.c
@@ -206,5 +206,4 @@ til_module_t ray_module = {
.name = "ray",
.description = "Ray tracer (threaded)",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv2",
};
diff --git a/src/modules/roto/roto.c b/src/modules/roto/roto.c
index 0ccb1e2..7aff770 100644
--- a/src/modules/roto/roto.c
+++ b/src/modules/roto/roto.c
@@ -256,5 +256,4 @@ til_module_t roto_module = {
.name = "roto",
.description = "Anti-aliased tiled texture rotation (threaded)",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv2",
};
diff --git a/src/modules/rtv/rtv.c b/src/modules/rtv/rtv.c
index 91da0a5..b166b15 100644
--- a/src/modules/rtv/rtv.c
+++ b/src/modules/rtv/rtv.c
@@ -184,13 +184,11 @@ static void setup_next_channel(rtv_context_t *ctxt, unsigned ticks)
txt_t *caption;
settings = randomize_module_setup(ctxt->channel->module);
- caption = txt_newf("Title: %s%s%s\nDescription: %s%s%s%s%s",
+ caption = txt_newf("Title: %s%s%s\nDescription: %s%s%s",
ctxt->channel->module->name,
ctxt->channel->module->author ? "\nAuthor: " : "",
ctxt->channel->module->author ? : "",
ctxt->channel->module->description,
- ctxt->channel->module->license ? "\nLicense: " : "",
- ctxt->channel->module->license ? : "",
settings ? "\nSettings: " : "",
settings ? settings : "");
diff --git a/src/modules/snow/snow.c b/src/modules/snow/snow.c
index 5c753b9..cffc10c 100644
--- a/src/modules/snow/snow.c
+++ b/src/modules/snow/snow.c
@@ -84,5 +84,4 @@ til_module_t snow_module = {
.name = "snow",
.description = "TV snow / white noise (threaded)",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv2",
};
diff --git a/src/modules/sparkler/sparkler.c b/src/modules/sparkler/sparkler.c
index 6a4b604..ca9bfaf 100644
--- a/src/modules/sparkler/sparkler.c
+++ b/src/modules/sparkler/sparkler.c
@@ -206,5 +206,4 @@ til_module_t sparkler_module = {
.name = "sparkler",
.description = "Particle system with spatial interactions (threaded (poorly))",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv2",
};
diff --git a/src/modules/spiro/spiro.c b/src/modules/spiro/spiro.c
index ca3086f..7f31ddb 100644
--- a/src/modules/spiro/spiro.c
+++ b/src/modules/spiro/spiro.c
@@ -152,5 +152,4 @@ til_module_t spiro_module = {
.name = "spiro",
.description = "Spirograph emulator",
.author = "Philip J Freeman <elektron@halo.nu>",
- .license = "GPLv2",
};
diff --git a/src/modules/stars/stars.c b/src/modules/stars/stars.c
index c762043..1fb73ec 100644
--- a/src/modules/stars/stars.c
+++ b/src/modules/stars/stars.c
@@ -243,5 +243,4 @@ til_module_t stars_module = {
.name = "stars",
.description = "Basic starfield",
.author = "Philip J Freeman <elektron@halo.nu>",
- .license = "GPLv2",
};
diff --git a/src/modules/submit/submit.c b/src/modules/submit/submit.c
index d643a2c..5dd5cb3 100644
--- a/src/modules/submit/submit.c
+++ b/src/modules/submit/submit.c
@@ -2,7 +2,7 @@
* Copyright (C) 2018 - Vito Caputo - <vcaputo@pengaru.com>
*
* This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 as published
+ * under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
@@ -364,6 +364,5 @@ til_module_t submit_module = {
.name = "submit",
.description = "Cellular automata conquest game sim (threaded (poorly))",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv3",
.setup = submit_setup,
};
diff --git a/src/modules/swab/swab.c b/src/modules/swab/swab.c
index 44b9f21..fee20cf 100644
--- a/src/modules/swab/swab.c
+++ b/src/modules/swab/swab.c
@@ -2,7 +2,7 @@
* Copyright (C) 2019 - Vito Caputo - <vcaputo@pengaru.com>
*
* This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 as published
+ * under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
@@ -148,5 +148,4 @@ til_module_t swab_module = {
.name = "swab",
.description = "Colorful perlin-noise visualization (threaded)",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv3",
};
diff --git a/src/modules/swarm/swarm.c b/src/modules/swarm/swarm.c
index 0b320fb..c64ef8e 100644
--- a/src/modules/swarm/swarm.c
+++ b/src/modules/swarm/swarm.c
@@ -2,7 +2,7 @@
* Copyright (C) 2021 - Vito Caputo - <vcaputo@pengaru.com>
*
* This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3 as published
+ * under the terms of the GNU General Public License version 2 as published
* by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful,
@@ -274,5 +274,4 @@ til_module_t swarm_module = {
.name = "swarm",
.description = "\"Boids\"-inspired particle swarm in 3D",
.author = "Vito Caputo <vcaputo@pengaru.com>",
- .license = "GPLv3",
};
diff --git a/src/til.h b/src/til.h
index 02f8f2d..adf614d 100644
--- a/src/til.h
+++ b/src/til.h
@@ -22,7 +22,6 @@ typedef struct til_module_t {
char *name;
char *description;
char *author;
- char *license;
} til_module_t;
int til_init(void);
© All Rights Reserved