From 47c848ac5f716836ce80d14f7c9324fb9014efe4 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Tue, 4 Sep 2018 20:10:10 +0200 Subject: Add drumgizmo recipe and dependencies. --- recipes-multimedia/drumgizmo/drumgizmo-native.bb | 12 +++ recipes-multimedia/drumgizmo/drumgizmo.bb | 55 ++++++++++++++ recipes-multimedia/drumgizmo/drumgizmo.inc | 11 +++ .../0001-automake-enable-subdir-objects.patch | 31 ++++++++ .../drumgizmo/files/0002-Use-native-rcgen.patch | 31 ++++++++ .../drumgizmo/files/0003-no-ui-compile.patch | 26 +++++++ .../drumgizmo/files/0004-missing-include.patch | 12 +++ .../clthreads/0001-Align-Makefile.patch | 45 +++++++++++ recipes-multimedia/kokkinizita/clthreads_2.4.0.bb | 19 +++++ .../clxclient/0001-Align-Makefile.patch | 53 +++++++++++++ recipes-multimedia/kokkinizita/clxclient_3.9.0.bb | 28 +++++++ .../zita-convolver/0001-Align-Makefile.patch | 52 +++++++++++++ .../kokkinizita/zita-convolver_3.1.0.bb | 28 +++++++ .../zita-resampler/0001-Align-Makefiles.patch | 87 ++++++++++++++++++++++ .../kokkinizita/zita-resampler_1.6.0.bb | 41 ++++++++++ 15 files changed, 531 insertions(+) create mode 100644 recipes-multimedia/drumgizmo/drumgizmo-native.bb create mode 100644 recipes-multimedia/drumgizmo/drumgizmo.bb create mode 100644 recipes-multimedia/drumgizmo/drumgizmo.inc create mode 100644 recipes-multimedia/drumgizmo/files/0001-automake-enable-subdir-objects.patch create mode 100644 recipes-multimedia/drumgizmo/files/0002-Use-native-rcgen.patch create mode 100644 recipes-multimedia/drumgizmo/files/0003-no-ui-compile.patch create mode 100644 recipes-multimedia/drumgizmo/files/0004-missing-include.patch create mode 100644 recipes-multimedia/kokkinizita/clthreads/0001-Align-Makefile.patch create mode 100644 recipes-multimedia/kokkinizita/clthreads_2.4.0.bb create mode 100644 recipes-multimedia/kokkinizita/clxclient/0001-Align-Makefile.patch create mode 100644 recipes-multimedia/kokkinizita/clxclient_3.9.0.bb create mode 100644 recipes-multimedia/kokkinizita/zita-convolver/0001-Align-Makefile.patch create mode 100644 recipes-multimedia/kokkinizita/zita-convolver_3.1.0.bb create mode 100644 recipes-multimedia/kokkinizita/zita-resampler/0001-Align-Makefiles.patch create mode 100644 recipes-multimedia/kokkinizita/zita-resampler_1.6.0.bb diff --git a/recipes-multimedia/drumgizmo/drumgizmo-native.bb b/recipes-multimedia/drumgizmo/drumgizmo-native.bb new file mode 100644 index 0000000..5539140 --- /dev/null +++ b/recipes-multimedia/drumgizmo/drumgizmo-native.bb @@ -0,0 +1,12 @@ +require ${BPN}.inc + +inherit native + +do_compile() { + ${CXX} ${CXXFLAGS} -o ${S}/drumgizmo-rcgen ${S}/plugingui/rcgen.cc $(LDFLAGS) +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${S}/drumgizmo-rcgen ${D}${bindir} +} diff --git a/recipes-multimedia/drumgizmo/drumgizmo.bb b/recipes-multimedia/drumgizmo/drumgizmo.bb new file mode 100644 index 0000000..0dca084 --- /dev/null +++ b/recipes-multimedia/drumgizmo/drumgizmo.bb @@ -0,0 +1,55 @@ +require ${BPN}.inc + +inherit autotools-brokensep pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURE = "x11" + +#DEPENDS += " \ +# ${BPN}-native \ +# libx11 \ +# libxext \ +# lv2 \ +# libsmf \ +# alsa-lib \ +# libsndfile1 \ +# libsamplerate0 \ +# zita-resampler \ +# jack \ +#" + +DEPENDS += " \ + ${BPN}-native \ + alsa-lib \ + libsndfile1 \ + zita-resampler \ + expat \ +" + +SRC_URI += " \ + file://0001-automake-enable-subdir-objects.patch \ + file://0002-Use-native-rcgen.patch \ + file://0003-no-ui-compile.patch \ + file://0004-missing-include.patch \ +" + +# --disable-editor: sigh - editor requires Qt4 +EXTRA_OECONF = " \ + --disable-gui \ + --disable-lv2 \ + --disable-vst \ + --enable-cli \ + --without-debug \ + --disable-sse \ + --disable-input-dummy \ + --enable-input-test \ + --disable-input-jackmidi \ + --disable-input-midifile \ + --disable-input-oss \ + --disable-output-dummy \ + --disable-output-jackaudio \ + --enable-output-alsa \ + --disable-output-wavfile \ + --disable-output-oss \ +" + +FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-multimedia/drumgizmo/drumgizmo.inc b/recipes-multimedia/drumgizmo/drumgizmo.inc new file mode 100644 index 0000000..3308a80 --- /dev/null +++ b/recipes-multimedia/drumgizmo/drumgizmo.inc @@ -0,0 +1,11 @@ +SUMMARY = "DrumGizmo is drum plugin and stand-alone application" +HOMEPAGE = "https://www.drumgizmo.org" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6a600fd5e1d9cbde2d983680233ad02" + +SRC_URI = " \ + http://www.drumgizmo.org/releases/${BPN}-${PV}/${BPN}-${PV}.tar.gz \ +" +SRC_URI[md5sum] = "86e4239f1eb59e8b77c7d13edc24f93b" +SRC_URI[sha256sum] = "8f76b58785186ac02337b9248003ec1a459a801d3003619fd32fde976c307947" +PV = "0.9.16" diff --git a/recipes-multimedia/drumgizmo/files/0001-automake-enable-subdir-objects.patch b/recipes-multimedia/drumgizmo/files/0001-automake-enable-subdir-objects.patch new file mode 100644 index 0000000..08cfb0d --- /dev/null +++ b/recipes-multimedia/drumgizmo/files/0001-automake-enable-subdir-objects.patch @@ -0,0 +1,31 @@ +From c9eec598b2f8b1435a2229dd5c49a9e15c6bc2ac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 22 Feb 2018 00:13:04 +0100 +Subject: [PATCH] automake: enable subdir-objects +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 0562059..13a7ffc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,7 +3,7 @@ + AC_INIT([drumgizmo], m4_esyscmd([cat version.h | cut -d'"' -f2 | xargs echo -n]))dnl" + + AC_CONFIG_SRCDIR([src/drumgizmo.cc]) +-AM_INIT_AUTOMAKE ++AM_INIT_AUTOMAKE(subdir-objects) + + AC_PROG_CXX + AC_PROG_OBJC +-- +2.14.3 + diff --git a/recipes-multimedia/drumgizmo/files/0002-Use-native-rcgen.patch b/recipes-multimedia/drumgizmo/files/0002-Use-native-rcgen.patch new file mode 100644 index 0000000..05bec80 --- /dev/null +++ b/recipes-multimedia/drumgizmo/files/0002-Use-native-rcgen.patch @@ -0,0 +1,31 @@ +From 766c8c4aa6f6e8743234b93a760a89480bddd7fd Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 28 May 2018 23:08:07 +0200 +Subject: [PATCH] Use native rcgen +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [cross specific] + +Signed-off-by: Andreas Müller +--- + plugingui/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plugingui/Makefile.am b/plugingui/Makefile.am +index dd36783..ca30e84 100644 +--- a/plugingui/Makefile.am ++++ b/plugingui/Makefile.am +@@ -28,7 +28,7 @@ RES = \ + ../COPYING + + resource_data.cc : rcgen $(RES) +- ./rcgen $(RES) > resource_data.cc ++ drumgizmo-rcgen $(RES) > resource_data.cc + + libdggui_la_CPPFLAGS = \ + $(GUI_CPPFLAGS) \ +-- +2.14.3 + diff --git a/recipes-multimedia/drumgizmo/files/0003-no-ui-compile.patch b/recipes-multimedia/drumgizmo/files/0003-no-ui-compile.patch new file mode 100644 index 0000000..6c11437 --- /dev/null +++ b/recipes-multimedia/drumgizmo/files/0003-no-ui-compile.patch @@ -0,0 +1,26 @@ +diff --git a/Makefile.am b/Makefile.am +index f39a2d8..d1a08f2 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,6 @@ + AUTOMAKE_OPTIONS = gnu +-SUBDIRS = tools include src plugingui plugin drumgizmo man test +-DISTDIRS = tools include src plugingui plugin drumgizmo man test ++SUBDIRS = tools include src plugin drumgizmo man ++DISTDIRS = tools include src plugin drumgizmo man + + EXTRA_DIST = \ + version.h \ +diff --git a/configure.ac b/configure.ac +index 6b4593c..591d800 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -188,7 +188,7 @@ AS_IF( + GUI_CPPFLAGS="-DUI_PUGL -DPUGL_HAVE_GL" + GUI_LIBS="-framework OpenGL -framework Cocoa"], + +- AC_MSG_ERROR([*** No GUI backend has been selected ***]) ++ AC_MSG_WARN([*** No GUI backend has been selected ***]) + ) + + AC_SUBST(GUI_CPPFLAGS) diff --git a/recipes-multimedia/drumgizmo/files/0004-missing-include.patch b/recipes-multimedia/drumgizmo/files/0004-missing-include.patch new file mode 100644 index 0000000..b4631a2 --- /dev/null +++ b/recipes-multimedia/drumgizmo/files/0004-missing-include.patch @@ -0,0 +1,12 @@ +diff --git a/drumgizmo/drumgizmoc.cc b/drumgizmo/drumgizmoc.cc +index 0c3e190..91de704 100644 +--- a/drumgizmo/drumgizmoc.cc ++++ b/drumgizmo/drumgizmoc.cc +@@ -31,6 +31,7 @@ + + #include + #include ++#include + #include + #include + #include diff --git a/recipes-multimedia/kokkinizita/clthreads/0001-Align-Makefile.patch b/recipes-multimedia/kokkinizita/clthreads/0001-Align-Makefile.patch new file mode 100644 index 0000000..174e256 --- /dev/null +++ b/recipes-multimedia/kokkinizita/clthreads/0001-Align-Makefile.patch @@ -0,0 +1,45 @@ +From 566cc7e03386a012b0e63b4cfe19632685070957 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 2 Aug 2017 16:18:09 +0200 +Subject: [PATCH] Align Makefile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* remove absolut paths +* don't hardcode g++ + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + Makefile | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 86d417e..f56044b 100644 +--- a/Makefile ++++ b/Makefile +@@ -42,14 +42,14 @@ CLTHREADS_H = clthreads.h + + + $(CLTHREADS_MIN): $(CLTHREADS_O) +- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP) ++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLTHREADS_MAJ) -o $(CLTHREADS_MIN) $(CLTHREADS_O) $(CLTHREADS_DEP) + + + install: $(CLTHREADS_MIN) +- /usr/bin/install -d $(PREFIX)/$(LIBDIR) +- /usr/bin/install -m 644 $(CLTHREADS_H) $(PREFIX)/include +- /usr/bin/install -m 755 $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR) +- /sbin/ldconfig -n $(PREFIX)/$(LIBDIR) ++ install -d $(PREFIX)/$(LIBDIR) ++ install -m 644 $(CLTHREADS_H) $(PREFIX)/include ++ install -m 755 $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR) ++ ldconfig -n $(PREFIX)/$(LIBDIR) + ln -sf $(CLTHREADS_MIN) $(PREFIX)/$(LIBDIR)/$(CLTHREADS_SO) + + +-- +2.9.4 + diff --git a/recipes-multimedia/kokkinizita/clthreads_2.4.0.bb b/recipes-multimedia/kokkinizita/clthreads_2.4.0.bb new file mode 100644 index 0000000..e2e4f2b --- /dev/null +++ b/recipes-multimedia/kokkinizita/clthreads_2.4.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "C++ wrapper library around the POSIX threads API" +HOMEPAGE = "http://kokkinizita.linuxaudio.org/linuxaudio/" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +DEPENDS = "ldconfig-native" + +SRC_URI = " \ + http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${BPN}-${PV}.tar.bz2 \ + file://0001-Align-Makefile.patch \ +" +SRC_URI[md5sum] = "90b650f1f5c9f39f4d77f73aca3c53be" +SRC_URI[sha256sum] = "a69fd566af24b85a10c5ecd957a85b7f5eb1c56995d2b999219b52f353ea1de9" + + +do_install() { + install -d "${D}${prefix}/include" + oe_runmake 'PREFIX=${D}${prefix}' 'LIBDIR=${baselib}' install +} diff --git a/recipes-multimedia/kokkinizita/clxclient/0001-Align-Makefile.patch b/recipes-multimedia/kokkinizita/clxclient/0001-Align-Makefile.patch new file mode 100644 index 0000000..3bed5aa --- /dev/null +++ b/recipes-multimedia/kokkinizita/clxclient/0001-Align-Makefile.patch @@ -0,0 +1,53 @@ +From 5b95fca0be36e0e57f65975cf5b295e1937bbbf4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 2 Aug 2017 21:08:36 +0200 +Subject: [PATCH] Align Makefile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* don't hardcode g++ +* make ldconfig work on installed directory only +* use pkgconfig to find freetype2 +* do not add host path to compiler/linker + +Signed-off-by: Andreas Müller +--- + Makefile | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile b/Makefile +index 2b29cbf..0811df9 100644 +--- a/Makefile ++++ b/Makefile +@@ -31,8 +31,8 @@ MINVERS = 9.0 + VERSION = $(MAJVERS).$(MINVERS) + + +-CPPFLAGS += -Wall -I. -I/usr/X11R6/include `freetype-config --cflags` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 +-LDFLAGS += -L/usr/X11R6/$(LIBDIR) `freetype-config --libs` ++CPPFLAGS += -Wall -I. `pkg-config --cflags freetype2` -fpic -DVERSION=\"$(VERSION)\" -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -O2 ++LDFLAGS += `pkg-config --libs freetype2` + LDLIBS += + + +@@ -46,14 +46,14 @@ CLXCLIENT_H = clxclient.h + + + $(CLXCLIENT_MIN): $(CLXCLIENT_O) +- g++ -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) ++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(CLXCLIENT_MAJ) -o $(CLXCLIENT_MIN) $(CLXCLIENT_O) $(CLXCLIENT_DEP) + + + install: $(CLXCLIENT_MIN) + install -d $(PREFIX)/$(LIBDIR) + install -m 644 $(CLXCLIENT_H) $(PREFIX)/include + install -m 755 $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR) +- ldconfig ++ ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR) + ln -sf $(CLXCLIENT_MIN) $(PREFIX)/$(LIBDIR)/$(CLXCLIENT_SO) + + +-- +2.14.3 + diff --git a/recipes-multimedia/kokkinizita/clxclient_3.9.0.bb b/recipes-multimedia/kokkinizita/clxclient_3.9.0.bb new file mode 100644 index 0000000..975677b --- /dev/null +++ b/recipes-multimedia/kokkinizita/clxclient_3.9.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "C++ wrapper library around the X Window System API" +HOMEPAGE = "http://kokkinizita.linuxaudio.org/linuxaudio/" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" + +inherit pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS = " \ + ldconfig-native \ + clthreads \ + freetype \ + libxft \ +" + +SRC_URI = " \ + http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${BPN}-${PV}.tar.bz2 \ + file://0001-Align-Makefile.patch \ +" +SRC_URI[md5sum] = "bd6df73f688c9be1b3afef58283d7ef5" +SRC_URI[sha256sum] = "80da572961ff0c635889986ae9b42c97a4aede2d966095aba7f4119360ee8792" + + +do_install() { + install -d "${D}${prefix}/include" + oe_runmake 'PREFIX=${D}${prefix}' 'LIBDIR=${baselib}' install +} diff --git a/recipes-multimedia/kokkinizita/zita-convolver/0001-Align-Makefile.patch b/recipes-multimedia/kokkinizita/zita-convolver/0001-Align-Makefile.patch new file mode 100644 index 0000000..dc09575 --- /dev/null +++ b/recipes-multimedia/kokkinizita/zita-convolver/0001-Align-Makefile.patch @@ -0,0 +1,52 @@ +From 77fd68629356acc5747d06814aa4a86ab7f8b31a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 2 Aug 2017 18:38:51 +0200 +Subject: [PATCH] Align Makefile +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* don't hardcode g++ +* remove -march=native from CXXFLAGS +* make ldconfig work on installed directory only + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + libs/Makefile | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/libs/Makefile b/libs/Makefile +index d1bfc37..7189d0e 100644 +--- a/libs/Makefile ++++ b/libs/Makefile +@@ -33,7 +33,6 @@ VERSION = $(MAJVERS).$(MINVERS) + CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS -DENABLE_VECTOR_MODE + CXXFLAGS += -fPIC -Wall + CXXFLAGS += -ffast-math -funroll-loops -O3 +-CXXFLAGS += -march=native + LDLFAGS += + LDLIBS += + +@@ -47,7 +46,7 @@ ZITA-CONVOLVER_H = zita-convolver.h + + + $(ZITA-CONVOLVER_MIN): $(ZITA-CONVOLVER_O) +- g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP) ++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-CONVOLVER_MAJ) -o $(ZITA-CONVOLVER_MIN) $(ZITA-CONVOLVER_O) $(ZITA-CONVOLVER_DEP) + + + install: $(ZITA-CONVOLVER_MIN) +@@ -56,7 +55,7 @@ install: $(ZITA-CONVOLVER_MIN) + install -m 644 $(ZITA-CONVOLVER_H) $(DESTDIR)$(PREFIX)/include + install -m 755 $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR) + ln -sf $(ZITA-CONVOLVER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-CONVOLVER_SO) +- ldconfig ++ ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR) + + clean: + /bin/rm -f *~ *.o *.a *.d *.so.* +-- +2.9.4 + diff --git a/recipes-multimedia/kokkinizita/zita-convolver_3.1.0.bb b/recipes-multimedia/kokkinizita/zita-convolver_3.1.0.bb new file mode 100644 index 0000000..91d7c15 --- /dev/null +++ b/recipes-multimedia/kokkinizita/zita-convolver_3.1.0.bb @@ -0,0 +1,28 @@ +SUMMARY = "A fast, partitioned convolution engine library" +HOMEPAGE = "http://kokkinizita.linuxaudio.org/linuxaudio/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit manpages + +DEPENDS = " \ + ldconfig-native \ + fftw \ +" + +SRC_URI = " \ + http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${BPN}-${PV}.tar.bz2 \ + file://0001-Align-Makefile.patch \ +" +SRC_URI[md5sum] = "7e264d0fb0d8ea277cdb4e33d764c68a" +SRC_URI[sha256sum] = "bf7e93b582168b78d40666974460ad8142c2fa3c3412e327e4ab960b3fb31993" + +do_compile() { + cd ${S}/libs + base_do_compile +} + +do_install() { + cd ${S}/libs + oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' 'LIBDIR=${baselib}' install +} diff --git a/recipes-multimedia/kokkinizita/zita-resampler/0001-Align-Makefiles.patch b/recipes-multimedia/kokkinizita/zita-resampler/0001-Align-Makefiles.patch new file mode 100644 index 0000000..09f7bfe --- /dev/null +++ b/recipes-multimedia/kokkinizita/zita-resampler/0001-Align-Makefiles.patch @@ -0,0 +1,87 @@ +From 23dd312b270330a0df18b229b9f68bc74c72934b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 2 Aug 2017 17:34:18 +0200 +Subject: [PATCH] Align Makefiles +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* don't hardcode g++ +* remove -march=native from CXXFLAGS +* make ldconfig work on installed directory only +* do not add host path to link flags + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + apps/Makefile | 6 ++---- + libs/Makefile | 5 ++--- + 2 files changed, 4 insertions(+), 7 deletions(-) + +diff --git a/apps/Makefile b/apps/Makefile +index f009937..9329b25 100644 +--- a/apps/Makefile ++++ b/apps/Makefile +@@ -24,10 +24,8 @@ LIBDIR = lib$(SUFFIX) + DISTDIR = zresample-$(VERSION) + VERSION = 1.6.0 + MANDIR = /usr/share/man/man1 +-LDFLAGS += -L$(PREFIX)/$(LIBDIR) + CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" + CXXFLAGS += -O3 -ffast-math -Wall +-CXXFLAGS += -march=native + + + all: zresample zretune zresample.1.gz zretune.1.gz +@@ -36,7 +34,7 @@ all: zresample zretune zresample.1.gz zretune.1.gz + ZRESAMPLE_O = zresample.o audiofile.o dither.o + zresample: LDLIBS += -lzita-resampler -lsndfile -lrt + zresample: $(ZRESAMPLE_O) +- g++ $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS) ++ $(CXX) $(LDFLAGS) -o $@ $(ZRESAMPLE_O) $(LDLIBS) + $(ZRESAMPLE_O): + -include $(ZRESAMPLE_O:%.o=%.d) + +@@ -44,7 +42,7 @@ $(ZRESAMPLE_O): + ZRETUNE_O = zretune.o audiofile.o dither.o + zretune: LDLIBS += -lzita-resampler -lsndfile -lrt + zretune: $(ZRETUNE_O) +- g++ $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS) ++ $(CXX) $(LDFLAGS) -o $@ $(ZRETUNE_O) $(LDLIBS) + $(ZRETUNE_O): + -include $(ZRETUNE_O:%.o=%.d) + +diff --git a/libs/Makefile b/libs/Makefile +index 15b0471..575e670 100644 +--- a/libs/Makefile ++++ b/libs/Makefile +@@ -32,7 +32,6 @@ DISTDIR = zita-resampler-$(VERSION) + + CPPFLAGS += -I. -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS + CXXFLAGS += -Wall -fPIC -O2 -ffast-math +-CXXFLAGS += -march=native + LDFLAGS += + LDLIBS += + +@@ -47,7 +46,7 @@ ZITA-RESAMPLER_H = zita-resampler/resampler.h zita-resampler/resampler-table.h \ + + + $(ZITA-RESAMPLER_MIN): $(ZITA-RESAMPLER_O) +- g++ -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP) ++ $(CXX) -shared $(LDFLAGS) -Wl,-soname,$(ZITA-RESAMPLER_MAJ) -o $(ZITA-RESAMPLER_MIN) $(ZITA-RESAMPLER_O) $(ZITA-RESAMPLER_DEP) + + $(ZITA-RESAMPLER_O): $(ZITA-RESAMPLER_H) + +@@ -58,7 +57,7 @@ install: $(ZITA-RESAMPLER_MIN) + install -m 644 $(ZITA-RESAMPLER_H) $(DESTDIR)$(PREFIX)/include/zita-resampler + install -m 644 $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR) + ln -sf $(ZITA-RESAMPLER_MIN) $(DESTDIR)$(PREFIX)/$(LIBDIR)/$(ZITA-RESAMPLER_SO) +- ldconfig ++ ldconfig -n $(DESTDIR)$(PREFIX)/$(LIBDIR) + + uninstall: + /bin/rm -rf $(DESTDIR)$(PREFIX)/include/zita-resampler +-- +2.14.3 + diff --git a/recipes-multimedia/kokkinizita/zita-resampler_1.6.0.bb b/recipes-multimedia/kokkinizita/zita-resampler_1.6.0.bb new file mode 100644 index 0000000..8bda076 --- /dev/null +++ b/recipes-multimedia/kokkinizita/zita-resampler_1.6.0.bb @@ -0,0 +1,41 @@ +SUMMARY = "A C++ library for resampling audio signals" +HOMEPAGE = "http://kokkinizita.linuxaudio.org/linuxaudio/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit manpages + +DEPENDS += " \ + ldconfig-native \ + libsndfile1 \ +" + +SRC_URI = " \ + http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${BPN}-${PV}.tar.bz2 \ + file://0001-Align-Makefiles.patch \ +" +SRC_URI[md5sum] = "7b5ddc42f210985b29c8769111217e4c" +SRC_URI[sha256sum] = "10888d76299d8072990939be45d6fc5865f5a45d766d7690819c5899d2a588f0" + +# for builing apps +CXXFLAGS+=" -I../libs" +LDFLAGS+=" -L../libs" + +do_compile() { + cd ${S}/libs + base_do_compile + + # create lib link for building apps + ln -sf lib${BPN}.so.${PV} lib${BPN}.so + + cd ${S}/apps + base_do_compile +} + +do_install() { + cd ${S}/libs + oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' 'LIBDIR=${baselib}' install + + cd ${S}/apps + oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' 'LIBDIR=${baselib}' install +} -- cgit v1.2.3