From 074f80abdfa044402bb779ed5e25070a486c5fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 21 Apr 2021 22:02:00 +0200 Subject: [PATCH 1/7] ntk: upgrade 1.3.1000 -> 1.3.1001 / change repo - old is gone MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-graphics/ntk/ntk_git.bb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/recipes-graphics/ntk/ntk_git.bb b/recipes-graphics/ntk/ntk_git.bb index 26d5a93..fb0fe80 100644 --- a/recipes-graphics/ntk/ntk_git.bb +++ b/recipes-graphics/ntk/ntk_git.bb @@ -4,14 +4,13 @@ LICENSE = "LGPLv2 & FLTK" LIC_FILES_CHKSUM = "file://COPYING;md5=f6b26344a24a941a01a5b0826e80b5ca" SRC_URI = " \ - git://github.com/original-male/${BPN}.git \ + git://github.com/falkTX/ntk.git \ file://0001-wscript-check-compile-instead-of-tun-check-datatype-.patch \ file://0002-Fix-build-for-python3-only-environments.patch \ " -SRCREV = "dae177189b12f74ea01ac2389b76326c06d9be78" +SRCREV = "720d8d33200ebd030df700c6c7a5a9cdf4581c03" S = "${WORKDIR}/git" -PV_LAST_RELEASE = "1.3.1000" -PV = "${PV_LAST_RELEASE}+git${SRCPV}" +PV = "1.3.1001" inherit waf pkgconfig @@ -30,11 +29,11 @@ WAF_EXTRA_CONF = " \ do_install_append() { rm ${D}${libdir}/libntk.a rm ${D}${libdir}/libntk.a.1 - mv ${D}${libdir}/libntk.a.${PV_LAST_RELEASE} ${D}${libdir}/libntk.a + mv ${D}${libdir}/libntk.a.${PV} ${D}${libdir}/libntk.a rm ${D}${libdir}/libntk_images.a rm ${D}${libdir}/libntk_images.a.1 - mv ${D}${libdir}/libntk_images.a.${PV_LAST_RELEASE} ${D}${libdir}/libntk_images.a + mv ${D}${libdir}/libntk_images.a.${PV} ${D}${libdir}/libntk_images.a } BBCLASSEXTEND = "native" From 8d76345c93c148b9159457d8f8f5ff8adbf3d1fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Wed, 21 Apr 2021 23:59:12 +0200 Subject: [PATCH 2/7] supercollider: upgrade 3.11.1 -> 3.11.2 / change branch to develop to fix fetch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/supercollider/supercollider.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-musicians/supercollider/supercollider.bb b/recipes-musicians/supercollider/supercollider.bb index 71ab3f4..5347508 100644 --- a/recipes-musicians/supercollider/supercollider.bb +++ b/recipes-musicians/supercollider/supercollider.bb @@ -3,9 +3,9 @@ HOMEPAGE = "http://supercollider.github.io/" LICENSE = "GPL-3.0" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "gitsm://github.com/supercollider/supercollider.git" +SRC_URI = "gitsm://github.com/supercollider/supercollider.git;branch=develop" SRCREV = "206f24d865efa37264a0b42594f536ed834c1493" -PV = "3.11.1" +PV = "3.11.2" S = "${WORKDIR}/git" inherit cmake_qt5 features_check mime mime-xdg From 42bd4e27f2ed54159dcb54df3ed68223fb84ec4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 22 Apr 2021 00:10:36 +0200 Subject: [PATCH 3/7] mixxx: fetch main branch - master is gone MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/mixxx/mixxx_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-musicians/mixxx/mixxx_git.bb b/recipes-musicians/mixxx/mixxx_git.bb index 37ab21c..4237e5d 100644 --- a/recipes-musicians/mixxx/mixxx_git.bb +++ b/recipes-musicians/mixxx/mixxx_git.bb @@ -40,7 +40,7 @@ DEPENDS += " \ # gperftools SRC_URI = " \ - git://github.com/mixxxdj/${BPN}.git \ + git://github.com/mixxxdj/${BPN}.git;branch=main \ file://0001-do-not-check-for-known-machine-types.patch \ file://0002-force-using-system-soundtouch.patch \ file://0003-align-path-of-qt-build-tools-to-our-needs.patch \ From a268e9c52a543a9603e09556a5f5efe426132a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 22 Apr 2021 00:32:46 +0200 Subject: [PATCH 4/7] non: remove - sources are gone MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/non/non.bb | 58 ------------------- .../packagegroups/musicians-world.bb | 1 - 2 files changed, 59 deletions(-) delete mode 100644 recipes-musicians/non/non.bb diff --git a/recipes-musicians/non/non.bb b/recipes-musicians/non/non.bb deleted file mode 100644 index 7a38527..0000000 --- a/recipes-musicians/non/non.bb +++ /dev/null @@ -1,58 +0,0 @@ -SUMMARY = "Lightweight and modular DAW" -HOMEPAGE = "http://non.tuxfamily.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS += " \ - ntk-native \ - ladspa-sdk \ - ntk \ - jack \ - liblo \ - libsndfile1 \ - lrdf \ - libsigc++-2.0 \ -" - -inherit waf pkgconfig features_check gtk-icon-cache - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "git://git.tuxfamily.org/gitroot/non/non.git" -SRCREV = "d958df0486c7397c243f5ac36bf4acbc461a1e50" -S = "${WORKDIR}/git" -PV = "1.2.0+git${SRCPV}" - -NON_SIMD ?= "--disable-sse" - -EXTRA_OECONF = " \ - ${NON_SIMD} \ - --bindir=${bindir} \ - --libdir=${libdir} \ -" - -python waf_preconfigure() { -} - -do_configure_prepend() { - for pfile in `grep -rl '/usr/bin/env python$' ${S}`; do - sed -i 's:/usr/bin/env python:/usr/bin/env python3:' $pfile - done -} - -FILES_${PN} += "${datadir}/non-sequencer" - -PACKAGES =+ "${PN}-session-manager" -FILES_${PN}-session-manager = " \ - ${datadir}/applications/non-session-manager.desktop \ - ${datadir}/icons/hicolor/*/apps/non-session-manager.png \ - ${datadir}/pixmaps/non-session-manager \ - ${bindir}/jackpatch \ - ${bindir}/non-session-manager \ - ${bindir}/nsm-proxy \ - ${bindir}/nsm-proxy-gui \ - ${bindir}/nsmd \ -" - -RCONFLICTS_${PN}-session-manager = "new-session-manager" -RREPLACES_${PN}-session-manager = "new-session-manager" diff --git a/recipes-support/packagegroups/musicians-world.bb b/recipes-support/packagegroups/musicians-world.bb index 5a886a0..d4eb86f 100644 --- a/recipes-support/packagegroups/musicians-world.bb +++ b/recipes-support/packagegroups/musicians-world.bb @@ -105,7 +105,6 @@ RDEPENDS_${PN} += " \ nekobee \ ninjas2-standalone ninjas2-lv2 ninjas2-vst \ noise-repellent \ - non \ \ \ arty-fx \ From dcc74f936cd261907dbe57af73cf88f7bebaff2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Thu, 22 Apr 2021 01:05:20 +0200 Subject: [PATCH 5/7] yoshimi: upgrade 2.0 -> 2.0.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/yoshimi/yoshimi.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-musicians/yoshimi/yoshimi.bb b/recipes-musicians/yoshimi/yoshimi.bb index 6803602..2307215 100644 --- a/recipes-musicians/yoshimi/yoshimi.bb +++ b/recipes-musicians/yoshimi/yoshimi.bb @@ -21,9 +21,9 @@ DEPENDS += " \ libxft \ " -PV = "2.0" +PV = "2.0.1" SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/2.0/${BPN}-${PV}.tar.bz2" -SRC_URI[sha256sum] = "d5d93cda9687dd3c8ea93ce306f6c4ab323ee2d34898d7cff51773537e1f4b4d" +SRC_URI[sha256sum] = "d33ec26b0e631d31afc0906b26fa507dc2a485c4658840146e2ccb4c3824eb38" OECMAKE_SOURCEPATH = "${S}/src" From 1579bc7b7f9dc14e786b50fade9dd17e85c85f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 24 Apr 2021 22:32:04 +0200 Subject: [PATCH 6/7] drumkv1: Build with CMake MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/rncbc/drumkv1.bb | 13 ++------ .../files/0002-Avoid-stripping-CMake.patch | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+), 11 deletions(-) create mode 100644 recipes-musicians/rncbc/files/0002-Avoid-stripping-CMake.patch diff --git a/recipes-musicians/rncbc/drumkv1.bb b/recipes-musicians/rncbc/drumkv1.bb index 0c545be..412df9b 100644 --- a/recipes-musicians/rncbc/drumkv1.bb +++ b/recipes-musicians/rncbc/drumkv1.bb @@ -12,27 +12,18 @@ DEPENDS += " \ hydrogen \ " -inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime +inherit cmake_qt5 gtk-icon-cache mime SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ + file://0002-Avoid-stripping-CMake.patch \ git://github.com/TuriSc/hydrogen2drumkv1.py.git;name=hydrogen2drumkv1;destsuffix=hydrogen2drumkv1 \ - file://0001-find-native-qt-build-tools-by-configure-options-auto-qt6.patch \ - file://0002-Avoid-stripping.patch \ " PV = "0.9.21" SRC_URI[sha256sum] = "35952d6ed82cde9c0d8b516addd2e2f376b94b6d777f2b2a6ffd3978b49da7fa" SRCREV_hydrogen2drumkv1 = "4ca8af8f1433dce33f675ae68e95429c9eed084e" -EXTRA_OECONF = " \ - --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \ - --with-moc=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/moc \ - --with-uic=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/uic \ - --with-lupdate=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lupdate \ - --with-lrelease=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/lrelease \ -" - do_install_append() { install -d ${D}${datadir}/${BPN}/presets # convert hydrogen drumkits to drumkv1 diff --git a/recipes-musicians/rncbc/files/0002-Avoid-stripping-CMake.patch b/recipes-musicians/rncbc/files/0002-Avoid-stripping-CMake.patch new file mode 100644 index 0000000..1f8d660 --- /dev/null +++ b/recipes-musicians/rncbc/files/0002-Avoid-stripping-CMake.patch @@ -0,0 +1,33 @@ +From 7e4c32eebb1b074c4f3c2916a43340985bdbfea2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 24 Apr 2021 21:50:53 +0200 +Subject: [PATCH] Avoid stripping - CMake +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + src/CMakeLists.txt | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 31ce7b8..0cd903a 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -173,12 +173,6 @@ if (CONFIG_LIBLO) + endif () + + +-if (UNIX AND NOT APPLE AND NOT CONFIG_DEBUG) +- add_custom_command(TARGET ${PROJECT_NAME}_lv2 POST_BUILD +- COMMAND strip lib${PROJECT_NAME}_lv2.so) +- add_custom_command(TARGET ${PROJECT_NAME}_jack POST_BUILD +- COMMAND strip ${PROJECT_NAME}_jack) +-endif () + + + if (UNIX AND NOT APPLE) +-- +2.30.2 + From d4f090689eacd08f1d9c068665f7f02b4910dd25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Sat, 24 Apr 2021 22:37:35 +0200 Subject: [PATCH 7/7] drumkv1: fix drumkit generation on buildmachines with python >= 3.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller --- recipes-musicians/rncbc/drumkv1.bb | 1 + .../drumkv1/0001-Fix-for-python-3.9.patch | 33 +++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 recipes-musicians/rncbc/drumkv1/0001-Fix-for-python-3.9.patch diff --git a/recipes-musicians/rncbc/drumkv1.bb b/recipes-musicians/rncbc/drumkv1.bb index 412df9b..cccc6d4 100644 --- a/recipes-musicians/rncbc/drumkv1.bb +++ b/recipes-musicians/rncbc/drumkv1.bb @@ -18,6 +18,7 @@ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ file://0002-Avoid-stripping-CMake.patch \ git://github.com/TuriSc/hydrogen2drumkv1.py.git;name=hydrogen2drumkv1;destsuffix=hydrogen2drumkv1 \ + file://0001-Fix-for-python-3.9.patch;patchdir=../hydrogen2drumkv1 \ " PV = "0.9.21" SRC_URI[sha256sum] = "35952d6ed82cde9c0d8b516addd2e2f376b94b6d777f2b2a6ffd3978b49da7fa" diff --git a/recipes-musicians/rncbc/drumkv1/0001-Fix-for-python-3.9.patch b/recipes-musicians/rncbc/drumkv1/0001-Fix-for-python-3.9.patch new file mode 100644 index 0000000..fc116cc --- /dev/null +++ b/recipes-musicians/rncbc/drumkv1/0001-Fix-for-python-3.9.patch @@ -0,0 +1,33 @@ +From a27b5d6badad46e044d4ecb688f76ab8a16b2fc7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 24 Apr 2021 22:13:20 +0200 +Subject: [PATCH] Fix for python >= 3.9 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +| AttributeError: 'xml.etree.ElementTree.Element' object has no attribute 'getiterator' + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + hydrogen2drumkv1.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/hydrogen2drumkv1.py b/hydrogen2drumkv1.py +index 0d2ff28..3f1e914 100644 +--- a/hydrogen2drumkv1.py ++++ b/hydrogen2drumkv1.py +@@ -36,7 +36,7 @@ def main(): + # strip namespace if present + namespace = '{http://www.hydrogen-music.org/drumkit}' + nsl = len(namespace) +- for elem in input_xml.getiterator(): ++ for elem in input_xml.iter(): + if elem.tag.startswith(namespace): + elem.tag = elem.tag[nsl:] + +-- +2.30.2 +