From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- media-libs/rubberband/Manifest | 5 +- .../rubberband/files/rubberband-2.0.1-build.patch | 164 +++++++++++++++++++++ media-libs/rubberband/rubberband-1.9.2.ebuild | 54 ------- media-libs/rubberband/rubberband-2.0.2.ebuild | 61 ++++++++ 4 files changed, 228 insertions(+), 56 deletions(-) create mode 100644 media-libs/rubberband/files/rubberband-2.0.1-build.patch delete mode 100644 media-libs/rubberband/rubberband-1.9.2.ebuild create mode 100644 media-libs/rubberband/rubberband-2.0.2.ebuild (limited to 'media-libs/rubberband') diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest index 110b800d6354..aea1c22e14f1 100644 --- a/media-libs/rubberband/Manifest +++ b/media-libs/rubberband/Manifest @@ -1,6 +1,7 @@ AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab02d1712b920a3c6c41b8981aa13ac5d7155bfd11e33577cb7b1e49a079ca5ea9840d37aaf477deffa0dea609b03fed7 SHA512 035f5549c902c1517ad5e09ee472eca578eed7d7f87f7ee20166dc46f495d5abaebc32902472b9ac6a3a367176c130bfa6fc743159b9efa3227873a16d8b4877 -DIST rubberband-1.9.2.tar.bz2 164178 BLAKE2B dc8e5b4c773dbb5c556331fa56e6cf4a5dd3f8a0fc7dcfed1fbe53d1a7635f12db6a884e775fbff8022e252d98b4e14a46a2395a5d4cb7645522ddf3e6b5482f SHA512 b1c763ab2a428aa2f1f8e5d0be6e9eb669808059ee5389e94f12de25f1a05cd89022656d98906c90b616773da11ab1f596ae2c5a9d300118e88049e1443121f2 +AUX rubberband-2.0.1-build.patch 6021 BLAKE2B f9e745c1eda3dc8d4f603df144a41143f3f7ee3691a09f97f069f469378d9541a057aefd1e23c7c00dbc276e13eb510dce63579f2334d2384433ce60b41231f6 SHA512 4e20aa9722f2995ad2959cfabd3eca24b6d72eb1d1e59bf2f4b283e4cbc60025ae0ee754bacfac3042214f96900f4bac100c3c1918da1a256ea7f42f0befe912 DIST rubberband-2.0.0.tar.bz2 175527 BLAKE2B 5b4b8c98ade57f8b7776902166e8aa33e8f89d4de3fe659425a7ef14c1cf3c8a48ad474d2fe0f13483844b4f931ca8128ca57bb7e6dbf6e9d96deadac8856ee0 SHA512 a915a3eea75f0345e83010cc3ffd3c5e0c68a0c1d88da11b11a5fd5010196167c81db611a38c2c2b8d5c5a1f828f2c74a134e6ca8bb3a543af3ef70ce8d56101 -EBUILD rubberband-1.9.2.ebuild 1327 BLAKE2B 664b970e19dfcd36c601c6f42fe0f8fdb9ac35cd6666c52e60cca2f9c45889297f502edf5aa2c1bbcd347a9c88ee96ac42f3e9c7bf59e28291759cb22baf124c SHA512 78686227e171bdea6b3056dc6d96739c5010dc62d06dfbbbdce11a46f9b3bbba503e0cc7d9ecbf64d32586209d8683c8e882d3ad3ad9aa4997e5b8df4d6e29d1 +DIST rubberband-2.0.2.tar.bz2 178974 BLAKE2B 602d7eb76791d431a65bd5ef0d53ea0c2672e67aaa566594b3b2bb026cdf1b8879380818c3626a2c6d51cd6366bd47a52c69c110da566aa234fb7b37b19f027b SHA512 87dc5d59995bf949c35b885bb2eced067d84775bab76692da1202ae7554cb1b8404ca7371c264363e6d55c8978762ed32b446535746061f09e90cfc599adc0a0 EBUILD rubberband-2.0.0.ebuild 1543 BLAKE2B 03eedcdc50b08bb3a16c57afd30ab53a5242e058d7c5c673dff773b4c3ababa4a1ac3a10e345c74188ebbff36971d18949d8c2efcb1564215f652f87013fb8f9 SHA512 126bc35ee1920bdaeaf0e8bc2ae2fe36fd54cde303ade9d24e858b46a07cfd2f71a8bfc4eaf95fa5d01b1f4224b53a01cf3817afc3f8463196fd11cd88a0ac11 +EBUILD rubberband-2.0.2.ebuild 1586 BLAKE2B d161bbbee0e49c2a95d48c5d21cfca513a06c5e499ced26c54df6a0112992eaf35e0337bb20b615466a4049e73087dd0c2bd4a09d4dd6fe161ccf6a541116d79 SHA512 ae912021dfe95b60276987e94d6c0ae192775e72c0b602aca1eedc2331581c1844f641df76e5a256c1cd311ed4a79da6dcf0f9929ec97d37e28de7f89661932b MISC metadata.xml 491 BLAKE2B bda0db771d95de138274eb35f4c135f3bd9fb3a1b75ce60a8c57ad71e0c0a894924bb52060c8ca87e689f2a0f581213639de2ca5615a134dfecfa4f008698b2a SHA512 c549bcf465808927153a79f145b222379270d2813e150606382dcb1c15980a37a89d7f0178d3fee2fd3eb7216dd6ad989efe0a24e398f67af95872f6c92d570a diff --git a/media-libs/rubberband/files/rubberband-2.0.1-build.patch b/media-libs/rubberband/files/rubberband-2.0.1-build.patch new file mode 100644 index 000000000000..5e7e023b4d8e --- /dev/null +++ b/media-libs/rubberband/files/rubberband-2.0.1-build.patch @@ -0,0 +1,164 @@ +diff --git a/meson.build b/meson.build +index 753d1df..005e638 100644 +--- a/meson.build ++++ b/meson.build +@@ -99,18 +99,26 @@ endforeach + + fftw3_dep = dependency('fftw3', version: '>= 3.0.0', required: false) + samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false) +-sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false) +-vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false) ++if get_option('programs') ++ sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false) ++endif ++if get_option('vamp') ++ vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false) ++endif + thread_dep = dependency('threads') +-have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args) ++if get_option('ladspa') ++ have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args) ++endif + have_lv2 = cpp.has_header('lv2.h', args: extra_include_args) + have_sincos = cpp.has_function('sincos', + prefix: '#define _GNU_SOURCE\n#include ', + args: '-lm') +-have_jni = cpp.has_header('jni.h', args: extra_include_args) ++if get_option('jni') ++ have_jni = cpp.has_header('jni.h', args: extra_include_args) + +-javac = find_program('javac', required: false) +-jar = find_program('jar', required: false) ++ javac = find_program('javac', required: false) ++ jar = find_program('jar', required: false) ++endif + + + # Check FFT and resampler options and set up dependencies and paths +@@ -281,37 +289,41 @@ if ipp_needed + endif + endif # ipp_needed + +-if not vamp_dep.found() +- vamp_dep = cpp.find_library('VampPluginSDK', +- dirs: get_option('extra_lib_dirs'), +- has_headers: ['vamp-sdk.h'], +- header_args: extra_include_args, +- required: false) ++if get_option('vamp') + if not vamp_dep.found() +- vamp_dep = cpp.find_library('vamp-sdk', ++ vamp_dep = cpp.find_library('VampPluginSDK', + dirs: get_option('extra_lib_dirs'), + has_headers: ['vamp-sdk.h'], + header_args: extra_include_args, + required: false) ++ if not vamp_dep.found() ++ vamp_dep = cpp.find_library('vamp-sdk', ++ dirs: get_option('extra_lib_dirs'), ++ has_headers: ['vamp-sdk.h'], ++ header_args: extra_include_args, ++ required: false) ++ endif + endif ++ have_vamp = true + endif +-have_vamp = vamp_dep.found() +- +-if not sndfile_dep.found() +- sndfile_dep = cpp.find_library('sndfile', +- dirs: get_option('extra_lib_dirs'), +- has_headers: ['sndfile.h'], +- header_args: extra_include_args, +- required: false) ++ ++if get_option('programs') + if not sndfile_dep.found() +- sndfile_dep = cpp.find_library('sndfile-1', ++ sndfile_dep = cpp.find_library('sndfile', + dirs: get_option('extra_lib_dirs'), + has_headers: ['sndfile.h'], + header_args: extra_include_args, + required: false) ++ if not sndfile_dep.found() ++ sndfile_dep = cpp.find_library('sndfile-1', ++ dirs: get_option('extra_lib_dirs'), ++ has_headers: ['sndfile.h'], ++ header_args: extra_include_args, ++ required: false) ++ endif + endif ++ have_sndfile = true + endif +-have_sndfile = sndfile_dep.found() + + + # General platform and compiler expectations +@@ -514,7 +526,7 @@ if get_option('default_library') != 'shared' and rubberband_additional_static_li + ) + endif + +-if have_jni and javac.found() and jar.found() ++if get_option('jni') + target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] } + message('Will build Java Native Interface') + rubberband_jni = shared_library( +@@ -549,7 +561,7 @@ if have_jni and javac.found() and jar.found() + ) + else + target_summary += { 'JNI library': false } +- if not have_jni ++ if not get_option('jni') + message('Not building Java Native Interface: jni.h header not found') + else + message('Not building Java Native Interface: Java compiler not found') +@@ -563,7 +575,7 @@ install_headers( + subdir: 'rubberband' + ) + +-if have_ladspa ++if get_option('ladspa') + target_summary += { 'LADSPA plugin': [ true, 'Name: ' + rubberband_ladspa_name ] } + message('Will build LADSPA plugin') + rubberband_ladspa = shared_library( +@@ -630,7 +642,7 @@ else + message('Not building LV2 plugin: lv2.h header not found') + endif + +-if have_vamp ++if get_option('vamp') + target_summary += { 'Vamp plugin': [ true, 'Name: ' + rubberband_vamp_name ] } + message('Will build Vamp plugin') + rubberband_vamp = shared_library( +@@ -662,7 +674,7 @@ else + message('Not building Vamp plugin: Vamp dependency not found') + endif + +-if have_sndfile ++if get_option('programs') + target_summary += { 'Command-line utility': [ true, 'Name: ' + rubberband_program_name ] } + message('Will build command-line utility') + rubberband_program = executable( +diff --git a/meson_options.txt b/meson_options.txt +index c820c20..81710de 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -26,3 +26,18 @@ option('extra_lib_dirs', + value: [], + description: 'Additional local library directories to search for dependencies.') + ++option('jni', ++ type: 'boolean', ++ value: 'false') ++ ++option('ladspa', ++ type: 'boolean', ++ value: 'false') ++ ++option('programs', ++ type: 'boolean', ++ value: 'false') ++ ++option('vamp', ++ type: 'boolean', ++ value: 'false') diff --git a/media-libs/rubberband/rubberband-1.9.2.ebuild b/media-libs/rubberband/rubberband-1.9.2.ebuild deleted file mode 100644 index f7f615276046..000000000000 --- a/media-libs/rubberband/rubberband-1.9.2.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit meson-multilib - -DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program" -HOMEPAGE="https://www.breakfastquay.com/rubberband/" -SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" -IUSE="ladspa jni static-libs +programs vamp" - -BDEPEND=" - virtual/pkgconfig -" -CDEPEND=" - media-libs/libsamplerate[${MULTILIB_USEDEP}] - sci-libs/fftw:3.0[${MULTILIB_USEDEP}] - jni? ( >=virtual/jdk-1.8:* ) - ladspa? ( media-libs/ladspa-sdk ) - programs? ( media-libs/libsndfile ) - vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] ) -" -RDEPEND="${CDEPEND}" -DEPEND="${CDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-build.patch" -) - -multilib_src_configure() { - local emesonargs=( - --buildtype=release - -Dfft=fftw - -Dresampler=libsamplerate - $(meson_use static-libs static) - $(meson_use ladspa) - $(meson_use jni) - $(meson_use programs) - $(meson_use vamp) - ) - use jni && emesonargs+=( - -Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux" - ) - meson_src_configure -} - -multilib_src_install_all() { - ! use jni && find "${ED}" -name "*.a" -delete -} diff --git a/media-libs/rubberband/rubberband-2.0.2.ebuild b/media-libs/rubberband/rubberband-2.0.2.ebuild new file mode 100644 index 000000000000..3a9d2a39197f --- /dev/null +++ b/media-libs/rubberband/rubberband-2.0.2.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson-multilib flag-o-matic + +DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program" +HOMEPAGE="https://www.breakfastquay.com/rubberband/" +SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="ladspa jni static-libs +programs vamp" + +BDEPEND=" + virtual/pkgconfig +" +CDEPEND=" + media-libs/libsamplerate[${MULTILIB_USEDEP}] + sci-libs/fftw:3.0[${MULTILIB_USEDEP}] + jni? ( >=virtual/jdk-1.8:* ) + ladspa? ( media-libs/ladspa-sdk ) + programs? ( media-libs/libsndfile ) + vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] ) +" +RDEPEND="${CDEPEND}" +DEPEND="${CDEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-2.0.1-build.patch" +) + +multilib_src_configure() { + if use ppc ; then + # bug #827203 + # meson doesn't respect/use LIBS but mangles LDFLAGS with libs + # correctly. Use this until we get a Meson test for libatomic. + append-ldflags -latomic + fi + + local emesonargs=( + --buildtype=release + -Dfft=fftw + -Dresampler=libsamplerate + -Ddefault_library=$(use static-libs && echo "both" || echo "shared") + $(meson_use ladspa) + $(meson_use jni) + $(meson_use programs) + $(meson_use vamp) + ) + use jni && emesonargs+=( + -Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux" + ) + meson_src_configure +} + +multilib_src_install_all() { + ! use jni && find "${ED}" -name "*.a" -delete +} -- cgit v1.2.3