gentoo resync : 15.06.2021

4 files changed, 240 insertions, 12 deletions

diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 8e69137f1036..0ccf5c12d221 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,4 +1,7 @@
 AUX rubberband-1.9.1-build.patch 6538 BLAKE2B 9387ebba5a8a06f6ea11dfa16c9b37fb2bc607a4982a6b77ad62e59fce597e7d4c358c0795c471a5e8b74cb553da31239cff50b2ac367e702e04262a66c462a0 SHA512 64677e108c17e35739a2e86a473c08b3d1e575daee14db124bec013e348120538e29e9a6829f7ec905998f7ba8f4386e8aea8591642bf45cf3be0f6e657b828f
+AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab02d1712b920a3c6c41b8981aa13ac5d7155bfd11e33577cb7b1e49a079ca5ea9840d37aaf477deffa0dea609b03fed7 SHA512 035f5549c902c1517ad5e09ee472eca578eed7d7f87f7ee20166dc46f495d5abaebc32902472b9ac6a3a367176c130bfa6fc743159b9efa3227873a16d8b4877
 DIST rubberband-1.9.1.tar.bz2 164644 BLAKE2B 1bbbd0056b2131ac16bf427db93e19bdd6adb5433733e62523f4a04c8a74d1a48e82dbace09e7ffe6dddfeec699e3aeee8e84344c9e7cbe75067316dde6268d6 SHA512 cb20ef8fb717a9e6b5b0b921541bd701e94326e12cdb20d50bed344d12fa1b4fd731335c3a0a7f2d2a5ce96031d965b209e7667c4d55fd8494b8e20d3409f0d3
-EBUILD rubberband-1.9.1-r1.ebuild 1444 BLAKE2B 19ae91edaa90e5b586d5d21b03f7c86667790a152542e19fe8d95c8fd5ecb662718b46a41d4292db1b4ae156c6fc91fb9b8e04994b8cd585989447ac5b8c5fa9 SHA512 0b85d47949f7fa42e4f301faf9ae022e10cf1fa3b994dc1a390baf85bf7f682cb40366e09df773349d457cbf4f4951bfd8f685f8e34bfe9bb86e6ce28217a306
+DIST rubberband-1.9.2.tar.bz2 164178 BLAKE2B dc8e5b4c773dbb5c556331fa56e6cf4a5dd3f8a0fc7dcfed1fbe53d1a7635f12db6a884e775fbff8022e252d98b4e14a46a2395a5d4cb7645522ddf3e6b5482f SHA512 b1c763ab2a428aa2f1f8e5d0be6e9eb669808059ee5389e94f12de25f1a05cd89022656d98906c90b616773da11ab1f596ae2c5a9d300118e88049e1443121f2
+EBUILD rubberband-1.9.1-r1.ebuild 1320 BLAKE2B a5aed87ad51ebd6db178862b58eaf6dcd783fd18e6b0dc7479a85e67350c433cdf6ea2febf662fdac1920767e5e802e020bde2e6954d11ec726d146352d02642 SHA512 5392bc5bcb1a46696207161b557a78f6b0fcfa12f32bd360ea3d73da0bbe00c0e3c1d5840a3dcae390e9b16eccf106814eec0ae97560646bbb69fbb9b61a76cd
+EBUILD rubberband-1.9.2.ebuild 1326 BLAKE2B 9ab4882838e917285e22e81c4667bdd9ea19b72ef0056a39fb3722d7029abe1e0f3f0fac9e17f1644a0a9773563aadfb08358a26a81d0a7987354113f2dfae1c SHA512 321ba173805d590586840fea7dbf9d101d99ab194540cca1f17f62f86cfec946b94440dbb2d6748feb014168fd1d2bf23d52a67b266e4bf7cc5f20585261bb0f
 MISC metadata.xml 490 BLAKE2B 849555ada519e1a558d37977b952b8338d4d19ac3a7e8523a15cc3924b7b7b5faca70df7782597e322c362af7d05b1a35dae64b8cd8f2a998cc5d074ee81f090 SHA512 a1e8673326887e5582aa7a948543341d3061a149e0232a01ef8aa3b6778a499393aae434d5f1c2181910aa309a3cd2f0d80820922dfe668745f75314e0526e31
diff --git a/media-libs/rubberband/files/rubberband-1.9.2-build.patch b/media-libs/rubberband/files/rubberband-1.9.2-build.patch
new file mode 100644
index 000000000000..dea90db4ddb0
--- /dev/null
+++ b/media-libs/rubberband/files/rubberband-1.9.2-build.patch
@@ -0,0 +1,180 @@
+diff --git a/meson.build b/meson.build
+index 3f7218c..3d402de 100644
+--- a/meson.build
++++ b/meson.build
+@@ -97,17 +97,25 @@ 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_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
+@@ -273,37 +281,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
+@@ -404,8 +416,10 @@ endif
+ # And the build targets: Static and dynamic libraries, command-line
+ # utility, LADSPA plugin, Vamp plugin, JNI library
+ 
+-message('Will build Rubber Band Library static library')
+-target_summary += { 'Static library': [ true, 'Name: ' + rubberband_static_name ] }
++if get_option('static')
++  message('Will build Rubber Band Library static library')
++  target_summary += { 'Static library': [ true, 'Name: ' + rubberband_static_name ] }
++endif
+ rubberband_static = static_library(
+   rubberband_static_name,
+   library_sources,
+@@ -443,7 +457,7 @@ else
+   message('Not building Rubber Band Library dynamic library: no_shared option set')
+ 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(
+@@ -478,7 +492,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')
+@@ -492,7 +506,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(
+@@ -527,7 +541,7 @@ else
+   message('Not building LADSPA plugin: ladspa.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(
+@@ -559,7 +573,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 86bf686..b99bb38 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -31,3 +31,22 @@ option('no_shared',
+        value: 'false',
+        description: 'Do not build shared libraries. On Windows this will also ensure that the static library is called simply rubberband.lib, not rubberband-static.lib as it is in the default build.')
+ 
++option('jni',
++       type: 'boolean',
++       value: 'false')
++
++option('ladspa',
++       type: 'boolean',
++       value: 'false')
++
++option('programs',
++       type: 'boolean',
++       value: 'false')
++
++option('static',
++       type: 'boolean',
++       value: 'false')
++
++option('vamp',
++       type: 'boolean',
++       value: 'false')
diff --git a/media-libs/rubberband/rubberband-1.9.1-r1.ebuild b/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
index ab6b7eac6dc4..23f485140902 100644
--- a/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
+++ b/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit meson multilib-minimal
+inherit meson-multilib
 
 DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
 HOMEPAGE="https://www.breakfastquay.com/rubberband/"
@@ -37,7 +37,7 @@ multilib_src_configure() {
 		--buildtype=release
 		-Dfft=fftw
 		-Dresampler=libsamplerate
-		-Dstatic=$(usex static-libs true false)
+		$(meson_use static-libs static)
 		$(meson_use ladspa)
 		$(meson_use jni)
 		$(meson_use programs)
@@ -49,15 +49,6 @@ multilib_src_configure() {
 	meson_src_configure
 }
 
-multilib_src_compile() {
-	meson_src_compile
-}
-
-multilib_src_install() {
-	meson_src_install
-}
-
 multilib_src_install_all() {
 	! use jni && find "${ED}" -name "*.a" -delete
-	einstalldocs
 }
diff --git a/media-libs/rubberband/rubberband-1.9.2.ebuild b/media-libs/rubberband/rubberband-1.9.2.ebuild
new file mode 100644
index 000000000000..f390295a8a94
--- /dev/null
+++ b/media-libs/rubberband/rubberband-1.9.2.ebuild
@@ -0,0 +1,54 @@
+# 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 ~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
+}