Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F10809491
D3554.id8769.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
9 KB
Referenced Files
None
Subscribers
None
D3554.id8769.diff
View Options
diff --git a/abi_used_libs b/abi_used_libs
--- a/abi_used_libs
+++ b/abi_used_libs
@@ -1,9 +1,9 @@
-libavcodec.so.57
-libavformat.so.57
-libavutil.so.55
+libavcodec.so.58
+libavformat.so.58
+libavutil.so.56
libc.so.6
libfftw3f.so.3
libm.so.6
libsamplerate.so.0
libsndfile.so.1
-libswresample.so.2
+libswresample.so.3
diff --git a/files/0001-Disable-creation-of-static-library.patch b/files/0001-Disable-creation-of-static-library.patch
deleted file mode 100644
--- a/files/0001-Disable-creation-of-static-library.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 70abdc76e38763dfe4d745e0cd562f473e1b176c Mon Sep 17 00:00:00 2001
-From: Michael Meinertzhagen <mmeinert@protonmail.com>
-Date: Wed, 19 Apr 2017 09:34:43 +0200
-Subject: [PATCH 1/1] Disable creation of static library
-
----
- src/wscript_build | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/src/wscript_build b/src/wscript_build
-index 0a7d72a..6786ff0 100644
---- a/src/wscript_build
-+++ b/src/wscript_build
-@@ -34,11 +34,6 @@ else:
- # linux, darwin, android, mingw, ...
- build_features = ['cstlib', 'cshlib']
-
--# also install static lib
--from waflib.Tools.c import cstlib
--from waflib.Tools.fc import fcstlib
--fcstlib.inst_to = cstlib.inst_to = '${LIBDIR}'
--
- for target in build_features:
- ctx(features = 'c ' + target,
- use = uselib + ['lib_objects'],
---
-2.12.2
-
diff --git a/files/ffmpeg4.patch b/files/ffmpeg4.patch
new file mode 100644
--- /dev/null
+++ b/files/ffmpeg4.patch
@@ -0,0 +1,28 @@
+From 5690daf759b473b9d13b4547ef37adc2695cf524 Mon Sep 17 00:00:00 2001
+From: James Cowgill <jcowgill@jcowgill.uk>
+Date: Sun, 25 Feb 2018 14:23:25 +0000
+Subject: [PATCH] Fix build with FFmpeg 4.0
+
+---
+ src/io/source_avcodec.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+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;
+--
+2.17.0
+
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,6 +1,6 @@
name : aubio
version : 0.4.6
-release : 4
+release : 5
source :
- https://aubio.org/pub/aubio-0.4.6.tar.bz2 : bdc73be1f007218d3ea6d2a503b38a217815a0e2ccc4ed441f6e850ed5d47cfb
license : GPL-3.0-or-later
@@ -14,6 +14,8 @@
- pkgconfig(samplerate)
- pkgconfig(sndfile)
setup : |
+ %patch -p1 < $pkgfiles/ffmpeg4.patch
+
%waf_configure --enable-fftw3f
build : |
%waf_build
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
<Source>
<Name>aubio</Name>
<Packager>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Packager>
<License>GPL-3.0-or-later</License>
<PartOf>multimedia.library</PartOf>
@@ -19,8 +19,14 @@
</Description>
<PartOf>multimedia.library</PartOf>
<Files>
- <Path fileType="executable">/usr/bin</Path>
- <Path fileType="library">/usr/lib64/lib*.so.*</Path>
+ <Path fileType="executable">/usr/bin/aubiomfcc</Path>
+ <Path fileType="executable">/usr/bin/aubionotes</Path>
+ <Path fileType="executable">/usr/bin/aubioonset</Path>
+ <Path fileType="executable">/usr/bin/aubiopitch</Path>
+ <Path fileType="executable">/usr/bin/aubioquiet</Path>
+ <Path fileType="executable">/usr/bin/aubiotrack</Path>
+ <Path fileType="library">/usr/lib64/libaubio.so.5</Path>
+ <Path fileType="library">/usr/lib64/libaubio.so.5.3.7</Path>
</Files>
</Package>
<Package>
@@ -30,22 +36,73 @@
</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="4">aubio</Dependency>
+ <Dependency release="5">aubio</Dependency>
</RuntimeDependencies>
<Files>
- <Path fileType="header">/usr/include/</Path>
- <Path fileType="library">/usr/lib64/lib*.a</Path>
- <Path fileType="library">/usr/lib64/lib*.so</Path>
- <Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
+ <Path fileType="header">/usr/include/aubio/aubio.h</Path>
+ <Path fileType="header">/usr/include/aubio/cvec.h</Path>
+ <Path fileType="header">/usr/include/aubio/fmat.h</Path>
+ <Path fileType="header">/usr/include/aubio/fvec.h</Path>
+ <Path fileType="header">/usr/include/aubio/io/audio_unit.h</Path>
+ <Path fileType="header">/usr/include/aubio/io/ioutils.h</Path>
+ <Path fileType="header">/usr/include/aubio/io/sink.h</Path>
+ <Path fileType="header">/usr/include/aubio/io/sink_apple_audio.h</Path>
+ <Path fileType="header">/usr/include/aubio/io/sink_sndfile.h</Path>
+ <Path fileType="header">/usr/include/aubio/io/sink_wavwrite.h</Path>
+ <Path fileType="header">/usr/include/aubio/io/source.h</Path>
+ <Path fileType="header">/usr/include/aubio/io/source_apple_audio.h</Path>
+ <Path fileType="header">/usr/include/aubio/io/source_avcodec.h</Path>
+ <Path fileType="header">/usr/include/aubio/io/source_sndfile.h</Path>
+ <Path fileType="header">/usr/include/aubio/io/source_wavread.h</Path>
+ <Path fileType="header">/usr/include/aubio/lvec.h</Path>
+ <Path fileType="header">/usr/include/aubio/mathutils.h</Path>
+ <Path fileType="header">/usr/include/aubio/musicutils.h</Path>
+ <Path fileType="header">/usr/include/aubio/notes/notes.h</Path>
+ <Path fileType="header">/usr/include/aubio/onset/onset.h</Path>
+ <Path fileType="header">/usr/include/aubio/onset/peakpicker.h</Path>
+ <Path fileType="header">/usr/include/aubio/pitch/pitch.h</Path>
+ <Path fileType="header">/usr/include/aubio/pitch/pitchfcomb.h</Path>
+ <Path fileType="header">/usr/include/aubio/pitch/pitchmcomb.h</Path>
+ <Path fileType="header">/usr/include/aubio/pitch/pitchschmitt.h</Path>
+ <Path fileType="header">/usr/include/aubio/pitch/pitchspecacf.h</Path>
+ <Path fileType="header">/usr/include/aubio/pitch/pitchyin.h</Path>
+ <Path fileType="header">/usr/include/aubio/pitch/pitchyinfast.h</Path>
+ <Path fileType="header">/usr/include/aubio/pitch/pitchyinfft.h</Path>
+ <Path fileType="header">/usr/include/aubio/spectral/awhitening.h</Path>
+ <Path fileType="header">/usr/include/aubio/spectral/fft.h</Path>
+ <Path fileType="header">/usr/include/aubio/spectral/filterbank.h</Path>
+ <Path fileType="header">/usr/include/aubio/spectral/filterbank_mel.h</Path>
+ <Path fileType="header">/usr/include/aubio/spectral/mfcc.h</Path>
+ <Path fileType="header">/usr/include/aubio/spectral/phasevoc.h</Path>
+ <Path fileType="header">/usr/include/aubio/spectral/specdesc.h</Path>
+ <Path fileType="header">/usr/include/aubio/spectral/tss.h</Path>
+ <Path fileType="header">/usr/include/aubio/synth/sampler.h</Path>
+ <Path fileType="header">/usr/include/aubio/synth/wavetable.h</Path>
+ <Path fileType="header">/usr/include/aubio/tempo/beattracking.h</Path>
+ <Path fileType="header">/usr/include/aubio/tempo/tempo.h</Path>
+ <Path fileType="header">/usr/include/aubio/temporal/a_weighting.h</Path>
+ <Path fileType="header">/usr/include/aubio/temporal/biquad.h</Path>
+ <Path fileType="header">/usr/include/aubio/temporal/c_weighting.h</Path>
+ <Path fileType="header">/usr/include/aubio/temporal/filter.h</Path>
+ <Path fileType="header">/usr/include/aubio/temporal/resampler.h</Path>
+ <Path fileType="header">/usr/include/aubio/types.h</Path>
+ <Path fileType="header">/usr/include/aubio/utils/hist.h</Path>
+ <Path fileType="header">/usr/include/aubio/utils/log.h</Path>
+ <Path fileType="header">/usr/include/aubio/utils/parameter.h</Path>
+ <Path fileType="header">/usr/include/aubio/utils/scale.h</Path>
+ <Path fileType="header">/usr/include/aubio/vecutils.h</Path>
+ <Path fileType="library">/usr/lib64/libaubio.a</Path>
+ <Path fileType="library">/usr/lib64/libaubio.so</Path>
+ <Path fileType="data">/usr/lib64/pkgconfig/aubio.pc</Path>
</Files>
</Package>
<History>
- <Update release="4">
- <Date>2018-04-20</Date>
+ <Update release="5">
+ <Date>2018-08-10</Date>
<Version>0.4.6</Version>
<Comment>Packaging update</Comment>
- <Name>Joey Riches</Name>
- <Email>josephriches@gmail.com</Email>
+ <Name>Pierre-Yves</Name>
+ <Email>pyu@riseup.net</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
May 31 2023, 1:41 PM (10 w, 2 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5818446
Default Alt Text
D3554.id8769.diff (9 KB)
Attached To
Mode
D3554: Patch aubio for ffmpeg 4.0.2
Attached
Detach File
Event Timeline
Log In to Comment