commit: 12b51de00c6a570512e61b853bd0f60bea2b374a Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Fri Nov 4 07:23:06 2022 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Nov 4 07:23:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b51de0
media-libs/rubberband: dropped obsolete 3.0.0 & 3.1.0 Bug: https://bugs.gentoo.org/879127 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-libs/rubberband/Manifest | 2 - .../rubberband/files/rubberband-3.0.0-build.patch | 165 -------------------- .../rubberband/files/rubberband-3.1.0-build.patch | 169 --------------------- media-libs/rubberband/rubberband-3.0.0.ebuild | 61 -------- media-libs/rubberband/rubberband-3.1.0.ebuild | 61 -------- 5 files changed, 458 deletions(-) diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest index 8b0acb05e0ed..11609ac99615 100644 --- a/media-libs/rubberband/Manifest +++ b/media-libs/rubberband/Manifest @@ -1,3 +1 @@ -DIST rubberband-3.0.0.tar.bz2 213089 BLAKE2B 74afdf1f7c3360b711b365d73e12fe84afa5abc8ddb6a10a3d31392a621e9fca67e8b4c0292238b0e5726c56242438e1b2ef1d7d6ea6979a360cc7ecab45de75 SHA512 d8ce300a2cca7e35c548f9cd9f2f77f9b730b0e9427214d4a825b32ea9c90769e229f91db5846b90ff11a1513e8f68447fb598aa2684f67f10b4b9414b9ad748 -DIST rubberband-3.1.0.tar.bz2 217523 BLAKE2B f16c702e39804bfa79d673b5eed4cf0e295b5b16ca0ed41175118dbd30b3b78de12302e04f5255474859bcf80761cbada85d4df441ee454a0276d7f313be40b2 SHA512 bf21e924801651986a64b3ec3f1bfd399925da63de78e798b5b7ef5f138db4e8f2ba4f93eda54c619952cadadaa0d76871c5be1b2cdbcbc74233d0e078d0b8d2 DIST rubberband-3.1.1.tar.bz2 217586 BLAKE2B 17f616eab563f0949dc89103775dac2c932b8ade79e7445524c87d9ced46ecd30d9cff53960e2638ce571c1f6ddbc9ad50e7371900b96eb0ec22c58cc80e585e SHA512 240ad6cd486f975099f76c6ac8bcf34add45670f58164089ffc9767ebef4c7dfdd7e58ad0c3d99a96f56af0d1f7669e55c5fc3e79277357c62fba21cb3bfe4cd diff --git a/media-libs/rubberband/files/rubberband-3.0.0-build.patch b/media-libs/rubberband/files/rubberband-3.0.0-build.patch deleted file mode 100644 index 3892f5231716..000000000000 --- a/media-libs/rubberband/files/rubberband-3.0.0-build.patch +++ /dev/null @@ -1,165 +0,0 @@ -diff --git a/meson.build b/meson.build -index 42f7f7f..b2a342a 100644 ---- a/meson.build -+++ b/meson.build -@@ -113,19 +113,27 @@ 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 - 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>', - 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 -@@ -296,37 +304,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() - -@@ -535,7 +547,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( -@@ -570,7 +582,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') -@@ -584,7 +596,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( -@@ -651,7 +663,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( -@@ -683,7 +695,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( -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/files/rubberband-3.1.0-build.patch b/media-libs/rubberband/files/rubberband-3.1.0-build.patch deleted file mode 100644 index 2e46c7e8ecfb..000000000000 --- a/media-libs/rubberband/files/rubberband-3.1.0-build.patch +++ /dev/null @@ -1,169 +0,0 @@ -diff --git a/meson.build b/meson.build -index c3de854..3dd5637 100644 ---- a/meson.build -+++ b/meson.build -@@ -117,25 +117,31 @@ 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>', - args: '-lm') - --javac = find_program('javac', required: false) --jar = find_program('jar', required: false) -- - # Look for JNI only if javac and jar are found. This is because the - # auto-JNI-dependency module in Meson 0.62 and 0.63 appears to bail - # out of the build completely if it can't find javac, even when - # required is false --if javac.found() and jar.found() -+if get_option('jni') -+ javac = find_program('javac', required: true) -+ 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) -@@ -362,37 +368,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() - -@@ -601,7 +611,7 @@ if get_option('default_library') != 'shared' and rubberband_additional_static_li - ) - endif - --if jni_dep.found() 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( -@@ -637,7 +647,7 @@ if jni_dep.found() and javac.found() and jar.found() - ) - else - target_summary += { 'JNI library': false } -- if not (javac.found() and jar.found()) -+ if not get_option('jni') - message('Not building Java Native Interface: Java compiler or archiver missing') - else - message('Not building Java Native Interface: JNI header not found') -@@ -651,7 +661,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( -@@ -718,7 +728,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( -@@ -750,7 +760,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( -diff --git a/meson_options.txt b/meson_options.txt -index e44837c..4e4ca29 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-3.0.0.ebuild b/media-libs/rubberband/rubberband-3.0.0.ebuild deleted file mode 100644 index e4b36dc1b583..000000000000 --- a/media-libs/rubberband/rubberband-3.0.0.ebuild +++ /dev/null @@ -1,61 +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 - -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() { - 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 -} diff --git a/media-libs/rubberband/rubberband-3.1.0.ebuild b/media-libs/rubberband/rubberband-3.1.0.ebuild deleted file mode 100644 index d19aa930e757..000000000000 --- a/media-libs/rubberband/rubberband-3.1.0.ebuild +++ /dev/null @@ -1,61 +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 - -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() { - 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 -}
