mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
avisynthplus: update to v3.7.5 (#12487)
* the RELEASE_TARBALL fix was merged upstream, so the patch is no longer necessary * libsoundtouch is now an external dependency for the TimeStretch plugin; detection is handled by pkg-config
This commit is contained in:
@@ -4,20 +4,19 @@ 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-2023 AviSynth+ Project"
|
||||
2013-2025 AviSynth+ Project"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="2"
|
||||
REVISION="1"
|
||||
SOURCE_URI="https://github.com/AviSynth/AviSynthPlus/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="b847705af6f16fa26664d06e0fea2bda14a7f6aac8249a9c37e4106ecb8fd44c"
|
||||
CHECKSUM_SHA256="2533fafe5b5a8eb9f14d84d89541252a5efd0839ef62b8ae98f40b9f34b3f3d5"
|
||||
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="10"
|
||||
libVersionCompat="$libVersion compat >= 10"
|
||||
libVersion="11"
|
||||
libVersionCompat="$libVersion compat >= 11"
|
||||
|
||||
PROVIDES="
|
||||
avisynthplus$secondaryArchSuffix = $portVersion
|
||||
@@ -26,6 +25,7 @@ PROVIDES="
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
lib:libIL$secondaryArchSuffix
|
||||
lib:libSoundTouch$secondaryArchSuffix
|
||||
"
|
||||
|
||||
PROVIDES_devel="
|
||||
@@ -39,11 +39,13 @@ REQUIRES_devel="
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libIL${secondaryArchSuffix}
|
||||
devel:libSoundTouch${secondaryArchSuffix}
|
||||
"
|
||||
BUILD_PREREQUIRES="
|
||||
cmd:cmake
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:pkg_config$secondaryArchSuffix
|
||||
"
|
||||
|
||||
BUILD()
|
||||
@@ -1,41 +0,0 @@
|
||||
From 59fb4c93d3afabde8b0573045082c0a3bd3023d9 Mon Sep 17 00:00:00 2001
|
||||
From: Stephen Hutchinson <qyot27@gmail.com>
|
||||
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
|
||||
Reference in New Issue
Block a user