commit: 3f7e97d8144a8f6b21a319cee4f273ef8ba57978 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Thu Apr 20 07:07:45 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Apr 20 07:07:50 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f7e97d8
media-libs/rubberband: dropped obsolete 3.1.1-r1 Bug: https://bugs.gentoo.org/904553 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-libs/rubberband/Manifest | 1 - .../rubberband/files/rubberband-3.1.1-build.patch | 179 --------------------- media-libs/rubberband/rubberband-3.1.1-r1.ebuild | 68 -------- 3 files changed, 248 deletions(-) diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest index 79f5f71cf670..b7394da09764 100644 --- a/media-libs/rubberband/Manifest +++ b/media-libs/rubberband/Manifest @@ -1,4 +1,3 @@ -DIST rubberband-3.1.1.tar.bz2 217586 BLAKE2B 17f616eab563f0949dc89103775dac2c932b8ade79e7445524c87d9ced46ecd30d9cff53960e2638ce571c1f6ddbc9ad50e7371900b96eb0ec22c58cc80e585e SHA512 240ad6cd486f975099f76c6ac8bcf34add45670f58164089ffc9767ebef4c7dfdd7e58ad0c3d99a96f56af0d1f7669e55c5fc3e79277357c62fba21cb3bfe4cd DIST rubberband-3.1.2.tar.bz2 218361 BLAKE2B 26d2850adea8b564e49ce1eb24abcd9cd83d20a5eda6bcfc1254b3357a0e720b04faa9e9f2de769b65f6449afe138de9051505f745f69a73cc1275786029838c SHA512 b21605a0cf882e34fc2eada38a446220257e4b067475e36dfeef00d491425ad51398fbb49773dbd162683531b70f7c864ab02bff744d7e0dde7ed1d64aa1d327 DIST rubberband-3.1.3.tar.bz2 218532 BLAKE2B edc9ada6a67af2b45f15a6240b46d77830068595f5b873b50b55e91be29abc30600025713e7bd84e99d05ea1d0fcdb36873cbf966b00d7e805cfea99a4462e1d SHA512 c7e42020c543b1741e1d3e7ad79f92081177953f63a8b7b1c302a185cb7a0b828d9519e03a6df39c1cff356b324370313501df54bc74be32dcdb955c789b6485 DIST rubberband-3.2.1.tar.bz2 221756 BLAKE2B 6b2bb540037495892907285561982b2f87affa60b6ad84315654e92f3321be097dfc23fec9dde6eb9e3a7a3e38d6e3126f683dc88f442845722f321ddeb8c24d SHA512 c2278d874ebaeafa2ff6be4bdd3dea40235debce7ced8b93f1b73a93b5796b77ee5f6024cb539776f11bd936c2f100c084d7e91c006e81c1e6f3cf5eff602cbf diff --git a/media-libs/rubberband/files/rubberband-3.1.1-build.patch b/media-libs/rubberband/files/rubberband-3.1.1-build.patch deleted file mode 100644 index 9dce52ec5e03..000000000000 --- a/media-libs/rubberband/files/rubberband-3.1.1-build.patch +++ /dev/null @@ -1,179 +0,0 @@ ---- a/meson.build -+++ b/meson.build -@@ -117,12 +117,18 @@ sleef_dep = dependency('sleef', version: '>= 3.3.0', required: false) - sleefdft_dep = dependency('sleefdft', version: '>= 3.3.0', required: false) - samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false) - speexdsp_dep = dependency('speexdsp', version: '>= 1.0.0', 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: true) -+endif -+if get_option('vamp') -+ vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: true) -+endif - - boost_unit_test_dep = dependency('boost', modules: ['unit_test_framework'], version: '>= 1.73', required: false) - 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 <math.h>', -@@ -142,8 +148,9 @@ have_sincos = cpp.has_function('sincos', - # language pack, optionally, and only go on to JNI if that succeeds, - # making sure that nothing "clever" happens if Java is not found. - # --have_java = add_languages('java', required: false) --if have_java -+if get_option('jni') -+ javac = find_program('javac', required: false) -+ jar = find_program('jar', required: true) - jni_dep = dependency('jni', version: '>= 7.0.0', required: false) - if not jni_dep.found() - if cpp.has_header('jni.h', args: extra_include_args) -@@ -370,37 +377,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() - - have_boost_unit_test = boost_unit_test_dep.found() - -@@ -609,7 +620,7 @@ if get_option('default_library') != 'shared' and rubberband_additional_static_li - ) - endif - --if have_java and jni_dep.found() -+if get_option('jni') - target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] } - message('Will build Java Native Interface') - rubberband_jni = shared_library( -@@ -630,14 +641,21 @@ if have_java and jni_dep.found() - # NB the JNI library is not versioned - install: true, - ) -- jar('rubberband', 'com/breakfastquay/rubberband/RubberBandStretcher.java') -+ rubberband_class = custom_target( -+ 'rubberband_class', -+ input: 'com/breakfastquay/rubberband/RubberBandStretcher.java', -+ output: 'RubberBandStretcher.class', -+ command: [ javac, '@INPUT@', '-d', '@OUTDIR@' ], -+ ) -+ rubberband_jar = custom_target( -+ 'rubberband_jar', -+ input: rubberband_class, -+ output: 'rubberband.jar', -+ command: [ jar, 'cvf', '@OUTPUT@', 'com/breakfastquay/rubberband/@INPUT@' ], -+ build_by_default: true, -+ ) - else - target_summary += { 'JNI library': false } -- if not have_java -- message('Not building Java Native Interface: Java compiler or archiver missing') -- else -- message('Not building Java Native Interface: JNI header not found') -- endif - endif - - install_headers( -@@ -647,7 +665,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( -@@ -714,7 +732,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( -@@ -746,7 +764,7 @@ else - message('Not building Vamp plugin: Vamp dependency not found') - endif - --if have_sndfile -+if get_option('programs') - message('Will build command-line utilities') - target_summary += { 'Command-line utility (R2)': [ true, 'Name: ' + rubberband_program_name ] } - rubberband_program = executable( ---- 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-3.1.1-r1.ebuild b/media-libs/rubberband/rubberband-3.1.1-r1.ebuild deleted file mode 100644 index 3488f7ac50cd..000000000000 --- a/media-libs/rubberband/rubberband-3.1.1-r1.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson-multilib flag-o-matic toolchain-funcs - -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 ~loong 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} - sys-devel/gcc:* -" -DEPEND="${CDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-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 - elif tc-is-clang && [[ $(tc-get-cxx-stdlib) == libstdc++ ]] ; then - # bug #860078 - # undefined reference to `__atomic_is_lock_free' - 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 -}
