diff options
| author | Torben | 2021-10-17 21:48:00 +0200 |
|---|---|---|
| committer | Torben | 2021-10-17 21:49:02 +0200 |
| commit | e92c0d8ecae865662fb81ece2531631a1b86e8bc (patch) | |
| tree | 92b4537951f61f27475252bd723a02a9f91b5066 | |
| parent | c704e3c01e41d5c61a1fdd5951b57d6fd984b332 (diff) | |
| download | aur-e92c0d8ecae865662fb81ece2531631a1b86e8bc.tar.gz | |
Use system's ffmpeg
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 6 | ||||
| -rw-r--r-- | no_ffmpeg_download.patch | 11 |
3 files changed, 19 insertions, 0 deletions
@@ -19,6 +19,7 @@ pkgbase = processing4-git source = disable_native_dialogs.patch source = disable_update_check.patch source = fix_theme_engine.patch + source = no_ffmpeg_download.patch source = no_jdk_download.patch source = no_jfx_download.patch source = use_system_jdk.patch @@ -27,6 +28,7 @@ pkgbase = processing4-git sha256sums = 500d00811031c0445416b6112972aa1f7a377092dd3b8565d79ead3fdfc62451 sha256sums = 35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30 sha256sums = 24b8a3e18b6e3a0de9422e4dbde46cceb91385f7ad6bdc89ec0a9614e082c977 + sha256sums = b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126 sha256sums = 0ef5266575db0fe6bde436e5a3205ca848440b3006bccb4c20fe8d7b98951ee9 sha256sums = dc733c1cb5a41cb06ef0f9ea01d701fd9ac7713b5817b4fe79d7076a505a7c44 sha256sums = aa77c001eb5de9e211bb38d06c17483d81450fa0667748c44fba6d04fa329732 @@ -16,6 +16,7 @@ source=('https://download.processing.org/reference.zip' disable_native_dialogs.patch disable_update_check.patch fix_theme_engine.patch + no_ffmpeg_download.patch no_jdk_download.patch no_jfx_download.patch use_system_jdk.patch @@ -24,6 +25,7 @@ sha256sums=('fabe7420a714f450a6b1430f13fc46f14ba52db57af360365c6a7fd96d0b642f' '500d00811031c0445416b6112972aa1f7a377092dd3b8565d79ead3fdfc62451' '35c4538e6e57c0ea296c6cea590cabeb2b0772f9a431838df270dcc581321e30' '24b8a3e18b6e3a0de9422e4dbde46cceb91385f7ad6bdc89ec0a9614e082c977' + 'b0742db84e6a6b148b56df6d4d1e8a3266461fe0f514f703301a310e99f1d126' '0ef5266575db0fe6bde436e5a3205ca848440b3006bccb4c20fe8d7b98951ee9' 'dc733c1cb5a41cb06ef0f9ea01d701fd9ac7713b5817b4fe79d7076a505a7c44' 'aa77c001eb5de9e211bb38d06c17483d81450fa0667748c44fba6d04fa329732' @@ -51,6 +53,7 @@ prepare() { # Don't download JDK and JFX files during Ant's build process patch $pkgname/build/build.xml < no_jdk_download.patch patch $pkgname/java/libraries/javafx/build.xml < no_jfx_download.patch + patch $pkgname/build/shared/tools/MovieMaker/build.xml < no_ffmpeg_download.patch # Use system libraries during build process patch $pkgname/core/build.xml < use_system_libraries.patch @@ -94,4 +97,7 @@ package() { mkdir -p "$pkgdir/usr/share/processing/java/bin/" echo -e '#!/bin/sh\n/usr/lib/jvm/java-17-openjdk/bin/java "$@"' > "$pkgdir/usr/share/processing/java/bin/java" chmod a+x "$pkgdir/usr/share/processing/java/bin/java" + + # Link processing's internal ffmpeg-command to the system's one + ln -s /usr/bin/ffmpeg "$pkgdir/usr/share/processing/tools/MovieMaker/tool/" } diff --git a/no_ffmpeg_download.patch b/no_ffmpeg_download.patch new file mode 100644 index 000000000000..c3649bcf0a1c --- /dev/null +++ b/no_ffmpeg_download.patch @@ -0,0 +1,11 @@ +--- a/build/share/tools/MovieMaker/build.xml ++++ b/build/share/tools/MovieMaker/build.xml +@@ -74,7 +74,7 @@ + nowarn="true" /> + </target> + +- <target name="build" depends="compile, prepare-ffmpeg" description="Build Movie Maker Tool"> ++ <target name="build" depends="compile" description="Build Movie Maker Tool"> + <mkdir dir="tool" /> + <jar basedir="bin" destfile="tool/MovieMaker.jar" /> + </target> |