From 0c28e7d9fe61809da78e5544f2b5eb9d28458028 Mon Sep 17 00:00:00 2001 From: qyot27 Date: Mon, 10 Jan 2022 04:51:48 -0500 Subject: [PATCH] avisynthplus: update to 3.7.1 (#6528) --- ...3.7.0.recipe => avisynthplus-3.7.1.recipe} | 13 +++--- ...akeLists-fix-setting-local-plugindir.patch | 41 ------------------- ...in-use-mounted-system-libdir-on-Haik.patch | 33 --------------- 3 files changed, 5 insertions(+), 82 deletions(-) rename media-libs/avisynthplus/{avisynthplus-3.7.0.recipe => avisynthplus-3.7.1.recipe} (78%) delete mode 100644 media-libs/avisynthplus/patches/0001-CMakeLists-fix-setting-local-plugindir.patch delete mode 100644 media-libs/avisynthplus/patches/0002-avisynth_conf.h.in-use-mounted-system-libdir-on-Haik.patch diff --git a/media-libs/avisynthplus/avisynthplus-3.7.0.recipe b/media-libs/avisynthplus/avisynthplus-3.7.1.recipe similarity index 78% rename from media-libs/avisynthplus/avisynthplus-3.7.0.recipe rename to media-libs/avisynthplus/avisynthplus-3.7.1.recipe index fd830edee..a86ca5ef4 100644 --- a/media-libs/avisynthplus/avisynthplus-3.7.0.recipe +++ b/media-libs/avisynthplus/avisynthplus-3.7.1.recipe @@ -8,18 +8,15 @@ COPYRIGHT="2000-2015 Ben Rudiak-Gould, et al. LICENSE="GNU GPL v2" REVISION="1" SOURCE_URI="https://github.com/AviSynth/AviSynthPlus/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="8906d9e46dc90a194413d69b710e3106c0aafddc0c5c62004885d0c3beb79862" +CHECKSUM_SHA256="96c5043512ecf8dca7a6257b8a54a28dcb8fea454d0dc5a9fd6f61cceda6bbef" SOURCE_FILENAME="avisynthplus-$portVersion.tar.gz" SOURCE_DIR="AviSynthPlus-$portVersion" -PATCHES="0001-CMakeLists-fix-setting-local-plugindir.patch - 0002-avisynth_conf.h.in-use-mounted-system-libdir-on-Haik.patch - " -ARCHITECTURES="all !x86_gcc2 ?arm ?ppc" +ARCHITECTURES="all !x86_gcc2 ?arm ?arm64 ?ppc ?riscv64 ?sparc" SECONDARY_ARCHITECTURES="x86" -libVersion="8" -libVersionCompat="$libVersion compat >= 8" +libVersion="9" +libVersionCompat="$libVersion compat >= 9" PROVIDES=" avisynthplus$secondaryArchSuffix = $portVersion @@ -52,7 +49,7 @@ BUILD() { mkdir -p avisynth-build cd avisynth-build - cmake ../ $cmakeDirArgs -DCMAKE_CXX_FLAGS="-DRELEASE_TARBALL" + cmake ../ $cmakeDirArgs -DCMAKE_CXX_FLAGS="-DRELEASE_TARBALL" -DCMAKE_BUILD_TYPE=Release make $jobArgs } diff --git a/media-libs/avisynthplus/patches/0001-CMakeLists-fix-setting-local-plugindir.patch b/media-libs/avisynthplus/patches/0001-CMakeLists-fix-setting-local-plugindir.patch deleted file mode 100644 index 44e1cc615..000000000 --- a/media-libs/avisynthplus/patches/0001-CMakeLists-fix-setting-local-plugindir.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 20377502a81eefa9356b04174a12508133ed733e Mon Sep 17 00:00:00 2001 -From: Stephen Hutchinson -Date: Sun, 17 Jan 2021 14:11:56 -0500 -Subject: [PATCH 1/2] CMakeLists: fix setting local plugindir - ---- - CMakeLists.txt | 4 +--- - .../docs/english/source/avisynthdoc/contributing/posix.rst | 2 +- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ea2c954..7da15fbb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,9 +66,7 @@ if(NOT HEADERS_ONLY) - - option(ENABLE_PLUGINS "Build set of default external plugins" ON) - option(ENABLE_INTEL_SIMD "Enable SIMD intrinsics for Intel processors" "${INTEL_SIMD}") -- option(LOCAL_PLUGINDIR "Override path for user-local plugins" "${USER_AVS_PLUGINDIR_LOCATION}") -- -- set(USER_AVS_PLUGINDIR_LOCATION "$ENV{HOME}/.local/lib/avisynth") -+ set(USER_AVS_PLUGINDIR_LOCATION "$ENV{HOME}/.local/lib/avisynth" CACHE STRING "Override path for user-local plugins (default: $HOME/.local/lib/avisynth)") - - if(CMAKE_CONFIGURATION_TYPES) - set(CMAKE_CONFIGURATION_TYPES Debug Release RelWithDebInfo) -diff --git a/distrib/docs/english/source/avisynthdoc/contributing/posix.rst b/distrib/docs/english/source/avisynthdoc/contributing/posix.rst -index 43a4e71c..c7e51303 100644 ---- a/distrib/docs/english/source/avisynthdoc/contributing/posix.rst -+++ b/distrib/docs/english/source/avisynthdoc/contributing/posix.rst -@@ -373,7 +373,7 @@ Plugin autoloading - - AviSynth+ will use several directories for autoloading: - the `avisynth/` subdirectory where libavisynth.so was installed, --`$HOME/.avisynth`, and the directory given to the LOCAL_PLUGINDIR -+`$HOME/.avisynth`, and the directory given to the USER_AVS_PLUGINDIR_LOCATION - configuration option (defaults to `$HOME/.local/lib/avisynth`). - The latter of which can hold plugins (and symlinks to plugins) - or AVSI files without needing root permissions. --- -2.30.0 - diff --git a/media-libs/avisynthplus/patches/0002-avisynth_conf.h.in-use-mounted-system-libdir-on-Haik.patch b/media-libs/avisynthplus/patches/0002-avisynth_conf.h.in-use-mounted-system-libdir-on-Haik.patch deleted file mode 100644 index a0586291c..000000000 --- a/media-libs/avisynthplus/patches/0002-avisynth_conf.h.in-use-mounted-system-libdir-on-Haik.patch +++ /dev/null @@ -1,33 +0,0 @@ -From acd6cab76425fed45a300822cd41f30548948d44 Mon Sep 17 00:00:00 2001 -From: Stephen Hutchinson -Date: Mon, 18 Jan 2021 04:41:52 -0500 -Subject: [PATCH 2/2] avisynth_conf.h.in: use mounted system libdir on Haiku - ---- - avs_core/avisynth_conf.h.in | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/avs_core/avisynth_conf.h.in b/avs_core/avisynth_conf.h.in -index 57bc107f..cdf96f19 100644 ---- a/avs_core/avisynth_conf.h.in -+++ b/avs_core/avisynth_conf.h.in -@@ -5,7 +5,15 @@ - - #ifdef AVS_POSIX - #define user_avs_plugindir_configurable "@USER_AVS_PLUGINDIR_LOCATION@" --#define system_avs_plugindir "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/avisynth" -+ #ifdef AVS_HAIKU -+ #ifdef X86_32 -+ #define system_avs_plugindir "/system/lib/x86/avisynth" -+ #else -+ #define system_avs_plugindir "/system/lib/avisynth" -+ #endif -+ #else -+ #define system_avs_plugindir "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/avisynth" -+ #endif - #endif - - #endif // _AVS_CONF_H_ --- -2.30.0 -