diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/vapoursynth')
4 files changed, 250 insertions, 41 deletions
diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch b/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch new file mode 100644 index 000000000000..0937ac6e3084 --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch @@ -0,0 +1,74 @@ +From 9b05a6f331506afa5aca8865677af83403d2a32d Mon Sep 17 00:00:00 2001 +From: Tadeo Kondrak <me@tadeo.ca> +Date: Mon, 25 Jan 2021 11:17:44 -0700 +Subject: [PATCH] Call weak function to allow adding preloaded plugins after + compile + +--- + src/core/vscore.cpp | 19 +++++++++++++++++++ + src/core/vscore.h | 5 +++++ + 2 files changed, 24 insertions(+) + +diff --git a/src/core/vscore.cpp b/src/core/vscore.cpp +index 2d29844d..35c509ed 100644 +--- a/src/core/vscore.cpp ++++ b/src/core/vscore.cpp +@@ -1229,6 +1229,20 @@ void VSCore::destroyFilterInstance(VSNode *node) { + freeDepth--; + } + ++extern "C" { ++void __attribute__((weak)) VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data); ++ ++struct VSLoadPluginsNixCallbackData { ++ VSCore *core; ++ const char *filter; ++}; ++ ++static void VSLoadPluginsNixCallback(void *data, const char *path) { ++ auto callbackData = static_cast<VSLoadPluginsNixCallbackData *>(data); ++ callbackData->core->loadAllPluginsInPath(path, callbackData->filter); ++} ++} ++ + VSCore::VSCore(int threads) : + coreFreed(false), + numFilterInstances(1), +@@ -1351,6 +1365,11 @@ VSCore::VSCore(int threads) : + } // If neither exists, an empty string will do. + #endif + ++ if (VSLoadPluginsNix != nullptr) { ++ VSLoadPluginsNixCallbackData data{this, filter.c_str()}; ++ VSLoadPluginsNix(VSLoadPluginsNixCallback, &data); ++ } ++ + VSMap *settings = readSettings(configFile); + const char *error = vs_internal_vsapi.getError(settings); + if (error) { +diff --git a/src/core/vscore.h b/src/core/vscore.h +index 74df8a84..3efac811 100644 +--- a/src/core/vscore.h ++++ b/src/core/vscore.h +@@ -582,6 +582,9 @@ public: + VSFunction() : functionData(nullptr), func(nullptr) {} + }; + ++extern "C" { ++static void VSLoadPluginsNixCallback(void *data, const char *path); ++} + + struct VSPlugin { + private: +@@ -683,6 +686,8 @@ public: + + explicit VSCore(int threads); + void freeCore(); ++ ++ friend void VSLoadPluginsNixCallback(void *data, const char *path); + }; + + #endif // VSCORE_H +-- +2.30.0 + diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix index 93f8d3c5ae5f..8ef209fe8051 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/default.nix @@ -1,13 +1,11 @@ { lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook, makeWrapper +, runCommandCC, runCommand, vapoursynth, writeText, patchelf, buildEnv , zimg, libass, python3, libiconv , ApplicationServices -, ocrSupport ? false, tesseract ? null -, imwriSupport? true, imagemagick7 ? null +, ocrSupport ? false, tesseract +, imwriSupport ? true, imagemagick }: -assert ocrSupport -> tesseract != null; -assert imwriSupport -> imagemagick7 != null; - with lib; stdenv.mkDerivation rec { @@ -21,13 +19,17 @@ stdenv.mkDerivation rec { sha256 = "1krfdzc2x2vxv4nq9kiv1c09hgj525qn120ah91fw2ikq8ldvmx4"; }; + patches = [ + ./0001-Call-weak-function-to-allow-adding-preloaded-plugins.patch + ]; + nativeBuildInputs = [ pkg-config autoreconfHook makeWrapper ]; buildInputs = [ zimg libass (python3.withPackages (ps: with ps; [ sphinx cython ])) ] ++ optionals stdenv.isDarwin [ libiconv ApplicationServices ] ++ optional ocrSupport tesseract - ++ optional imwriSupport imagemagick7; + ++ optional imwriSupport imagemagick; configureFlags = [ (optionalString (!ocrSupport) "--disable-ocr") @@ -36,12 +38,17 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru = { + passthru = rec { # If vapoursynth is added to the build inputs of mpv and then # used in the wrapping of it, we want to know once inside the # wrapper, what python3 version was used to build vapoursynth so # the right python3.sitePackages will be used there. inherit python3; + + withPlugins = import ./plugin-interface.nix { + inherit lib python3 buildEnv writeText runCommandCC stdenv runCommand + vapoursynth makeWrapper withPlugins; + }; }; postInstall = '' @@ -54,7 +61,7 @@ stdenv.mkDerivation rec { homepage = "http://www.vapoursynth.com/"; license = licenses.lgpl21; platforms = platforms.x86_64; - maintainers = with maintainers; [ rnhmjoj tadeokondrak ]; + maintainers = with maintainers; [ rnhmjoj sbruder tadeokondrak ]; }; } diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix index f9ebed197522..5cd4b4608ecb 100644 --- a/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix @@ -1,43 +1,59 @@ -{ lib, mkDerivation, fetchFromBitbucket +{ lib, mkDerivation, fetchFromBitbucket, makeWrapper, runCommand , python3, vapoursynth , qmake, qtbase, qtwebsockets }: -mkDerivation rec { - pname = "vapoursynth-editor"; - version = "R19"; - - src = fetchFromBitbucket { - owner = "mystery_keeper"; - repo = pname; - rev = lib.toLower version; - sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; +let + unwrapped = mkDerivation rec { + pname = "vapoursynth-editor"; + version = "R19"; + + src = fetchFromBitbucket { + owner = "mystery_keeper"; + repo = pname; + rev = lib.toLower version; + sha256 = "1zlaynkkvizf128ln50yvzz3b764f5a0yryp6993s9fkwa7djb6n"; + }; + + nativeBuildInputs = [ qmake ]; + buildInputs = [ qtbase vapoursynth qtwebsockets ]; + + dontWrapQtApps = true; + + preConfigure = "cd pro"; + + preFixup = '' + cd ../build/release* + mkdir -p $out/bin + for bin in vsedit{,-job-server{,-watcher}}; do + mv $bin $out/bin + wrapQtApp $out/bin/$bin + done + ''; + + passthru = { inherit withPlugins; }; + + meta = with lib; { + description = "Cross-platform editor for VapourSynth scripts"; + homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; + license = licenses.mit; + maintainers = with maintainers; [ tadeokondrak ]; + platforms = platforms.all; + }; }; - nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase vapoursynth qtwebsockets ]; - - dontWrapQtApps = true; - - preConfigure = "cd pro"; - - preFixup = '' - cd ../build/release* + withPlugins = plugins: let + vapoursynthWithPlugins = vapoursynth.withPlugins plugins; + in runCommand "${unwrapped.name}-with-plugins" { + buildInputs = [ makeWrapper ]; + passthru = { withPlugins = plugins': withPlugins (plugins ++ plugins'); }; + } '' mkdir -p $out/bin for bin in vsedit{,-job-server{,-watcher}}; do - mv $bin $out/bin - - wrapQtApp $out/bin/$bin \ - --prefix PYTHONPATH : ${vapoursynth}/${python3.sitePackages} \ - --prefix LD_LIBRARY_PATH : ${vapoursynth}/lib + makeWrapper ${unwrapped}/bin/$bin $out/bin/$bin \ + --prefix PYTHONPATH : ${vapoursynthWithPlugins}/${python3.sitePackages} \ + --prefix LD_LIBRARY_PATH : ${vapoursynthWithPlugins}/lib done ''; - - meta = with lib; { - description = "Cross-platform editor for VapourSynth scripts"; - homepage = "https://bitbucket.org/mystery_keeper/vapoursynth-editor"; - license = licenses.mit; - maintainers = with maintainers; [ tadeokondrak ]; - platforms = platforms.all; - }; -} +in + withPlugins [] diff --git a/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix b/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix new file mode 100644 index 000000000000..55b2b03c893e --- /dev/null +++ b/nixpkgs/pkgs/development/libraries/vapoursynth/plugin-interface.nix @@ -0,0 +1,112 @@ +{ lib, python3, buildEnv, writeText, runCommandCC, stdenv, runCommand +, vapoursynth, makeWrapper, withPlugins }: + +plugins: let + pythonEnvironment = python3.buildEnv.override { + extraLibs = plugins; + }; + + getRecursivePropagatedBuildInputs = pkgs: lib.flatten + (map + (pkg: pkg.propagatedBuildInputs ++ (getRecursivePropagatedBuildInputs pkg.propagatedBuildInputs)) + pkgs); + + deepPlugins = plugins ++ (getRecursivePropagatedBuildInputs plugins); + + pluginsEnv = buildEnv { + name = "vapoursynth-plugins-env"; + pathsToLink = [ "/lib/vapoursynth" ]; + paths = deepPlugins; + }; + + pluginLoader = let + source = writeText "vapoursynth-nix-plugins.c" '' + void VSLoadPluginsNix(void (*load)(void *data, const char *path), void *data) { + ${lib.concatMapStringsSep "" (path: "load(data, \"${path}/lib/vapoursynth\");") deepPlugins} + } + ''; + in + runCommandCC "vapoursynth-plugin-loader" { + executable = true; + preferLocalBuild = true; + allowSubstitutes = false; + } '' + mkdir -p $out/lib + $CC -shared -fPIC ${source} -o "$out/lib/libvapoursynth-nix-plugins${ext}" + ''; + + ext = stdenv.targetPlatform.extensions.sharedLibrary; +in +runCommand "${vapoursynth.name}-with-plugins" { + nativeBuildInputs = [ makeWrapper ]; + passthru = { + inherit python3; + withPlugins = plugins': withPlugins (plugins ++ plugins'); + }; +} '' + mkdir -p \ + $out/bin \ + $out/lib/pkgconfig \ + $out/lib/vapoursynth \ + $out/${python3.sitePackages} + + for textFile in \ + lib/pkgconfig/vapoursynth{,-script}.pc \ + lib/libvapoursynth.la \ + lib/libvapoursynth-script.la \ + ${python3.sitePackages}/vapoursynth.la + do + substitute ${vapoursynth}/$textFile $out/$textFile \ + --replace "${vapoursynth}" "$out" + done + + for binaryPlugin in ${pluginsEnv}/lib/vapoursynth/*; do + ln -s $binaryPlugin $out/''${binaryPlugin#"${pluginsEnv}/"} + done + + for pythonPlugin in ${pythonEnvironment}/${python3.sitePackages}/*; do + ln -s $pythonPlugin $out/''${pythonPlugin#"${pythonEnvironment}/"} + done + + for binaryFile in \ + lib/libvapoursynth${ext} \ + lib/libvapoursynth-script${ext}.0.0.0 + do + old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile) + new_rpath="$old_rpath:$out/lib" + patchelf \ + --set-rpath "$new_rpath" \ + --output $out/$binaryFile \ + ${vapoursynth}/$binaryFile + patchelf \ + --add-needed libvapoursynth-nix-plugins${ext} \ + $out/$binaryFile + done + + for binaryFile in \ + ${python3.sitePackages}/vapoursynth${ext} \ + bin/.vspipe-wrapped + do + old_rpath=$(patchelf --print-rpath ${vapoursynth}/$binaryFile) + new_rpath="''${old_rpath//"${vapoursynth}"/"$out"}" + patchelf \ + --set-rpath "$new_rpath" \ + --output $out/$binaryFile \ + ${vapoursynth}/$binaryFile + done + + ln -s \ + ${pluginLoader}/lib/libvapoursynth-nix-plugins${ext} \ + $out/lib/libvapoursynth-nix-plugins${ext} + ln -s ${vapoursynth}/include $out/include + ln -s ${vapoursynth}/lib/vapoursynth/* $out/lib/vapoursynth + ln -s \ + libvapoursynth-script${ext}.0.0.0 \ + $out/lib/libvapoursynth-script${ext} + ln -s \ + libvapoursynth-script${ext}.0.0.0 \ + $out/lib/libvapoursynth-script${ext}.0 + + makeWrapper $out/bin/.vspipe-wrapped $out/bin/vspipe \ + --prefix PYTHONPATH : $out/${python3.sitePackages} +'' |