public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/, media-libs/aubio/files/
@ 2015-09-16 16:52 Alexis Ballier
  0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2015-09-16 16:52 UTC (permalink / raw
  To: gentoo-commits

commit:     3c9e7fad2eb6f5052e23e9ee23b74de6dbca3673
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 16 16:49:01 2015 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 16 16:49:01 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c9e7fad

media-libs/aubio: fix build with ffmpeg git master.

Package-Manager: portage-2.2.20.1

 media-libs/aubio/aubio-0.4.1.ebuild               |  3 ++-
 media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch | 22 ++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/media-libs/aubio/aubio-0.4.1.ebuild b/media-libs/aubio/aubio-0.4.1.ebuild
index dfddfdb..3d8976b 100644
--- a/media-libs/aubio/aubio-0.4.1.ebuild
+++ b/media-libs/aubio/aubio-0.4.1.ebuild
@@ -8,7 +8,7 @@ DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python2_7 )
 PYTHON_REQ_USE='threads(+)'
 
-inherit distutils-r1 waf-utils multilib
+inherit distutils-r1 waf-utils multilib eutils
 
 DESCRIPTION="Library for audio labelling"
 HOMEPAGE="http://aubio.org/"
@@ -39,6 +39,7 @@ 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() {

diff --git a/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch b/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch
new file mode 100644
index 0000000..8656271
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch
@@ -0,0 +1,22 @@
+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);


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/, media-libs/aubio/files/
@ 2018-10-06 19:45 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-10-06 19:45 UTC (permalink / raw
  To: gentoo-commits

commit:     640bb6cccb3c071724ae448942c4e37e9d6821f0
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  6 19:33:01 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct  6 19:45:14 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=640bb6cc

media-libs/aubio: Security cleanup

Bug: https://bugs.gentoo.org/667510
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11

 media-libs/aubio/Manifest                         |   3 -
 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/files/aubio-0.4.1-ffmpeg29.patch |  22 -----
 media-libs/aubio/files/aubio-0.4.6-ffmpeg4.patch  |  13 ---
 6 files changed, 358 deletions(-)

diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 6a455a6bc03..b4ed4a63e48 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,4 +1 @@
-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

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 59a64870fc8..00000000000
--- 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 47feb82207d..00000000000
--- 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 9c6af6537ba..00000000000
--- 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/files/aubio-0.4.1-ffmpeg29.patch b/media-libs/aubio/files/aubio-0.4.1-ffmpeg29.patch
deleted file mode 100644
index 86562716d3e..00000000000
--- 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 7df4665655b..00000000000
--- 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;


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/, media-libs/aubio/files/
@ 2018-12-03 12:38 Lars Wendler
  0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2018-12-03 12:38 UTC (permalink / raw
  To: gentoo-commits

commit:     8368600a28901b37e357f73400f952aad2f137b8
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  3 12:38:07 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Dec  3 12:38:36 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8368600a

media-libs/aubio: Bump to version 0.4.8

- Fixed docdir install path
- added python3 support

Closes: https://bugs.gentoo.org/655618
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/aubio/Manifest                       |   1 +
 media-libs/aubio/aubio-0.4.8.ebuild             | 126 ++++++++++++++++++++++++
 media-libs/aubio/files/aubio-0.4.8-docdir.patch |  20 ++++
 3 files changed, 147 insertions(+)

diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index b4ed4a63e48..73c0139fa3e 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1 +1,2 @@
 DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1c3242e3e1077fa0780160785a9934884a1f0d0dc80fe21b1d417bc3800db59842ec300a4c29d75b7942cba05 SHA512 30c614f2b502b993df28d4746a99421fe0aada33c98c42ea19c271554b29b360cb4d4f6650c1b1da508da4bc341348c5944cb452f69b2bf354ca6348f84de260
+DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c843ef9d6bf0483ffb750916eaccf9e28b8d80dcc0034572cca4f08479e4db44468c96206ce7b60a2fa9600634 SHA512 e58b32beda36865a5243ec7ed4647cf96e3652a25fd319fc697c08f93487f895070dc66b830700b40b879220c2e3a53b8cdc255ce2e34770ba5e34b36a4f51b4

diff --git a/media-libs/aubio/aubio-0.4.8.ebuild b/media-libs/aubio/aubio-0.4.8.ebuild
new file mode 100644
index 00000000000..f75c644d475
--- /dev/null
+++ b/media-libs/aubio/aubio-0.4.8.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_REQ_USE='threads(+)'
+inherit distutils-r1 waf-utils
+
+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 test"
+
+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? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	sndfile? ( media-libs/libsndfile )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/txt2man
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( double-precision libsamplerate )
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+PYTHON_SRC_DIR="${S}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.8-docdir.patch
+)
+
+src_prepare() {
+	default
+	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
+	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
+		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
+
+	find "${ED}" -name "*.a" -delete || die
+}

diff --git a/media-libs/aubio/files/aubio-0.4.8-docdir.patch b/media-libs/aubio/files/aubio-0.4.8-docdir.patch
new file mode 100644
index 00000000000..58797995e3a
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.8-docdir.patch
@@ -0,0 +1,20 @@
+--- aubio-0.4.8/wscript
++++ aubio-0.4.8/wscript
+@@ -548,7 +548,7 @@
+                 source = 'doc/web.cfg',
+                 target = '../doc/web/html/index.html',
+                 cwd = 'doc')
+-        bld.install_files( '${DATAROOTDIR}' + '/doc/libaubio-doc',
++        bld.install_files( '${DATAROOTDIR}' + '/doc/' + os.environ['PF'] + '/libaubio-doc',
+                 bld.path.ant_glob('doc/web/html/**'),
+                 cwd = bld.path.find_dir ('doc/web'),
+                 relative_trick = True)
+@@ -564,7 +564,7 @@
+                         ' `dirname ${SRC}` `dirname ${TGT}`',
+                 source = 'doc/conf.py',
+                 target = '../doc/_build/html/index.html')
+-        bld.install_files( '${DATAROOTDIR}' + '/doc/libaubio-doc/sphinx',
++        bld.install_files( '${DATAROOTDIR}' + '/doc/' + os.environ['PF'] + '/libaubio-doc/sphinx',
+                 bld.path.ant_glob('doc/_build/html/**'),
+                 cwd = bld.path.find_dir('doc/_build/html'),
+                 relative_trick = True)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/, media-libs/aubio/files/
@ 2019-02-14  2:58 Lars Wendler
  0 siblings, 0 replies; 4+ messages in thread
From: Lars Wendler @ 2019-02-14  2:58 UTC (permalink / raw
  To: gentoo-commits

commit:     d4dcf8d9423be2fa4053c69ec078e4063dc3e5bb
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 14 02:20:55 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Feb 14 02:58:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4dcf8d9

media-libs/aubio: Bump to version 0.4.9

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-libs/aubio/Manifest                       |   1 +
 media-libs/aubio/aubio-0.4.9.ebuild             | 126 ++++++++++++++++++++++++
 media-libs/aubio/files/aubio-0.4.9-docdir.patch |  20 ++++
 3 files changed, 147 insertions(+)

diff --git a/media-libs/aubio/Manifest b/media-libs/aubio/Manifest
index 73c0139fa3e..77196db1fd3 100644
--- a/media-libs/aubio/Manifest
+++ b/media-libs/aubio/Manifest
@@ -1,2 +1,3 @@
 DIST aubio-0.4.7.tar.bz2 372173 BLAKE2B 544239b215dd87d4cf4a6ed6b5dd856411d0a3f1c3242e3e1077fa0780160785a9934884a1f0d0dc80fe21b1d417bc3800db59842ec300a4c29d75b7942cba05 SHA512 30c614f2b502b993df28d4746a99421fe0aada33c98c42ea19c271554b29b360cb4d4f6650c1b1da508da4bc341348c5944cb452f69b2bf354ca6348f84de260
 DIST aubio-0.4.8.tar.bz2 387933 BLAKE2B e30d0ce97360376edf8eba895dc3040157a139c843ef9d6bf0483ffb750916eaccf9e28b8d80dcc0034572cca4f08479e4db44468c96206ce7b60a2fa9600634 SHA512 e58b32beda36865a5243ec7ed4647cf96e3652a25fd319fc697c08f93487f895070dc66b830700b40b879220c2e3a53b8cdc255ce2e34770ba5e34b36a4f51b4
+DIST aubio-0.4.9.tar.bz2 397604 BLAKE2B b849d92678ea8fb20e17921b1a61fdc85a84d4a528acfefa3278169ab5f7fe935217ec37dd9f931202f0f0a1fd3a9518372afbce34cc2dd3ca30c6b4e5d9a301 SHA512 0cb81bb4b15051db3f3f4d160d500af56fdfb237e0a74e3f366f53c2870030aa0a7cee8469a611a9694c36b8866d3d42ffb48241c999de08f3fee43e6d903130

diff --git a/media-libs/aubio/aubio-0.4.9.ebuild b/media-libs/aubio/aubio-0.4.9.ebuild
new file mode 100644
index 00000000000..89c6112ddc2
--- /dev/null
+++ b/media-libs/aubio/aubio-0.4.9.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_REQ_USE='threads(+)'
+inherit distutils-r1 waf-utils
+
+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 test"
+
+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? (
+		${PYTHON_DEPS}
+		dev-python/numpy[${PYTHON_USEDEP}]
+	)
+	sndfile? ( media-libs/libsndfile )
+"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	app-text/txt2man
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	?? ( double-precision libsamplerate )
+"
+
+DOCS=( AUTHORS ChangeLog README.md )
+PYTHON_SRC_DIR="${S}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.4.9-docdir.patch
+)
+
+src_prepare() {
+	default
+	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
+	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
+		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
+
+	find "${ED}" -name "*.a" -delete || die
+}

diff --git a/media-libs/aubio/files/aubio-0.4.9-docdir.patch b/media-libs/aubio/files/aubio-0.4.9-docdir.patch
new file mode 100644
index 00000000000..258e56a29b1
--- /dev/null
+++ b/media-libs/aubio/files/aubio-0.4.9-docdir.patch
@@ -0,0 +1,20 @@
+--- aubio-0.4.9/wscript
++++ aubio-0.4.9/wscript
+@@ -557,7 +557,7 @@
+                 target = bld.path.find_or_declare('api/index.html'),
+                 cwd = bld.path.find_dir('doc'))
+         # evaluate nodes lazily to prevent build directory traversal warnings
+-        bld.install_files('${DATAROOTDIR}/doc/libaubio-doc/api',
++        bld.install_files('${DATAROOTDIR}/doc/' + os.environ['PF'] + '/libaubio-doc/api',
+                 bld.path.find_or_declare('api').ant_glob('**/*',
+                     generator=True), cwd=bld.path.find_or_declare('api'),
+                 relative_trick=True)
+@@ -582,7 +582,7 @@
+                 source = bld.path.find_dir('doc').ant_glob('*.rst'),
+                 target = bld.path.find_or_declare('manual/index.html'))
+         # evaluate nodes lazily to prevent build directory traversal warnings
+-        bld.install_files('${DATAROOTDIR}/doc/libaubio-doc/manual',
++        bld.install_files('${DATAROOTDIR}/doc/' + os.environ['PF'] + '/libaubio-doc/manual',
+                 bld.path.find_or_declare('manual').ant_glob('**/*',
+                     generator=True), cwd=bld.path.find_or_declare('manual'),
+                 relative_trick=True)


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2019-02-14  2:58 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-10-06 19:45 [gentoo-commits] repo/gentoo:master commit in: media-libs/aubio/, media-libs/aubio/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2019-02-14  2:58 Lars Wendler
2018-12-03 12:38 Lars Wendler
2015-09-16 16:52 Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox