From 281ed87039c631435147cb7a3eac5f06e8085fc3 Mon Sep 17 00:00:00 2001 From: qyot27 Date: Fri, 21 Jul 2023 05:51:14 -0400 Subject: [PATCH] avisynthplus: update to v3.7.3 (#9049) --- ...3.7.1.recipe => avisynthplus-3.7.3.recipe} | 15 ++++--- ...ASE_TARBALL-case-in-mixed-chroot-env.patch | 41 +++++++++++++++++++ 2 files changed, 51 insertions(+), 5 deletions(-) rename media-libs/avisynthplus/{avisynthplus-3.7.1.recipe => avisynthplus-3.7.3.recipe} (80%) create mode 100644 media-libs/avisynthplus/patches/0001-Version-Fix-RELEASE_TARBALL-case-in-mixed-chroot-env.patch diff --git a/media-libs/avisynthplus/avisynthplus-3.7.1.recipe b/media-libs/avisynthplus/avisynthplus-3.7.3.recipe similarity index 80% rename from media-libs/avisynthplus/avisynthplus-3.7.1.recipe rename to media-libs/avisynthplus/avisynthplus-3.7.3.recipe index 55819b0f6..a81c41af6 100644 --- a/media-libs/avisynthplus/avisynthplus-3.7.1.recipe +++ b/media-libs/avisynthplus/avisynthplus-3.7.3.recipe @@ -4,19 +4,20 @@ of core filters for editing, pre-production and post-production, and the \ ability to extend its capabilities through the use of external plugins." HOMEPAGE="https://avs-plus.net" COPYRIGHT="2000-2015 Ben Rudiak-Gould, et al. - 2013-2021 AviSynth+ Project" + 2013-2023 AviSynth+ Project" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/AviSynth/AviSynthPlus/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="96c5043512ecf8dca7a6257b8a54a28dcb8fea454d0dc5a9fd6f61cceda6bbef" +CHECKSUM_SHA256="b847705af6f16fa26664d06e0fea2bda14a7f6aac8249a9c37e4106ecb8fd44c" SOURCE_FILENAME="avisynthplus-$portVersion.tar.gz" SOURCE_DIR="AviSynthPlus-$portVersion" +PATCHES="0001-Version-Fix-RELEASE_TARBALL-case-in-mixed-chroot-env.patch" ARCHITECTURES="all !x86_gcc2 ?arm ?arm64 ?ppc ?riscv64 ?sparc" SECONDARY_ARCHITECTURES="x86" -libVersion="9" -libVersionCompat="$libVersion compat >= 9" +libVersion="10" +libVersionCompat="$libVersion compat >= 10" PROVIDES=" avisynthplus$secondaryArchSuffix = $portVersion @@ -27,6 +28,8 @@ REQUIRES=" lib:libIL$secondaryArchSuffix " +SUPPLEMENTS="x264$secondaryArchSuffix" + PROVIDES_devel=" avisynthplus${secondaryArchSuffix}_devel = $portVersion devel:libavisynth$secondaryArchSuffix = $libVersionCompat @@ -60,6 +63,8 @@ INSTALL() prepareInstalledDevelLib libavisynth fixPkgconfig + ln -s libavisynth.so.$portVersion $libDir/libavisynth.so + packageEntries devel \ $developDir } diff --git a/media-libs/avisynthplus/patches/0001-Version-Fix-RELEASE_TARBALL-case-in-mixed-chroot-env.patch b/media-libs/avisynthplus/patches/0001-Version-Fix-RELEASE_TARBALL-case-in-mixed-chroot-env.patch new file mode 100644 index 000000000..5768b8ed2 --- /dev/null +++ b/media-libs/avisynthplus/patches/0001-Version-Fix-RELEASE_TARBALL-case-in-mixed-chroot-env.patch @@ -0,0 +1,41 @@ +From 59fb4c93d3afabde8b0573045082c0a3bd3023d9 Mon Sep 17 00:00:00 2001 +From: Stephen Hutchinson +Date: Wed, 19 Jul 2023 14:19:37 -0400 +Subject: [PATCH] Version: Fix RELEASE_TARBALL case in mixed chroot environment + +Uncovered by haikuports, because that environment uses a git +directory during the build control process, but the chroot it drops +into for the build does not have git available. This resulted in +the RELEASE_TARBALL check failing because the `.git` directory +had reappeared, but then git wasn't there so Version.cmake failed. +--- + avs_core/CMakeLists.txt | 2 +- + avs_core/Version.cmake | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/avs_core/CMakeLists.txt b/avs_core/CMakeLists.txt +index eef0f8b0..ea100af8 100644 +--- a/avs_core/CMakeLists.txt ++++ b/avs_core/CMakeLists.txt +@@ -202,7 +202,7 @@ ADD_CUSTOM_TARGET( + ) + ADD_DEPENDENCIES("AvsCore" VersionGen) + +-if (NOT EXISTS "${CMAKE_SOURCE_DIR}/.git") ++if (NOT EXISTS "${CMAKE_SOURCE_DIR}/.git" OR NOT GIT_FOUND) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DRELEASE_TARBALL") + endif() + +diff --git a/avs_core/Version.cmake b/avs_core/Version.cmake +index 33c51e7c..6cd792ab 100644 +--- a/avs_core/Version.cmake ++++ b/avs_core/Version.cmake +@@ -1,4 +1,5 @@ +-if (EXISTS ${REPO}/.git) ++FIND_PACKAGE(Git) ++if (EXISTS "${REPO}/.git" AND GIT_FOUND) + EXECUTE_PROCESS( + COMMAND "${GIT}" --git-dir=${REPO}/.git rev-list --count HEAD + OUTPUT_VARIABLE AVS_SEQREV +-- +2.37.3