From 957235cf19a691360c720f7913672adda4258ed0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 7 Oct 2018 11:03:14 +0100 Subject: gentoo resync : 07.10.2018 --- media-libs/aubio/Manifest | 10 +- media-libs/aubio/aubio-0.4.1-r1.ebuild | 104 -------------------- media-libs/aubio/aubio-0.4.2-r1.ebuild | 105 -------------------- media-libs/aubio/aubio-0.4.6.ebuild | 111 ---------------------- media-libs/aubio/aubio-0.4.7.ebuild | 48 ++++++---- media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch | 22 ----- media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch | 13 --- 7 files changed, 30 insertions(+), 383 deletions(-) delete mode 100644 media-libs/aubio/aubio-0.4.1-r1.ebuild delete mode 100644 media-libs/aubio/aubio-0.4.2-r1.ebuild delete mode 100644 media-libs/aubio/aubio-0.4.6.ebuild delete mode 100644 media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch delete mode 100644 media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch (limited to 'media-libs/aubio') diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest index ce09144203b8..3c4c4ba176b3 100644 --- a/media-libs/aubio/Manifest +++ b/media-libs/aubio/Manifest @@ -1,11 +1,3 @@ -AUX aubio-0.4.1-ffmpeg29.patch 709 BLAKE2B 1247aba5a87283e48a7bd312aaf2399d920f4c4684caf84f2203ba3af1219c15a5cb87301bdced313188eafaa9abc725676555ea922b146ee98cc5532b1a2ba7 SHA512 7dfec25471d9d802d747cf13102067de0ff589e51501083cab35cc9e3fc8947e1ccdbd2087cfdc0caa7cf9129dde5dc37a3e90548fb8328322aa7a9ca89a6ae0 -AUX aubio-0.4.6-ffmpeg4.patch 442 BLAKE2B 41daeb41d18f1b964e625ba2199054a3ffd90f73710f40dd061c9c5bf1df6cf7caf90c1e51b8bf323d7c6cd3c0ccb1fb58b2268b955547c31811b8c5b3c12c98 SHA512 3dcaba80b3cd269627e60ad6fe8dc7a884492bca6365e74e55fb5279d8b2f1900ac5b078eb3c574f499389e06cb2aaed3de447cf00a3be46c83b062b970af187 -DIST aubio-0.4.1.tar.bz2 288136 BLAKE2B ba7368fab21fec73dc555ea0d7291eea010a415d8bc77601337cf311277f3c82564c2f021b971a4117a3f99ab69e7a61e55b8ee488ca24b9b5319ab4a00a3a6b SHA512 f36800f1a0cbe72509e05d15d79759ed25975e92701804597ed4c9d93e27d5e7b908e0aa65819ce763882945123ea174a0825c7aacf9f9494f56d72de5b8308c -DIST aubio-0.4.2.tar.bz2 304216 BLAKE2B aab7e55d580105e6180503503ae2970d150d86e445d5c1b10d3f39c8cdf7496d0c280a57a2fc7ad3ea5142996d56c53cd2e1c6f736fb1a98b9b142438c919e04 SHA512 b57b6d147b305a264f0055726f76a8452f784b556a7fda911f056adbedd2855048e93c0e21b9f359e3f442f1542189aff0c214dd85141e2e06048a07f47703ff -DIST aubio-0.4.6.tar.bz2 363016 BLAKE2B 3847ed02b7d64d9796bd1f5a06044d945f5859ab87a762978bf2b0b6650cc0e19c9b8eec99a793e14dd25c06f66d2bffd453ecca824fbc5f47700fda7f78854b SHA512 0e5cab0c88d51f2fb70c0d85e1c067a7b3758fbffdbd5026686726379aa36203adb63ed3f8e40c83ea02930e0ffc4e6c246803f1d518d448d47a01984678e77d DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1c3242e3e1077fa0780160785a9934884a1f0d0dc80fe21b1d417bc3800db59842ec300a4c29d75b7942cba05 SHA512 30c614f2b502b993df28d4746a99421fe0aada33c98c42ea19c271554b29b360cb4d4f6650c1b1da508da4bc341348c5944cb452f69b2bf354ca6348f84de260 -EBUILD aubio-0.4.1-r1.ebuild 2290 BLAKE2B 8c8dd11e0a1b64a9d5643fd5c212f3afe881c2d58a923dd087008631b6319814d5ef8b40804b24714696dbf21ddd36532f225e6c5bd40450beff129e5623427f SHA512 104687177d18f338d7616995602e04da412aecd184ef2759739cce7e242b138769b0d4ea54baa1730d81fbe4c5b2a371e72f9b9127b9f1a180f5baea81f3db4b -EBUILD aubio-0.4.2-r1.ebuild 2212 BLAKE2B dbf8a2d51acb131d2ff2ab5a67bc6c560f8fbf45c196f71b5db3efde58f8d7561023087600306ab6870e5696e994299b9aa5c3436328f80a9659e073a352fe99 SHA512 ed2478410501447475bea8474387339a291e6f790672fa4afe2a7ecbf5ab707a7b7c750e02083c705bf8f10da4dc04f0ca94987992c8dae19ccc3fae71323c4d -EBUILD aubio-0.4.6.ebuild 2293 BLAKE2B 47eac9ff599213674a34161525ba865a67358a0cedf7f0c9c52ca5fdbd3049897c303bab11c328ce97eb66798819e176e45388ba19f07b715813628790044a8b SHA512 fbf5390c609fcac1fc9c544438f4dddc86f03746a392336a823f0a355abe62e2c93e7decadcf9a68d90b2deaa1b3a9657daaaadb87af39091e1e7232fbc437b9 -EBUILD aubio-0.4.7.ebuild 2280 BLAKE2B c489046f7d7b1ae283c31a4c7fb232b2302c58e830e056ef5f5015f890590161c4ad7935f7bdd9ec9ae449cf2aa42838ca8472dcbfa26377fb4bd3aa13f722d0 SHA512 f29514a1d45252a92f3e7fc1f17db8eb96df89785e2ff72e266425c0487678ba2b4349ab2c57475f211f92cb17f9006901a7c28a57369b6f8ac59d543e08ccd9 +EBUILD aubio-0.4.7.ebuild 2450 BLAKE2B 975c2121ba3b505134e3b079e8654f77d16902e2fe6c31b158577922e3a2332909ff78f3eb04e16eef14039e1fdb4ead67a949eecc6f166f5efaf69a17bfc5c9 SHA512 7f26d97bf9de42e2429f797c3af73079a3105822ded2550fcf2852c5e6807fc4b60e9dd1688ef97aed1389161bde2544c94360f9fb82dfd92ba23d072ff90f8d MISC metadata.xml 346 BLAKE2B 00429033f506bf3818f26f13062d21d0d04d8fc84185244615a09d008c5da6e350df5f32bdcba2c07103039ed64f802cc563a0ca8cd79e117741b947e421142d SHA512 ff3830c2d2322fabdb34458fd27c3e05ad825b1d707eee6150417e4c21480bdffbe4e639ff33a9914cc28189b91e970719326f065746f4241e186f7b27b168d1 diff --git a/media-libs/aubio/aubio-0.4.1-r1.ebuild b/media-libs/aubio/aubio-0.4.1-r1.ebuild deleted file mode 100644 index 59a64870fc89..000000000000 --- a/media-libs/aubio/aubio-0.4.1-r1.ebuild +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' - -inherit distutils-r1 waf-utils multilib eutils - -DESCRIPTION="Library for audio labelling" -HOMEPAGE="https://aubio.org/" -SRC_URI="https://aubio.org/pub/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 ~ppc ppc64 sparc x86" -IUSE="doc double-precision examples ffmpeg fftw jack libsamplerate sndfile python" - -RDEPEND=" - ffmpeg? ( virtual/ffmpeg ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( virtual/jack ) - libsamplerate? ( media-libs/libsamplerate ) - python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} ) - sndfile? ( media-libs/libsndfile )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - app-text/txt2man - doc? ( app-doc/doxygen )" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -DOCS=( AUTHORS ChangeLog README.md ) -PYTHON_SRC_DIR="${S}/python" - -src_prepare() { - sed -i -e "s:\/lib:\/$(get_libdir):" src/wscript_build || die - sed -i -e "s:doxygen:doxygen_disabled:" wscript || die - has_version '>=media-video/ffmpeg-2.8' && epatch "${FILESDIR}/${PN}-0.4.1-ffmpeg29.patch" -} - -src_configure() { - python_setup - waf-utils_src_configure \ - --enable-complex \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable double-precision double) \ - $(use_enable fftw fftw3f) \ - $(use_enable fftw fftw3) \ - $(use_enable ffmpeg avcodec) \ - $(use_enable jack) \ - $(use_enable libsamplerate samplerate) \ - $(use_enable sndfile) - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - distutils-r1_src_configure - fi -} - -src_compile() { - waf-utils_src_compile --notests - - if use doc; then - cd "${S}"/doc || die - doxygen full.cfg || die - fi - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - distutils-r1_src_compile - fi -} - -src_test() { - waf-utils_src_compile --alltests - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - distutils-r1_src_test - fi -} - -src_install() { - waf-utils_src_install - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - DOCS="" distutils-r1_src_install - newdoc README README.python - fi - - if use doc; then - dohtml -r doc/full/html/. - dodoc doc/*.txt - fi - - if use examples; then - # install dist_noinst_SCRIPTS from Makefile.am - dodoc -r examples - fi -} diff --git a/media-libs/aubio/aubio-0.4.2-r1.ebuild b/media-libs/aubio/aubio-0.4.2-r1.ebuild deleted file mode 100644 index 47feb82207d9..000000000000 --- a/media-libs/aubio/aubio-0.4.2-r1.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' - -inherit distutils-r1 waf-utils multilib eutils - -DESCRIPTION="Library for audio labelling" -HOMEPAGE="https://aubio.org/" -SRC_URI="https://aubio.org/pub/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python" - -RDEPEND=" - ffmpeg? ( - !libav? ( >=media-video/ffmpeg-2.6:0= ) - libav? ( >=media-video/libav-9:0= ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( virtual/jack ) - libsamplerate? ( media-libs/libsamplerate ) - python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} ) - sndfile? ( media-libs/libsndfile )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - virtual/pkgconfig - app-text/txt2man - doc? ( app-doc/doxygen )" -REQUIRED_USE=${PYTHON_REQUIRED_USE} - -DOCS=( AUTHORS ChangeLog README.md ) -PYTHON_SRC_DIR="${S}/python" - -src_prepare() { - sed -i -e "s:doxygen:doxygen_disabled:" wscript || die -} - -src_configure() { - python_setup - waf-utils_src_configure \ - --enable-complex \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable double-precision double) \ - $(use_enable fftw fftw3f) \ - $(use_enable fftw fftw3) \ - $(use_enable ffmpeg avcodec) \ - $(use_enable jack) \ - $(use_enable libsamplerate samplerate) \ - $(use_enable sndfile) - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - distutils-r1_src_configure - fi -} - -src_compile() { - waf-utils_src_compile --notests - - if use doc; then - cd "${S}"/doc || die - doxygen full.cfg || die - fi - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - distutils-r1_src_compile - fi -} - -src_test() { - waf-utils_src_compile --alltests - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - distutils-r1_src_test - fi -} - -src_install() { - waf-utils_src_install - - if use doc; then - dohtml -r doc/full/html/. - dodoc doc/*.txt - fi - - if use examples; then - # install dist_noinst_SCRIPTS from Makefile.am - dodoc -r examples - fi - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - DOCS="" distutils-r1_src_install - newdoc README README.python - fi -} diff --git a/media-libs/aubio/aubio-0.4.6.ebuild b/media-libs/aubio/aubio-0.4.6.ebuild deleted file mode 100644 index 9c6af6537ba0..000000000000 --- a/media-libs/aubio/aubio-0.4.6.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DISTUTILS_OPTIONAL=1 -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='threads(+)' - -inherit distutils-r1 waf-utils multilib eutils - -DESCRIPTION="Library for audio labelling" -HOMEPAGE="https://aubio.org/" -SRC_URI="https://aubio.org/pub/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0/5" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python" - -RDEPEND=" - ffmpeg? ( - !libav? ( >=media-video/ffmpeg-2.6:0= ) - libav? ( >=media-video/libav-9:0= ) - ) - fftw? ( sci-libs/fftw:3.0 ) - jack? ( virtual/jack ) - libsamplerate? ( media-libs/libsamplerate ) - python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} ) - sndfile? ( media-libs/libsndfile ) -" -DEPEND=" - ${RDEPEND} - ${PYTHON_DEPS} - app-text/txt2man - virtual/pkgconfig - doc? ( app-doc/doxygen ) -" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DOCS=( AUTHORS ChangeLog README.md ) -PYTHON_SRC_DIR="${S}" -PATCHES=( "${FILESDIR}/${PN}-0.4.6-ffmpeg4.patch" ) - -src_prepare() { - default - sed -i -e "s:doxygen:doxygen_disabled:" wscript || die -} - -src_configure() { - python_setup - waf-utils_src_configure \ - --enable-complex \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable double-precision double) \ - $(use_enable fftw fftw3f) \ - $(use_enable fftw fftw3) \ - $(use_enable ffmpeg avcodec) \ - $(use_enable jack) \ - $(use_enable libsamplerate samplerate) \ - $(use_enable sndfile) - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - distutils-r1_src_configure - fi -} - -src_compile() { - waf-utils_src_compile --notests - - if use doc; then - cd "${S}"/doc || die - emake dirhtml - fi - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - distutils-r1_src_compile - fi -} - -src_test() { - waf-utils_src_compile --alltests - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - distutils-r1_src_test - fi -} - -src_install() { - waf-utils_src_install - - if use examples; then - # install dist_noinst_SCRIPTS from Makefile.am - dodoc -r examples - fi - - if use python ; then - cd "${PYTHON_SRC_DIR}" || die - DOCS="" distutils-r1_src_install - newdoc python/README.md README.python - fi - - if use doc; then - dodoc doc/*.txt - docinto html - dodoc -r doc/_build/dirhtml/. - fi -} diff --git a/media-libs/aubio/aubio-0.4.7.ebuild b/media-libs/aubio/aubio-0.4.7.ebuild index 9cb10b60097e..8b392873a277 100644 --- a/media-libs/aubio/aubio-0.4.7.ebuild +++ b/media-libs/aubio/aubio-0.4.7.ebuild @@ -6,8 +6,7 @@ EAPI=6 DISTUTILS_OPTIONAL=1 PYTHON_COMPAT=( python2_7 ) PYTHON_REQ_USE='threads(+)' - -inherit distutils-r1 waf-utils multilib eutils +inherit distutils-r1 waf-utils DESCRIPTION="Library for audio labelling" HOMEPAGE="https://aubio.org/" @@ -15,49 +14,60 @@ SRC_URI="https://aubio.org/pub/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0/5" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python" +KEYWORDS="amd64 ~ppc ppc64 sparc x86" +IUSE="doc double-precision examples ffmpeg fftw jack libav libsamplerate sndfile python test" RDEPEND=" ffmpeg? ( !libav? ( >=media-video/ffmpeg-2.6:0= ) libav? ( >=media-video/libav-9:0= ) ) - fftw? ( sci-libs/fftw:3.0 ) + fftw? ( sci-libs/fftw:3.0= ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) - python? ( dev-python/numpy[${PYTHON_USEDEP}] ${PYTHON_DEPS} ) + python? ( + ${PYTHON_DEPS} + dev-python/numpy[${PYTHON_USEDEP}] + ) sndfile? ( media-libs/libsndfile ) " -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND} ${PYTHON_DEPS} app-text/txt2man virtual/pkgconfig doc? ( app-doc/doxygen ) " -REQUIRED_USE="${PYTHON_REQUIRED_USE}" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + ?? ( double-precision libsamplerate ) +" DOCS=( AUTHORS ChangeLog README.md ) PYTHON_SRC_DIR="${S}" src_prepare() { default - sed -i -e "s:doxygen:doxygen_disabled:" wscript || die + sed -e "s:doxygen:doxygen_disabled:" -i wscript || die + + if ! use test; then + sed -e "/bld.*tests/d" -i wscript || die + fi } src_configure() { python_setup - waf-utils_src_configure \ - --enable-complex \ - --docdir="${EPREFIX}"/usr/share/doc/${PF} \ - $(use_enable double-precision double) \ - $(use_enable fftw fftw3f) \ - $(use_enable fftw fftw3) \ - $(use_enable ffmpeg avcodec) \ - $(use_enable jack) \ - $(use_enable libsamplerate samplerate) \ + local mywafconfargs=( + --enable-complex + --docdir="${EPREFIX}"/usr/share/doc/${PF} + $(use_enable double-precision double) + $(use_enable fftw fftw3) + $(use_enable ffmpeg avcodec) + $(use_enable jack) + $(use_enable libsamplerate samplerate) $(use_enable sndfile) + ) + use double-precision || mywafconfargs+=( $(use_enable fftw fftw3f) ) + + waf-utils_src_configure "${mywafconfargs[@]}" if use python ; then cd "${PYTHON_SRC_DIR}" || die diff --git a/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch b/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch deleted file mode 100644 index 86562716d3e5..000000000000 --- a/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: aubio-0.4.1/src/io/source_avcodec.c -=================================================================== ---- aubio-0.4.1.orig/src/io/source_avcodec.c -+++ aubio-0.4.1/src/io/source_avcodec.c -@@ -167,7 +167,7 @@ aubio_source_avcodec_t * new_aubio_sourc - } - - AVFrame *avFrame = s->avFrame; -- avFrame = avcodec_alloc_frame(); -+ avFrame = av_frame_alloc(); - if (!avFrame) { - AUBIO_ERR("source_avcodec: Could not allocate frame for (%s)\n", s->path); - } -@@ -415,7 +415,7 @@ void del_aubio_source_avcodec(aubio_sour - } - s->output = NULL; - if (s->avFrame != NULL) { -- avcodec_free_frame( &(s->avFrame) ); -+ av_frame_free( &(s->avFrame) ); - } - s->avFrame = NULL; - AUBIO_FREE(s); diff --git a/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch b/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch deleted file mode 100644 index 7df4665655bb..000000000000 --- a/media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: aubio-0.4.6/src/io/source_avcodec.c -=================================================================== ---- aubio-0.4.6.orig/src/io/source_avcodec.c -+++ aubio-0.4.6/src/io/source_avcodec.c -@@ -58,7 +58,7 @@ - #include "fmat.h" - #include "source_avcodec.h" - --#define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE -+#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE - - struct _aubio_source_avcodec_t { - uint_t hop_size; -- cgit v1.2.3