vscarefulsource 2__tar.gz → 6__tar.gz

{vscarefulsource-2 → vscarefulsource-6}/.gitignore

@@ -6,3 +6,5 @@
 /.vspreview
 *.png
 /build*
+/dist*
+/.venv

{vscarefulsource-2 → vscarefulsource-6}/PKG-INFO

@@ -1,22 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.5
 Name: vscarefulsource
-Version: 2
+Version: 6
 Requires-Python: >3.12
-Requires-Dist: vsauto
+Requires-Dist: vapoursynth>=74
 Description-Content-Type: text/markdown
 
 # CarefulSource
 
-## Installation
-
-`pip install vsnoise`
-
-    import vsauto
-    vsauto.load()
-    ...
-    import vapoursynth as vs
-    vs.core.noise.Add(...)
-
 ## Usage
 
 ```

{vscarefulsource-2 → vscarefulsource-6}/README.md

@@ -1,15 +1,5 @@
 # CarefulSource
 
-## Installation
-
-`pip install vsnoise`
-
-    import vsauto
-    vsauto.load()
-    ...
-    import vapoursynth as vs
-    vs.core.noise.Add(...)
-
 ## Usage
 
 ```

vscarefulsource-6/hatch_build.py

@@ -0,0 +1,47 @@
+import shutil
+import subprocess
+import sys
+from pathlib import Path
+from typing import Any
+
+from hatchling.builders.hooks.plugin.interface import BuildHookInterface
+from packaging import tags
+
+
+class CustomHook(BuildHookInterface[Any]):
+    source_dir = Path("build")
+    target_dir = Path("vapoursynth/plugins")
+
+    def initialize(self, version: str, build_data: dict[str, Any]) -> None:
+
+        build_data["pure_python"] = False
+        build_data["tag"] = f"py3-none-{next(tags.platform_tags())}"
+
+        subprocess.run(
+            [
+                sys.executable,
+                "-m",
+                "mesonbuild.mesonmain",
+                "setup",
+                "build",
+                "--vsenv",
+                "-Dpy_ext=false",
+            ],
+            check=True,
+        )
+        subprocess.run(
+            [sys.executable, "-m", "mesonbuild.mesonmain", "compile", "-C", "build"],
+            check=True,
+        )
+
+        shutil.rmtree(self.target_dir.parent, ignore_errors=True)
+        for file_path in self.source_dir.rglob("*"):
+            if file_path.is_file() and file_path.suffix in [".dll", ".so", ".dylib"]:
+                build_data.setdefault("force_include", {})[str(file_path)] = str(
+                    self.target_dir / file_path.name
+                )
+
+    def finalize(
+        self, version: str, build_data: dict[str, Any], artifact_path: str
+    ) -> None:
+        shutil.rmtree(self.target_dir.parent, ignore_errors=True)

vscarefulsource-6/meson.build

@@ -0,0 +1,64 @@
+project('carefulsource', 'cpp',
+  default_options: ['buildtype=release', 'warning_level=2', 'b_lto=true', 'b_ndebug=if-release', 'cpp_std=c++20', 'default_library=static', 'wrap_mode=forcefallback'],
+  meson_version: '>=1.1.0',
+  version: '3'
+)
+
+cxx = meson.get_compiler('cpp')
+gcc_syntax = cxx.get_argument_syntax() == 'gcc'
+
+if get_option('buildtype') == 'release'
+  add_project_arguments(gcc_syntax ? ['-fno-math-errno', '-fno-trapping-math'] : ['/GS-'], language: 'cpp')
+endif
+
+py = import('python').find_installation(pure: false)
+
+vapoursynth_include_command = run_command(
+  py,
+  '-c',
+  'import vapoursynth as vs; print(vs.get_include())',
+  check: true,
+)
+vapoursynth_inc = include_directories(vapoursynth_include_command.stdout().strip(), is_system: true)
+vapoursynth_dep = declare_dependency(compile_args: '-I' + vapoursynth_include_command.stdout().strip())
+
+lcms2_dep = dependency(
+  'lcms2',
+  fallback: ['lcms2', 'liblcms2_dep'],
+  default_options: ['tests=disabled', 'utils=false', 'default_library=static'],
+)
+libpng_dep = dependency(
+  'libpng',
+  fallback: ['libpng', 'libpng_dep'],
+  default_options: ['tests=false', 'default_library=static'],
+)
+libjpeg_dep = dependency(
+  'libjpeg',
+  fallback: ['libjpeg-turbo', 'libjpeg_dep'],
+  default_options: ['tests=disabled', 'default_library=static'],
+)
+
+sources = [
+  'src/carefulsource.cpp',
+  'src/decoder_png.cpp',
+  'src/decoder_jpeg.cpp',
+]
+
+deps = [vapoursynth_dep, lcms2_dep, libpng_dep, libjpeg_dep]
+libs = []
+
+if get_option('py_ext')
+  py.extension_module('vscarefulsource_ext', sources,
+    dependencies: deps,
+    link_with: libs,
+    install: true,
+  )
+else
+  shared_module('carefulsource', sources,
+    dependencies: deps,
+    link_with: libs,
+    install: true,
+    install_dir: py.get_install_dir(pure: false) / 'vapoursynth' / 'plugins',
+    gnu_symbol_visibility: 'hidden',
+  )
+endif

vscarefulsource-6/pyproject.toml

@@ -0,0 +1,44 @@
+[project]
+name = "vscarefulsource"
+version = "6"
+requires-python = ">3.12"
+readme = "README.md"
+dependencies = ["vapoursynth>=74"]
+
+[build-system]
+build-backend = "hatchling.build"
+requires = ["hatchling", "packaging", "meson", "ninja", "wheel", "vapoursynth>=74"]
+
+[tool.hatch.build.targets.wheel]
+include = ["vapoursynth/plugins"]
+artifacts = [
+    "vapoursynth/plugins/*.dylib",
+    "vapoursynth/plugins/*.so",
+    "vapoursynth/plugins/*.dll",
+]
+
+[tool.hatch.build.targets.sdist]
+include = [
+  "src",
+  "subprojects/*.wrap",
+  "subprojects/packagefiles",
+  "subprojects/lcms2-*",
+  "subprojects/libjpeg-turbo-*",
+  "subprojects/libpng-*",
+  "subprojects/zlib-*",
+  "meson.build",
+  "meson.options",
+]
+
+[tool.hatch.build.targets.wheel.hooks.custom]
+path = "hatch_build.py"
+
+[tool.cibuildwheel]
+archs = ["auto64"]
+
+[tool.cibuildwheel.macos]
+environment = { MACOSX_DEPLOYMENT_TARGET = "11.0" }
+
+[[tool.cibuildwheel.overrides]]
+select = "*-macosx_x86_64"
+environment = { MACOSX_DEPLOYMENT_TARGET = "10.13" }

{vscarefulsource-2 → vscarefulsource-6}/subprojects/libjpeg-turbo.wrap

@@ -9,6 +9,7 @@ patch_url = https://wrapdb.mesonbuild.com/v2/libjpeg-turbo_3.1.3-1/get_patch
 patch_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/libjpeg-turbo_3.1.3-1/libjpeg-turbo_3.1.3-1_patch.zip
 patch_hash = 4c552c743b6a16d3338cbee6ab1dc10333f19a72464e7b7c964f6e03d78f48df
 wrapdb_version = 3.1.3-1
+diff_files = libjpeg-turbo-force-pic.patch
 
 [provide]
 dependency_names = libjpeg, libturbojpeg

vscarefulsource-6/subprojects/packagefiles/libjpeg-turbo-force-pic.patch

@@ -0,0 +1,12 @@
+--- a/simd/meson.build
++++ b/simd/meson.build
+@@ -173,7 +173,7 @@
+     simd = static_library(
+       'simd',
+       simd_src,
+       include_directories: [incdir, 'nasm', dir],
+-      pic: get_option('default_library') != 'static',
++      pic: true,
+     )
+   endif
+ elif host_cpu in ['arm', 'aarch64']

vscarefulsource-2/.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto

vscarefulsource-2/.github/workflows/build.yaml

@@ -1,40 +0,0 @@
-name: Build
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  build-windows:
-    runs-on: windows-latest
-    defaults:
-      run:
-        shell: msys2 {0}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      - name: Setup MSYS2
-        uses: msys2/setup-msys2@v2
-        with:
-          msystem: UCRT64
-          update: true
-          install: >-
-            base-devel
-            mingw-w64-ucrt-x86_64-gcc
-            mingw-w64-ucrt-x86_64-meson
-            mingw-w64-ucrt-x86_64-ninja
-            mingw-w64-ucrt-x86_64-vapoursynth
-            mingw-w64-ucrt-x86_64-libjpeg-turbo
-            mingw-w64-ucrt-x86_64-libpng
-            mingw-w64-ucrt-x86_64-lcms2
-      - name: Build
-        run: |
-          CXX="c++" meson setup build --prefer-static -Dcpp_link_args='-static'
-          meson compile -C build
-      - name: Upload
-        uses: actions/upload-artifact@v4
-        with:
-          name: carefulsource-windows
-          path: |
-            build/libcarefulsource.dll

vscarefulsource-2/meson.build

@@ -1,54 +0,0 @@
-project('carefulsource', 'cpp',
-  default_options: ['buildtype=release', 'warning_level=2', 'b_lto=true', 'b_ndebug=if-release', 'cpp_std=c++20'],
-  meson_version: '>=0.51.0',
-  version: '1'
-)
-
-cxx = meson.get_compiler('cpp')
-
-gcc_syntax = cxx.get_argument_syntax() == 'gcc'
-
-if get_option('buildtype') == 'release'
-  add_project_arguments(gcc_syntax ? ['-fno-math-errno', '-fno-trapping-math'] : ['/GS-'], language: 'cpp')
-endif
-
-if gcc_syntax
-  vapoursynth_dep = dependency('vapoursynth', version: '>=55').partial_dependency(compile_args: true, includes: true)
-  install_dir = vapoursynth_dep.get_variable(pkgconfig: 'libdir') / 'vapoursynth'
-else
-  vapoursynth_inc = include_directories('C:/Program Files/VapourSynth/sdk/include/vapoursynth', is_system: true)
-  vapoursynth_dep = declare_dependency(include_directories: vapoursynth_inc)
-  install_dir = get_option('libdir') / 'vapoursynth'
-endif
-
-lcms2_dep = dependency('lcms2')
-libpng_dep = dependency('libpng')
-libjpeg_dep = dependency('libjpeg')
-
-sources = [
-  'src/carefulsource.cpp',
-  'src/decoder_png.cpp',
-  'src/decoder_jpeg.cpp',
-]
-
-deps = [vapoursynth_dep, lcms2_dep, libpng_dep, libjpeg_dep]
-libs = []
-
-if get_option('py_ext')
-  python = import('python')
-  py = python.find_installation(pure: false)
-  py.extension_module('vscarefulsource_ext', sources,
-    dependencies: deps,
-    link_with: libs,
-    install: true,
-  )
-  py.install_sources(['vscarefulsource/__init__.py'], subdir: 'vscarefulsource')
-else
-  shared_module('carefulsource', sources,
-    dependencies: deps,
-    link_with: libs,
-    install: true,
-    install_dir: install_dir,
-    gnu_symbol_visibility: 'hidden',
-  )
-endif

vscarefulsource-2/pyproject.toml

@@ -1,19 +0,0 @@
-[project]
-name = "vscarefulsource"
-version = "2"
-requires-python = ">3.12"
-readme = "README.md"
-dependencies = ["vsauto"]
-
-[build-system]
-build-backend = "mesonpy"
-requires = ["meson-python", "meson", "ninja", "wheel"] 
-
-[tool.meson-python]
-allow-windows-internal-shared-libs = true
-
-[tool.meson-python.args]
-setup = ["-Dpy_ext=true"]
-
-[project.entry-points.vsauto]
-vscarefulsource = "vscarefulsource"

vscarefulsource-2/vscarefulsource/__init__.py

@@ -1,34 +0,0 @@
-import os
-
-import vsauto
-from pathlib import Path
-
-# Use os.path.join for cross-platform compatibility
-namespace = "vscarefulsource"
-
-
-@vsauto.hookimpl
-def loadPlugin():
-    import importlib.util
-    import logging
-    from pathlib import Path
-
-    import vapoursynth as vs
-
-    # Gracefully handling cases where vapoursynth has autoloaded a plugin
-    # with the same namespace is strongly encouraged.
-    preloaded = next(
-        (plugin for plugin in vs.core.plugins() if plugin.namespace == namespace), None
-    )
-    if preloaded:
-        logging.warning(
-            f"A plugin at '{Path(preloaded.plugin_path)}' has prevented loading '{__name__}'. Please remove the conflicting package or auto-loaded plugin if you wish to use this version."
-        )
-        return
-
-    origin = importlib.util.find_spec("vscarefulsource_ext").origin
-
-    if os.name == "nt":
-        new_path = Path(origin).parent / ".vscarefulsource.mesonpy.libs"
-        os.add_dll_directory(new_path)
-    vs.core.std.LoadPlugin(origin)