diff --git a/recipes-misc/recipes-multimedia/rubberband/files/0001-Do-not-try-to-install-librubberband-jni.so-no-java-p.patch b/recipes-misc/recipes-multimedia/rubberband/files/0001-Do-not-try-to-install-librubberband-jni.so-no-java-p.patch new file mode 100644 index 00000000..1dcbfa8b --- /dev/null +++ b/recipes-misc/recipes-multimedia/rubberband/files/0001-Do-not-try-to-install-librubberband-jni.so-no-java-p.patch @@ -0,0 +1,30 @@ +From 9a7c07d3db3cccb9fc6128c66f1c2e61bd07b3df Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 11 Aug 2018 01:16:35 +0200 +Subject: [PATCH] Do not try to install librubberband-jni.so - no java please +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + Makefile.in | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index 3a70a71..76f8552 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -183,7 +183,6 @@ install: all + cp $(DYNAMIC_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) + ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_ABI_VERSION) + ln -s $(LIBNAME)$(DYNAMIC_EXTENSION).$(DYNAMIC_FULL_VERSION) $(DESTDIR)$(INSTALL_LIBDIR)/$(LIBNAME)$(DYNAMIC_EXTENSION) +- cp -f $(JNI_TARGET) $(DESTDIR)$(INSTALL_LIBDIR)/$(JNINAME)$(DYNAMIC_EXTENSION) + cp $(VAMP_TARGET) $(DESTDIR)$(INSTALL_VAMPDIR) + cp vamp/vamp-rubberband.cat $(DESTDIR)$(INSTALL_VAMPDIR) + cp $(LADSPA_TARGET) $(DESTDIR)$(INSTALL_LADSPADIR) +-- +2.14.4 + diff --git a/recipes-misc/recipes-multimedia/rubberband/files/0001-replace-double-process_t.patch b/recipes-misc/recipes-multimedia/rubberband/files/0001-replace-double-process_t.patch deleted file mode 100644 index 74072ad1..00000000 --- a/recipes-misc/recipes-multimedia/rubberband/files/0001-replace-double-process_t.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 305ecda9ccc039e95129a17a46ebdc3a90e2c912 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 26 Dec 2016 21:09:09 +0100 -Subject: [PATCH] replace double->process_t -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -fixes builds for -DPROCESS_SAMPLE_TYPE=float - -Upstram-Status: Pending - -Signed-off-by: Andreas Müller ---- - src/StretcherProcess.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/StretcherProcess.cpp b/src/StretcherProcess.cpp -index 36b224a..801029a 100644 ---- a/src/StretcherProcess.cpp -+++ b/src/StretcherProcess.cpp -@@ -930,7 +930,7 @@ RubberBandStretcher::Impl::formantShiftChunk(size_t channel) - - v_scale(dblbuf, factor, cutoff); - -- double *spare = (double *)alloca((hs + 1) * sizeof(double)); -+ process_t *spare = (process_t *)alloca((hs + 1) * sizeof(process_t)); - cd.fft->forward(dblbuf, envelope, spare); - - v_exp(envelope, hs + 1); --- -2.5.5 - diff --git a/recipes-misc/recipes-multimedia/rubberband/files/0002-Fix-build-for-FFTW_SINGLE_ONLY.patch b/recipes-misc/recipes-multimedia/rubberband/files/0002-Fix-build-for-FFTW_SINGLE_ONLY.patch new file mode 100644 index 00000000..a3d7b7d2 --- /dev/null +++ b/recipes-misc/recipes-multimedia/rubberband/files/0002-Fix-build-for-FFTW_SINGLE_ONLY.patch @@ -0,0 +1,44 @@ +From 2f5e8aeb4ba05babfdb0093055bc521899d3d263 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 11 Aug 2018 14:32:54 +0200 +Subject: [PATCH] Fix build for FFTW_SINGLE_ONLY +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| src/dsp/FFT.cpp:1647: error: undefined reference to 'fftw_cleanup' +| src/dsp/FFT.cpp:1647: error: undefined reference to 'fftw_cleanup' +| src/dsp/FFT.cpp:1647: error: undefined reference to 'fftw_cleanup' + +Tested for FFTW_SINGLE_ONLY and FFTW_DOUBLE_ONLY + +Upstream-Status: Submitted + +Signed-off-by: Andreas Müller +--- + src/dsp/FFT.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/dsp/FFT.cpp b/src/dsp/FFT.cpp +index 6346713..336ffb1 100644 +--- a/src/dsp/FFT.cpp ++++ b/src/dsp/FFT.cpp +@@ -1568,6 +1568,7 @@ private: + #define fftwf_destroy_plan fftw_destroy_plan + #define fftwf_malloc fftw_malloc + #define fftwf_free fftw_free ++#define fftwf_cleanup fftw_cleanup + #define fftwf_execute fftw_execute + #define atan2f atan2 + #define sqrtf sqrt +@@ -1586,6 +1587,7 @@ private: + #define fftw_destroy_plan fftwf_destroy_plan + #define fftw_malloc fftwf_malloc + #define fftw_free fftwf_free ++#define fftw_cleanup fftwf_cleanup + #define fftw_execute fftwf_execute + #define atan2 atan2f + #define sqrt sqrtf +-- +2.14.4 + diff --git a/recipes-misc/recipes-multimedia/rubberband/files/0002-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch b/recipes-misc/recipes-multimedia/rubberband/files/0003-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch similarity index 68% rename from recipes-misc/recipes-multimedia/rubberband/files/0002-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch rename to recipes-misc/recipes-multimedia/rubberband/files/0003-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch index a2da5cb4..d6d352fa 100644 --- a/recipes-misc/recipes-multimedia/rubberband/files/0002-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch +++ b/recipes-misc/recipes-multimedia/rubberband/files/0003-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch @@ -15,22 +15,23 @@ Signed-off-by: Andreas Müller 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 413d075..31246ba 100644 +index 76f8552..c5a8e8f 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -1,6 +1,6 @@ - +@@ -2,7 +2,7 @@ + PREFIX := @prefix@ CXX := @CXX@ --CXXFLAGS := -DHAVE_LIBSAMPLERATE -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS -DUSE_PTHREADS -DNO_TIMING -DNDEBUG @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ -Irubberband -I. -Isrc $(OPTFLAGS) -+CXXFLAGS := -DHAVE_LIBSAMPLERATE -DHAVE_FFTW3 -DFFTW_SINGLE_ONLY -DNO_THREAD_CHECKS -DUSE_PTHREADS -DNO_TIMING -DNDEBUG @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ -Irubberband -I. -Isrc $(OPTFLAGS) + CC := @CC@ +-CXXFLAGS := -DHAVE_LIBSAMPLERATE -DHAVE_FFTW3 -DFFTW_DOUBLE_ONLY -DNO_THREAD_CHECKS -DUSE_PTHREADS -DNO_TIMING -DNDEBUG -I. -Isrc -Irubberband @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ $(OPTFLAGS) ++CXXFLAGS := -DHAVE_LIBSAMPLERATE -DHAVE_FFTW3 -DFFTW_SINGLE_ONLY -DNO_THREAD_CHECKS -DUSE_PTHREADS -DNO_TIMING -DNDEBUG -I. -Isrc -Irubberband @CXXFLAGS@ @SRC_CFLAGS@ @SNDFILE_CFLAGS@ @FFTW_CFLAGS@ @Vamp_CFLAGS@ $(OPTFLAGS) CFLAGS := @CFLAGS@ $(OPTFLAGS) LDFLAGS := @LDFLAGS@ -lpthread $(LDFLAGS) diff --git a/configure.ac b/configure.ac -index 1339294..5814055 100644 +index eef571b..900370f 100644 --- a/configure.ac +++ b/configure.ac -@@ -14,7 +14,7 @@ PKG_CHECK_MODULES([SNDFILE],[sndfile]) +@@ -15,7 +15,7 @@ PKG_CHECK_MODULES([SNDFILE],[sndfile]) AC_SUBST(SNDFILE_CFLAGS) AC_SUBST(SNDFILE_LIBS) @@ -40,5 +41,5 @@ index 1339294..5814055 100644 AC_SUBST(FFTW_LIBS) -- -2.5.5 +2.14.4 diff --git a/recipes-misc/recipes-multimedia/rubberband/rubberband_1.8.1.bb b/recipes-misc/recipes-multimedia/rubberband/rubberband_1.8.2.bb similarity index 69% rename from recipes-misc/recipes-multimedia/rubberband/rubberband_1.8.1.bb rename to recipes-misc/recipes-multimedia/rubberband/rubberband_1.8.2.bb index 59547f27..01cc9ac4 100644 --- a/recipes-misc/recipes-multimedia/rubberband/rubberband_1.8.1.bb +++ b/recipes-misc/recipes-multimedia/rubberband/rubberband_1.8.2.bb @@ -13,15 +13,16 @@ DEPENDS += " \ " # fftwf is neon accelerated -> force SINGLE precision -SINGLEPATCH = "${@bb.utils.contains('TUNE_FEATURES', 'neon', 'file://0002-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch', '', d)}" +SINGLEPATCH = "${@bb.utils.contains('TUNE_FEATURES', 'neon', 'file://0003-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch', '', d)}" SRC_URI = " \ http://code.breakfastquay.com/attachments/download/34/${BPN}-${PV}.tar.bz2 \ - file://0001-replace-double-process_t.patch \ + file://0001-Do-not-try-to-install-librubberband-jni.so-no-java-p.patch \ + file://0002-Fix-build-for-FFTW_SINGLE_ONLY.patch \ ${SINGLEPATCH} \ " -SRC_URI[md5sum] = "6c2b4e18a714bcc297d0db81a10f9348" -SRC_URI[sha256sum] = "ff0c63b0b5ce41f937a8a3bc560f27918c5fe0b90c6bc1cb70829b86ada82b75" +SRC_URI[md5sum] = "db0ecb4f1a647bdaf7e43ef2ca2f7883" +SRC_URI[sha256sum] = "86bed06b7115b64441d32ae53634fcc0539a50b9b648ef87443f936782f6c3ca" CPPFLAGS += "-ftree-vectorize -DPROCESS_SAMPLE_TYPE=float"