From 32553e45200e553d388ab0fdf9666bf14830e6f5 Mon Sep 17 00:00:00 2001 From: ed Date: Sat, 16 Mar 2024 13:59:08 +0000 Subject: [PATCH] fix building mtp deps on python 3.12 --- README.md | 2 +- bin/mtag/install-deps.sh | 5 ++++- scripts/docker/Dockerfile.djf | 6 +++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index b0ba44f5..7b6e5339 100644 --- a/README.md +++ b/README.md @@ -597,7 +597,7 @@ this initiates an upload using `up2k`; there are two uploaders available: * `[🎈] bup`, the basic uploader, supports almost every browser since netscape 4.0 * `[🚀] up2k`, the good / fancy one -NB: you can undo/delete your own uploads with `[🧯]` [unpost](#unpost) +NB: you can undo/delete your own uploads with `[🧯]` [unpost](#unpost) (and this is also where you abort unfinished uploads, but you have to refresh the page first) up2k has several advantages: * you can drop folders into the browser (files are added recursively) diff --git a/bin/mtag/install-deps.sh b/bin/mtag/install-deps.sh index 3603c974..b0a6ae5a 100755 --- a/bin/mtag/install-deps.sh +++ b/bin/mtag/install-deps.sh @@ -223,7 +223,10 @@ install_vamp() { # use msys2 in mingw-w64 mode # pacman -S --needed mingw-w64-x86_64-{ffmpeg,python,python-pip,vamp-plugin-sdk} - $pybin -m pip install --user vamp + $pybin -m pip install --user vamp || { + printf '\n\033[7malright, trying something else...\033[0m\n' + $pybin -m pip install --user --no-build-isolation vamp + } cd "$td" echo '#include ' | g++ -x c++ -c -o /dev/null - || [ -e ~/pe/vamp-sdk ] || { diff --git a/scripts/docker/Dockerfile.djf b/scripts/docker/Dockerfile.djf index 589a8598..57167512 100644 --- a/scripts/docker/Dockerfile.djf +++ b/scripts/docker/Dockerfile.djf @@ -1,4 +1,4 @@ -FROM fedora:38 +FROM fedora:39 WORKDIR /z LABEL org.opencontainers.image.url="https://github.com/9001/copyparty" \ org.opencontainers.image.source="https://github.com/9001/copyparty/tree/hovudstraum/scripts/docker" \ @@ -21,7 +21,7 @@ RUN dnf install -y \ vips vips-jxl vips-poppler vips-magick \ python3-numpy fftw libsndfile \ gcc gcc-c++ make cmake patchelf jq \ - python3-devel ffmpeg-devel fftw-devel libsndfile-devel python3-setuptools \ + python3-devel ffmpeg-devel fftw-devel libsndfile-devel python3-setuptools python3-wheel \ vamp-plugin-sdk qm-vamp-plugins \ vamp-plugin-sdk-devel vamp-plugin-sdk-static \ && rm -f /usr/lib/python3*/EXTERNALLY-MANAGED \ @@ -29,7 +29,7 @@ RUN dnf install -y \ && bash install-deps.sh \ && dnf erase -y \ gcc gcc-c++ make cmake patchelf jq \ - python3-devel ffmpeg-devel fftw-devel libsndfile-devel python3-setuptools \ + python3-devel ffmpeg-devel fftw-devel libsndfile-devel python3-setuptools python3-wheel \ vamp-plugin-sdk-devel vamp-plugin-sdk-static \ && dnf clean all \ && find /usr/ -name __pycache__ | xargs rm -rf \