fixed dependencies, whitespaces in plugin name

Stefan-Olt · Sep 30, 2024 · bef81e8 · bef81e8
1 parent f4d6cfd
commit bef81e8
Show file tree

Hide file tree

Showing 5 changed files with 116 additions and 8 deletions.
diff --git a/plugins/bm3d.json b/plugins/bm3d.json
@@ -4,6 +4,56 @@
 	"description": "Denoising filter using the BM3D algorithm",
 	"identifier": "com.vapoursynth.bm3d",
 	"github": "https://github.com/HomeOfVapourSynthEvolution/VapourSynth-BM3D",
+	"runtime_dependencies": {
+		"fftw3": {
+			"versions": {
+				"3.3.10": {
+					"source": "https://www.fftw.org/fftw-3.3.10.tar.gz",
+					"hash": "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467",
+					"build": {
+						".*": {
+							"commands": [
+								{
+									"cmd": [
+										"tar",
+										"xzf",
+										"{DL_FILENAME}"
+									]
+								},
+								{
+									"env": {
+										"CFLAGS": "-fPIC"
+									},
+									"cwd": "{DL_DIRECTORY}",
+									"cmd": [
+										"./configure",
+										"--prefix={WORKSPACEDIR}",
+										"--enable-static",
+										"--disable-shared",
+										"--enable-single"
+									]
+								},
+								{
+									"cwd": "{DL_DIRECTORY}",
+									"cmd": [
+										"make",
+										"-j{NPROC}"
+									]
+								},
+								{
+									"cwd": "{DL_DIRECTORY}",
+									"cmd": [
+										"make",
+										"install"
+									]
+								}
+							]
+						}
+					}
+				}
+			}
+		}
+	},
 	"file_definitions": {
 		"test-filter-0.vpy": {
 			"path": "{TESTDIR}",
@@ -44,6 +94,12 @@
 			},
 			"build": {
 				".*": {
+					"dependencies": [
+						{
+							"name": "fftw3",
+							"version": "3.3.10"
+						}
+					],
 					"commands": [
 						{
 							"cmd": [

diff --git a/plugins/cas.json b/plugins/cas.json
@@ -14,9 +14,7 @@
 	"tests": [
 		{
 			"name": "test-filter-0",
-			"create_files": [
-				"test-filter-0.vpy"
-			],
+			"create_files": [ "test-filter-0.vpy" ],
 			"commands": [
 				{
 					"cwd": "{TESTDIR}",

diff --git a/plugins/depan.json b/plugins/depan.json
@@ -4,6 +4,56 @@
 	"description": "Tools for estimation and compensation of global motion (pan)",
 	"identifier": "com.holywu.depan",
 	"github": "https://github.com/Vapoursynth-Plugins-Gitify/DePan",
+	"runtime_dependencies": {
+		"fftw3": {
+			"versions": {
+				"3.3.10": {
+					"source": "https://www.fftw.org/fftw-3.3.10.tar.gz",
+					"hash": "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467",
+					"build": {
+						".*": {
+							"commands": [
+								{
+									"cmd": [
+										"tar",
+										"xzf",
+										"{DL_FILENAME}"
+									]
+								},
+								{
+									"env": {
+										"CFLAGS": "-fPIC"
+									},
+									"cwd": "{DL_DIRECTORY}",
+									"cmd": [
+										"./configure",
+										"--prefix={WORKSPACEDIR}",
+										"--enable-static",
+										"--disable-shared",
+										"--enable-single"
+									]
+								},
+								{
+									"cwd": "{DL_DIRECTORY}",
+									"cmd": [
+										"make",
+										"-j{NPROC}"
+									]
+								},
+								{
+									"cwd": "{DL_DIRECTORY}",
+									"cmd": [
+										"make",
+										"install"
+									]
+								}
+							]
+						}
+					}
+				}
+			}
+		}
+	},
 	"file_definitions": {
 		"test-filter-0.vpy": {
 			"path": "{TESTDIR}",
@@ -44,6 +94,12 @@
 			},
 			"build": {
 				".*": {
+					"dependencies": [
+						{
+							"name": "fftw3",
+							"version": "3.3.10"
+						}
+					],
 					"commands": [
 						{
 							"cmd": [

diff --git a/plugins/motionmask.json b/plugins/motionmask.json
@@ -15,9 +15,7 @@
 	"tests": [
 		{
 			"name": "test-filter-0",
-			"create_files": [
-				"test-filter-0.vpy"
-			],
+			"create_files": [ "test-filter-0.vpy" ],
 			"commands": [
 				{
 					"cwd": "{TESTDIR}",

diff --git a/vsp-build.py b/vsp-build.py
@@ -307,7 +307,7 @@ def build_plugin(filename: str, version: Optional[str] = None) -> bool:
             print("Error: Could not find file additional file to include: '"+i+"'")
             return -13
     # zip output files
-    zipfile = os.path.join(config_vars['OUTPUTDIR'],build_def['name']+"-"+version.replace(':','~')+"-"+platform+".zip")
+    zipfile = os.path.join(config_vars['OUTPUTDIR'],build_def['name'].split()[0]+"-"+version.replace(':','-')+"-"+platform+".zip")
     zipcmd = ['zip','-j','-9',zipfile]
     zipcmd.extend(output_files)
     if exec_command(zipcmd) != 0:
@@ -317,7 +317,7 @@ def build_plugin(filename: str, version: Optional[str] = None) -> bool:
         print("Finished creating output zip file: '"+zipfile+"'")
 
     with open(os.path.join(config_vars['OUTPUTDIR'], 'TAG'), 'w', encoding='utf-8') as f:
-        f.write('vsplugin/'+build_def['identifier']+'/'+version.replace(':','~')+'/'+platform+'/'+datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0).isoformat().replace(':','.')+'Z')
+        f.write('vsplugin/'+build_def['identifier']+'/'+version.replace(':','-')+'/'+platform+'/'+datetime.datetime.now(datetime.timezone.utc).replace(microsecond=0).isoformat().replace(':','.')+'Z')
 
     # testing
     if config_vars['TESTDIR'] != None: