From cd40bc9ab405aca4e72f869db79d9d1ff77d8313 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Aug 2022 08:23:34 +0100 Subject: gentoo auto-resync : 13:08:2022 - 08:23:34 --- media-libs/Manifest.gz | Bin 65949 -> 65941 bytes media-libs/libmtp/Manifest | 2 +- media-libs/libmtp/libmtp-1.1.20.ebuild | 2 +- media-libs/rubberband/Manifest | 3 - .../rubberband/files/rubberband-2.0.1-build.patch | 164 --------------------- media-libs/rubberband/rubberband-2.0.2.ebuild | 61 -------- 6 files changed, 2 insertions(+), 230 deletions(-) delete mode 100644 media-libs/rubberband/files/rubberband-2.0.1-build.patch delete mode 100644 media-libs/rubberband/rubberband-2.0.2.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index 028d94c4ada8..2f7a8e91528e 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest index 6c98c6f4eaf5..06dea669e918 100644 --- a/media-libs/libmtp/Manifest +++ b/media-libs/libmtp/Manifest @@ -2,6 +2,6 @@ AUX libmtp-1.1.19-fix-docdir.patch 462 BLAKE2B 5c23a2b98a138fb6bc51d49c07d556cff DIST libmtp-1.1.19.tar.gz 855810 BLAKE2B 0c570284e06b4f0aacc3edf5d19a0fe3f9ac6598319e8c803db0c69b35541ce7b1ab7cfd211ca701c7c6a9df300b689ccb7341d9d24f053c14411d5e91298849 SHA512 3cd3b0ea5aecb25abf4267e301d5e82ad9f6253bfa5a3bc4c70645d3007c69b014d6407c6703665d987cce3a42bd2219abbf1972e5964b39e9e1329bf9091044 DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018 EBUILD libmtp-1.1.19-r2.ebuild 1705 BLAKE2B b8a2231e68ecc3afd4bd66894b9940f099ad151bdcf9c5bd777d62c239badaf18089607fa7db935ad12fe97f797c44f72ffac41a8b8536e7afdef2aa69ac5d75 SHA512 692dbba0b3a8b629dee534f1dd3ac36b2f813a5b4d5c6e8c1b8116844078e794b6a57d15492d634d2bc89d5b16fa424b72caae933f4ba48a7bba193c81155507 -EBUILD libmtp-1.1.20.ebuild 1917 BLAKE2B bf554526e729ba781513545d5aaf2de97a5fdf66bc8fdfbc7805998de09d4bd6913c3f74439a179a92f73b773f1ce9d13b8c37138fc73d304b9e48cf4839c510 SHA512 c5491c946f3cfb5cfba7eea99ef4d9b007af034163fb91812075d9ed2e9581d7e78dd4357ba3fcec9c83e4e8384b252823948541b0d2c055c9b02043ae738fa5 +EBUILD libmtp-1.1.20.ebuild 1914 BLAKE2B 1dbd45263f6bb2e24c9e2d08a1da000c45cbadc4c4993205fbdfc5dc06f0e37eff00d26971417c67047847061b3c8db54731770c1de881b00a0c74c0939b9a37 SHA512 cd98b6cf7110e1034c1118feb4dbc19e1078827293701d51b42a9817da55717a608640498c00e9ce2c01da13747b17b3fc56b47998a4f79e92b74b6b83588a6e EBUILD libmtp-9999.ebuild 1859 BLAKE2B d6c4d0516b3028951494178b3823090a56e03b1777871134a3b6152709ebf6c00e0e6caee12d38a00453245402ce5499ee7b568880195f6cf45256bd76255e3c SHA512 f102aba2ae7d1b10997dd3dc2676f1463b5dd14890fe74796c4490524acd6d706a2cb3709f876c2ffb3e035a9599a027ca2b76519c61663185bef663f00a6f0f MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be diff --git a/media-libs/libmtp/libmtp-1.1.20.ebuild b/media-libs/libmtp/libmtp-1.1.20.ebuild index 1d3b612f5449..ca891973bc8b 100644 --- a/media-libs/libmtp/libmtp-1.1.20.ebuild +++ b/media-libs/libmtp/libmtp-1.1.20.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == 9999* ]]; then else inherit libtool SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~x86" fi DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)" diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest index 490657434333..48c80af683e8 100644 --- a/media-libs/rubberband/Manifest +++ b/media-libs/rubberband/Manifest @@ -1,7 +1,4 @@ -AUX rubberband-2.0.1-build.patch 6021 BLAKE2B f9e745c1eda3dc8d4f603df144a41143f3f7ee3691a09f97f069f469378d9541a057aefd1e23c7c00dbc276e13eb510dce63579f2334d2384433ce60b41231f6 SHA512 4e20aa9722f2995ad2959cfabd3eca24b6d72eb1d1e59bf2f4b283e4cbc60025ae0ee754bacfac3042214f96900f4bac100c3c1918da1a256ea7f42f0befe912 AUX rubberband-3.0.0-build.patch 6150 BLAKE2B 2548de747697e04988e55483f08afd1c8e748080ff81f2db997cdd34ac64ad7031fa6ce5852bfeac0c5f96a04ba906f10d61ce395383ba509da7ed46823fcfc1 SHA512 b1be06cd1ec660db0f023268796850833e0813480acb9c0ba15a62ffca5174b2c5e4897eedc94606033bc51b865da607a549c1bca1bc56a3cd9268cae0566488 -DIST rubberband-2.0.2.tar.bz2 178974 BLAKE2B 602d7eb76791d431a65bd5ef0d53ea0c2672e67aaa566594b3b2bb026cdf1b8879380818c3626a2c6d51cd6366bd47a52c69c110da566aa234fb7b37b19f027b SHA512 87dc5d59995bf949c35b885bb2eced067d84775bab76692da1202ae7554cb1b8404ca7371c264363e6d55c8978762ed32b446535746061f09e90cfc599adc0a0 DIST rubberband-3.0.0.tar.bz2 213089 BLAKE2B 74afdf1f7c3360b711b365d73e12fe84afa5abc8ddb6a10a3d31392a621e9fca67e8b4c0292238b0e5726c56242438e1b2ef1d7d6ea6979a360cc7ecab45de75 SHA512 d8ce300a2cca7e35c548f9cd9f2f77f9b730b0e9427214d4a825b32ea9c90769e229f91db5846b90ff11a1513e8f68447fb598aa2684f67f10b4b9414b9ad748 -EBUILD rubberband-2.0.2.ebuild 1580 BLAKE2B 63d0645884bbbf9b033c42c257477c57b794f95a6dad529e707db3c4319b6ff9be4b62a42f17f2fd8528ffcf3998653bae2b3eaa72a2448d1fcbbda30b3b2438 SHA512 708a74df246ca65f6ea0f384ada9870b88c4db42d92d03758daf232d7f2bb6d35de6c50b3291ac4a5bbfb1aac82ecce38d33c0785d6a5df5e107479cd39093a6 EBUILD rubberband-3.0.0.ebuild 1573 BLAKE2B 65f28fa2d3d9b09903da0f2d8fe55108ab4dc32345a4d91dd069a5c39c7cbe6267bbce78d82f2dfd8c8622ece1b069fa5fda15162894fa8209b0cab0c2672264 SHA512 08b2a01e072f341562f7eea435c110002ef9aed1e876c3d54598fc674102ab67886f747cd26236f53507af9defe45f79ba44de0d863f61d511b1887f4279bc27 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 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 -} -- cgit v1.2.3