From 67a4e3efd11852e1a3fb945903126dd3214926a6 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Thu, 22 Sep 2022 13:30:27 +0300 Subject: [PATCH] aedi: update flac to 1.4.1 --- aedi/target/library_tier1.py | 10 ++-------- patch/flac-no-git.diff | 11 ----------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 patch/flac-no-git.diff diff --git a/aedi/target/library_tier1.py b/aedi/target/library_tier1.py index 5f1d10bc..7fe0a338 100644 --- a/aedi/target/library_tier1.py +++ b/aedi/target/library_tier1.py @@ -76,9 +76,8 @@ class FlacTarget(CMakeStaticDependencyTarget): def prepare_source(self, state: BuildState): state.download_source( - 'https://github.com/xiph/flac/releases/download/1.4.0/flac-1.4.0.tar.xz', - 'af41c0733c93c237c3e52f64dd87e3b0d9af38259f1c7d11e8cbf583c48c2506', - patches='flac-no-git') + 'https://github.com/xiph/flac/releases/download/1.4.1/flac-1.4.1.tar.xz', + '91303c3e5dfde52c3e94e75976c0ab3ee14ced278ab8f60033a3a12db9209ae6') def configure(self, state: BuildState): opts = state.options @@ -89,11 +88,6 @@ class FlacTarget(CMakeStaticDependencyTarget): super().configure(state) - def post_build(self, state: BuildState): - super().post_build(state) - - shutil.copytree(state.install_path / 'share/FLAC/cmake', state.install_path / 'lib/cmake/FLAC') - class FluidSynthTarget(CMakeStaticDependencyTarget): def __init__(self, name='fluidsynth'): diff --git a/patch/flac-no-git.diff b/patch/flac-no-git.diff deleted file mode 100644 index 1e1b36ba..00000000 --- a/patch/flac-no-git.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -53,7 +53,7 @@ - - find_program (HAVE_GIT git) - --if(HAVE_GIT) -+if(0) - execute_process( - COMMAND git describe --tags --exact-match - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}