From e4d56e744e326c4333d23b5a677aee42438653fb Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 29 Dec 2018 10:18:38 +0100 Subject: [PATCH] libaubio, bump version (#3497) * libaubio, bump version --- media-libs/libaubio/libaubio-0.4.2.recipe | 83 ------------------- ...bio-0.4.6.recipe => libaubio-0.4.8.recipe} | 19 +++-- .../libaubio/patches/libaubio-0.4.2.patchset | 79 ------------------ .../libaubio/patches/libaubio-0.4.6.patchset | 22 ----- 4 files changed, 12 insertions(+), 191 deletions(-) delete mode 100644 media-libs/libaubio/libaubio-0.4.2.recipe rename media-libs/libaubio/{libaubio-0.4.6.recipe => libaubio-0.4.8.recipe} (82%) delete mode 100644 media-libs/libaubio/patches/libaubio-0.4.2.patchset delete mode 100644 media-libs/libaubio/patches/libaubio-0.4.6.patchset diff --git a/media-libs/libaubio/libaubio-0.4.2.recipe b/media-libs/libaubio/libaubio-0.4.2.recipe deleted file mode 100644 index 0c8856839..000000000 --- a/media-libs/libaubio/libaubio-0.4.2.recipe +++ /dev/null @@ -1,83 +0,0 @@ -SUMMARY="A library to label music and sounds" -DESCRIPTION="aubio is a library to label music and sounds. It listens to \ -audio signals and attempts to detect events. For instance, when a drum is \ -hit, at which frequency is a note, or at what tempo is a rhythmic melody. - -Its features include segmenting a sound file before each of its attacks, \ -performing pitch detection, tapping the beat and producing midi streams from \ -live audio." -HOMEPAGE="https://aubio.org" -COPYRIGHT="2003-2013 Paul Brossier" -LICENSE="GNU GPL v3" -REVISION="3" -SOURCE_URI="https://aubio.org/pub/aubio-$portVersion.tar.bz2" -CHECKSUM_SHA256="1cc58e0fed2b9468305b198ad06b889f228b797a082c2ede716dc30fcb4f8f1f" -SOURCE_DIR="aubio-$portVersion" -PATCHES="libaubio-$portVersion.patchset" - -ARCHITECTURES="?x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="?x86_gcc2 x86" - -PROVIDES=" - libaubio$secondaryArchSuffix = $portVersion compat >= 0 - lib:libaubio$secondaryArchSuffix = 4.2.2 compat >= 4 - " -if [ -z "$secondaryArchSuffix" ]; then -PROVIDES="$PROVIDES - cmd:aubiomfcc = $portVersion compat >= 0 - cmd:aubionotes = $portVersion compat >= 0 - cmd:aubioonset = $portVersion compat >= 0 - cmd:aubiopitch = $portVersion compat >= 0 - cmd:aubioquiet = $portVersion compat >= 0 - cmd:aubiotrack = $portVersion compat >= 0 - " -fi - -REQUIRES=" - haiku$secondaryArchSuffix -# lib:libsamplerate$secondaryArchSuffix - " - -PROVIDES_devel=" - libaubio${secondaryArchSuffix}_devel = $portVersion compat >= 0 - devel:libaubio$secondaryArchSuffix = 4.2.2 compat >= 4 - " -REQUIRES_devel=" - libaubio$secondaryArchSuffix == $portVersion base - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel -# devel:libsamplerate$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:python - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:pkg_config$secondaryArchSuffix - " - -BUILD() -{ - echo $includeDir - runConfigure --omit-buildspec ./waf configure \ - --with-target-platform=$effectiveTargetMachineTriple - ./waf build -} - -INSTALL() -{ - ./waf install - - prepareInstalledDevelLibs libaubio - fixPkgconfig - - # devel package - packageEntries devel \ - $developDir - - #remove bin commands when building for secondary arch - if [ -n "$secondaryArchSuffix" ];then - rm -rf $prefix/bin - fi -} diff --git a/media-libs/libaubio/libaubio-0.4.6.recipe b/media-libs/libaubio/libaubio-0.4.8.recipe similarity index 82% rename from media-libs/libaubio/libaubio-0.4.6.recipe rename to media-libs/libaubio/libaubio-0.4.8.recipe index d8ea043b5..201cecf44 100644 --- a/media-libs/libaubio/libaubio-0.4.6.recipe +++ b/media-libs/libaubio/libaubio-0.4.8.recipe @@ -7,18 +7,17 @@ Its features include segmenting a sound file before each of its attacks, \ performing pitch detection, tapping the beat and producing midi streams from \ live audio." HOMEPAGE="https://aubio.org" -COPYRIGHT="2003-2013 Paul Brossier" +COPYRIGHT="2003-2018 Paul Brossier" LICENSE="GNU GPL v3" -REVISION="3" +REVISION="1" SOURCE_URI="https://aubio.org/pub/aubio-$portVersion.tar.bz2" -CHECKSUM_SHA256="bdc73be1f007218d3ea6d2a503b38a217815a0e2ccc4ed441f6e850ed5d47cfb" +CHECKSUM_SHA256="dcf7473e1e123cc7f95ae06d18cf7901d70d5d245b1adaceca4c779568f84bba" SOURCE_DIR="aubio-$portVersion" -PATCHES="libaubio-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion="5.3.7" +libVersion="5.4.8" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" @@ -33,7 +32,10 @@ PROVIDES=" " REQUIRES=" haiku$secondaryArchSuffix - ffmpeg$secondaryArchSuffix + lib:libavcodec$secondaryArchSuffix + lib:libavformat$secondaryArchSuffix + lib:libavutil$secondaryArchSuffix + lib:libswresample$secondaryArchSuffix lib:libsamplerate$secondaryArchSuffix lib:libsndfile$secondaryArchSuffix " @@ -48,7 +50,10 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel - ffmpeg${secondaryArchSuffix}_devel + devel:libavcodec$secondaryArchSuffix + devel:libavformat$secondaryArchSuffix + devel:libavutil$secondaryArchSuffix + devel:libswresample$secondaryArchSuffix devel:libsamplerate$secondaryArchSuffix devel:libsndfile$secondaryArchSuffix " diff --git a/media-libs/libaubio/patches/libaubio-0.4.2.patchset b/media-libs/libaubio/patches/libaubio-0.4.2.patchset deleted file mode 100644 index 42fa9da4c..000000000 --- a/media-libs/libaubio/patches/libaubio-0.4.2.patchset +++ /dev/null @@ -1,79 +0,0 @@ -From 94f1698e2348f513128bf3e7dc789df498b93c9d Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 19 May 2014 19:39:09 +0000 -Subject: Haiku has no libm - - -diff --git a/examples/wscript_build b/examples/wscript_build -index 4a1ad39..7ed5b8d 100644 ---- a/examples/wscript_build -+++ b/examples/wscript_build -@@ -24,7 +24,7 @@ bld(features = 'c', - for source_file in programs_source: - bld(features = 'c cprogram', - includes = '../src', -- lib = 'm', -+ lib = '', - use = ['aubio', 'utilsio'], - uselib = uselib, - source = source_file, -diff --git a/src/wscript_build b/src/wscript_build -index ba64b25..8fd514c 100644 ---- a/src/wscript_build -+++ b/src/wscript_build -@@ -15,7 +15,7 @@ ctx(features = 'c', - source = source, - includes = ['.'], - uselib = uselib, -- lib = 'm', -+ lib = '', - target = 'lib_objects') - - # build libaubio.so (cshlib) and/or libaubio.a (cstlib) -@@ -30,7 +30,7 @@ for target in build_features: - ctx(features = 'c ' + target, - use = ['lib_objects'], - uselib = uselib, -- lib = 'm', -+ lib = '', - target = 'aubio', - vnum = ctx.env['LIB_VERSION']) - -diff --git a/tests/wscript_build b/tests/wscript_build -index 6aebad6..67b6300 100644 ---- a/tests/wscript_build -+++ b/tests/wscript_build -@@ -14,7 +14,7 @@ for target_name in ctx.path.ant_glob('src/**/*.c'): - extra_source = [] - - bld(features = 'c cprogram test', -- lib = 'm', -+ lib = '', - uselib = uselib, - source = [target_name] + extra_source, - target = str(target_name).split('.')[0], --- -2.2.2 - - -From 60153b9125cc45f6ba429a8955d74c7fad577deb Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 19 May 2014 23:15:04 +0000 -Subject: fix headers installation - - -diff --git a/src/wscript_build b/src/wscript_build -index 8fd514c..4b19c0d 100644 ---- a/src/wscript_build -+++ b/src/wscript_build -@@ -35,6 +35,6 @@ for target in build_features: - vnum = ctx.env['LIB_VERSION']) - - # install headers, except _priv.h ones --ctx.install_files('${PREFIX}/include/aubio/', -+ctx.install_files('${INCLUDEDIR}/aubio/', - ctx.path.ant_glob('**/*.h', excl = ['**_priv.h', 'config.h']), - relative_trick=True) --- -2.2.2 - diff --git a/media-libs/libaubio/patches/libaubio-0.4.6.patchset b/media-libs/libaubio/patches/libaubio-0.4.6.patchset deleted file mode 100644 index 0bf275e86..000000000 --- a/media-libs/libaubio/patches/libaubio-0.4.6.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From 5690daf759b473b9d13b4547ef37adc2695cf524 Mon Sep 17 00:00:00 2001 -From: James Cowgill -Date: Sun, 25 Feb 2018 14:23:25 +0000 -Subject: Fix build with FFmpeg 4.0 - - -diff --git a/src/io/source_avcodec.c b/src/io/source_avcodec.c -index ccdce807..8197445c 100644 ---- a/src/io/source_avcodec.c -+++ b/src/io/source_avcodec.c -@@ -58,7 +58,11 @@ - #include "fmat.h" - #include "source_avcodec.h" - -+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(56, 56, 0) - #define AUBIO_AVCODEC_MAX_BUFFER_SIZE FF_MIN_BUFFER_SIZE -+#else -+#define AUBIO_AVCODEC_MAX_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE -+#endif - - struct _aubio_source_avcodec_t { - uint_t hop_size;