From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 730AF158094 for ; Sat, 13 Aug 2022 04:07:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A47AE0827; Sat, 13 Aug 2022 04:07:06 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 359D9E0827 for ; Sat, 13 Aug 2022 04:07:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34A4F34136B for ; Sat, 13 Aug 2022 04:07:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62033570 for ; Sat, 13 Aug 2022 04:07:03 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1660363615.7c76d6cd78a898c1076b30bec9056249e0d743f4.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/rubberband/files/, media-libs/rubberband/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/rubberband/Manifest media-libs/rubberband/files/rubberband-2.0.1-build.patch media-libs/rubberband/rubberband-2.0.2.ebuild X-VCS-Directories: media-libs/rubberband/files/ media-libs/rubberband/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 7c76d6cd78a898c1076b30bec9056249e0d743f4 X-VCS-Branch: master Date: Sat, 13 Aug 2022 04:07:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1501a00f-adfb-4a64-8859-b946ab67f322 X-Archives-Hash: 33a7adf18bb09183ce776a35674eeb52 commit: 7c76d6cd78a898c1076b30bec9056249e0d743f4 Author: Miroslav Šulc gentoo org> AuthorDate: Sat Aug 13 04:06:55 2022 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Sat Aug 13 04:06:55 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c76d6cd media-libs/rubberband: dropped obsolete 2.0.2 Bug: https://bugs.gentoo.org/864280 Signed-off-by: Miroslav Šulc gentoo.org> media-libs/rubberband/Manifest | 1 - .../rubberband/files/rubberband-2.0.1-build.patch | 164 --------------------- media-libs/rubberband/rubberband-2.0.2.ebuild | 61 -------- 3 files changed, 226 deletions(-) diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest index fad19665c345..0829fa0d6499 100644 --- a/media-libs/rubberband/Manifest +++ b/media-libs/rubberband/Manifest @@ -1,2 +1 @@ -DIST rubberband-2.0.2.tar.bz2 178974 BLAKE2B 602d7eb76791d431a65bd5ef0d53ea0c2672e67aaa566594b3b2bb026cdf1b8879380818c3626a2c6d51cd6366bd47a52c69c110da566aa234fb7b37b19f027b SHA512 87dc5d59995bf949c35b885bb2eced067d84775bab76692da1202ae7554cb1b8404ca7371c264363e6d55c8978762ed32b446535746061f09e90cfc599adc0a0 DIST rubberband-3.0.0.tar.bz2 213089 BLAKE2B 74afdf1f7c3360b711b365d73e12fe84afa5abc8ddb6a10a3d31392a621e9fca67e8b4c0292238b0e5726c56242438e1b2ef1d7d6ea6979a360cc7ecab45de75 SHA512 d8ce300a2cca7e35c548f9cd9f2f77f9b730b0e9427214d4a825b32ea9c90769e229f91db5846b90ff11a1513e8f68447fb598aa2684f67f10b4b9414b9ad748 diff --git a/media-libs/rubberband/files/rubberband-2.0.1-build.patch b/media-libs/rubberband/files/rubberband-2.0.1-build.patch deleted file mode 100644 index 5e7e023b4d8e..000000000000 --- a/media-libs/rubberband/files/rubberband-2.0.1-build.patch +++ /dev/null @@ -1,164 +0,0 @@ -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-2.0.2.ebuild b/media-libs/rubberband/rubberband-2.0.2.ebuild deleted file mode 100644 index 42b4ec3e69e4..000000000000 --- a/media-libs/rubberband/rubberband-2.0.2.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}/${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 -}