From aced73c2861ab9b1b3c29c716bc9fd3214a7beed Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 Sep 2024 16:57:58 +0200 Subject: Bump asdcplib for erroneous python import in wscript. --- cscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cscript b/cscript index 61d94539..36b34078 100644 --- a/cscript +++ b/cscript @@ -35,7 +35,7 @@ import os import shutil def dependencies(target, options): - return (('libcxml', 'v0.17.11'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '8a4a2f25cac0c58aac1d4267facab20e5ec3b57f')) + return (('libcxml', 'v0.17.11'), ('openjpeg', '925ca5192bb16d4f58a6fddc8b1623eced7f0203'), ('asdcplib', '467a54314c7b25e28f6df4c7ea03e9f8802fa525')) def build(target, options): cmd = './waf configure --disable-examples --disable-dumpimage --disable-benchmarks --prefix=%s' % target.directory -- cgit v1.2.3 From dd6e5ef16dfedb62b8349f1884b9a0e171fbb310 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 29 Sep 2024 17:09:46 +0200 Subject: Replace distutils.spawn.find_executable with shutil.which The former is gone from Python 3.14. --- wscript | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index a45a72a4..f8d51859 100644 --- a/wscript +++ b/wscript @@ -35,7 +35,7 @@ import subprocess import os import sys import shlex -import distutils.spawn +import shutil from waflib import Logs, Context APPNAME = 'libdcp' @@ -129,7 +129,7 @@ def configure(conf): # ImageMagick / GraphicsMagick if (not conf.options.disable_examples) and (not conf.options.disable_dumpimage): - if distutils.spawn.find_executable('Magick++-config'): + if shutil.which('Magick++-config'): conf.check_cfg(package='', path='Magick++-config', args='--cppflags --cxxflags --libs', uselib_store='MAGICK', mandatory=True, msg='Checking for ImageMagick/GraphicsMagick') else: image = conf.check_cfg(package='ImageMagick++', args='--cflags --libs', uselib_store='MAGICK', mandatory=False) -- cgit v1.2.3