diff --git a/classes/kde-apps.bbclass b/classes/kde-apps.bbclass index dc4d188e..e3f0b696 100644 --- a/classes/kde-apps.bbclass +++ b/classes/kde-apps.bbclass @@ -1,6 +1,6 @@ inherit kde-base -KDE_APP_VERSION = "18.08.3" +KDE_APP_VERSION = "18.12.3" SRC_URI = "${KDE_MIRROR}/stable/applications/${PV}/src/${BPN}-${PV}.tar.xz" diff --git a/classes/kde-base.bbclass b/classes/kde-base.bbclass index ad78f76d..bb617577 100644 --- a/classes/kde-base.bbclass +++ b/classes/kde-base.bbclass @@ -24,8 +24,6 @@ do_compile_prepend() { } FILES_${PN} += "${libdir}/plugins/kf5 ${datadir}/kf5 ${libexecdir}/kf5" -FILES_${PN}-dev += "${libdir}/cmake" -FILES_${PN}-dbg += "${libdir}/plugins/kf5/.debug ${libexecdir}/kf5/.debug" EXTRA_OECMAKE += " \ -DECM_MKSPECS_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \ diff --git a/classes/kde-kf5-porting-aids.bbclass b/classes/kde-kf5-porting-aids.bbclass index cc7dbade..d70f8e64 100644 --- a/classes/kde-kf5-porting-aids.bbclass +++ b/classes/kde-kf5-porting-aids.bbclass @@ -1,3 +1,3 @@ inherit kde-kf5 -SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.52/portingAids/${BPN}-${PV}.tar.xz" +SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.56/portingAids/${BPN}-${PV}.tar.xz" diff --git a/classes/kde-kf5.bbclass b/classes/kde-kf5.bbclass index 1f4740aa..9d7a77d7 100644 --- a/classes/kde-kf5.bbclass +++ b/classes/kde-kf5.bbclass @@ -1,5 +1,5 @@ inherit kde-base -KF5_VERSION = "5.52.0" +KF5_VERSION = "5.56.0" -SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.52/${BPN}-${PV}.tar.xz" +SRC_URI = "${KDE_MIRROR}/stable/frameworks/5.56/${BPN}-${PV}.tar.xz" diff --git a/classes/kde-plasma.bbclass b/classes/kde-plasma.bbclass index 88f06cb1..443bf459 100644 --- a/classes/kde-plasma.bbclass +++ b/classes/kde-plasma.bbclass @@ -1,8 +1,9 @@ inherit kde-base -PLASMA_VERSION = "5.14.4" +PLASMA_VERSION = "5.15.3" +PLASMA_FIXUP_VERSION = "5.15.3.2" -SRC_URI = "${KDE_MIRROR}/stable/plasma/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI = "${KDE_MIRROR}/stable/plasma/${PLASMA_VERSION}/${BPN}-${PV}.tar.xz" DEPENDS += " \ kwayland \ diff --git a/classes/liri.bbclass b/classes/liri.bbclass index 28fe2207..39300666 100644 --- a/classes/liri.bbclass +++ b/classes/liri.bbclass @@ -2,12 +2,21 @@ LIRI_GIT_BRANCH ?= "develop" SRC_URI = "git://github.com/lirios/${@'${BPN}'.replace('liri-', '')}.git;protocol=git;branch=${LIRI_GIT_BRANCH}" -DEPENDS += "qtbase qtdeclarative liri-cmake-shared extra-cmake-modules qttools qttools-native" +DEPENDS += " \ + qtwayland-native \ + qttools-native \ + liri-cmake-shared \ + extra-cmake-modules \ + qtbase \ + qttools \ + qtdeclarative \ + qtwayland \ +" inherit cmake_qt5_extra pkgconfig qt5-translation EXTRA_OECMAKE += " \ - -DQML_INSTALL_DIR=${OE_QMAKE_PATH_QML} \ - -DPLUGIN_INSTALL_DIR=${OE_QMAKE_PATH_PLUGINS} \ - -DQT_PLUGIN_INSTALL_DIR=${OE_QMAKE_PATH_PLUGINS} \ + -DINSTALL_LIBDIR:PATH=${baselib} \ + -DINSTALL_QMLDIR:PATH=${OE_QMAKE_PATH_QML} \ + -DINSTALL_PLUGINSDIR:PATH=${OE_QMAKE_PATH_PLUGINS} \ " diff --git a/classes/lv2-postinst-helper.bbclass b/classes/lv2-postinst-helper.bbclass index 88b6ff3a..d11be55f 100644 --- a/classes/lv2-postinst-helper.bbclass +++ b/classes/lv2-postinst-helper.bbclass @@ -31,7 +31,7 @@ do_install_append() { } -pkg_postinst_ontarget_${PN}() { +pkg_postinst_ontarget_${PN}-lv2() { oldpath=`pwd` for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do cd `dirname "$sofile"` @@ -40,7 +40,7 @@ pkg_postinst_ontarget_${PN}() { cd $oldpath } -pkg_prerm_${PN}() { +pkg_prerm_${PN}-lv2() { for sofile in `cat ${LV2-POSTINST-MANIFEST}`; do path=`dirname "$sofile"` for turtle in `find $path -name '*.ttl'`; do @@ -49,5 +49,5 @@ pkg_prerm_${PN}() { done } -RDEPENDS_${PN} += "lv2-ttl-generator" - +FILES_${PN}-lv2 += "${LV2-POSTINST-MANIFEST}" +RDEPENDS_${PN}-lv2 += "lv2-ttl-generator" diff --git a/classes/lxqt.bbclass b/classes/lxqt.bbclass index f96eac93..a5e49da7 100644 --- a/classes/lxqt.bbclass +++ b/classes/lxqt.bbclass @@ -1,4 +1,4 @@ -inherit cmake_qt5_extra +inherit cmake_qt5_extra qt5-translation HOMEPAGE = "http://lxqt.org/" @@ -6,10 +6,3 @@ DEPENDS += "lxqt-build-tools qtbase qttools-native" SRC_URI = "git://github.com/lxqt/${BPN}.git;protocol=git;branch=master" S = "${WORKDIR}/git" - -EXTRA_OECMAKE += " \ - -DPULL_TRANSLATIONS=Off \ - -DCLEAN_TRANSLATIONS=Off \ -" - -FILES_${PN}-dev += "${datadir}/cmake ${libdir}/cmake" diff --git a/classes/pack_audio_plugins.bbclass b/classes/pack_audio_plugins.bbclass new file mode 100644 index 00000000..f7205ebf --- /dev/null +++ b/classes/pack_audio_plugins.bbclass @@ -0,0 +1,8 @@ +# Auto package audio plugins + +PACKAGES =+ "${PN}-dssi ${PN}-ladspa ${PN}-lv2 ${PN}-vst" + +FILES_${PN}-dssi += "${libdir}/dssi" +FILES_${PN}-ladspa += "${libdir}/ladspa" +FILES_${PN}-lv2 += "${libdir}/lv2" +FILES_${PN}-vst += "${libdir}/vst" diff --git a/conf/layer.conf b/conf/layer.conf index b5808b74..b80b48e5 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -17,6 +17,3 @@ LICENSE_PATH += "${LAYERDIR}/files/licenses" # required for fluxbox - supplied by e.g fedora glibc-common HOSTTOOLS_NONFATAL += "gencat" - - -PREFERRED_PROVIDER_zyn = "${@bb.utils.contains("DISTRO_FEATURES", "opengl", "zyn-fusion", "zynaddsubfx",d)}" diff --git a/extends-meta-oe/libsigrok_%.bbappend b/extends-meta-oe/libsigrok_%.bbappend new file mode 100644 index 00000000..82c65306 --- /dev/null +++ b/extends-meta-oe/libsigrok_%.bbappend @@ -0,0 +1 @@ +PACKAGECONFIG += "cxx" diff --git a/extends-oe-core/flac%.bbappend b/extends-oe-core/flac%.bbappend new file mode 100644 index 00000000..d3267ac4 --- /dev/null +++ b/extends-oe-core/flac%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native" diff --git a/extends-oe-core/libogg%.bbappend b/extends-oe-core/libogg%.bbappend new file mode 100644 index 00000000..d3267ac4 --- /dev/null +++ b/extends-oe-core/libogg%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native" diff --git a/extends-oe-core/libsndfile1_%.bbappend b/extends-oe-core/libsndfile1_%.bbappend new file mode 100644 index 00000000..d3267ac4 --- /dev/null +++ b/extends-oe-core/libsndfile1_%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native" diff --git a/extends-oe-core/libvorbis%.bbappend b/extends-oe-core/libvorbis%.bbappend new file mode 100644 index 00000000..d3267ac4 --- /dev/null +++ b/extends-oe-core/libvorbis%.bbappend @@ -0,0 +1 @@ +BBCLASSEXTEND = "native" diff --git a/recipes-gottcode/focuswriter/focuswriter_1.7.1.bb b/recipes-gottcode/focuswriter/focuswriter_1.7.1.bb new file mode 100644 index 00000000..661d8f81 --- /dev/null +++ b/recipes-gottcode/focuswriter/focuswriter_1.7.1.bb @@ -0,0 +1,29 @@ +SUMMARY = "FocusWriter is a simple, distraction-free writing environment" +HOMEPAGE = "http://gottcode.org/gottet/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit qmake5 qt5-translation gtk-icon-cache + +DEPENDS = " \ + qttools-native \ + qtbase \ + qtmultimedia \ + hicolor-icon-theme \ + hunspell \ +" + +SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2" +SRC_URI[md5sum] = "b3bcf028c519b6a6daabfc71055d4ca8" +SRC_URI[sha256sum] = "0190fff4930213b2e32d5d76750af784f45f89046d239da466dc5c9f625ec05b" + +EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}" + +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/${BPN}/icons \ + ${datadir}/${BPN}/symbols1000.dat \ + ${datadir}/${BPN}/icons \ + ${datadir}/${BPN}/themes \ + ${datadir}/${BPN}/sounds \ +" diff --git a/recipes-misc/recipes-games/gottet/gottet_1.1.6.bb b/recipes-gottcode/gottet/gottet_1.1.7.bb similarity index 76% rename from recipes-misc/recipes-games/gottet/gottet_1.1.6.bb rename to recipes-gottcode/gottet/gottet_1.1.7.bb index faccc5c2..09d04dcc 100644 --- a/recipes-misc/recipes-games/gottet/gottet_1.1.6.bb +++ b/recipes-gottcode/gottet/gottet_1.1.7.bb @@ -8,8 +8,8 @@ inherit qmake5 qt5-translation gtk-icon-cache DEPENDS = "qttools-native qtbase hicolor-icon-theme" SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2" -SRC_URI[md5sum] = "ef22e0df90b350476827f9a881d6fcf3" -SRC_URI[sha256sum] = "b7124832e4ffdb404e9fd6f6f35ec37eb86352f49dc315fa48aa06aecd3d6c5c" +SRC_URI[md5sum] = "f5a0a46d4d1c40c98f20be531aacf488" +SRC_URI[sha256sum] = "7cc6c49cb191a264dccf18659b885ead921f01ad496dac9774c7ec49428c8a7d" EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}" diff --git a/recipes-misc/recipes-games/hexalate/hexalate_1.1.3.bb b/recipes-gottcode/hexalate/hexalate_1.1.4.bb similarity index 76% rename from recipes-misc/recipes-games/hexalate/hexalate_1.1.3.bb rename to recipes-gottcode/hexalate/hexalate_1.1.4.bb index 560dca71..2bdba2ab 100644 --- a/recipes-misc/recipes-games/hexalate/hexalate_1.1.3.bb +++ b/recipes-gottcode/hexalate/hexalate_1.1.4.bb @@ -8,8 +8,8 @@ inherit qmake5 qt5-translation gtk-icon-cache DEPENDS = "qttools-native qtbase hicolor-icon-theme" SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2" -SRC_URI[md5sum] = "054bc8b14334477e8465a0d5a1a0de76" -SRC_URI[sha256sum] = "2f480bc45eea4bd3a3c96bc6e0a59722ae8a2997bfe67c66510203a19b354085" +SRC_URI[md5sum] = "0b8d536e87c634471543cfae97b7b1c0" +SRC_URI[sha256sum] = "9dfdaaf802f792dbd539b7e87674f942a773970aa50c298cd395b5d21a9acca3" EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}" diff --git a/recipes-gottcode/packagegroups/gottcode-world.bb b/recipes-gottcode/packagegroups/gottcode-world.bb new file mode 100644 index 00000000..d54f4380 --- /dev/null +++ b/recipes-gottcode/packagegroups/gottcode-world.bb @@ -0,0 +1,14 @@ +SUMMARY = "All gottcode recipes - just for build test" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +inherit packagegroup + +RDEPENDS_${PN} = " \ + focuswriter \ + gottet \ + hexalate \ + peg-e \ + simsu \ + tetzle \ +" diff --git a/recipes-misc/recipes-games/peg-e/peg-e_1.2.5.bb b/recipes-gottcode/peg-e/peg-e_1.2.6.bb similarity index 76% rename from recipes-misc/recipes-games/peg-e/peg-e_1.2.5.bb rename to recipes-gottcode/peg-e/peg-e_1.2.6.bb index a9bc9663..661ee26c 100644 --- a/recipes-misc/recipes-games/peg-e/peg-e_1.2.5.bb +++ b/recipes-gottcode/peg-e/peg-e_1.2.6.bb @@ -8,8 +8,8 @@ inherit qmake5 qt5-translation gtk-icon-cache DEPENDS = "qttools-native qtbase hicolor-icon-theme" SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2" -SRC_URI[md5sum] = "62070311e753b197f2192543cc39a6c3" -SRC_URI[sha256sum] = "6ee95cce87c633333f2a30ad87ab0da882b0a90e0395242922da16f7e40cf6a1" +SRC_URI[md5sum] = "001a9d449c47e7dca9c9c93defbaa946" +SRC_URI[sha256sum] = "b7a644397a6e8fd24c5df72a8c5950af8de035c9fafc712fea5eae87eea15d81" EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}" diff --git a/recipes-misc/recipes-games/simsu/simsu_1.3.6.bb b/recipes-gottcode/simsu/simsu_1.3.7.bb similarity index 75% rename from recipes-misc/recipes-games/simsu/simsu_1.3.6.bb rename to recipes-gottcode/simsu/simsu_1.3.7.bb index 972c7173..590e8fc3 100644 --- a/recipes-misc/recipes-games/simsu/simsu_1.3.6.bb +++ b/recipes-gottcode/simsu/simsu_1.3.7.bb @@ -8,8 +8,8 @@ inherit qmake5 qt5-translation gtk-icon-cache DEPENDS = "qttools-native qtbase hicolor-icon-theme" SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2" -SRC_URI[md5sum] = "fe9ab82d6675d0a00b3bad1cdd8511d4" -SRC_URI[sha256sum] = "77a6ececec02787731f32ebdbc0a89fe5cecb4418519e86311c445814eb9ab1c" +SRC_URI[md5sum] = "f7567be498c365b6a2e301346d08659a" +SRC_URI[sha256sum] = "a3c56b6339fd314b198b7ec89d27f1919d4b480e7e0eae03980dda5fec31cd6a" EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}" diff --git a/recipes-gottcode/tetzle/tetzle_2.1.3.bb b/recipes-gottcode/tetzle/tetzle_2.1.3.bb new file mode 100644 index 00000000..0ebbf350 --- /dev/null +++ b/recipes-gottcode/tetzle/tetzle_2.1.3.bb @@ -0,0 +1,18 @@ +SUMMARY = "Tetzle is a jigsaw puzzle game that uses tetrominoes for the pieces" +HOMEPAGE = "https://gottcode.org/tetzle/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit qmake5 qt5-translation gtk-icon-cache + +DEPENDS = "qttools-native qtbase hicolor-icon-theme" + +SRC_URI = "http://gottcode.org/${BPN}/${BPN}-${PV}-src.tar.bz2" +SRC_URI[md5sum] = "df7a1a9174a3802b8738ddb3f423d0da" +SRC_URI[sha256sum] = "ef67083018dc5e22a61d52e3041d6d725753e6ed5bc70b770159d867451c8cb1" + +EXTRA_QMAKEVARS_PRE += "PREFIX=${prefix}" + +FILES_${PN} += " \ + ${datadir}/metainfo \ +" diff --git a/recipes-kde/apps/analitza/analitza.bb b/recipes-kde/apps/analitza/analitza.bb new file mode 100644 index 00000000..2b9ea553 --- /dev/null +++ b/recipes-kde/apps/analitza/analitza.bb @@ -0,0 +1,24 @@ +SUMMARY = "Add mathematical features to your program" +LICENSE = "GPLv2 & GFDL-1.2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \ +" + +inherit kde-apps + +DEPENDS += " \ + libeigen \ + qtsvg \ + qtdeclarative \ +" + +PV = "${KDE_APP_VERSION}" +SRC_URI[md5sum] = "f8186958405a7ee235ba0bff76c0f126" +SRC_URI[sha256sum] = "c241b6a3d849534ccd50601c0aebd5cd785220bb7957ed7f6b1d3db35ba0f925" + +FILES_${PN} += " \ + ${datadir}/libanalitza \ + ${OE_QMAKE_PATH_QML} \ +" diff --git a/recipes-kde/apps/ark/ark.bb b/recipes-kde/apps/ark/ark.bb index 4f47ec01..1396f7a5 100644 --- a/recipes-kde/apps/ark/ark.bb +++ b/recipes-kde/apps/ark/ark.bb @@ -28,8 +28,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "623c3feaea00c573dbe2308f85ed0cfb" -SRC_URI[sha256sum] = "aeb735ad332514d284b2bad9e6dd41261a81f901ff896001ef9e5b986620b3fb" +SRC_URI[md5sum] = "72d72ddaa13a10cd8ed6319fe00e51be" +SRC_URI[sha256sum] = "ecf781b5d3691bb967c9170938c1133e2972ee97d71aab2de65487a952700722" SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ @@ -39,9 +39,3 @@ FILES_${PN} += " \ ${datadir}/k*5 \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/kio_dnd/.debug \ -" diff --git a/recipes-kde/apps/baloo-widgets/baloo-widgets.bb b/recipes-kde/apps/baloo-widgets/baloo-widgets.bb index 07585826..4c0c20bd 100644 --- a/recipes-kde/apps/baloo-widgets/baloo-widgets.bb +++ b/recipes-kde/apps/baloo-widgets/baloo-widgets.bb @@ -19,8 +19,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "8535ac3f5f3443dc4ad0bd0606c3b811" -SRC_URI[sha256sum] = "3a8583adbd9bf9f1c38918c11972ef8aa2db5e94bee36695823c1360a7d47d1c" +SRC_URI[md5sum] = "d131f6dec4f4e50d52657087403e4c05" +SRC_URI[sha256sum] = "b8475ba1a74f8ebc6a36029b60ac803ab0d2c81c253b8c16bd05b6249454c3e3" FILES_${PN} += " \ ${datadir}/kservices5 \ diff --git a/recipes-kde/apps/bovo/bovo.bb b/recipes-kde/apps/bovo/bovo.bb index 823677b4..ac1aab3a 100644 --- a/recipes-kde/apps/bovo/bovo.bb +++ b/recipes-kde/apps/bovo/bovo.bb @@ -19,8 +19,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "e44a1626281a33d17ecbc6b7e818c752" -SRC_URI[sha256sum] = "a5ce1d7adadfb19585e440191083ad7d4df8498e3ab7c81ce0c7c668f9582330" +SRC_URI[md5sum] = "340d557424fc1ae1defff10a660f39b2" +SRC_URI[sha256sum] = "7fc7ff304cf5b5bf2049fdd53fbb4a819bddefc77fde94702c5118240403d972" FILES_${PN} += " \ ${datadir}/kxmlgui5 \ diff --git a/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb b/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb index b47b46d4..2efd42f2 100644 --- a/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb +++ b/recipes-kde/apps/dolphin-plugins/dolphin-plugins.bb @@ -19,15 +19,11 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "ea42d71187245acdf204aa03610b41f5" -SRC_URI[sha256sum] = "8324e4552d896970c90f9c63f202979b6520f18f291f4fa8b9baf33c25105e42" +SRC_URI[md5sum] = "f4be0f56a4935ef177375ab7f22ce25b" +SRC_URI[sha256sum] = "1bff5f828f11e9b9a527b59f12ec16745fa19fb09392ca1872d6b0c909212427" FILES_${PN} += " \ ${datadir}/config.kcfg \ ${datadir}/kservices5 \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/apps/dolphin/dolphin.bb b/recipes-kde/apps/dolphin/dolphin.bb index 2a06f08b..696cf035 100644 --- a/recipes-kde/apps/dolphin/dolphin.bb +++ b/recipes-kde/apps/dolphin/dolphin.bb @@ -36,8 +36,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "55aa66c77b94e52582e09366aaae5a5b" -SRC_URI[sha256sum] = "2bb4560979f8b3fe970bfdebea51b784cc3088ee4c3919bc5d9bf5eb5dfd916c" +SRC_URI[md5sum] = "08f6009c452da25828e26608b1191d19" +SRC_URI[sha256sum] = "c4921759bdfec9a96201a5d76a67869f867ec7e3caf92f8e46fa5d853a0741b1" SRC_URI += " \ file://0001-fix-build-for-qtbase-without-session-management.patch \ file://0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch \ diff --git a/recipes-kde/apps/dolphin/files/0001-fix-build-for-qtbase-without-session-management.patch b/recipes-kde/apps/dolphin/files/0001-fix-build-for-qtbase-without-session-management.patch index 05d90e91..ec911682 100644 --- a/recipes-kde/apps/dolphin/files/0001-fix-build-for-qtbase-without-session-management.patch +++ b/recipes-kde/apps/dolphin/files/0001-fix-build-for-qtbase-without-session-management.patch @@ -1,7 +1,7 @@ From b9abe385e2563d7178fbf982ec6977b9f3e625bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Fri, 28 Aug 2015 23:22:18 +0200 -Subject: [PATCH 2/2] fix build for qtbase without session management +Subject: [PATCH] fix build for qtbase without session management MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -16,7 +16,7 @@ diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp index f7a7613..127cd85 100644 --- a/src/dolphinmainwindow.cpp +++ b/src/dolphinmainwindow.cpp -@@ -346,9 +346,11 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) +@@ -386,9 +386,11 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event) // Find out if Dolphin is closed directly by the user or // by the session manager because the session is closed bool closedByUser = true; @@ -32,7 +32,7 @@ diff --git a/src/main.cpp b/src/main.cpp index b4ca2c6..5c058a9 100644 --- a/src/main.cpp +++ b/src/main.cpp -@@ -134,6 +134,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) +@@ -156,6 +156,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) mainWindow->show(); @@ -40,7 +40,7 @@ index b4ca2c6..5c058a9 100644 if (app.isSessionRestored()) { const QString className = KXmlGuiWindow::classNameOfToplevel(1); if (className == QLatin1String("DolphinMainWindow")) { -@@ -142,6 +143,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) +@@ -164,6 +165,7 @@ extern "C" Q_DECL_EXPORT int kdemain(int argc, char **argv) qCWarning(DolphinDebug) << "Unknown class " << className << " in session saved data!"; } } diff --git a/recipes-kde/apps/dolphin/files/0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch b/recipes-kde/apps/dolphin/files/0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch index 6ff722d4..4214c60d 100644 --- a/recipes-kde/apps/dolphin/files/0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch +++ b/recipes-kde/apps/dolphin/files/0002-Revert-Make-target_link_libraries-for-kdeinit_dolphi.patch @@ -21,7 +21,4 @@ index 5aff4b0fa..9dc77c3da 100644 +target_link_libraries(kdeinit_dolphin dolphinstatic dolphinprivate - ) --- -2.14.4 - + KF5::Crash diff --git a/recipes-kde/apps/dragon/dragon.bb b/recipes-kde/apps/dragon/dragon.bb index 6552321c..46ba4a16 100644 --- a/recipes-kde/apps/dragon/dragon.bb +++ b/recipes-kde/apps/dragon/dragon.bb @@ -29,8 +29,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "8ebe9af5816d17a84094da963f77b3ef" -SRC_URI[sha256sum] = "e202596ffc56e6d45fbd42d0259be2ebe148c29c940c9d87282e2998dac7448e" +SRC_URI[md5sum] = "fcf5e0ec51b65619fcfe8c7bc59bd162" +SRC_URI[sha256sum] = "115d60bfdef498ea75bc077a7091fb738615b399b03ec2a76a4bf34f19b407f3" CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE" @@ -40,7 +40,3 @@ FILES_${PN} += " \ ${datadir}/icons \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/apps/filelight/filelight.bb b/recipes-kde/apps/filelight/filelight.bb index ffc2e421..dddcf72f 100644 --- a/recipes-kde/apps/filelight/filelight.bb +++ b/recipes-kde/apps/filelight/filelight.bb @@ -21,8 +21,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "8339ad56f0ac0348ed0c1f8fe67e548c" -SRC_URI[sha256sum] = "c24203ad84f109a831cfe970d4e524a0c883d3a31a58aef3cf00c149914ab042" +SRC_URI[md5sum] = "af910a156f817368d2bab2520636f320" +SRC_URI[sha256sum] = "9090bc7c7ac2586e857cdc246a94621c1453e7f65c6d491f2f374f43d3e4af1a" SRC_URI += " \ file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \ " @@ -32,7 +32,3 @@ FILES_${PN} += " \ ${datadir}/icons \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/apps/granatier/granatier.bb b/recipes-kde/apps/granatier/granatier.bb index 8c3d38e1..f5801b6a 100644 --- a/recipes-kde/apps/granatier/granatier.bb +++ b/recipes-kde/apps/granatier/granatier.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "66550efd554c665cf5e64ccc560a709c" -SRC_URI[sha256sum] = "377ee8f1dcd9cf996e9727e58dc424611a35d851851c2bd2b54dd2b028a9b327" +SRC_URI[md5sum] = "e18910bb5e1605ed4c8eafe07ab2a0ad" +SRC_URI[sha256sum] = "ad065e488f9a751423d571f51449e766c625e88ca7d3c30d21ff3b9027fc04af" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/gwenview/files/0002-Avoid-try_run.patch b/recipes-kde/apps/gwenview/files/0001-Avoid-try_run.patch similarity index 100% rename from recipes-kde/apps/gwenview/files/0002-Avoid-try_run.patch rename to recipes-kde/apps/gwenview/files/0001-Avoid-try_run.patch diff --git a/recipes-kde/apps/gwenview/files/0001-Set-Kipi-package-properties.patch b/recipes-kde/apps/gwenview/files/0001-Set-Kipi-package-properties.patch deleted file mode 100644 index 3012ec37..00000000 --- a/recipes-kde/apps/gwenview/files/0001-Set-Kipi-package-properties.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 06f07a9b331bec4ff51c2a5174e758b1bffba10c Mon Sep 17 00:00:00 2001 -From: "Luis Gustavo S. Barreto" -Date: Wed, 6 Apr 2016 19:23:55 +0000 -Subject: [PATCH 2/3] Set Kipi package properties - -This change make Kipi optional. - -Upstream-Status: Pending - -Signed-off-by: Luis Gustavo S. Barreto ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a18ca16..d855192 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,7 +75,7 @@ find_package(KF5Kipi) - if (KF5Kipi_FOUND) - set(KIPI_FOUND true) - endif() --# set_package_properties(Kipi PROPERTIES URL"http://www.kipi-plugins.org" DESCRIPTION "Provides various image manipulation and export features" TYPE OPTIONAL) -+set_package_properties(KF5Kipi PROPERTIES URL "http://www.kipi-plugins.org" DESCRIPTION "Provides various image manipulation and export features" TYPE OPTIONAL) - - find_package(LCMS2) - set_package_properties(LCMS2 PROPERTIES URL "http://www.littlecms.com" DESCRIPTION "Color management engine" TYPE REQUIRED) --- -2.1.4 - diff --git a/recipes-kde/apps/gwenview/gwenview.bb b/recipes-kde/apps/gwenview/gwenview.bb index e6dd16a6..9341de06 100644 --- a/recipes-kde/apps/gwenview/gwenview.bb +++ b/recipes-kde/apps/gwenview/gwenview.bb @@ -25,12 +25,11 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "75eb27efb8710a063bb4b7f247f0ddff" -SRC_URI[sha256sum] = "0c95452ad82e2a5e7bc6bdb4464e7be44b6af9c75a972678f8925e2a6bb15671" +SRC_URI[md5sum] = "93019f12a8b494b22d00d9489832246b" +SRC_URI[sha256sum] = "0b4ff869fc09140e258e894f5169fc6c96f1126891b8ed1a391d4624d6ab0c35" SRC_URI += " \ - file://0001-Set-Kipi-package-properties.patch \ - file://0002-Avoid-try_run.patch \ + file://0001-Avoid-try_run.patch \ " CXXFLAGS += "-isystem ${STAGING_INCDIR}/phonon4qt5/KDE" @@ -42,7 +41,3 @@ FILES_${PN} += " \ ${datadir}/kconf_update \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/apps/kalgebra/kalgebra.bb b/recipes-kde/apps/kalgebra/kalgebra.bb new file mode 100644 index 00000000..81ec1836 --- /dev/null +++ b/recipes-kde/apps/kalgebra/kalgebra.bb @@ -0,0 +1,31 @@ +SUMMARY = "2D and 3D Graph Calculator" +LICENSE = "GPLv2 & LGPLv2 & GFDL-1.2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ + file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \ +" + +inherit kde-apps gettext gtk-icon-cache + +DEPENDS += "\ + ncurses \ + readline \ + analitza \ + kauth-native \ + kconfig-native \ + kcoreaddons-native \ + kdoctools-native \ + ki18n \ + kconfigwidgets \ + kwidgetsaddons \ +" + +PV = "${KDE_APP_VERSION}" +SRC_URI[md5sum] = "6357ca100f9f85ffd9fab69fa4bb9d79" +SRC_URI[sha256sum] = "a93b319c6a3fab3d3a12923f8153a6f38281887e176fffaa37ca6cc677a280b5" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/kalgebramobile \ +" diff --git a/recipes-kde/apps/kapman/kapman.bb b/recipes-kde/apps/kapman/kapman.bb index 48ec3a11..4b48abe5 100644 --- a/recipes-kde/apps/kapman/kapman.bb +++ b/recipes-kde/apps/kapman/kapman.bb @@ -26,8 +26,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "b76e38cc2a5549373b06836fe56b60b2" -SRC_URI[sha256sum] = "15a74129d53133b4b771060875c2c0f2fda92db8361a273dd38553e019e38878" +SRC_URI[md5sum] = "6fbc7241c27a158e3983e2cfb64237f5" +SRC_URI[sha256sum] = "ad4a6377d260df76d000631ab4c95e5cb82ce47d031edc9801b6ed92d856305c" FILES_${PN} += " \ ${datadir}/kxmlgui5 \ diff --git a/recipes-kde/apps/kate/kate.bb b/recipes-kde/apps/kate/kate.bb index 7401c53b..34728dcc 100644 --- a/recipes-kde/apps/kate/kate.bb +++ b/recipes-kde/apps/kate/kate.bb @@ -34,8 +34,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "fb20d04f0807ddce9fd6d73bac379f30" -SRC_URI[sha256sum] = "d0a95d777f7638ffb6ba4e6b064c1eee79f291d01945e93286e708d7a05fd811" +SRC_URI[md5sum] = "17e8021c1c1bf1d77cd467ca3fab3caf" +SRC_URI[sha256sum] = "f7f2cba41a4c88b65885532db6b6161c66055a6697d20ee88adb70f302d387e1" SRC_URI += " \ file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch \ @@ -54,8 +54,3 @@ FILES_${PN} += " \ ${libdir}/libkdeinit5*.so \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \ -" diff --git a/recipes-kde/apps/katomic/katomic.bb b/recipes-kde/apps/katomic/katomic.bb index a24a8c89..e1430429 100644 --- a/recipes-kde/apps/katomic/katomic.bb +++ b/recipes-kde/apps/katomic/katomic.bb @@ -27,8 +27,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "b0cba325c112a036cac704b8dc8a3964" -SRC_URI[sha256sum] = "21672c61fd741b9d8263990a3e82837394e0500044892bb6418efb3d251b68fb" +SRC_URI[md5sum] = "83a27f535669d9a5d4782b9355db757b" +SRC_URI[sha256sum] = "0e18087d0de067282023a98b800807632dd6a91bab51cf0d43d53bffba9b33f1" SRC_URI += "file://0001-fix-build-for-qtbase-build-without-session-support-Q.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/kblocks/kblocks.bb b/recipes-kde/apps/kblocks/kblocks.bb index f9347370..ab2acd34 100644 --- a/recipes-kde/apps/kblocks/kblocks.bb +++ b/recipes-kde/apps/kblocks/kblocks.bb @@ -22,8 +22,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "9fabc1bf53bca51a7545a65bb12ae07a" -SRC_URI[sha256sum] = "fcc0659ee97fb17106cfe6d52c5152104af64294b43e001f3e8a1550410829f7" +SRC_URI[md5sum] = "640b68db31f22b138ef0df5968e648a9" +SRC_URI[sha256sum] = "e981107096893a8078ab978c429f367432a74de1bdeffe8fb628ccc397701332" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/kbounce/kbounce.bb b/recipes-kde/apps/kbounce/kbounce.bb index 856cc44a..808a0ad7 100644 --- a/recipes-kde/apps/kbounce/kbounce.bb +++ b/recipes-kde/apps/kbounce/kbounce.bb @@ -28,8 +28,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "630d379236843bcf68acdebfb5053386" -SRC_URI[sha256sum] = "4150f85ffdabe06a2989f50cb6dc8dacf4da32187b350346af9d9b8eb564ecd1" +SRC_URI[md5sum] = "f190c2913ba0dbcdf15c6f02be532ce8" +SRC_URI[sha256sum] = "c62cb68b4246c1aef73efb04ea883599384afbd977e8da93893346cbd835f343" SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/kbreakout/kbreakout.bb b/recipes-kde/apps/kbreakout/kbreakout.bb new file mode 100644 index 00000000..c5e046fe --- /dev/null +++ b/recipes-kde/apps/kbreakout/kbreakout.bb @@ -0,0 +1,32 @@ +SUMMARY = "KBreakout: Destroy as many bricks as possible without losing the ball" +DESCRIPTION = "KBreakout is a Breakout-like game. Its objective is to destroy as many bricks as possible without losing the ball" +LICENSE = "GPLv2 & GFDL-1.2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \ +" + +inherit kde-apps gettext + +DEPENDS += "\ + kcoreaddons-native \ + kconfig-native \ + kauth-native \ + kdoctools-native \ + kcrash \ + kwidgetsaddons \ + kdbusaddons \ + ki18n \ + kconfigwidgets \ + kxmlgui \ + libkdegames \ +" + +PV = "${KDE_APP_VERSION}" +SRC_URI[md5sum] = "26c31da7a5dae51ef1a362ca3458517f" +SRC_URI[sha256sum] = "23e1cc935eab6a2520e683185cb223243c71553b1ef6059a21f09d72e8fe00af" + +FILES_${PN} += " \ + ${datadir}/kxmlgui5 \ + ${datadir}/icons \ +" diff --git a/recipes-kde/apps/kcachegrind/kcachegrind.bb b/recipes-kde/apps/kcachegrind/kcachegrind.bb new file mode 100644 index 00000000..e273ccd0 --- /dev/null +++ b/recipes-kde/apps/kcachegrind/kcachegrind.bb @@ -0,0 +1,32 @@ +SUMMARY = "GUI to profilers such as Valgrind" +HOMEPAGE = "https://kcachegrind.github.io/html/Home.html" +LICENSE = "GPLv2 & GFDL-1.2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \ + file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \ +" + +inherit kde-apps gettext gtk-icon-cache + +DEPENDS += "\ + kcoreaddons-native \ + kdoctools-native \ + ki18n-native \ + kauth-native \ + kconfig-native \ + karchive \ + kwidgetsaddons \ + kxmlgui \ + kio \ + kdbusaddons \ +" + +PV = "${KDE_APP_VERSION}" +SRC_URI[md5sum] = "3193c9233a545e55528f68b6fb5eb6fb" +SRC_URI[sha256sum] = "48011190a0ef28998e6c96b9d644e3d06b68606b7d1467c84a8d176eeebb9adf" + +FILES_${PN} += " \ + ${datadir}/kxmlgui5 \ +" + +RRECOMMENDS_${PN} += "graphviz" diff --git a/recipes-kde/apps/kcalc/kcalc.bb b/recipes-kde/apps/kcalc/kcalc.bb index 1969f797..b35a515e 100644 --- a/recipes-kde/apps/kcalc/kcalc.bb +++ b/recipes-kde/apps/kcalc/kcalc.bb @@ -22,8 +22,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "b49543a80b664189298529b88a84cd98" -SRC_URI[sha256sum] = "35d72e101e481306fdfc64d07c36e006feb99fcaeeb76ce703a9d964991ccc71" +SRC_URI[md5sum] = "ddd1ca9dcdb7db22f8a011e525e99963" +SRC_URI[sha256sum] = "10b3ebb5efab3731e9f12a8632546685281179881b03aae98f96a2cdbd21f02f" FILES_SOLIBSDEV = "" diff --git a/recipes-kde/apps/kcolorchooser/kcolorchooser.bb b/recipes-kde/apps/kcolorchooser/kcolorchooser.bb index 97de8a02..ba587331 100644 --- a/recipes-kde/apps/kcolorchooser/kcolorchooser.bb +++ b/recipes-kde/apps/kcolorchooser/kcolorchooser.bb @@ -16,8 +16,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "0cf04a5362610c84fae2b930896466f6" -SRC_URI[sha256sum] = "8d17463c72325d1f39490052ca9efb45441355ccc3bf683716e53057ce16bae3" +SRC_URI[md5sum] = "edc6d65d8ed5c0a7c02e2eda2b78ab4c" +SRC_URI[sha256sum] = "8defdb9450922b675dc80561a0f4bb119e621a85dd73661fc4caacef8db91228" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/recipes-kde/apps/kdenlive/kdenlive.bb b/recipes-kde/apps/kdenlive/kdenlive.bb index 34a5783e..da8e47c2 100644 --- a/recipes-kde/apps/kdenlive/kdenlive.bb +++ b/recipes-kde/apps/kdenlive/kdenlive.bb @@ -36,8 +36,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "40824d0309f2f7a467812cbc1901dc13" -SRC_URI[sha256sum] = "587941cccff85ff87063dbb70fe1a67f140fce207a46e35ce136cbf104e35d15" +SRC_URI[md5sum] = "57e49c3995117945938669e24aff9352" +SRC_URI[sha256sum] = "fcfe2474bc271e730ed95edb21ae46e93c1ce773ed036f63c9fb2db02cbc7e64" SRC_URI += " \ file://0001-CMakeLists.txt-make-MLT_PREFIX-configurable.patch \ @@ -54,8 +54,4 @@ FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ " -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" - RRECOMMENDS_${PN} += "ffmpeg" diff --git a/recipes-kde/apps/kdf/kdf.bb b/recipes-kde/apps/kdf/kdf.bb index 280f860b..eee20542 100644 --- a/recipes-kde/apps/kdf/kdf.bb +++ b/recipes-kde/apps/kdf/kdf.bb @@ -22,8 +22,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "5e356db415380418e94ab0d1ee53d0d4" -SRC_URI[sha256sum] = "cf43e4002d18a1ce0b1463aa80dbe30e004796ec9962f47d00a474bda35c1439" +SRC_URI[md5sum] = "daa73fb65eb5b48928b3b4e4511d6e06" +SRC_URI[sha256sum] = "a8a9e8a4c2bdc1855078383f10720b4b3a388c678dee148494dc18ba5019a6ae" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/apps/kdiamond/kdiamond.bb b/recipes-kde/apps/kdiamond/kdiamond.bb index 71cbefd5..a2db2302 100644 --- a/recipes-kde/apps/kdiamond/kdiamond.bb +++ b/recipes-kde/apps/kdiamond/kdiamond.bb @@ -26,8 +26,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "96f1b75d6ba0a9f6eb190ddd24faa915" -SRC_URI[sha256sum] = "a374cc40d03148acd8384d00af8dc256ffce6e2830a8781ec8d337db3a781eab" +SRC_URI[md5sum] = "fe3970879eec195f387c772e6fd6fba5" +SRC_URI[sha256sum] = "b3d959cc195b924ca877df2762c3e8ef115ac41c2355f34efbbcaabe9b02b500" SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/kfind/kfind.bb b/recipes-kde/apps/kfind/kfind.bb new file mode 100644 index 00000000..fe1c654a --- /dev/null +++ b/recipes-kde/apps/kfind/kfind.bb @@ -0,0 +1,29 @@ +SUMMARY = "KDE file find utility" +LICENSE = "GPLv2 & GFDL-1.3" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://COPYING.DOC;md5=10b9de612d532fdeeb7fe8fcd1435cc6 \ +" + +inherit kde-apps gettext gtk-icon-cache + +DEPENDS += " \ + kauth-native \ + kconfig-native \ + kcoreaddons-native \ + kdoctools-native \ + karchive \ + kfilemetadata \ + ki18n \ + kio \ + ktextwidgets \ + kwidgetsaddons \ +" + +PV = "${KDE_APP_VERSION}" +SRC_URI[md5sum] = "fa127f073bbb0075741c12d0017b2f44" +SRC_URI[sha256sum] = "ad123b24f88e1ade5a845c16a84a483835cce31b92741107d8dbd02f462d4cd9" + +FILES_${PN} += " \ + ${datadir}/icons \ +" diff --git a/recipes-kde/apps/khelpcenter/khelpcenter.bb b/recipes-kde/apps/khelpcenter/khelpcenter.bb index d95ce159..bb47b52b 100644 --- a/recipes-kde/apps/khelpcenter/khelpcenter.bb +++ b/recipes-kde/apps/khelpcenter/khelpcenter.bb @@ -28,8 +28,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "43166f3d90e7ffb75d5cae074276f97f" -SRC_URI[sha256sum] = "c724fbbea161432ac627c86809ff2dc97cc645ab76ac4ed68a984b17a1d96f2a" +SRC_URI[md5sum] = "7af7f7f466600d08ca11aa1f24e9c977" +SRC_URI[sha256sum] = "5b4a9ed17d0898c74cf7fd1612e2d055086d5e04148b3b17df5977255fc240b8" SRC_URI += " \ file://0001-fix-build-for-qtbase-without-session-management.patch \ diff --git a/recipes-kde/apps/kio-extras/kio-extras.bb b/recipes-kde/apps/kio-extras/kio-extras.bb index cd8ff5b0..b814b8bf 100644 --- a/recipes-kde/apps/kio-extras/kio-extras.bb +++ b/recipes-kde/apps/kio-extras/kio-extras.bb @@ -12,7 +12,6 @@ LIC_FILES_CHKSUM = " \ inherit kde-apps gettext DEPENDS += " \ - libssh \ qtsvg \ qtwebengine \ \ @@ -40,6 +39,7 @@ DEPENDS += " \ " # REVISIT optionals +# libssh \ # openslp # openssh <-> dropbear DEPENDS += " \ @@ -49,8 +49,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "2a34d890b3b6d6ea52ae9ac8023816fa" -SRC_URI[sha256sum] = "450d69b16a873da51190c9397b2b0ecb08bc0dcae0d2a07f7ab1d2efcd02c280" +SRC_URI[md5sum] = "93e86cccf0b4d4868d5b32e16fa5299f" +SRC_URI[sha256sum] = "f8879abaea6fcf31ee0bd4a55d0c24a5fded6d61abed1b059f704f797793aef2" # gperf creates hard #line links do_install_prepend() { @@ -73,8 +73,3 @@ FILES_${PN} += " \ \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \ -" diff --git a/recipes-kde/apps/kmag/kmag.bb b/recipes-kde/apps/kmag/kmag.bb index c9bd18fe..7d5b27c9 100644 --- a/recipes-kde/apps/kmag/kmag.bb +++ b/recipes-kde/apps/kmag/kmag.bb @@ -19,8 +19,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "472a879705318277832afa03a53f2ff0" -SRC_URI[sha256sum] = "6c42ea93e8f4251360af0340bb89489868520f9b0c990260be8464df6ae38d63" +SRC_URI[md5sum] = "f0d06288f2b55f63fd67d747f2868216" +SRC_URI[sha256sum] = "04f1357e46bb3e32c85f08c9d5655cde6351c6efd27824a17019ea8562e8d5ba" FILES_${PN} += " \ ${datadir}/kxmlgui5 \ diff --git a/recipes-kde/apps/kmahjongg/kmahjongg.bb b/recipes-kde/apps/kmahjongg/kmahjongg.bb index dcba7f70..bfe2da6a 100644 --- a/recipes-kde/apps/kmahjongg/kmahjongg.bb +++ b/recipes-kde/apps/kmahjongg/kmahjongg.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "7cc1a3e0817e6a6d1c95c87e013cf51d" -SRC_URI[sha256sum] = "aadef9680a0a8670f9996c498adb609b287e5f016b83e44b5b1458d239db5782" +SRC_URI[md5sum] = "73db8ba5adba90700a3447833304341e" +SRC_URI[sha256sum] = "188a8d921b72965d4ed0f6490048cde7b9d5606cca7d3cea12463dc71a90ccf6" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/kmines/kmines.bb b/recipes-kde/apps/kmines/kmines.bb index 73ee9a10..b17acae5 100644 --- a/recipes-kde/apps/kmines/kmines.bb +++ b/recipes-kde/apps/kmines/kmines.bb @@ -23,8 +23,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "9b0891a00e9f696b264625d91142c270" -SRC_URI[sha256sum] = "09ba45ca7f934753c1bf4e3113b00174cbb71a332eb3ceb0bc5fc404d1534092" +SRC_URI[md5sum] = "f308aa02233b191051a4da306bc4b899" +SRC_URI[sha256sum] = "40c16b57614098555c32252c75e3890922b62d7005b9059f6ae92e11c96d980f" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/recipes-kde/apps/kmix/kmix.bb b/recipes-kde/apps/kmix/kmix.bb index a1c6189f..74ded872 100644 --- a/recipes-kde/apps/kmix/kmix.bb +++ b/recipes-kde/apps/kmix/kmix.bb @@ -32,8 +32,8 @@ PACKAGECONFIG = "pulseaudio" PACKAGECONFIG[pulseaudio] = ",,pulseaudio" PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "5437e003e452efe4c3154c25d6fb42db" -SRC_URI[sha256sum] = "2d27ad00533188d55f01c4d98b1ca91a22e0cdcd1f3f77bae9005a2a357e1214" +SRC_URI[md5sum] = "2071a1c7b592a238bc03503e8d0f3cfc" +SRC_URI[sha256sum] = "4edf31a36a5d700cc190ba7a5a0d76789729069d48324a22bda7977cb4ed081a" SRC_URI += "file://0001-Fix-build-with-QT_NO_SESSIONMANAGER-set.patch" @@ -50,8 +50,3 @@ FILES_${PN} += " \ ${libdir}/libkdeinit5*.so \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/plasma/*/.debug \ -" diff --git a/recipes-kde/apps/kmplot/kmplot.bb b/recipes-kde/apps/kmplot/kmplot.bb new file mode 100644 index 00000000..9b29b474 --- /dev/null +++ b/recipes-kde/apps/kmplot/kmplot.bb @@ -0,0 +1,35 @@ +SUMMARY = "Mathematical Function Plotter" +LICENSE = "GPLv2 & GFDL-1.2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=7974e16b472f00bbbadf2d006aa00c50 \ + file://COPYING.DOC;md5=ad1419ecc56e060eccf8184a87c4285f \ +" + +inherit kde-apps gtk-icon-cache + +DEPENDS += " \ + qtsvg \ + \ + kauth-native \ + kconfig-native \ + kcoreaddons-native \ + kdoctools-native \ + kcrash \ + kguiaddons \ + ki18n \ + kparts \ + kwidgetsaddons \ + kdbusaddons \ +" + +PV = "${KDE_APP_VERSION}" +SRC_URI[md5sum] = "6f92126fc111e28b733f458a536ac914" +SRC_URI[sha256sum] = "2dd6eec34088b5d3b591091cce41616ee310a66aa2d16e5800db56044d60dd7b" + +FILES_${PN} += " \ + ${datadir}/config.kcfg \ + ${datadir}/kxmlgui5 \ + ${datadir}/dbus-1 \ + ${datadir}/kservices5 \ + ${OE_QMAKE_PATH_PLUGINS} \ +" diff --git a/recipes-kde/apps/kolourpaint/kolourpaint.bb b/recipes-kde/apps/kolourpaint/kolourpaint.bb index d61f3b53..0ee4b261 100644 --- a/recipes-kde/apps/kolourpaint/kolourpaint.bb +++ b/recipes-kde/apps/kolourpaint/kolourpaint.bb @@ -29,8 +29,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "d21f754ae2749503e610dc486161fb89" -SRC_URI[sha256sum] = "207d344db75e13f1d72050e329dba3d8a48227c22c93e916741f76ae742fb44b" +SRC_URI[md5sum] = "07f4861f1b09d08fc954cf2ea8c7189c" +SRC_URI[sha256sum] = "450b714f0d73b59d31c4ceda142a3496d14e51d84b8c8968548a15e05c138f98" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/apps/konsole/konsole.bb b/recipes-kde/apps/konsole/konsole.bb index c317e437..6ceb708d 100644 --- a/recipes-kde/apps/konsole/konsole.bb +++ b/recipes-kde/apps/konsole/konsole.bb @@ -1,10 +1,9 @@ SUMMARY = "KDE's terminal emulator" -LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2 & MIT" +LICENSE = "GPLv2 & GFDL-1.2 & LGPLv2" LIC_FILES_CHKSUM = " \ file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \ file://COPYING.DOC;md5=24ea4c7092233849b4394699333b5c56 \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://COPYING.Unicode;md5=ca09fbc4ba99ecc01ce41d513908dcd3 \ " inherit kde-apps gettext @@ -41,8 +40,8 @@ DEPENDS += " \ PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "c6fd2099ffd9129290c6d201f5430e76" -SRC_URI[sha256sum] = "a0c8535f0260c67c86c2563cb224f57da53a8800ba8388dfa14e326b5050f7d3" +SRC_URI[md5sum] = "1378218f3e108403decdbc8ad846cc49" +SRC_URI[sha256sum] = "01ff3245d755a6e38207e58e50e5f82e5c681ead2ad7176d46aec00a8a562e08" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" diff --git a/recipes-kde/apps/kpat/kpat.bb b/recipes-kde/apps/kpat/kpat.bb index 628788b3..0c746b35 100644 --- a/recipes-kde/apps/kpat/kpat.bb +++ b/recipes-kde/apps/kpat/kpat.bb @@ -27,8 +27,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "90094d62dd7307a337b4b8e9e020e1e2" -SRC_URI[sha256sum] = "bbead384a9c9d81656595c4bc5952ea9f4399f633fb7b9bb50d497789087f2e6" +SRC_URI[md5sum] = "d0b23b0430f650ce898a57edb7b11024" +SRC_URI[sha256sum] = "62c31d6f7a9bb49c09725722bea472811d897b149e29558ca6e248b5d2a41377" FILES_SOLIBSDEV = "" diff --git a/recipes-kde/apps/kreversi/kreversi.bb b/recipes-kde/apps/kreversi/kreversi.bb index aa9e16fc..727c5db6 100644 --- a/recipes-kde/apps/kreversi/kreversi.bb +++ b/recipes-kde/apps/kreversi/kreversi.bb @@ -30,8 +30,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "7596e73feee142e8f642ef46f88bbe65" -SRC_URI[sha256sum] = "3d58f74334c2c3634e6b9ac1c466f0c31c1e42076402eb594e35df3dcc46b15c" +SRC_URI[md5sum] = "e05fcf9365abb666b38c963988ce040e" +SRC_URI[sha256sum] = "818ef2ded02caacf2ccf3c012e992070c3b898db319682e8a42cf5726d56b3fc" SRC_URI+="file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ diff --git a/recipes-kde/apps/ksudoku/ksudoku.bb b/recipes-kde/apps/ksudoku/ksudoku.bb index da5822d9..a5184f00 100644 --- a/recipes-kde/apps/ksudoku/ksudoku.bb +++ b/recipes-kde/apps/ksudoku/ksudoku.bb @@ -29,8 +29,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "a5e853dd976fcb069aea1ecbf20dc30a" -SRC_URI[sha256sum] = "6c3a13d816a567228fa06f1b48ce2f8f3b4d84596b3af6b1160c7720dacac6ec" +SRC_URI[md5sum] = "904d4cdab886484afb1fc90dfd522a14" +SRC_URI[sha256sum] = "4a44248f2bde9c66c911fe7ed7bd54e31956053dac18e29217a355ad2b3a05e1" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/recipes-kde/apps/ksystemlog/ksystemlog.bb b/recipes-kde/apps/ksystemlog/ksystemlog.bb index 8b2901fd..ef0f9145 100644 --- a/recipes-kde/apps/ksystemlog/ksystemlog.bb +++ b/recipes-kde/apps/ksystemlog/ksystemlog.bb @@ -22,7 +22,7 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "98b642b64d0bf5047f753d964ae6a3fa" -SRC_URI[sha256sum] = "0aeacf783e465f84934359f41c5afda487a8f7d1ff9cdd4dd3687df11d732583" +SRC_URI[md5sum] = "ce0e9290effc7ed38ab6232809843f4b" +SRC_URI[sha256sum] = "93f276698b74af654f3ed147d5c025162bd919ec6c79a7c7dd7678051c307e52" FILES_${PN} += "${datadir}/kxmlgui5" diff --git a/recipes-kde/apps/kwalletmanager/kwalletmanager.bb b/recipes-kde/apps/kwalletmanager/kwalletmanager.bb index 926ebe4e..f0acfe1a 100644 --- a/recipes-kde/apps/kwalletmanager/kwalletmanager.bb +++ b/recipes-kde/apps/kwalletmanager/kwalletmanager.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "bfb9fcf08b2200a37c9938c708a9aaad" -SRC_URI[sha256sum] = "50d74198e98debef6409c8f7e3e90261e2f7ff6955dcaaa753f426edea741762" +SRC_URI[md5sum] = "6d90a44ee14a0937bc5a1f983fc46421" +SRC_URI[sha256sum] = "78232285c08241dc06cd6da88dcdce0d850417dd73f0d07034ec6d9a6f97f478" SRC_URI += "file://0001-fix-build-with-QT_NO_SESSIONMANAGER-set.patch" FILES_${PN} += " \ @@ -33,11 +33,5 @@ FILES_${PN} += " \ ${datadir}/polkit-1 \ ${datadir}/icons \ ${datadir}/k*5 \ - ${libdir}/kauth \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${libdir}/kauth/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/apps/kwave/kwave.bb b/recipes-kde/apps/kwave/kwave.bb index 04e06120..a1da7f89 100644 --- a/recipes-kde/apps/kwave/kwave.bb +++ b/recipes-kde/apps/kwave/kwave.bb @@ -32,8 +32,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "659fd24acdccbb4603b7e6db6f6657ce" -SRC_URI[sha256sum] = "e18d8a08c9df73e6d38c7d3200fb177f070943fb472f4d437e193edfee9a5992" +SRC_URI[md5sum] = "e9c5692d83493a4293a706c41b0762fe" +SRC_URI[sha256sum] = "4ca9a15ecd06b96e013855f8109b52fcd4a848652438b2e7a2f55a8fcb1d1c48" SRC_URI += "file://0001-FIND_REQUIRED_PROGRAM-is-broken-use-the-tools-direct.patch" # Aagh: To select a soundcard we need to select another type - so keep oss in as dummy diff --git a/recipes-kde/apps/libkdcraw/libkdcraw.bb b/recipes-kde/apps/libkdcraw/libkdcraw.bb index 284d64af..55245870 100644 --- a/recipes-kde/apps/libkdcraw/libkdcraw.bb +++ b/recipes-kde/apps/libkdcraw/libkdcraw.bb @@ -13,5 +13,5 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "c7f10236316f103a6d9527db7b0838d3" -SRC_URI[sha256sum] = "6c40db4ec7c3c1978650fdc5ce36ea78e85d5efb76061df451fdde2e533fc926" +SRC_URI[md5sum] = "75999ed863aef72bcf62a40910c0ca20" +SRC_URI[sha256sum] = "c4b6541419b2ebee15d24744d10e67c9a137e616766e765c13e5056c2a37ef99" diff --git a/recipes-kde/apps/libkdegames/libkdegames.bb b/recipes-kde/apps/libkdegames/libkdegames.bb index 2482d6b6..46b58175 100644 --- a/recipes-kde/apps/libkdegames/libkdegames.bb +++ b/recipes-kde/apps/libkdegames/libkdegames.bb @@ -43,15 +43,11 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "df1e09cb399a166fa24f9387fd7b92f5" -SRC_URI[sha256sum] = "3fca47c6d08081b44f184813b9fea3b5b47157da4dcba18d62eb04fb02b1546d" +SRC_URI[md5sum] = "69830d93bd7dfa8882a45a9d7a45a0a1" +SRC_URI[sha256sum] = "7c833fe476043f0492a09a52af60ee7652805cccbbb72e5f473a9d35abff9ed9" FILES_${PN} += " \ ${datadir}/carddecks \ ${datadir}/kconf_update \ ${OE_QMAKE_PATH_QML} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \ -" diff --git a/recipes-kde/apps/libkexiv2/libkexiv2.bb b/recipes-kde/apps/libkexiv2/libkexiv2.bb index 6660fc9e..e239a19c 100644 --- a/recipes-kde/apps/libkexiv2/libkexiv2.bb +++ b/recipes-kde/apps/libkexiv2/libkexiv2.bb @@ -13,5 +13,5 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "1110a0f82f138d082078dfef1fd41a33" -SRC_URI[sha256sum] = "18dbe07aa8bfc2529f62d81d5c36699b2da897d12279477bdf9b87e6f12b4546" +SRC_URI[md5sum] = "50ef0905ed41eb586145dac0274ca226" +SRC_URI[sha256sum] = "1d14ff63af42ab7e19e2039648a95ea5dc946afbe3e3df52c17ce1618a02ebdc" diff --git a/recipes-kde/apps/libkmahjongg/libkmahjongg.bb b/recipes-kde/apps/libkmahjongg/libkmahjongg.bb index 5e46f59f..5f65397f 100644 --- a/recipes-kde/apps/libkmahjongg/libkmahjongg.bb +++ b/recipes-kde/apps/libkmahjongg/libkmahjongg.bb @@ -19,8 +19,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "46dc849ed8901349227a80463e68a902" -SRC_URI[sha256sum] = "2e73db1ee52d5805e341f0ea2163482554bd5d534e13c9b89f07d67612bca1c6" +SRC_URI[md5sum] = "a2ffeb6f68f7a84ad6e01c2a58b12708" +SRC_URI[sha256sum] = "25e5cea50b6c96f18efa8d013ab58abfaac7845edb969b8e63e0c297482a6be4" FILES_${PN} += " \ ${datadir}/kmahjongglib \ diff --git a/recipes-kde/apps/lokalize/lokalize.bb b/recipes-kde/apps/lokalize/lokalize.bb index 1b2b9957..cd11d23d 100644 --- a/recipes-kde/apps/lokalize/lokalize.bb +++ b/recipes-kde/apps/lokalize/lokalize.bb @@ -26,8 +26,8 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "67aee04577deda43565b4fb5220a759b" -SRC_URI[sha256sum] = "ec996691a9198e344fdd6f2c2b23ed0032733f3421be304a4b74219591dcfd94" +SRC_URI[md5sum] = "4ae0ce5d6989aeb8f877f63e2a4ea473" +SRC_URI[sha256sum] = "cce11b9384d27006855a141d2241a67d05679baa7096db2311c49a78bd642fed" FILES_${PN} += " \ ${datadir}/config.kcfg \ diff --git a/recipes-kde/apps/marble/marble.bb b/recipes-kde/apps/marble/marble.bb index f894e115..b0384ac0 100644 --- a/recipes-kde/apps/marble/marble.bb +++ b/recipes-kde/apps/marble/marble.bb @@ -31,8 +31,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "1d4f5bbcbce52716370bdab6656e23f0" -SRC_URI[sha256sum] = "a81c9047a9596922671eca91007dc066cbe10e4424e44f3980673494c839b331" +SRC_URI[md5sum] = "49b86d84d38ccc0804c922a9502a2b12" +SRC_URI[sha256sum] = "0bfd7ae576e42ebbddadc8c83c2fec5edaf462bcf284642b1002d36d751b24ee" EXTRA_OECMAKE += " \ -DMARBLE_PRI_INSTALL_DIR=${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/modules \ @@ -41,7 +41,7 @@ EXTRA_OECMAKE += " \ PACKAGES =+ " \ ${PN}-qt \ - ${PN}-designer-plugin-dbg ${PN}-designer-plugin \ + ${PN}-designer-plugin \ " CMAKE_ALIGN_SYSROOT[1] = "Marble, -S${includedir}, -s${_IMPORT_PREFIX}/include" @@ -63,16 +63,6 @@ FILES_${PN} += " \ ${OE_QMAKE_PATH_QML} \ " -FILES_${PN}-dbg += " \ - ${libdir}/marble/plugins/.debug \ - ${libdir}/marble/plugins/org/kde/edu/marble/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" - FILES_${PN}-designer-plugin += " \ ${OE_QMAKE_PATH_PLUGINS}/designer \ " - -FILES_${PN}-designer-plugin-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/designer/.debug \ -" diff --git a/recipes-kde/apps/minuet/minuet.bb b/recipes-kde/apps/minuet/minuet.bb index e937d459..3cf28613 100644 --- a/recipes-kde/apps/minuet/minuet.bb +++ b/recipes-kde/apps/minuet/minuet.bb @@ -21,8 +21,9 @@ DEPENDS += "\ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "4303d7a3c8ab93632859e0ac5a3ff1e4" -SRC_URI[sha256sum] = "a16507d8a5302f3314ae371217eaca0eeb36c0fb48bdc728cb98b7279b03c797" +SRC_URI[md5sum] = "44c25f80973304f0d683dd7fc4a48aa9" +SRC_URI[sha256sum] = "9244ec364d031c73f9aed9568012a28b847ec4dceca61040324af7afd3d64009" +SRC_URI += "file://0001-Do-not-try-to-find-qtquick-compiler.patch" FILES_${PN} += " \ ${datadir}/kxmlgui5 \ diff --git a/recipes-kde/apps/minuet/minuet/0001-Do-not-try-to-find-qtquick-compiler.patch b/recipes-kde/apps/minuet/minuet/0001-Do-not-try-to-find-qtquick-compiler.patch new file mode 100644 index 00000000..e8d314c9 --- /dev/null +++ b/recipes-kde/apps/minuet/minuet/0001-Do-not-try-to-find-qtquick-compiler.patch @@ -0,0 +1,34 @@ +From 08d1d50a8e9433a0fe163d7b1251dafc66bcc40e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 14 Dec 2018 01:41:47 +0100 +Subject: [PATCH] Do not try to find qtquick-compiler +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +we do not have qtdeclarative-native and even if we would: is output target +binary compatible? + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f13838b..9788aeb 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,7 +41,7 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS + Svg + ) + +-find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler) ++#find_package(Qt5 CONFIG QUIET OPTIONAL_COMPONENTS QuickCompiler) + + IF(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Android") + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS +-- +2.14.5 + diff --git a/recipes-kde/apps/okular/okular.bb b/recipes-kde/apps/okular/okular.bb index a69116b9..56e01679 100644 --- a/recipes-kde/apps/okular/okular.bb +++ b/recipes-kde/apps/okular/okular.bb @@ -36,8 +36,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "0fbf8eba9b6017239bea13596b31769d" -SRC_URI[sha256sum] = "343cb0984453329b1b838a049753ae41c98ff6629fb5dde7db6aa40141a2efe2" +SRC_URI[md5sum] = "6d76a028cd3c84e392326d095244bf91" +SRC_URI[sha256sum] = "d7ef9b59acb5746ebc64399f4c1a99faf0c1530bf6a818b3bfd34b73476d90ab" FILES_${PN} += " \ ${datadir}/k*5 \ diff --git a/recipes-kde/apps/spectacle/spectacle.bb b/recipes-kde/apps/spectacle/spectacle.bb index fe13af11..3f622358 100644 --- a/recipes-kde/apps/spectacle/spectacle.bb +++ b/recipes-kde/apps/spectacle/spectacle.bb @@ -31,8 +31,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "0474c1e7018de398ddc9b95f8cfdfd00" -SRC_URI[sha256sum] = "e9f7d09e2b1eb4d8d919a57b461e37e3f5b8d0ef152206e55deef28af2aa7946" +SRC_URI[md5sum] = "39ef496c6cadd6ae308ea9cf612fa447" +SRC_URI[sha256sum] = "8abf85b85de7844c503ef84182303c47cf425f5c14d71e723e3c887ee87ce06e" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/recipes-kde/apps/umbrello/umbrello.bb b/recipes-kde/apps/umbrello/umbrello.bb index 1f2f624f..287d2a27 100644 --- a/recipes-kde/apps/umbrello/umbrello.bb +++ b/recipes-kde/apps/umbrello/umbrello.bb @@ -32,8 +32,8 @@ DEPENDS += " \ " PV = "${KDE_APP_VERSION}" -SRC_URI[md5sum] = "9be3855aecacc7566c400b03d9054e1a" -SRC_URI[sha256sum] = "80d24252b958dea167d10ee97b969f85cfa86e3f95f4a9d94c6e368a3e9d667e" +SRC_URI[md5sum] = "56d4d078d980d2133a9cc08b07006e59" +SRC_URI[sha256sum] = "2ab53b33cf1fcaea470c01b2421e911d4287b1d0421fa33e0b60043fe6943cc7" EXTRA_OECMAKE += "-DBUILD_KF5=1" diff --git a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc index f2ad7fd9..18d4c9b0 100644 --- a/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc +++ b/recipes-kde/kf5/porting-aids-tier1/kjs/kjs.inc @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit kde-kf5-porting-aids perlnative PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "89f51e28a53abdea2e4769ec07fec910" -SRC_URI[sha256sum] = "d96b0dd6a64fe3d288cdd0133f5a646f64f2a85570a26247f50e1b0e610bf6ee" +SRC_URI[md5sum] = "56101da043e93122262cf1ab1510fa4e" +SRC_URI[sha256sum] = "963e452ff3aa18ddc858fbfdcf234bdc97576b9496b871f742d90177a33974ac" SRC_URI += "file://0001-create_hash_table-avoid-polution-of-files-with-build.patch" DEPENDS += " \ diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch index c036b211..5c3dda19 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/files/0003-only-build-kf5-config-for-native.patch @@ -1,6 +1,6 @@ From ac2556aa6a1bdbbdb7347079bfe4bddb74756263 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Mon, 8 Dec 2014 13:37:14 +0100 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 10 Dec 2018 22:47:59 +0100 Subject: [PATCH 3/3] only build kf5-config for native MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -8,24 +8,24 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [cross-specific] -Signed-off-by: Andreas Müller +Signed-off-by: Andreas Müller --- - CMakeLists.txt | 29 +------ - src/CMakeLists.txt | 197 +----------------------------------------- + CMakeLists.txt | 29 +----- + src/CMakeLists.txt | 200 +----------------------------------------- src/kdecore/kglobal.cpp | 18 ---- src/kdecore/klocale_kde.cpp | 4 - src/kdecore/kstandarddirs.cpp | 1 - - 5 files changed, 4 insertions(+), 245 deletions(-) + 5 files changed, 4 insertions(+), 248 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index a3ea743..237b801 100644 +index 2d1f57a..5394b0a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,30 +20,11 @@ include(GenerateExportHeader) include(CMakeFindFrameworks) - set(REQUIRED_QT_VERSION 5.8.0) + set(REQUIRED_QT_VERSION 5.10.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network Widgets DBus Test Svg PrintSupport Designer) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Network DBus Test) @@ -38,7 +38,7 @@ index a3ea743..237b801 100644 -find_package(KF5DocTools ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5Emoticons ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5GuiAddons ${KF5_DEP_VERSION} REQUIRED) -+ find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) ++find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED) find_package(KF5I18n ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5IconThemes ${KF5_DEP_VERSION} REQUIRED) -find_package(KF5KIO ${KF5_DEP_VERSION} REQUIRED) @@ -63,7 +63,7 @@ index a3ea743..237b801 100644 endif () if (APPLE) cmake_find_frameworks(CoreFoundation) -@@ -151,13 +131,8 @@ install( +@@ -153,13 +133,8 @@ install( @@ -78,7 +78,7 @@ index a3ea743..237b801 100644 if (BUILD_TESTING) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index ab0b246..e134bd9 100644 +index ab0b246..0751644 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,4 @@ @@ -96,15 +96,16 @@ index ab0b246..e134bd9 100644 find_package(OpenSSL) set_package_properties(OpenSSL PROPERTIES DESCRIPTION "Support for secure network communications (SSL and TLS)" URL "http://openssl.org" -@@ -51,6 +50,7 @@ else() +@@ -50,7 +49,7 @@ else() + set(libkdelibs4support_SRCS solid/networking_unix.cpp) endif() - +- +endif() set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} kdecore/k4aboutdata.cpp -@@ -58,39 +58,9 @@ set(libkdelibs4support_SRCS +@@ -58,39 +57,9 @@ set(libkdelibs4support_SRCS kdecore/kcurrencycode.cpp kdecore/kdebug.cpp kdecore/kdebugdbusiface.cpp @@ -144,7 +145,7 @@ index ab0b246..e134bd9 100644 kdecore/kcalendarera.cpp kdecore/kcalendarsystem.cpp kdecore/kcalendarsystemcoptic.cpp -@@ -115,95 +85,6 @@ set(libkdelibs4support_SRCS +@@ -115,95 +84,6 @@ set(libkdelibs4support_SRCS kdecore/klocale.cpp kdecore/klocale_kde.cpp @@ -240,7 +241,7 @@ index ab0b246..e134bd9 100644 ) set_source_files_properties( solid/org.freedesktop.PowerManagement.xml -@@ -211,36 +92,6 @@ set_source_files_properties( solid/org.freedesktop.PowerManagement.xml +@@ -211,37 +91,6 @@ set_source_files_properties( solid/org.freedesktop.PowerManagement.xml solid/org.kde.Solid.PowerManagement.PolicyAgent.xml PROPERTIES NO_NAMESPACE TRUE) @@ -274,10 +275,11 @@ index ab0b246..e134bd9 100644 -else() - set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} kdecore/klockfile_unix.cpp) -endif () - +- if (APPLE) set(libkdelibs4support_SRCS ${libkdelibs4support_SRCS} -@@ -266,10 +117,6 @@ configure_file(kdecore/config-date.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-da + kdecore/klocale_mac.cpp +@@ -266,10 +115,6 @@ configure_file(kdecore/config-date.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-da configure_file(kdecore/config-localization.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-localization.h) @@ -288,7 +290,7 @@ index ab0b246..e134bd9 100644 check_function_exists(mmap HAVE_MMAP) check_symbol_exists(posix_madvise "sys/mman.h" HAVE_MADVISE) configure_file(config-kdelibs4support.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdelibs4support.h ) -@@ -315,32 +162,12 @@ endif() +@@ -315,32 +160,12 @@ endif() target_link_libraries(KF5KDELibs4Support PUBLIC @@ -321,7 +323,7 @@ index ab0b246..e134bd9 100644 ${platformLinkLibraries} ) -@@ -368,26 +195,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES +@@ -368,27 +193,6 @@ set_target_properties(KF5KDELibs4Support PROPERTIES ) @@ -345,11 +347,12 @@ index ab0b246..e134bd9 100644 -install(TARGETS kf5deprecatedwidgets DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/designer) - -########## - +- add_subdirectory(pics) + install(TARGETS KF5KDELibs4Support diff --git a/src/kdecore/kglobal.cpp b/src/kdecore/kglobal.cpp -index bd2ba59..f06f73e 100644 +index ac3daa6..2dcafe2 100644 --- a/src/kdecore/kglobal.cpp +++ b/src/kdecore/kglobal.cpp @@ -42,7 +42,6 @@ @@ -362,8 +365,8 @@ index bd2ba59..f06f73e 100644 #undef QT_NO_TRANSLATION @@ -50,14 +49,12 @@ #define QT_NO_TRANSLATION - #include - #include + #include + #include -#include // umask // ~KConfig needs qrand(). qrand() depends on a Q_GLOBAL_STATIC. With this Q_CONSTRUCTOR_FUNCTION we @@ -405,17 +408,17 @@ index bd2ba59..f06f73e 100644 { return KComponentData::activeComponent(); diff --git a/src/kdecore/klocale_kde.cpp b/src/kdecore/klocale_kde.cpp -index d7e45ed..278cf0c 100644 +index dd58c73..c66bd48 100644 --- a/src/kdecore/klocale_kde.cpp +++ b/src/kdecore/klocale_kde.cpp @@ -42,7 +42,6 @@ - #include - #include - #include + #include + #include + #include -#include - #include - #include - #include + #include + #include + #include @@ -485,9 +484,6 @@ void KLocalePrivate::initFormat() m_weekNumberSystem, KLocale::WeekNumberSystem); @@ -427,7 +430,7 @@ index d7e45ed..278cf0c 100644 QString calendarType; readConfigEntry("CalendarSystem", "gregorian", calendarType); diff --git a/src/kdecore/kstandarddirs.cpp b/src/kdecore/kstandarddirs.cpp -index 01560dc..344aa43 100644 +index f366c9d..e5ded7f 100644 --- a/src/kdecore/kstandarddirs.cpp +++ b/src/kdecore/kstandarddirs.cpp @@ -35,7 +35,6 @@ @@ -439,5 +442,5 @@ index 01560dc..344aa43 100644 #include #include -- -1.9.3 +2.14.5 diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb index 30d9b5ed..1550ccf2 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.bb @@ -57,9 +57,3 @@ FILES_${PN} += " \ ${datadir}/dbus-1 \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ -" diff --git a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc index a3e8e20b..a7011cf9 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc +++ b/recipes-kde/kf5/porting-aids-tier3/kdelibs4support/kdelibs4support.inc @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5-porting-aids perlnative PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "ab90b27fb5a26426259328c785f0feed" -SRC_URI[sha256sum] = "eb66382f3aed4d5c01f236807388db3784abbbbd558d5c44a823d0e19d784a23" +SRC_URI[md5sum] = "df51f32b53128527e6afd7db86fc3b9f" +SRC_URI[sha256sum] = "edcc14715699f247c57303d7418014202bd0ed3b06cf9752ddd156fefeb60efa" EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" diff --git a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb index 02b0c954..2e34faf5 100644 --- a/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb +++ b/recipes-kde/kf5/porting-aids-tier3/khtml/khtml.bb @@ -37,8 +37,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "109d9802560834c03464690388d0c840" -SRC_URI[sha256sum] = "150737b9bb55ec6eec6ca77349bc7556e68c403254bd8f69b0340bfcec7a115a" +SRC_URI[md5sum] = "248a4a4990f3230b4d410f6265348c39" +SRC_URI[sha256sum] = "7d381c2a7d15710b4ba404111135c1aadbd3fc8027ad77f153b81a5208c3acf2" do_compile_append() { # gperf-native sets absolut debug comments/links in header @@ -50,7 +50,3 @@ FILES_${PN} += " \ ${datadir}/k*5 \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \ -" diff --git a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb index c37086f2..c8703f1d 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kjsembed/kjsembed.bb @@ -16,5 +16,5 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "2a72f28626d50ce4a7025726e7f552c5" -SRC_URI[sha256sum] = "cefff15d12331338cedd64386c67a6c924b6a233475b14e0bd22e71b29586813" +SRC_URI[md5sum] = "a9a1b9eb54b520e6f252b92e589a533c" +SRC_URI[sha256sum] = "7bde7a742c05c5ba0b8faef4681dcec0a0b91ad0a3c7cc3cdd3cfa94c0c16e52" diff --git a/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb b/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb index c2630c23..3759a3bb 100644 --- a/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb +++ b/recipes-kde/kf5/porting-aids-tier3/kross/kross.bb @@ -25,14 +25,9 @@ DEPENDS += "\ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "b1e0637099649bead354f2696e2637ff" -SRC_URI[sha256sum] = "9aafba35b57614758dc13c018b40fa47be470a9dffb503e07e290411edce0c95" +SRC_URI[md5sum] = "7a3854f1c5afdbf21d0aa691d5b4ed27" +SRC_URI[sha256sum] = "bbfafe4abd2c2166f31eb36daa1849f4dc4a829c06fe85402e1fad0ce875c667" FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ -" diff --git a/recipes-kde/kf5/tier1/attica/attica.bb b/recipes-kde/kf5/tier1/attica/attica.bb index 00686c98..0852b0a7 100644 --- a/recipes-kde/kf5/tier1/attica/attica.bb +++ b/recipes-kde/kf5/tier1/attica/attica.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -SRC_URI[md5sum] = "c7efdea96f928d1b1dfd006daaa12a4e" -SRC_URI[sha256sum] = "b6734d976d6909cba789b18187e16db7d72edca43dc0ceaa89be4f1901e6e01c" +SRC_URI[md5sum] = "b0b58d82e5047796eeebdac4bf969aa4" +SRC_URI[sha256sum] = "abbaeed8ec027735d6504d31387e4115400457e14b8983a780debd769e4766c5" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb b/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb index 625fe551..0cb4590f 100644 --- a/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb +++ b/recipes-kde/kf5/tier1/bluez-qt/bluez-qt.bb @@ -7,10 +7,9 @@ inherit kde-kf5 DEPENDS += "qtdeclarative" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "b467e097d77fb0a591a5e3daccd05d6f" -SRC_URI[sha256sum] = "f65854f9ca206c5f74c367070438d9dd958401e6ea9114943bca1878189f4cfc" +SRC_URI[md5sum] = "2e2a7b4b5a2efbb2acc9c48f9111291f" +SRC_URI[sha256sum] = "d592b84dd52aeaa0a5453949aced2fa7b160830d7325382f1616e92a338017de" EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" FILES_${PN} += "${OE_QMAKE_PATH_QML}" -FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/org/kde/bluezqt/.debug" diff --git a/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc b/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc index fb48418d..b9c30add 100644 --- a/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc +++ b/recipes-kde/kf5/tier1/breeze-icons/breeze-icons.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 gtk-icon-cache -SRC_URI[md5sum] = "0f6822ca8ede075b9005a3ff525a7734" -SRC_URI[sha256sum] = "979db0040d8c7ef7adcac133988f6440ebe21bf3f4c4479e830d38195ba1dc5a" +SRC_URI[md5sum] = "e708f4df6128da1ea7c7493d3da836e4" +SRC_URI[sha256sum] = "7d98d6be0795cc5dd7468e3d8093541726dcc10586a91477c02879f5eb8fcf58" SRC_URI += "file://0001-Force-build-of-Qt-binary-resource-files.patch" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier1/karchive/karchive.inc b/recipes-kde/kf5/tier1/karchive/karchive.inc index 0ea55a57..bdf637a2 100644 --- a/recipes-kde/kf5/tier1/karchive/karchive.inc +++ b/recipes-kde/kf5/tier1/karchive/karchive.inc @@ -10,7 +10,7 @@ inherit kde-kf5 DEPENDS += "bzip2 xz zlib" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "3f0a5580b368394800b6707564e41e0b" -SRC_URI[sha256sum] = "3da2eab8f14e9d995e467ba6c20186d7eadd06f2cff946c569b716bb1a648950" +SRC_URI[md5sum] = "681afd14a1c294795d509930418b83d0" +SRC_URI[sha256sum] = "281a6cea68d19d56f8506e839e450d6652604e49ab70b540e29828b50adbcad6" EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" diff --git a/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb index 77d6ca24..2f7573ce 100644 --- a/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb +++ b/recipes-kde/kf5/tier1/kcodecs/kcodecs.bb @@ -10,8 +10,8 @@ inherit kde-kf5 DEPENDS += "gperf-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "714f06bdb059ce1a1fae9fda370f06cb" -SRC_URI[sha256sum] = "5b988a3a1d66e335e0a42addc0cb507b030db46e796e8d2355bbc122f09857fc" +SRC_URI[md5sum] = "a3cda4ef6700a9975225f2fc6544ceb6" +SRC_URI[sha256sum] = "e7234cddea70d4fa61dd66272dd43da401cc2543e40a6e9bb3a3655263419c82" do_compile_append() { # gperf-native sets absolut debug comments/links in header diff --git a/recipes-kde/kf5/tier1/kconfig/kconfig.bb b/recipes-kde/kf5/tier1/kconfig/kconfig.bb index 1aea3ed9..23a673d2 100644 --- a/recipes-kde/kf5/tier1/kconfig/kconfig.bb +++ b/recipes-kde/kf5/tier1/kconfig/kconfig.bb @@ -4,5 +4,4 @@ DEPENDS += "${BPN}-native" PACKAGES =+ "${PN}-bin" -FILES_${PN}-dbg += "${libdir}/kconfig/kf5/.debug" FILES_${PN}-bin = "${bindir}/k*" diff --git a/recipes-kde/kf5/tier1/kconfig/kconfig.inc b/recipes-kde/kf5/tier1/kconfig/kconfig.inc index e68645d9..97b6f77c 100644 --- a/recipes-kde/kf5/tier1/kconfig/kconfig.inc +++ b/recipes-kde/kf5/tier1/kconfig/kconfig.inc @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 cmake_lib PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "0c14d82f423ae540c42df57781022e67" -SRC_URI[sha256sum] = "1da21c1cbeae28e4faa850baaab94c6a86c80f86db486c811f3764da82ba428b" +SRC_URI[md5sum] = "8064e6bbb1703c42e22055ea8e4f7250" +SRC_URI[sha256sum] = "2a970733da16b90ecc317e8ac77f08530650eb2e98dc93834e09e156ec353172" # REVISIT remove ugly hack for wayland-only environments SRC_URI += " \ diff --git a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc index cbfe6191..b05e5559 100644 --- a/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc +++ b/recipes-kde/kf5/tier1/kcoreaddons/kcoreaddons.inc @@ -7,5 +7,5 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 mime PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "dfa547e55e32d4a6c22f47514c17be15" -SRC_URI[sha256sum] = "49aaae09f4196f2aef7b78ea2ee4d290bbedd9fe3831680197e3a767697c78d3" +SRC_URI[md5sum] = "61056e358e4a90e15023573bf73bbbfc" +SRC_URI[sha256sum] = "9f41039f1bd453087ff784e9e95d4f09624ff893fe0298d3c986a6a554b37b9e" diff --git a/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb index 7bcde65f..edd83473 100644 --- a/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb +++ b/recipes-kde/kf5/tier1/kdbusaddons/kdbusaddons.bb @@ -11,5 +11,5 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "0283c5e0aed6c9c67145e131d2f9f8ec" -SRC_URI[sha256sum] = "d757340e5727b6437dad5cdb5cbe51fe6d96c814c44279b774fe56e2b66e7db9" +SRC_URI[md5sum] = "7e9071c078a7a56aaa74a7554a338f04" +SRC_URI[sha256sum] = "b930918ccece1d80aaf0eb770d4e17e5926d7da3a97d1f8506f28829d267b972" diff --git a/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb index f0242a03..db652f5a 100644 --- a/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb +++ b/recipes-kde/kf5/tier1/kdnssd/kdnssd.bb @@ -10,5 +10,5 @@ inherit kde-kf5 DEPENDS += "avahi" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "ccb0e0d1b3c755ece0bf3b8632ff256d" -SRC_URI[sha256sum] = "fe50259eb7d16ee2a3353af34889273b6e5332859f87e7ff501491fdfc1413c1" +SRC_URI[md5sum] = "f54a1ec86d7c6004bc19319db1eaae10" +SRC_URI[sha256sum] = "7e1383580f97248d8bfb6522bd230657bd002d3eb0e74a178bccc8a511e353bf" diff --git a/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb b/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb index 95034f23..54b96fb9 100644 --- a/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb +++ b/recipes-kde/kf5/tier1/kguiaddons/kguiaddons.bb @@ -12,5 +12,5 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "a5fc8e86f7c42255ddc4eac971cae762" -SRC_URI[sha256sum] = "6bda17a5252a627607a1110510676435772dcf27e2ca8486b7e5a1a56844c254" +SRC_URI[md5sum] = "57cf67c1d6911c244f6d79a24da7425e" +SRC_URI[sha256sum] = "b190b601679bb5f6994f85d452b0a182283dbb872b688447449aefe09388e23e" diff --git a/recipes-kde/kf5/tier1/kholidays/kholidays.bb b/recipes-kde/kf5/tier1/kholidays/kholidays.bb index df594f91..e76a3a24 100644 --- a/recipes-kde/kf5/tier1/kholidays/kholidays.bb +++ b/recipes-kde/kf5/tier1/kholidays/kholidays.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 -SRC_URI[md5sum] = "fe3147b9f1bff71ae71404c2e28bab65" -SRC_URI[sha256sum] = "b4ad42478ef58d53799a904ad1ec88c5f3c66c993ef5eca3b0cab7a92ec629de" +SRC_URI[md5sum] = "8abfaeee4518335b2c9881f77004263f" +SRC_URI[sha256sum] = "28bc4a987adac5313dcc03b50eb34d910b93f76f54c0aaa0d30b97a086a6a252" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier1/ki18n/ki18n.inc b/recipes-kde/kf5/tier1/ki18n/ki18n.inc index c4326c4d..e32d5b65 100644 --- a/recipes-kde/kf5/tier1/ki18n/ki18n.inc +++ b/recipes-kde/kf5/tier1/ki18n/ki18n.inc @@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "c35c89cd31f7fef949e92def931ed3bc" -SRC_URI[sha256sum] = "b1d9c14fa5067235be02d2bb822cde5292edb0d54513f4e49dd28a641547bd53" +SRC_URI[md5sum] = "d3b4ea17742aba2a24b8b3115a5df47d" +SRC_URI[sha256sum] = "b885bcde4cdf700ecbd8487c52ced453de67c44dac014b53b4eefbba5353ae41" diff --git a/recipes-kde/kf5/tier1/kidletime/kidletime.bb b/recipes-kde/kf5/tier1/kidletime/kidletime.bb index 39c0ac86..a4a96bae 100644 --- a/recipes-kde/kf5/tier1/kidletime/kidletime.bb +++ b/recipes-kde/kf5/tier1/kidletime/kidletime.bb @@ -10,8 +10,7 @@ inherit kde-kf5 DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "libxcb qtx11extras libxscrnsaver", "", d)}" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "7bd74ea0223998157d9a87378f68c0d7" -SRC_URI[sha256sum] = "d72a6f4a33e8d496fe5f029ac407a7b26f445500a83ed978d03765cc4b4048e9" +SRC_URI[md5sum] = "e0e37a5a5a3fdfe805d0acb151e3459c" +SRC_URI[sha256sum] = "252965db39e1c9f927896176b8b9683c9d7ca25cd1373a3924036f87e2222824" FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}" -FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug" diff --git a/recipes-kde/kf5/tier1/kirigami/kirigami2.bb b/recipes-kde/kf5/tier1/kirigami/kirigami2.bb index 2f8554b9..f6f8c882 100644 --- a/recipes-kde/kf5/tier1/kirigami/kirigami2.bb +++ b/recipes-kde/kf5/tier1/kirigami/kirigami2.bb @@ -13,8 +13,8 @@ DEPENDS += " \ PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "7308ffce8c900befea2c3fb4306d7083" -SRC_URI[sha256sum] = "375ec103d56a71ee3a5f43de1cfb4720fc33c125b2b2de545f9e563851c38c24" +SRC_URI[md5sum] = "b53c211a97fc1574d372922fbf528463" +SRC_URI[sha256sum] = "fea01ea5d277a1d415a3b2f0fe8f7659bf345933c4fd1c78c5f92fab40c97e5d" FILES_${PN} += " \ ${OE_QMAKE_PATH_QML} \ diff --git a/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb index c34958ac..984e6443 100644 --- a/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb +++ b/recipes-kde/kf5/tier1/kitemmodels/kitemmodels.bb @@ -9,5 +9,5 @@ inherit kde-kf5 DEPENDS += "qtdeclarative" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "536f945311dc68982ebadd0bf061f3b0" -SRC_URI[sha256sum] = "56f3f518e728a06291e169a6ff2a6c8f5141a04fdad117f8b9f1d0d1ec365b5e" +SRC_URI[md5sum] = "2b83a402d77edce5d472bd8c593b7717" +SRC_URI[sha256sum] = "2fcf1c08766096c9e62fd40087013e7fd69900d8e5d306d392817949e15ea18e" diff --git a/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb index 02d8215e..57ebe1c9 100644 --- a/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb +++ b/recipes-kde/kf5/tier1/kitemviews/kitemviews.bb @@ -8,5 +8,5 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "d3db2d188235a6b0e6881d55eed17175" -SRC_URI[sha256sum] = "eb71fe0c674123285cff66d67c2c930b2b6c44a63998279b67a67c30b1fe07db" +SRC_URI[md5sum] = "e050ff0c4362abe8ebeb4aa31b0617bb" +SRC_URI[sha256sum] = "a84036e6dd2974ddcfcc4d8c0f5a1eab59dafdb20f60fbd8df3d5f7fa54824ab" diff --git a/recipes-kde/kf5/tier1/kplotting/kplotting.bb b/recipes-kde/kf5/tier1/kplotting/kplotting.bb index 0f431f31..e508818c 100644 --- a/recipes-kde/kf5/tier1/kplotting/kplotting.bb +++ b/recipes-kde/kf5/tier1/kplotting/kplotting.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "2598d21a9dc2d1b741afc0cf1d739aee" -SRC_URI[sha256sum] = "d7d9444580b3b6b45744976894667d38fd7bd338123649fe945fb6f70fc9d146" +SRC_URI[md5sum] = "efa1993430511e0e20e059f835a1c237" +SRC_URI[sha256sum] = "39e44138af405f8e07eb91d660447a770394bf8fae166634a386e873761c33c3" diff --git a/recipes-kde/kf5/tier1/kwayland/kwayland.bb b/recipes-kde/kf5/tier1/kwayland/kwayland.bb index 14675e40..c91eb143 100644 --- a/recipes-kde/kf5/tier1/kwayland/kwayland.bb +++ b/recipes-kde/kf5/tier1/kwayland/kwayland.bb @@ -9,5 +9,5 @@ inherit kde-kf5 cmake_auto_align_paths DEPENDS += "wayland wayland-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "962e29ea6311810293dde85133bbc8c1" -SRC_URI[sha256sum] = "4006e9b10b65fbd3e821025a5ee2345b8c0352fb3b9be4d46b8546cb42e6d437" +SRC_URI[md5sum] = "97ba639374122d2ae0fa8bb3cc43b85a" +SRC_URI[sha256sum] = "bbe76d398b96e0f0ba4342616b91de49e7cbc1f0a7f5038cd97a981f8a8de99c" diff --git a/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb index 8c6098d3..3cb9fba7 100644 --- a/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb +++ b/recipes-kde/kf5/tier1/kwidgetsaddons/kwidgetsaddons.bb @@ -10,5 +10,5 @@ inherit kde-kf5 DEPENDS += "qttools" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "d059a26696f74b1a3a2d325e6ede68c7" -SRC_URI[sha256sum] = "76c8b0008e49ebb0b058650c3be454fc3a3b23925f2df4ab859d45d163f047d9" +SRC_URI[md5sum] = "59fef0ceb831b41a514aea9d9ab59bab" +SRC_URI[sha256sum] = "9b06e67a05d6f90287edf6a7cc31b93c01c9e58f35ae456b6d89e8ef78e0953a" diff --git a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb index a015df40..09826c5f 100644 --- a/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb +++ b/recipes-kde/kf5/tier1/kwindowsystem/kwindowsystem.bb @@ -9,10 +9,9 @@ inherit kde-kf5 cmake_auto_align_paths cmake_lib DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras libxrender", "", d)}" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "e9aa4de548e2c34a2c0cf9fa01f146ca" -SRC_URI[sha256sum] = "fd7adee58e803732cda7ea1ba1d99f6750920a774945293174e0512254bdaeab" +SRC_URI[md5sum] = "4cec43e5c481322f0b36e78d6b5688a5" +SRC_URI[sha256sum] = "ecb39fcbe48e24c0a3b9c70b9b08c3c95ade446759b850bf5079df7669f56936" CMAKE_ALIGN_SYSROOT[1] = "KF5WindowSystem, -S${includedir}, -s${_IMPORT_PREFIX}/include" FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}" -FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug" diff --git a/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb b/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb index 34da7aba..a3dbdfec 100644 --- a/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb +++ b/recipes-kde/kf5/tier1/modemmanager-qt/modemmanager-qt.bb @@ -7,8 +7,8 @@ inherit kde-kf5 pkgconfig cmake_auto_align_paths cmake_lib DEPENDS += "modemmanager" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "0121cc6445a988c3c9525657eaf730cf" -SRC_URI[sha256sum] = "08c9cbabdde683dbee953ca40ee41b5cb99b062c102feb8bb763d5e85974c693" +SRC_URI[md5sum] = "f8d5a52adae4b0427c44de6d964aa009" +SRC_URI[sha256sum] = "6cd1490efcfeddd64cc536889b9e675077d76cbce6fcebb0a216c9b8bc379df7" CMAKE_ALIGN_SYSROOT[1] = "KF5ModemManagerQt, -S${includedir}, -s${_IMPORT_PREFIX}/include" diff --git a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb index fbd529fc..d199e65f 100644 --- a/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb +++ b/recipes-kde/kf5/tier1/networkmanager-qt/networkmanager-qt.bb @@ -7,8 +7,8 @@ inherit kde-kf5 pkgconfig cmake_auto_align_paths cmake_lib DEPENDS += "networkmanager" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "8d2ee42d568da06f4b136ba83d9edd0f" -SRC_URI[sha256sum] = "1779ad439c99c5440ac97739fca36c66bb937ee6257a6cabc234c62f9959bd5e" +SRC_URI[md5sum] = "f476894b17852379a6cf472a5a37885e" +SRC_URI[sha256sum] = "61d212ef98c5ce6406bfa8f6e84e4bea43c0e4b7ddb4abbff1df077d701e0b5c" CMAKE_ALIGN_SYSROOT[1] = "KF5NetworkManagerQt, -S${includedir}, -s${_IMPORT_PREFIX}/include" -CMAKE_ALIGN_SYSROOT[2] = "KF5NetworkManagerQt, -S;${libdir}, -s;${_IMPORT_PREFIX}/lib" +CMAKE_ALIGN_SYSROOT[2] = "KF5NetworkManagerQt, -S;${libdir}, -S;${_IMPORT_PREFIX}/${baselib}" diff --git a/recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb b/recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb index 0fc7b63b..4e2bdebd 100644 --- a/recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb +++ b/recipes-kde/kf5/tier1/oxygen-icons/oxygen-icons5.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 gtk-icon-cache -SRC_URI[md5sum] = "dc1ae66764ee48813e1a8bc270f5bda9" -SRC_URI[sha256sum] = "16cafdb5a91465e1c711f55305a41df0ccb6f7b78582243fbdf45752d1f0d3de" +SRC_URI[md5sum] = "3a5f3d18cd63785c45e09f6d911d050b" +SRC_URI[sha256sum] = "0b07c6092d46ee6359bcf101a85a55342214c11a1a4c262c82dc6fc4aa63929d" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier1/prison/prison.bb b/recipes-kde/kf5/tier1/prison/prison.bb index 50c318c9..2739c235 100644 --- a/recipes-kde/kf5/tier1/prison/prison.bb +++ b/recipes-kde/kf5/tier1/prison/prison.bb @@ -11,7 +11,7 @@ DEPENDS += " \ libdmtx \ " -SRC_URI[md5sum] = "4968c986f485ddd1882a114647e5c7ac" -SRC_URI[sha256sum] = "8d9a88137995abf42cc11ad8d42c23759939bc837b74f8527d09866c0879c4b1" +SRC_URI[md5sum] = "b34f81e5af793dfde9943e4eaf9969a8" +SRC_URI[sha256sum] = "1dbe7531d1ebe6adcef6b56553812ae6557d32c3a3da65be7cd7ea02be331e16" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier1/solid/solid.bb b/recipes-kde/kf5/tier1/solid/solid.bb index e756e0fc..9f6b9b74 100644 --- a/recipes-kde/kf5/tier1/solid/solid.bb +++ b/recipes-kde/kf5/tier1/solid/solid.bb @@ -9,10 +9,9 @@ inherit kde-kf5 DEPENDS += "bison-native qtdeclarative" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "cfb3f22aa572a8a126440294de6fe65b" -SRC_URI[sha256sum] = "b2f776c595519570f2faa64bb50c5ba6da2c10d078b51bb0608f9d659e8902ca" +SRC_URI[md5sum] = "2b3708251bb4f86b5b9aae5c4c61348b" +SRC_URI[sha256sum] = "841d90346cdc51214076cf26357701781d8d534dd209d92768f306e281e46e9e" FILES_${PN} += "${OE_QMAKE_PATH_QML}" -FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/org/kde/${BPN}/.debug" RRECOMMENDS_${PN} += "udisks2" diff --git a/recipes-kde/kf5/tier1/sonnet/sonnet.bb b/recipes-kde/kf5/tier1/sonnet/sonnet.bb index ae29e331..177d26cc 100644 --- a/recipes-kde/kf5/tier1/sonnet/sonnet.bb +++ b/recipes-kde/kf5/tier1/sonnet/sonnet.bb @@ -9,10 +9,6 @@ FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS}/kf5/sonnet \ " -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/sonnet/.debug \ -" - CMAKE_ALIGN_SYSROOT[1] = "KF5Sonnet, -s${_IMPORT_PREFIX}/bin, -s${KDE_PATH_EXTERNAL_HOST_BINS}" PACKAGECONFIG ??= "hunspell" diff --git a/recipes-kde/kf5/tier1/sonnet/sonnet.inc b/recipes-kde/kf5/tier1/sonnet/sonnet.inc index 75ad34da..c4aaea72 100644 --- a/recipes-kde/kf5/tier1/sonnet/sonnet.inc +++ b/recipes-kde/kf5/tier1/sonnet/sonnet.inc @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "50654527bf2a9de3ba206db34a4c45de" -SRC_URI[sha256sum] = "11037f2ca098dd389fd22fdf6ce2bf13f6429895e85dbfb740cc289e590be1a8" +SRC_URI[md5sum] = "0b42e1dd0873c54a9d06dc4ef95bdfff" +SRC_URI[sha256sum] = "3c6539eb6e50a01ec0a823dd21ba8a49e1b9fb709cf91c25d95be6a48ed30b65" diff --git a/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc b/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc index 3c90454d..fc6e0eb0 100644 --- a/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc +++ b/recipes-kde/kf5/tier1/syntax-highlighting/syntax-highlighting.inc @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 perlnative -SRC_URI[md5sum] = "ae98e0911cf571d8b8cbe5505bf4c4be" -SRC_URI[sha256sum] = "293817aaf2088496343006aa8059de54b6183018c1f5b92f00a9944365f46137" +SRC_URI[md5sum] = "9cb5b2eb63776bf69fa196f45fd53675" +SRC_URI[sha256sum] = "14c1832e268c8053cc0ef9ff00415794801e518f9c103328eca661a657d8803e" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb index 05f60416..89a6816c 100644 --- a/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb +++ b/recipes-kde/kf5/tier1/threadweaver/threadweaver.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1" inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "1238ad19d3ab42d50ed00450d7d9004b" -SRC_URI[sha256sum] = "a262abf07336a6085060c5f7ae9dbb3841064070834af0e019e9303bade396c2" +SRC_URI[md5sum] = "95e365a634957aaff8c5a0be45c6ff44" +SRC_URI[sha256sum] = "bd300ce0dc7d8b796fdcc257b9d27eb3f35cdcdef18611a146d3c11f3690dbbf" diff --git a/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb b/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb index 704f1a8c..a3e693fc 100644 --- a/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb +++ b/recipes-kde/kf5/tier2/kactivities-stats/kactivities-stats.bb @@ -20,5 +20,5 @@ DEPENDS += " \ CXXFLAGS += "-DBOOST_DISABLE_ASSERTS" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "2579bdfdadf36b5277e57f72113ad2e6" -SRC_URI[sha256sum] = "ba4ecca9f948bf88b0117cb91d560e4c09bf7cda19105012f4a6144c38bed65e" +SRC_URI[md5sum] = "479c89c78fbcb4cc8ce8f639ff5a43a9" +SRC_URI[sha256sum] = "6ed0f91dd1dee3db2b0ac8e9a344eb32a881cf243dbf34c0d95888955b7277ec" diff --git a/recipes-kde/kf5/tier2/kauth/kauth.bb b/recipes-kde/kf5/tier2/kauth/kauth.bb index 6ea37dd2..1f433332 100644 --- a/recipes-kde/kf5/tier2/kauth/kauth.bb +++ b/recipes-kde/kf5/tier2/kauth/kauth.bb @@ -1,13 +1,13 @@ require ${BPN}.inc -inherit cmake_lib +inherit cmake_lib distro_features_check DEPENDS += "${BPN}-native kcoreaddons polkit-qt-1" +REQUIRED_DISTRO_FEATURE = "polkit" EXTRA_OECMAKE += "-DKAUTH_BACKEND_NAME=POLKITQT5-1" # executables CMAKE_ALIGN_SYSROOT[1] = "KF5Auth, -s${_IMPORT_PREFIX}/libexec/kauth/kauth-policy-gen, -s${KDE_PATH_EXTERNAL_HOST_LIBEXECS}/kauth/kauth-policy-gen" FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}" -FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/*/.debug" diff --git a/recipes-kde/kf5/tier2/kauth/kauth.inc b/recipes-kde/kf5/tier2/kauth/kauth.inc index 0ead18fd..63eb35e5 100644 --- a/recipes-kde/kf5/tier2/kauth/kauth.inc +++ b/recipes-kde/kf5/tier2/kauth/kauth.inc @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "ab9cc12cbcf19583a975e6e049f0e7aa" -SRC_URI[sha256sum] = "b5f7a8c4e13dfcb904d0767e87354420cf385d1e02e53d4a5bb329bc71f72079" +SRC_URI[md5sum] = "3d4fe8eda589cca76ca846e8a151c638" +SRC_URI[sha256sum] = "cbcca13064b112dff26d1f78b1e77c8ad263cb663aab6329bc6e0a6505f4613d" EXTRA_OECMAKE += "-DAUTOTESTS=OFF" diff --git a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb index 2f43aae4..77aceef1 100644 --- a/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb +++ b/recipes-kde/kf5/tier2/kcompletion/kcompletion.bb @@ -9,5 +9,5 @@ inherit kde-kf5 DEPENDS += "kconfig kconfig-native kwidgetsaddons" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "52143b17340fb5e79904f8a4e203b383" -SRC_URI[sha256sum] = "0b4b523d259e253882a01ed9897764097b440bbd242137532af9fc5420705b39" +SRC_URI[md5sum] = "8f5717c167558618c0fa62504f4204af" +SRC_URI[sha256sum] = "49dbfda63c64724ecff40032c1631a7c7b84a8c551401a7547fa12e100cdbafb" diff --git a/recipes-kde/kf5/tier2/kcrash/kcrash.bb b/recipes-kde/kf5/tier2/kcrash/kcrash.bb index 0ad8cd81..63942834 100644 --- a/recipes-kde/kf5/tier2/kcrash/kcrash.bb +++ b/recipes-kde/kf5/tier2/kcrash/kcrash.bb @@ -11,5 +11,5 @@ REQUIRED_DISTRO_FEATURE = "x11" DEPENDS += "kcoreaddons kcoreaddons-native kwindowsystem virtual/libx11" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "384150a2e65befe16e7e2f9e193ee638" -SRC_URI[sha256sum] = "2b5cd37d67edaba93a9fd90f12889c57bb83c178c58e1635b6204b8e742f9481" +SRC_URI[md5sum] = "db49cf5fb083bf45dcca7c7813ee92ac" +SRC_URI[sha256sum] = "581e8215212a584886e8d4b6d5c1aac277590bcb343697d8b3653e1c22f6b1e0" diff --git a/recipes-kde/kf5/tier2/kdoctools/files/0001-don-t-build-documentation.patch b/recipes-kde/kf5/tier2/kdoctools/files/0001-don-t-build-documentation.patch index aa7c34a4..6ca9c255 100644 --- a/recipes-kde/kf5/tier2/kdoctools/files/0001-don-t-build-documentation.patch +++ b/recipes-kde/kf5/tier2/kdoctools/files/0001-don-t-build-documentation.patch @@ -1,6 +1,6 @@ From 760e76e826f935c72b4874f104773c954def532e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 28 Nov 2014 12:21:41 +0100 +Date: Mon, 10 Dec 2018 21:51:52 +0100 Subject: [PATCH 4/4] don't build documentation MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 @@ -8,19 +8,19 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [configuration] -Signed-off-by: Andreas Müller +Signed-off-by: Andreas Müller --- CMakeLists.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5927437..2e49d39 100644 +index 8ce562e..a1187fc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -91,12 +91,7 @@ set(KDOCTOOLS_LANGUAGES_LIST af bg ca cs da de el en-GB en eo es et fi fo fr gl - +@@ -95,12 +95,7 @@ set(KDOCTOOLS_LANGUAGES_LIST af bg ca cs da de el en-GB en eo es et fi fo fr gl set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5DocTools") add_definitions(-DTRANSLATION_DOMAIN=\"kdoctools5\") + add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) -if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po" AND KF5I18n_FOUND) - ki18n_install(po) - kdoctools_install(po) @@ -31,5 +31,5 @@ index 5927437..2e49d39 100644 if (BUILD_TESTING) add_subdirectory(autotests) -- -2.14.4 +2.14.5 diff --git a/recipes-kde/kf5/tier2/kdoctools/files/0002-Make-our-cross-build-find-docbookl10nhelper.patch b/recipes-kde/kf5/tier2/kdoctools/files/0002-Make-our-cross-build-find-docbookl10nhelper.patch index e7085e03..cfbfc7c8 100644 --- a/recipes-kde/kf5/tier2/kdoctools/files/0002-Make-our-cross-build-find-docbookl10nhelper.patch +++ b/recipes-kde/kf5/tier2/kdoctools/files/0002-Make-our-cross-build-find-docbookl10nhelper.patch @@ -17,8 +17,8 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a615ca8..300772a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -184,18 +184,6 @@ if(INSTALL_INTERNAL_TOOLS) - install(TARGETS docbookl10nhelper EXPORT KF5DocToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) +@@ -209,18 +209,6 @@ if(INSTALL_INTERNAL_TOOLS) + install(TARGETS docbookl10nhelper EXPORT KF5DocToolsToolsTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) endif() -if(CMAKE_CROSSCOMPILING AND DOCBOOKL10NHELPER_EXECUTABLE) diff --git a/recipes-kde/kf5/tier2/kdoctools/files/0004-Add-cmdline-param-to-help-find-xsl.patch b/recipes-kde/kf5/tier2/kdoctools/files/0004-Add-cmdline-param-to-help-find-xsl.patch index 1eab3d7d..561f078f 100644 --- a/recipes-kde/kf5/tier2/kdoctools/files/0004-Add-cmdline-param-to-help-find-xsl.patch +++ b/recipes-kde/kf5/tier2/kdoctools/files/0004-Add-cmdline-param-to-help-find-xsl.patch @@ -8,7 +8,7 @@ Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [configuration] -Signed-off-by: Andreas Müller +Signed-off-by: Andreas Müller --- CMakeLists.txt | 2 ++ @@ -26,7 +26,7 @@ index d99537c..a06d025 100644 +# OE specific +set(OE_ROOT_PATH_PREFIX "" CACHE STRING "OE sysroot") # Dependencies - set(REQUIRED_QT_VERSION 5.8.0) + set(REQUIRED_QT_VERSION 5.10.0) find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) diff --git a/cmake/FindDocBookXSL.cmake b/cmake/FindDocBookXSL.cmake index 3d9e40c..779cb2c 100644 diff --git a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc index 6b2efc61..c58c35cb 100644 --- a/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc +++ b/recipes-kde/kf5/tier2/kdoctools/kdoctools.inc @@ -11,8 +11,8 @@ inherit kde-kf5 perlnative DEPENDS += "docbook-xml-dtd4 docbook-xsl-stylesheets liburi-perl-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "c6b567f454d6fdb3b96e21d511d505cd" -SRC_URI[sha256sum] = "368ef2d68a50ec006a6a05fbbd95574bb0620151b493d0fcdca32e964a2c2139" +SRC_URI[md5sum] = "af377ccda2cabcbfb352422a15923cb3" +SRC_URI[sha256sum] = "e4f83bfaeca9ef89711577b756a3c359eb8d45b60a180934ba82431b5c36c007" # allarch packages do only install into machine sysroot # for xml4 diff --git a/recipes-kde/kf5/tier2/kfilemetadata/files/0001-Revert-extractors-Hide-warnings-from-system-headers.patch b/recipes-kde/kf5/tier2/kfilemetadata/files/0001-Revert-extractors-Hide-warnings-from-system-headers.patch index c755d021..9df42cb9 100644 --- a/recipes-kde/kf5/tier2/kfilemetadata/files/0001-Revert-extractors-Hide-warnings-from-system-headers.patch +++ b/recipes-kde/kf5/tier2/kfilemetadata/files/0001-Revert-extractors-Hide-warnings-from-system-headers.patch @@ -45,44 +45,24 @@ Upstream-Status: Pending Signed-off-by: Andreas Müller --- - src/extractors/CMakeLists.txt | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) + src/extractors/CMakeLists.txt | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/extractors/CMakeLists.txt b/src/extractors/CMakeLists.txt -index 3888d1d..0401429 100644 +index 15399f7..5c9fd60 100644 --- a/src/extractors/CMakeLists.txt +++ b/src/extractors/CMakeLists.txt -@@ -16,8 +16,10 @@ if(Poppler_Qt5_FOUND) +@@ -16,8 +16,8 @@ if(Poppler_Qt5_FOUND) endif() if(TAGLIB_FOUND) + include_directories( ${TAGLIB_INCLUDES} ) -+ add_library(kfilemetadata_taglibextractor MODULE taglibextractor.cpp ) - target_include_directories(kfilemetadata_taglibextractor SYSTEM PRIVATE ${TAGLIB_INCLUDES}) -+ target_link_libraries( kfilemetadata_taglibextractor KF5::FileMetaData ${TAGLIB_LIBRARIES} -@@ -27,12 +29,15 @@ if(TAGLIB_FOUND) - install( - TARGETS kfilemetadata_taglibextractor - DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kfilemetadata) -+ - endif() - - if(EXIV2_FOUND) -+ include_directories( ${EXIV2_INCLUDE_DIR} ) -+ -+ kde_enable_exceptions() - add_library(kfilemetadata_exiv2extractor MODULE exiv2extractor.cpp) -- target_include_directories(kfilemetadata_exiv2extractor SYSTEM PRIVATE ${EXIV2_INCLUDE_DIR}) -- kde_target_enable_exceptions(kfilemetadata_exiv2extractor PRIVATE) -+ - target_link_libraries(kfilemetadata_exiv2extractor - KF5::FileMetaData - ${EXIV2_LIBRARIES} -@@ -46,8 +46,8 @@ if(EXIV2_FOUND) +@@ -45,8 +45,8 @@ if(LibExiv2_FOUND) endif() if(FFMPEG_FOUND) @@ -92,7 +72,7 @@ index 3888d1d..0401429 100644 target_link_libraries(kfilemetadata_ffmpegextractor KF5::FileMetaData ${AVCODEC_LIBRARIES} -@@ -62,8 +69,10 @@ endif() +@@ -63,8 +63,9 @@ endif() if(EPUB_FOUND) @@ -100,20 +80,18 @@ index 3888d1d..0401429 100644 + add_library(kfilemetadata_epubextractor MODULE epubextractor.cpp) - target_include_directories(kfilemetadata_epubextractor SYSTEM PRIVATE ${EPUB_INCLUDE_DIR}) -+ target_link_libraries(kfilemetadata_epubextractor KF5::FileMetaData ${EPUB_LIBRARIES} -@@ -163,7 +172,8 @@ DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kfilemetadata) +@@ -202,7 +203,7 @@ DESTINATION ${PLUGIN_INSTALL_DIR}/kf5/kfilemetadata) # if (QMOBIPOCKET_FOUND) add_library(kfilemetadata_mobiextractor MODULE mobiextractor.cpp) - target_include_directories(kfilemetadata_mobiextractor SYSTEM PRIVATE ${QMOBIPOCKET_INCLUDE_DIR}) -+ + include_directories(${QMOBIPOCKET_INCLUDE_DIR}) target_link_libraries(kfilemetadata_mobiextractor KF5::FileMetaData ${QMOBIPOCKET_LIBRARIES} -- -2.14.3 +2.14.5 diff --git a/recipes-kde/kf5/tier2/kfilemetadata/files/0002-Do-not-include-taglib-as-system-library.patch b/recipes-kde/kf5/tier2/kfilemetadata/files/0002-Do-not-include-taglib-as-system-library.patch new file mode 100644 index 00000000..6439224a --- /dev/null +++ b/recipes-kde/kf5/tier2/kfilemetadata/files/0002-Do-not-include-taglib-as-system-library.patch @@ -0,0 +1,44 @@ +From 5dc359caa176d40245e8b1f7bdc0a0ff6d769383 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 11 Mar 2019 14:14:26 +0100 +Subject: [PATCH] Do not include taglib as system library +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + src/CMakeLists.txt | 2 +- + src/writers/CMakeLists.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c3cbe8c..710e7b0 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -39,7 +39,7 @@ target_link_libraries(KF5FileMetaData + ) + + if(TAGLIB_FOUND) +- target_include_directories(KF5FileMetaData SYSTEM PRIVATE ${TAGLIB_INCLUDES}) ++ target_include_directories(KF5FileMetaData PRIVATE ${TAGLIB_INCLUDES}) + + target_link_libraries(KF5FileMetaData + PRIVATE +diff --git a/src/writers/CMakeLists.txt b/src/writers/CMakeLists.txt +index 864dc51..039d24e 100644 +--- a/src/writers/CMakeLists.txt ++++ b/src/writers/CMakeLists.txt +@@ -1,6 +1,6 @@ + if(TAGLIB_FOUND) + add_library(kfilemetadata_taglibwriter MODULE taglibwriter.cpp) +- target_include_directories(kfilemetadata_taglibwriter SYSTEM PRIVATE ${TAGLIB_INCLUDES}) ++ target_include_directories(kfilemetadata_taglibwriter PRIVATE ${TAGLIB_INCLUDES}) + + target_link_libraries( kfilemetadata_taglibwriter + KF5::FileMetaData +-- +2.20.1 + diff --git a/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb b/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb index 23aa47ec..c8a16c39 100644 --- a/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb +++ b/recipes-kde/kf5/tier2/kfilemetadata/kfilemetadata.bb @@ -9,14 +9,20 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 pkgconfig gettext PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "e1b9d7f405dfe3ee5861e5b20522ff19" -SRC_URI[sha256sum] = "bcaa271e4234016b7f12a64c9cd8f3e9827ff1eb49f9cf2aaecea1a8535d51fe" -SRC_URI += "file://0001-Revert-extractors-Hide-warnings-from-system-headers.patch" +SRC_URI[md5sum] = "0e6bec57c4de4f279ebac2b3852c2706" +SRC_URI[sha256sum] = "269db442adef2409ccf6b2078e3b644eb504b36f84c33c2809b1ff739c68f512" +SRC_URI += " \ + file://0001-Revert-extractors-Hide-warnings-from-system-headers.patch \ + file://0002-Do-not-include-taglib-as-system-library.patch \ +" # TODO: optionals PACKAGECONFIG (poppler-qt5 / exiv2 / ffmpeg / epub) DEPENDS += " \ qtmultimedia \ lmdb \ + kconfig-native \ + kcoreaddons-native \ + kcoreaddons \ ki18n \ karchive \ libav \ @@ -25,8 +31,8 @@ DEPENDS += " \ exiv2 \ " +EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" + FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/kf5" -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \ -" + +RRECOMMENDS_${PN} += "catdoc" diff --git a/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb b/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb index 58c50a7c..04427d2d 100644 --- a/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb +++ b/recipes-kde/kf5/tier2/kimageformats/kimageformats.bb @@ -12,11 +12,10 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "b54d8596c6be3b892688be3bb39efe15" -SRC_URI[sha256sum] = "cfd0a93ebd846fe246788ad91973c233e3e16f5cf9b9e0e094c76490f021abb2" +SRC_URI[md5sum] = "540cd0efb02b1302bdca5cc6aa16f468" +SRC_URI[sha256sum] = "a58ddeb83295d1c0305897788aa303aba6ec8d3f9663f3d175cb8337a518f0b1" FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ ${datadir}/kservices5 \ " -FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/*/.debug" diff --git a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb index ef373eec..0ce8ad8a 100644 --- a/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb +++ b/recipes-kde/kf5/tier2/kjobwidgets/kjobwidgets.bb @@ -10,7 +10,7 @@ DEPENDS += "kcoreaddons kcoreaddons-native kwidgetsaddons \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "", d)}" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "f3dcb4dc2826314f51a7c79110f400e2" -SRC_URI[sha256sum] = "021d3777a106aa2a0157b35fd734822370a3ab1370de1c5b3a4987d99e65f0b7" +SRC_URI[md5sum] = "f61a3f12abe0fb2b8c25cfa834dcf68e" +SRC_URI[sha256sum] = "3ea6001724c82e2158f6ee3719f7b4974f271b056661fac037b39ce2338d04b6" FILES_${PN} += "${datadir}/dbus-1" diff --git a/recipes-kde/kf5/tier2/knotifications/knotifications.bb b/recipes-kde/kf5/tier2/knotifications/knotifications.bb index 48eb62e9..bfab7b6c 100644 --- a/recipes-kde/kf5/tier2/knotifications/knotifications.bb +++ b/recipes-kde/kf5/tier2/knotifications/knotifications.bb @@ -22,7 +22,7 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "484db54a1b961771d0e053ae7f1ca29f" -SRC_URI[sha256sum] = "27e24b0fa30bf529953125087bc0cbf2f7fba9e524ce48596fc26062c8af7656" +SRC_URI[md5sum] = "ee5bffb6757af216ceb0f8c7d984fbc9" +SRC_URI[sha256sum] = "44ac6a710a0d89947c4f1412a8b324d89db18b9f1179ff98e22c61070e12ce16" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/kservicetypes5" diff --git a/recipes-kde/kf5/tier2/kpackage/kpackage.inc b/recipes-kde/kf5/tier2/kpackage/kpackage.inc index d683e79e..d2030331 100644 --- a/recipes-kde/kf5/tier2/kpackage/kpackage.inc +++ b/recipes-kde/kf5/tier2/kpackage/kpackage.inc @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "a8bf815c1189b23d142f8535708e2317" -SRC_URI[sha256sum] = "3997add0d4b4fc7a6f9fa86a2dbec2e4f419c8b2e1e2c02fce6d2f6839466814" +SRC_URI[md5sum] = "3754136eb861119e747d56d6d5c26bc5" +SRC_URI[sha256sum] = "59fe9c9ec38ec9afb0381921ad72593772d28273ad85469df20083731b05f90c" EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" diff --git a/recipes-kde/kf5/tier2/kpty/kpty.bb b/recipes-kde/kf5/tier2/kpty/kpty.bb index 52ac307f..8c89335d 100644 --- a/recipes-kde/kf5/tier2/kpty/kpty.bb +++ b/recipes-kde/kf5/tier2/kpty/kpty.bb @@ -10,5 +10,5 @@ inherit kde-kf5 gettext DEPENDS += "kcoreaddons kcoreaddons-native ki18n" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "e60a43ae5c5144168a49d6611ad29f2a" -SRC_URI[sha256sum] = "02cd57c6fb41946d76e79153387db24de664f3f55db6664b37d65286ef91c78a" +SRC_URI[md5sum] = "0e1a8bec275e08cf1b8ba9c32c83a465" +SRC_URI[sha256sum] = "f310c89854a10000dabc3e67b227bf6b28b1511c87968a7cb81a9a9f8d22f7b7" diff --git a/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb index 039690c4..e8801f39 100644 --- a/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb +++ b/recipes-kde/kf5/tier2/kunitconversion/kunitconversion.bb @@ -7,5 +7,5 @@ inherit kde-kf5 gettext DEPENDS += "ki18n" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "d6ae3e7ef1cb101387d9c5c43116d051" -SRC_URI[sha256sum] = "36a05251365616cfff4fc2ee94ab78fcd78dd1426e88c26c321532fe7c126df9" +SRC_URI[md5sum] = "6c62d8fa81a980303b8f9e5881754a43" +SRC_URI[sha256sum] = "848472340fb24fdb57c0ea60bc4bafcb2b3a26d0eede21a2e8b39e730d6bc5cd" diff --git a/recipes-kde/kf5/tier2/syndication/syndication.bb b/recipes-kde/kf5/tier2/syndication/syndication.bb index 8db62fb3..6bdb5c04 100644 --- a/recipes-kde/kf5/tier2/syndication/syndication.bb +++ b/recipes-kde/kf5/tier2/syndication/syndication.bb @@ -12,5 +12,5 @@ DEPENDS += " \ kcodecs \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "65ab7595092ff5726e1f20d3afe4855c" -SRC_URI[sha256sum] = "0d9ae4b6eecf5310f580df05f2f1ab6da2d4b17d1e616a46ad0893d6341d9e9a" +SRC_URI[md5sum] = "1d7c5865589f34626f6f093a39a5e85a" +SRC_URI[sha256sum] = "09874ad643da79c538592800d307ab8f2e8785032c0d885fac8f9355ae83d972" diff --git a/recipes-kde/kf5/tier3/baloo/baloo.bb b/recipes-kde/kf5/tier3/baloo/baloo.bb index 411e877c..0c3ca906 100644 --- a/recipes-kde/kf5/tier3/baloo/baloo.bb +++ b/recipes-kde/kf5/tier3/baloo/baloo.bb @@ -25,8 +25,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "4d856340bd15547452f4369195ca77f3" -SRC_URI[sha256sum] = "8ddf85c6ae74dac868f37b562b80fdad753888f0c75b97ab26f01bdfc7bf5ea8" +SRC_URI[md5sum] = "219106bf7fbd84ae7a98eb320eb3684b" +SRC_URI[sha256sum] = "9ed5ba80305815cde3ebe1fe707c35661cedba39539645e815d408fe28a41212" SRC_URI += " \ file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \ diff --git a/recipes-kde/kf5/tier3/kactivities/kactivities.bb b/recipes-kde/kf5/tier3/kactivities/kactivities.bb index 846a64de..17399c17 100644 --- a/recipes-kde/kf5/tier3/kactivities/kactivities.bb +++ b/recipes-kde/kf5/tier3/kactivities/kactivities.bb @@ -13,8 +13,8 @@ DEPENDS += "boost kconfig kcoreaddons ki18n kservice kwindowsystem kglobalaccel kauth-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "242b533d6f2511581bb429250685162e" -SRC_URI[sha256sum] = "add14c6331d4a282ca8313a5a931f111cb85efaf13079035428c50e2f65c935d" +SRC_URI[md5sum] = "73e6b1ddb49999ffad14ea3485bd6121" +SRC_URI[sha256sum] = "e76a4d44ca6e7ce2273d8c3b133fdd12e32367aeffd66098ec46e7b28c491750" do_compile_prepend() { # Error: Could not locate service type file kservicetypes5/ "kfileitemactionplugin.desktop" , tried ... @@ -27,6 +27,3 @@ FILES_${PN} += " \ ${datadir}/k*5 \ ${OE_QMAKE_PATH_QML}/org/kde \ " -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_QML}/org/kde/*/.debug \ -" diff --git a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb index 13735a0f..f2f6163f 100644 --- a/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb +++ b/recipes-kde/kf5/tier3/kbookmarks/kbookmarks.bb @@ -10,5 +10,5 @@ DEPENDS += "kconfigwidgets kconfig kiconthemes kxmlgui kconfig-native kcoreaddon kauth-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "f12cb1e7056be3d999459295bdd6109f" -SRC_URI[sha256sum] = "608367a9959dabb22e544ad1a98a2c5270f0eba2348ba4a26f664dfe16758b48" +SRC_URI[md5sum] = "07d9185bfacd575c4ed57b04ca495e82" +SRC_URI[sha256sum] = "02011a370959e9fe91db499ba8b12284f2274471760b1bd466587aa9c0c1953b" diff --git a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb index e745149f..2e0f3382 100644 --- a/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb +++ b/recipes-kde/kf5/tier3/kcmutils/kcmutils.bb @@ -10,7 +10,7 @@ DEPENDS += "kitemviews kconfigwidgets kcoreaddons ki18n kiconthemes kservice kxm kdeclarative kcoreaddons-native kauth-native kconfig-native kpackage-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "4595a7fde0edebb72bd109f377b1622e" -SRC_URI[sha256sum] = "b11bbabdb11c205bdf7419e7a397555dd769353ffe217182d2c187f98e3142b3" +SRC_URI[md5sum] = "9507cf7bd35be9c5435302e41e2f7a99" +SRC_URI[sha256sum] = "7cf6a81818745852c38558160e3888bdd2a9bcce135aee53c3df99e939633ab8" FILES_${PN} += "${datadir}/kservicetypes5" diff --git a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb index fa554ed1..0e6f5ddf 100644 --- a/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb +++ b/recipes-kde/kf5/tier3/kconfigwidgets/kconfigwidgets.bb @@ -11,7 +11,7 @@ DEPENDS += "kauth kconfig kcodecs kguiaddons kwidgetsaddons kdoctools \ gettext-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "aa132506fd6e0eb8652f5e4129569a28" -SRC_URI[sha256sum] = "a3f802fa0f3d2b675ced7aee0ff56a684b435ddc43517d91decbbeea967a6018" +SRC_URI[md5sum] = "7f5ba2cf7ef7190c554d24967848a4a1" +SRC_URI[sha256sum] = "c5cfcd8ba356563d83c11a2ebe78d163336df2ef3f97faed0f487ddc5f67a503" RDEPENDS_${PN} += "perl" diff --git a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb index a068ae48..e5db5391 100644 --- a/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb +++ b/recipes-kde/kf5/tier3/kdeclarative/kdeclarative.bb @@ -16,11 +16,7 @@ SRC_URI += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "18e7b4904501054c48dc470e008d8c2a" -SRC_URI[sha256sum] = "53eae45d1525a1e08596a698b47fb80ec8218a1f27fa64fe8eabf89ec2fa536b" +SRC_URI[md5sum] = "026ce4fdb02dbc05549742756f004d1e" +SRC_URI[sha256sum] = "799c21af97dfbd25d844ff4839461a7ce29bd7e8ec04e00edf43c8bc3eee906a" FILES_${PN} += "${OE_QMAKE_PATH_QML}/org/kde" -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_QML}/org/kde/*/.debug \ - ${OE_QMAKE_PATH_QML}/org/kde/*/*/.debug \ -" diff --git a/recipes-kde/kf5/tier3/kded/kded.bb b/recipes-kde/kf5/tier3/kded/kded.bb index cee84383..28936cc4 100644 --- a/recipes-kde/kf5/tier3/kded/kded.bb +++ b/recipes-kde/kf5/tier3/kded/kded.bb @@ -17,8 +17,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "b60a88ec6e583709f63bc402f5013452" -SRC_URI[sha256sum] = "750da21b06f4da633208e7296cbb9a31ae2e622163878a3f5bd5380502079bd5" +SRC_URI[md5sum] = "a2ed3e22036855d08aab3e60ea00abe5" +SRC_URI[sha256sum] = "ff2a105edaec825bc9d964df8e181c0f4910432bbfbf2238d61acb17b3bebf39" SRC_URI += "file://0001-hardcode-path-to-kconf_update.patch" FILES_${PN} += "${datadir}/dbus-1 ${datadir}/k*5 ${libdir}/libkdeinit5_kded5.so" diff --git a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb index b4d4686c..bb100fe2 100644 --- a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb +++ b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.bb @@ -36,4 +36,3 @@ PACKAGECONFIG[kdewebkit] = "-DWITH_KDEWEBKIT=ON,,kdewebkit" CMAKE_ALIGN_SYSROOT[1] = "KF5DesignerPlugin, -s${_IMPORT_PREFIX}/bin, -s${KDE_PATH_EXTERNAL_HOST_BINS}" FILES_${PN} += "${libdir}/plugins/designer" -FILES_${PN}-dbg += "${libdir}/plugins/designer/.debug" diff --git a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc index 7584f8f0..6c45e892 100644 --- a/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc +++ b/recipes-kde/kf5/tier3/kdesignerplugin/kdesignerplugin.inc @@ -7,5 +7,5 @@ inherit kde-kf5 DEPENDS += "qttools kcoreaddons kconfig kdoctools" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "fc42adfbd144591fb6824d2e36509ba4" -SRC_URI[sha256sum] = "8db46460457b696662a78d307949529356b1c2f6c6c540b957d866eb217ddf75" +SRC_URI[md5sum] = "9f7a117b0a32e0afe7b8516ad4fc4a5e" +SRC_URI[sha256sum] = "9bf43498f631dbf1c2bc15af7f6e6494d979223cf2a34ec9f95f58a7be57d816" diff --git a/recipes-kde/kf5/tier3/kdesu/kdesu.bb b/recipes-kde/kf5/tier3/kdesu/kdesu.bb index cb70228d..cc17bfff 100644 --- a/recipes-kde/kf5/tier3/kdesu/kdesu.bb +++ b/recipes-kde/kf5/tier3/kdesu/kdesu.bb @@ -16,7 +16,5 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "0fd68cc6ec04ee3709365e3aa167d5f8" -SRC_URI[sha256sum] = "821f7929564bcbf756d64f564a28d8697004e8dcb22845db37d6c422107ea1a2" - -FILES_${PN}-dbg += "${libdir}/kdesu/kf5/.debug" +SRC_URI[md5sum] = "d5a2b995e7c3558c6489c0fa9f2555b5" +SRC_URI[sha256sum] = "949a23837de945131042e795daaa8a1abc4d9e03cf149cc9cea78636573e8739" diff --git a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb index d178e421..2a9e1ccc 100644 --- a/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb +++ b/recipes-kde/kf5/tier3/kdewebkit/kdewebkit.bb @@ -20,5 +20,5 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "172082249635e325bf2fc59c6a6cc700" -SRC_URI[sha256sum] = "9816885a4a6ba0f86e0fe99419ad08ac57d95d7bc2f1173297754b308658e81b" +SRC_URI[md5sum] = "2c33f12c1ceac064add3a03819375fd0" +SRC_URI[sha256sum] = "822dc687eec418646132219d98834cbe3c992555bc83bb7ca751a00086ee35b0" diff --git a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb index b86adcc9..bc48f375 100644 --- a/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb +++ b/recipes-kde/kf5/tier3/kemoticons/kemoticons.bb @@ -10,15 +10,11 @@ inherit kde-kf5 gettext DEPENDS += "karchive kconfig kconfig-native kservice kcoreaddons kcoreaddons-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "fc4556f09c2e5fb536f6c06d72abacaa" -SRC_URI[sha256sum] = "ca1311f31ad6c924c5d513be3f0c7c5c57ad319cfe76234ae43c35d2e53304b9" +SRC_URI[md5sum] = "85a0f162dd40f5b5f99e942e476540cc" +SRC_URI[sha256sum] = "82eeb425a0b4eebd60c743433e09bb6aadcb512dce27c5dbd7ce73fb12680b02" FILES_${PN} += " \ ${datadir}/emoticons \ ${datadir}/k*5 \ ${OE_QMAKE_PATH_PLUGINS} \ " -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \ -" diff --git a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb index 4de1a3a1..725d8bca 100644 --- a/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb +++ b/recipes-kde/kf5/tier3/kglobalaccel/kglobalaccel.bb @@ -16,15 +16,11 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "3b8877d0dbd6ee92601a4b82307045e0" -SRC_URI[sha256sum] = "1eb6b54d6114e98d0f30c41d54288bca65ba9725d062a5c4f40b0772aa3ba30d" +SRC_URI[md5sum] = "1dd09569d7824f2bef24a110b3fde08e" +SRC_URI[sha256sum] = "c3a7c694f257d9331c8cb6f398532e89e9cb962f2224524fe69937c17edcaf5e" FILES_${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/kservices5 \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ -" diff --git a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb index c2ea398c..07aeb430 100644 --- a/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb +++ b/recipes-kde/kf5/tier3/kiconthemes/kiconthemes.bb @@ -10,7 +10,7 @@ DEPENDS += "qtsvg ki18n kconfig kconfigwidgets kwidgetsaddons kitemviews gettext kcoreaddons-native kauth-native kconfig-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "c75757aa9fbd5cab563ce90885126c74" -SRC_URI[sha256sum] = "02e3cbe74556f34eac730b826ab87998cd42ab11bc0437588f2ceb348dfd3f2f" +SRC_URI[md5sum] = "f48bc1e2268193f0abe07cb18a1d5b25" +SRC_URI[sha256sum] = "0ae1525aafc9083218a1b0540510b3c65f5843a5f1bd4adf88988ba5f1dab765" FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}" diff --git a/recipes-kde/kf5/tier3/kinit/kinit.bb b/recipes-kde/kf5/tier3/kinit/kinit.bb index 9e2ab1df..ebac7f6e 100644 --- a/recipes-kde/kf5/tier3/kinit/kinit.bb +++ b/recipes-kde/kf5/tier3/kinit/kinit.bb @@ -23,9 +23,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "1d8c8ec597a4e412a95ad55cfdc9213e" -SRC_URI[sha256sum] = "cda65094a7bb4a0a467b6fdfca65efd1cac7b8388d057f2a5624e89f6e16005f" +SRC_URI[md5sum] = "45b405b1a0305c903355ca42c744e1ae" +SRC_URI[sha256sum] = "473f6ba85f99d0d907fdb8105935854ec9b687191e0391a3e66348e5ad5519c6" FILES_${PN} += "${datadir}/dbus-1 ${libdir}/libkdeinit5_klauncher.so" -FILES_${PN}-dbg += "${libdir}/*/*/.debug" FILES_${PN}-dev = "${libdir}/cmake" diff --git a/recipes-kde/kf5/tier3/kio/kio.bb b/recipes-kde/kf5/tier3/kio/kio.bb index 15a659fa..7892c2b5 100644 --- a/recipes-kde/kf5/tier3/kio/kio.bb +++ b/recipes-kde/kf5/tier3/kio/kio.bb @@ -26,8 +26,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "8f1fd180c66f13fe27567608347042cb" -SRC_URI[sha256sum] = "acb05d730f057a81a263d1b217019ffadc276929462c54add202de44313524a1" +SRC_URI[md5sum] = "262629a89383652f57c4f3925d6b4424" +SRC_URI[sha256sum] = "d6fb0bdae9454cd67de19806e338fdcb72e8678a27e95fad3626491d8b1a4cd4" SRC_URI += "file://0001-Extend-upstream-workaround-for-bug-371721-to-also-co.patch" diff --git a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb index 0dd690f2..55f8018a 100644 --- a/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb +++ b/recipes-kde/kf5/tier3/knewstuff/knewstuff.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "067b2556c1662eb8d2dbdce4881ab58c" -SRC_URI[sha256sum] = "ad5f7637ef65a03d433014bf1fbbef4f193e844ee04109e71dfbd43d7fab9bf4" +SRC_URI[md5sum] = "6b7a0aac5699d65f7748dc3fd4215eb1" +SRC_URI[sha256sum] = "3249464773b90c03178fb4be3c874644629f611cef72c3ea89d9ed200a501164" FILES_${PN} += " \ ${OE_QMAKE_PATH_QML}/org/kde/newstuff \ diff --git a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb index 4db43e70..d218e70c 100644 --- a/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb +++ b/recipes-kde/kf5/tier3/knotifyconfig/knotifyconfig.bb @@ -21,5 +21,5 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "d6772be16854c06859d89512c951c6c1" -SRC_URI[sha256sum] = "bd4c9ab350e0dc7f09fb0625d05467d8f9ccf5350ef0470879d8e52572043d4d" +SRC_URI[md5sum] = "9097e1825ba9cc705b25afbc94d2ab94" +SRC_URI[sha256sum] = "b4efe3e636a542531b28841e92c732d6c778670e5f98277bd7029174ce05987f" diff --git a/recipes-kde/kf5/tier3/kparts/kparts.bb b/recipes-kde/kf5/tier3/kparts/kparts.bb index c4801f86..e8bebc32 100644 --- a/recipes-kde/kf5/tier3/kparts/kparts.bb +++ b/recipes-kde/kf5/tier3/kparts/kparts.bb @@ -25,12 +25,11 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "2e52a46ef3f4a031a3ce790661c8fcc9" -SRC_URI[sha256sum] = "072d893e6466a50781c46168616cc165586f75751bd2290a0790b166e751f783" +SRC_URI[md5sum] = "863c68ed99fa8e143e4aa298bf5a22ca" +SRC_URI[sha256sum] = "1ff0d7ffc327f29c250d9c13c782a772b630d6146de68fe5fd1c38575a5645ee" FILES_${PN} += " \ ${datadir}/k*5 \ ${datadir}/kdevappwizard \ ${OE_QMAKE_PATH_PLUGINS} \ " -FILES_${PN}-dbg += "${OE_QMAKE_PATH_PLUGINS}/.debug" diff --git a/recipes-kde/kf5/tier3/kpeople/kpeople.bb b/recipes-kde/kf5/tier3/kpeople/kpeople.bb index 0e23e1a3..ee50dd07 100644 --- a/recipes-kde/kf5/tier3/kpeople/kpeople.bb +++ b/recipes-kde/kf5/tier3/kpeople/kpeople.bb @@ -14,11 +14,10 @@ DEPENDS += "kcoreaddons \ kitemviews" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "85db5bccf51436dbe2749a324c00a479" -SRC_URI[sha256sum] = "98b96d57ba66c8966bf53da065416763dd54761dd1f82628a5a5a719bffbb6c4" +SRC_URI[md5sum] = "fb175e8643f8d70a0aaac2296b7afeac" +SRC_URI[sha256sum] = "79e6d54a1b5c3d41717cb94898ab52a5e0c6187a069cb1e35cd4930ee5348540" FILES_${PN} += " \ ${datadir}/k*5 \ ${OE_QMAKE_PATH_QML} \ " -FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/*/*/*/.debug" diff --git a/recipes-kde/kf5/tier3/krunner/krunner.bb b/recipes-kde/kf5/tier3/krunner/krunner.bb index 9dad0304..a5a9d626 100644 --- a/recipes-kde/kf5/tier3/krunner/krunner.bb +++ b/recipes-kde/kf5/tier3/krunner/krunner.bb @@ -19,8 +19,8 @@ DEPENDS += "qtdeclarative \ threadweaver" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "7df53746e04ecddd2f4b61323219c244" -SRC_URI[sha256sum] = "937d550ba0b46cb91e45416dfb983eee11d829df07a70e0b00693d192500c9af" +SRC_URI[md5sum] = "2fc269f96bfc503906f13d8f39f121de" +SRC_URI[sha256sum] = "ea2176751010e19a0f4df76cfefb178441fd51d2447e0418a21dae8f4e7640bf" FILES_${PN} += " \ ${datadir}/k*5 \ @@ -28,4 +28,3 @@ FILES_${PN} += " \ ${datadir}/dbus-1 \ ${OE_QMAKE_PATH_QML}/org/kde \ " -FILES_${PN}-dbg += "${OE_QMAKE_PATH_QML}/org/kde/*/.debug" diff --git a/recipes-kde/kf5/tier3/kservice/kservice.bb b/recipes-kde/kf5/tier3/kservice/kservice.bb index ccd040d7..403cb609 100644 --- a/recipes-kde/kf5/tier3/kservice/kservice.bb +++ b/recipes-kde/kf5/tier3/kservice/kservice.bb @@ -21,7 +21,7 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "e48ca2a44622c676226303ca3a97badb" -SRC_URI[sha256sum] = "347e03d802c7b8363521cd509ec15a0ae949d7b009ace7e345da2aa386dc97de" +SRC_URI[md5sum] = "a66a5bba0556be3da8487f13f524c3bb" +SRC_URI[sha256sum] = "dbc67e2b0cdc2616e39842a1a9a7ab0ab99a96a083de98b6bf9abff8d4454cc3" FILES_${PN} += "${datadir}/kservicetypes5" diff --git a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb index 601e2184..32a952a0 100644 --- a/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb +++ b/recipes-kde/kf5/tier3/ktexteditor/ktexteditor.bb @@ -22,8 +22,8 @@ DEPENDS += "qtxmlpatterns \ libgit2" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "5aa4136165bafccd4dc0acd8336c256e" -SRC_URI[sha256sum] = "215c38142a8ca5d001f945f98056463adc808b1c195bca0c505ad69cb4ad03a3" +SRC_URI[md5sum] = "82b4b54dbba12f86671461cb1224c0ce" +SRC_URI[sha256sum] = "4c88d0033775e0715ad115370a36680ede95d29c7c4b840c0e06f23ef64959a8" EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" @@ -34,6 +34,3 @@ FILES_${PN} += " \ ${datadir}/kdevappwizard \ ${OE_QMAKE_PATH_PLUGINS} \ " -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/parts/.debug \ -" diff --git a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb index f9a8e3e2..c53e5895 100644 --- a/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb +++ b/recipes-kde/kf5/tier3/ktextwidgets/ktextwidgets.bb @@ -11,7 +11,7 @@ DEPENDS += "kcompletion kconfig kconfigwidgets ki18n kiconthemes kservice kwidge gettext-native sonnet-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "d492e3ab4b762d3fb9f431f2842f68c1" -SRC_URI[sha256sum] = "f1de7662ed95c99bcd665aa8033b884a7e5315c2f3ba3825a12b92ce157579e1" +SRC_URI[md5sum] = "4071bcd54668bcb0977ad3af03ec9500" +SRC_URI[sha256sum] = "17af96f8fcc4dc67245d2d3c4d1c997dab8619a35599fb516c49f873ca4fa1ce" FILES_${PN} += "${datadir}/kservicetypes5" diff --git a/recipes-kde/kf5/tier3/kwallet/kwallet.bb b/recipes-kde/kf5/tier3/kwallet/kwallet.bb index 8a7f5729..49457c45 100644 --- a/recipes-kde/kf5/tier3/kwallet/kwallet.bb +++ b/recipes-kde/kf5/tier3/kwallet/kwallet.bb @@ -26,7 +26,7 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "a618a7b52bc9f56ae19ec9a1e716c017" -SRC_URI[sha256sum] = "b03a797654dd677f15f758e4258d1821b71b13c383146c879b782b8b790e84db" +SRC_URI[md5sum] = "65c4168de9bae3b745f2f2a347dba1ba" +SRC_URI[sha256sum] = "d2957ca5e0539a4f7689373ded3bbe642cb48bb37f76b6e5f2dac499f0ec260a" FILES_${PN} += "${datadir}" diff --git a/recipes-kde/kf5/tier3/kxmlgui/files/0001-no-session-management-if-not-supported-by-qtbase-ind.patch b/recipes-kde/kf5/tier3/kxmlgui/files/0001-no-session-management-if-not-supported-by-qtbase-ind.patch deleted file mode 100644 index 2dc72d4f..00000000 --- a/recipes-kde/kf5/tier3/kxmlgui/files/0001-no-session-management-if-not-supported-by-qtbase-ind.patch +++ /dev/null @@ -1,98 +0,0 @@ -From ec4fa422d845e2de33b6392a8fdb4ae76ddcfac2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 17 Jun 2015 10:49:14 +0200 -Subject: [PATCH] no session management if not supported by qtbase - indicated - by QT_NO_SESSIONMANAGER -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: pending - -Signed-off-by: Andreas Müller ---- - src/kmainwindow.cpp | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/src/kmainwindow.cpp b/src/kmainwindow.cpp -index c384b67..a745762 100644 ---- a/src/kmainwindow.cpp -+++ b/src/kmainwindow.cpp -@@ -119,10 +119,12 @@ bool DockResizeListener::eventFilter(QObject *watched, QEvent *event) - - KMWSessionManager::KMWSessionManager() - { -+#ifndef QT_NO_SESSIONMANAGER - connect(qApp, SIGNAL(saveStateRequest(QSessionManager&)), - this, SLOT(saveState(QSessionManager&))); - connect(qApp, SIGNAL(commitDataRequest(QSessionManager&)), - this, SLOT(commitData(QSessionManager&))); -+#endif - } - - KMWSessionManager::~KMWSessionManager() -@@ -131,6 +133,7 @@ KMWSessionManager::~KMWSessionManager() - - void KMWSessionManager::saveState(QSessionManager &sm) - { -+#ifndef QT_NO_SESSIONMANAGER - KConfigGui::setSessionConfig(sm.sessionId(), sm.sessionKey()); - - KConfig *config = KConfigGui::sessionConfig(); -@@ -160,6 +163,7 @@ void KMWSessionManager::saveState(QSessionManager &sm) - discard << localFilePath; - sm.setDiscardCommand(discard); - } -+#endif - } - - void KMWSessionManager::commitData(QSessionManager &sm) -@@ -433,6 +437,9 @@ QMenu *KMainWindow::customHelpMenu(bool showWhatsThis) - - bool KMainWindow::canBeRestored(int number) - { -+#ifdef QT_NO_SESSIONMANAGER -+ return false; -+#else - if (!qApp->isSessionRestored()) { - return false; - } -@@ -444,10 +451,14 @@ bool KMainWindow::canBeRestored(int number) - KConfigGroup group(config, "Number"); - const int n = group.readEntry("NumberOfWindows", 1); - return number >= 1 && number <= n; -+#endif - } - - const QString KMainWindow::classNameOfToplevel(int number) - { -+#ifdef QT_NO_SESSIONMANAGER -+ return QString(); -+#else - if (!qApp->isSessionRestored()) { - return QString(); - } -@@ -462,10 +473,12 @@ const QString KMainWindow::classNameOfToplevel(int number) - } else { - return group.readEntry("ClassName"); - } -+#endif - } - - bool KMainWindow::restore(int number, bool show) - { -+#ifdef QT_NO_SESSIONMANAGER - if (!canBeRestored(number)) { - return false; - } -@@ -476,6 +489,7 @@ bool KMainWindow::restore(int number, bool show) - } - return false; - } -+#endif - return false; - } - --- -2.5.0 - diff --git a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb index 8ca661db..c3226860 100644 --- a/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb +++ b/recipes-kde/kf5/tier3/kxmlgui/kxmlgui.bb @@ -26,15 +26,7 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "ac84f7cdcc0f5bae355cd32fbd15f5de" -SRC_URI[sha256sum] = "e4624f4f8a630ee30093ea785f17833e7668915dd71d7058829049427001b631" - -# REVISIT remove ugly hack for wayland-only environments -SRC_URI += " \ - file://0001-no-session-management-if-not-supported-by-qtbase-ind.patch \ -" +SRC_URI[md5sum] = "4686179511ed09440032b3dcd6f1815c" +SRC_URI[sha256sum] = "34af5e4b23c13a92d7103fd0c6464da886ed816367ede78d1bfa19382d06eac6" EXTRA_OECMAKE += "-DBUILD_TESTING=OFF" - -# evt. put ksendbugmail to separate package later -FILES_${PN}-dbg += "${libdir}/kxmlgui/kf5/.debug/" diff --git a/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb b/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb index 746c24f0..cbf0f2e0 100644 --- a/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb +++ b/recipes-kde/kf5/tier3/kxmlrpcclient/kxmlrpcclient.bb @@ -9,5 +9,5 @@ inherit kde-kf5 gettext DEPENDS += "ki18n kio kcoreaddons-native kconfig-native kauth-native" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "e4c58263a8ec01858933402d9ec1a35d" -SRC_URI[sha256sum] = "5514c0749b2c601d1ab3241120bef0ad30e382a7994d71d0e0470fae266f46e9" +SRC_URI[md5sum] = "41ffd8e68e831b6e16ee6608821cd976" +SRC_URI[sha256sum] = "14a300a68ac6ade06206ebfc296c5ae2aa55b6f95629f87e19fb055108bd56ae" diff --git a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb index 0dad90ce..00d92f9e 100644 --- a/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb +++ b/recipes-kde/kf5/tier3/plasma-framework/plasma-framework.bb @@ -39,8 +39,8 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "c986caf7998d6ace12580ba7637aef54" -SRC_URI[sha256sum] = "64c2d459ec6fc58b52c9313b1b82eee3152f5a67a1b1ea79536477318fd538cf" +SRC_URI[md5sum] = "1291b03536fb9719acc910f6d3c2af98" +SRC_URI[sha256sum] = "0accc21e8dd47531821d9a4a339fb790d3695fe12868d8c92e1b00564e028943" FILES_${PN} += " \ ${datadir}/kdevappwizard \ @@ -53,11 +53,3 @@ FILES_${PN} += " \ ${OE_QMAKE_PATH_QML} \ ${libdir}/org/kde/plasma \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \ - ${libdir}/platformqml/*/org/kde/plasma/*/.debug \ - ${libdir}/org/kde/plasma/*/.debug \ - ${OE_QMAKE_PATH_QML}/org/kde/plasma/*/.debug \ -" diff --git a/recipes-kde/kf5/tier3/purpose/purpose.bb b/recipes-kde/kf5/tier3/purpose/purpose.bb index 7af6263a..539a1c7d 100644 --- a/recipes-kde/kf5/tier3/purpose/purpose.bb +++ b/recipes-kde/kf5/tier3/purpose/purpose.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-kf5 gettext gtk-icon-cache -SRC_URI[md5sum] = "c8e28239fdf7331cc50b7fbf380635b6" -SRC_URI[sha256sum] = "5637d61fd6c75fac212789967ae927f30f802789e3d207d2da28d5124423e261" +SRC_URI[md5sum] = "7709474d48e375a9b6f127b05247a06e" +SRC_URI[sha256sum] = "882aa64c55e134d1aff06d533f8c3c6f8e5886b5b782925e1aad2e0ca7e37e67" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/tier3/qqc2-desktop-style/qqc2-desktop-style.bb b/recipes-kde/kf5/tier3/qqc2-desktop-style/qqc2-desktop-style.bb index 825b555d..7ca25861 100644 --- a/recipes-kde/kf5/tier3/qqc2-desktop-style/qqc2-desktop-style.bb +++ b/recipes-kde/kf5/tier3/qqc2-desktop-style/qqc2-desktop-style.bb @@ -18,14 +18,10 @@ DEPENDS += " \ " PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "0aad32d67d7a3e9d6a7897167ba0918c" -SRC_URI[sha256sum] = "2ee8a3b3a50b2d8a71e097dd9f687ace823dca05acb30595b9bb88cb473b10b7" +SRC_URI[md5sum] = "2018e747ed94f81f718ec6147a8562b0" +SRC_URI[sha256sum] = "0b00eb10646593a57aff1b1ba79ddb34f5e2a3fb5f955df1bf9b02af5ff04e21" FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ ${OE_QMAKE_PATH_QML} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb index da713df8..7ee6138f 100644 --- a/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb +++ b/recipes-kde/kf5/tier4/frameworkintegration/frameworkintegration.bb @@ -23,15 +23,11 @@ DEPENDS += " \ RRECCOMENDS_${PN} += "oxygen-fonts" PV = "${KF5_VERSION}" -SRC_URI[md5sum] = "6cd4c73285aea20b09ff2c035daea2e1" -SRC_URI[sha256sum] = "017ea17befc773614fbe4074baee66be16e79801c6af964087fd01b718097ae9" +SRC_URI[md5sum] = "5a2cc48884abc1eac8fa51b45842ff70" +SRC_URI[sha256sum] = "ee8d46b629a95e49fda80e50ba8863504a6c463fec887f83370b7e7977db80f5" FILES_${PN} += " \ ${datadir}/knotifications5 \ ${datadir}/kconf_update \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ -" diff --git a/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb b/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb index bd93878a..75b62fef 100644 --- a/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb +++ b/recipes-kde/kf5/untier/extra-cmake-modules/extra-cmake-modules.bb @@ -6,8 +6,8 @@ inherit kde-kf5 DEPENDS = "qttools-native" -SRC_URI[md5sum] = "14983880c7b4b3c6e66a42ace7de277e" -SRC_URI[sha256sum] = "68c08aac2611e3faded476a5bba5ba56f8ed964374810bfcee93c6a7fa419b49" +SRC_URI[md5sum] = "89be75b53098e1e6cd9b2e30b0bb9e44" +SRC_URI[sha256sum] = "913ce70cd64c5a35586f1ecdac5d6417cb128a9d3829ded7bb95e602d0ecb528" SRC_URI += "file://0001-Temporary-workaround-gold-linker-errors.patch" PV = "${KF5_VERSION}" diff --git a/recipes-kde/kf5/untier/extra-cmake-modules/files/0001-Temporary-workaround-gold-linker-errors.patch b/recipes-kde/kf5/untier/extra-cmake-modules/files/0001-Temporary-workaround-gold-linker-errors.patch index 479efc36..ea86d6d5 100644 --- a/recipes-kde/kf5/untier/extra-cmake-modules/files/0001-Temporary-workaround-gold-linker-errors.patch +++ b/recipes-kde/kf5/untier/extra-cmake-modules/files/0001-Temporary-workaround-gold-linker-errors.patch @@ -18,7 +18,7 @@ index 44358fb..1402796 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -344,8 +344,8 @@ if ((CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT APPLE) OR - (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND NOT APPLE) OR + (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT APPLE) OR (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32)) # Linker warnings should be treated as errors - set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings ${CMAKE_SHARED_LINKER_FLAGS}") diff --git a/recipes-kde/other/kpmcore/kpmcore_2.0.0.bb b/recipes-kde/other/kpmcore/kpmcore_2.0.0.bb index c3d60209..6055378a 100644 --- a/recipes-kde/other/kpmcore/kpmcore_2.0.0.bb +++ b/recipes-kde/other/kpmcore/kpmcore_2.0.0.bb @@ -27,7 +27,3 @@ FILES_${PN} += " \ ${datadir}/k*5 \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/other/phonon/phonon_4.10.1.bb b/recipes-kde/other/phonon/phonon_4.10.1.bb index 4b080998..a39627d6 100644 --- a/recipes-kde/other/phonon/phonon_4.10.1.bb +++ b/recipes-kde/other/phonon/phonon_4.10.1.bb @@ -22,9 +22,8 @@ PACKAGECONFIG[pulseaudio] = "-DCMAKE_DISABLE_FIND_PACKAGE_PULSEAUDIO=FALSE -DCMA PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" -PACKAGES =+ "${PN}-designer-plugin-dbg ${PN}-designer-plugin" +PACKAGES =+ "${PN}-designer-plugin" FILES_${PN}-designer-plugin = "${OE_QMAKE_PATH_PLUGINS}/designer" -FILES_${PN}-designer-plugin-dbg = "${OE_QMAKE_PATH_PLUGINS}/designer/.debug" FILES_${PN} += "${datadir}/dbus-1" FILES_${PN}-dev += "${datadir}/qt5/mkspecs ${OE_QMAKE_PATH_ARCHDATA}/mkspecs ${datadir}/phonon4qt5/buildsystem" diff --git a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb index e9040539..31dab714 100644 --- a/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb +++ b/recipes-kde/other/polkit-qt-1/polkit-qt-1_0.112.0.bb @@ -2,7 +2,9 @@ SUMMARY = "PolicyKit Qt wrapper" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=7dbc59dc445b2261c4fb2f9466e3446a" -inherit kde-base cmake_lib +inherit kde-base cmake_lib distro_features_check + +REQUIRED_DISTRO_FEATURE = "polkit" DEPENDS += "polkit glib-2.0" diff --git a/recipes-kde/other/qca/qca_2.1.3.bb b/recipes-kde/other/qca/qca_git.bb similarity index 82% rename from recipes-kde/other/qca/qca_2.1.3.bb rename to recipes-kde/other/qca/qca_git.bb index abe7e475..897c2aad 100644 --- a/recipes-kde/other/qca/qca_2.1.3.bb +++ b/recipes-kde/other/qca/qca_git.bb @@ -23,7 +23,10 @@ SRCREV = "32343842d359a60e3619f97aac983d587f6eca16" S = "${WORKDIR}/git" PV = "2.1.3+git${SRCPV}" -EXTRA_OECMAKE += "-DQCA_FEATURE_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/features" +EXTRA_OECMAKE += " \ + -DQCA_FEATURE_INSTALL_DIR=${libdir}${QT_DIR_NAME}/mkspecs/features \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +" FILES_${PN} += "${libdir}/qca-qt5/crypto" diff --git a/recipes-kde/packagegroups/kde-apps.bb b/recipes-kde/packagegroups/kde-apps.bb index 218db015..388f5d89 100644 --- a/recipes-kde/packagegroups/kde-apps.bb +++ b/recipes-kde/packagegroups/kde-apps.bb @@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup RDEPENDS_${PN} = " \ + analitza \ ark \ baloo-widgets \ dolphin \ @@ -12,16 +13,20 @@ RDEPENDS_${PN} = " \ dragon \ filelight \ gwenview \ + kalgebra \ kate \ + kcachegrind \ kcalc \ kcolorchooser \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "kdenlive", "",d)} \ kdf \ kexi \ + kfind \ khelpcenter \ kio-extras \ kmag \ kmix \ + kmplot \ kolourpaint \ konsole \ krita \ diff --git a/recipes-kde/packagegroups/kde-games.bb b/recipes-kde/packagegroups/kde-games.bb index c8b6eaf5..42a816be 100644 --- a/recipes-kde/packagegroups/kde-games.bb +++ b/recipes-kde/packagegroups/kde-games.bb @@ -11,6 +11,7 @@ RDEPENDS_${PN} = " \ katomic \ kblocks \ kbounce \ + kbreakout \ kdiamond \ kmahjongg \ kmines \ diff --git a/recipes-kde/packagegroups/kde-world.bb b/recipes-kde/packagegroups/kde-world.bb index 286f5f66..ee45aa92 100644 --- a/recipes-kde/packagegroups/kde-world.bb +++ b/recipes-kde/packagegroups/kde-world.bb @@ -12,7 +12,7 @@ RDEPENDS_${PN} = " \ kpmcore \ partitionmanager \ phonon \ - polkit-qt-1 \ + ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-qt-1", "",d)} \ qca \ " diff --git a/recipes-kde/packagegroups/kf5-world.bb b/recipes-kde/packagegroups/kf5-world.bb index f136b361..ec686fab 100644 --- a/recipes-kde/packagegroups/kf5-world.bb +++ b/recipes-kde/packagegroups/kf5-world.bb @@ -36,7 +36,6 @@ TIER_1 = " \ TIER_2 = " \ kactivities-stats \ - kauth \ kcompletion \ kcrash \ kdoctools \ @@ -48,6 +47,7 @@ TIER_2 = " \ kunitconversion \ syndication \ " +# kauth TIER_3 = " \ baloo \ diff --git a/recipes-kde/packagegroups/plasma-world.bb b/recipes-kde/packagegroups/plasma-world.bb index 9164d8da..75c0d888 100644 --- a/recipes-kde/packagegroups/plasma-world.bb +++ b/recipes-kde/packagegroups/plasma-world.bb @@ -53,7 +53,7 @@ UNTIER = " \ plasma-pa \ plasma-vault \ plasma-workspace-wallpapers \ - polkit-kde-agent-1 \ + ${@bb.utils.contains("DISTRO_FEATURES", "polkit", "polkit-kde-agent-1", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "powerdevil", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "sddm-kcm", "",d)} \ systemsettings \ diff --git a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb index 6b531c88..65718a51 100644 --- a/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb +++ b/recipes-kde/plasma/tier1/kdecoration/kdecoration.bb @@ -9,5 +9,5 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "014d15755600481d8bd2125d82776510" -SRC_URI[sha256sum] = "f3ffc122b52aae490f4efb1ecc131e2d2575a9305dd8df6adead48892cd4d882" +SRC_URI[md5sum] = "b0cbc29002c38525f06e25926e41ce46" +SRC_URI[sha256sum] = "b04d9e2b454ee61f44e5557764782f3a7c73ace2c1a2076ddbce5e78bf36b7fa" diff --git a/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb b/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb index 225acd9a..e7c82d84 100644 --- a/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb +++ b/recipes-kde/plasma/tier3/kactivitymanagerd/kactivitymanagerd.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "d2ef43f119c8afa91745092f649205ff" -SRC_URI[sha256sum] = "f5698b015569e22538d69056db685611a48afe2c231ad48a779a51fe30d60eaa" +SRC_URI[md5sum] = "242dbc1fc363e90dad8350c9138918c3" +SRC_URI[sha256sum] = "d5e7afeb00b81fe79b7730b5a13765a47e8c8fd606d89179475c44ba40ade3d3" SRC_URI += "file://0001-replace-try_run-by-try_compile-in-compiler-feature-c.patch" # Workaround @@ -40,7 +40,3 @@ FILES_${PN} += " \ ${libdir}/libkactivitymanagerd_plugin.so \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \ -" diff --git a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb index c3d16d1b..c45bdf55 100644 --- a/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb +++ b/recipes-kde/plasma/tier3/plasma-workspace/plasma-workspace.bb @@ -11,14 +11,20 @@ REQUIRED_DISTRO_FEATURES = "x11" inherit kde-plasma distro_features_check gettext DEPENDS += " \ + kpackage-native \ + kdoctools-native \ + sonnet-native \ + kdesignerplugin-native \ + kdelibs4support-native \ + kauth-native \ baloo \ kdeclarative \ plasma-framework \ - kauth-native \ kconfig \ kactivities \ krunner \ kjsembed \ + kholidays \ knotifyconfig \ kdesu \ knewstuff \ @@ -36,20 +42,14 @@ DEPENDS += " \ networkmanager-qt \ libksysguard \ libkscreen \ - libdbusmenu-qt5 \ kwin \ - kpackage-native \ - kdoctools-native \ - sonnet-native \ - kdesignerplugin-native \ - kdelibs4support-native \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 libsm libxcb", "", d)} \ zlib \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "eaeaeaf57be7d45752ec92f0b5beda0b" -SRC_URI[sha256sum] = "c5391f714d50828e10b58616ea8a9873cd6bd183039b8693bfc968c68d98af36" +SRC_URI[md5sum] = "582ef2fb97a9020c09d86118c04f3b0a" +SRC_URI[sha256sum] = "a9b8e2af593929695c3b2f9d3c709d4a0a4d760dcbe439ca2f24efd8d06b3922" SRC_URI += " \ file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch \ @@ -65,35 +65,26 @@ SRC_URI += " \ # REVISIT FILES_${PN} += " \ ${datadir}/config.kcfg \ - ${datadir}/k*5 \ ${datadir}/dbus-1 \ - ${datadir}/kstyle \ - ${datadir}/wayland-sessions \ - ${datadir}/ksplash \ - ${datadir}/drkonqi \ - ${datadir}/kio_desktop \ - ${datadir}/solid \ - ${datadir}/xsessions \ ${datadir}/desktop-directories \ - ${datadir}/sddm \ - ${datadir}/plasma \ - ${datadir}/ksmserver \ - ${datadir}/kdevappwizard \ ${datadir}/kconf_update \ + ${datadir}/kdevappwizard \ + ${datadir}/kio_desktop \ + ${datadir}/k*5 \ + ${datadir}/kpackage \ + ${datadir}/ksplash \ + ${datadir}/kstyle \ + ${datadir}/plasma \ + ${datadir}/sddm \ + ${datadir}/solid \ + ${datadir}/wayland-sessions \ + ${datadir}/xsessions \ \ ${libdir}/libkdeinit5*.so \ ${libdir}/kconf_update_bin \ ${OE_QMAKE_PATH_PLUGINS} \ ${OE_QMAKE_PATH_QML} \ " -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \ - ${OE_QMAKE_PATH_QML}/org/kde/*/.debug \ - ${OE_QMAKE_PATH_QML}/org/kde/*/*/.debug \ - ${OE_QMAKE_PATH_QML}/org/kde/*/*/*/.debug \ -" FILES_${PN}-dev = " \ ${includedir} \ diff --git a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb index ace356b2..85d48f51 100644 --- a/recipes-kde/plasma/untier/bluedevil/bluedevil.bb +++ b/recipes-kde/plasma/untier/bluedevil/bluedevil.bb @@ -26,8 +26,8 @@ DEPENDS += " \ PV = "${PLASMA_VERSION}" SRC_URI += "file://0001-Hack-build-with-gcc8.patch" -SRC_URI[md5sum] = "fe29af65a55d434bfb5a1806f7ca61b0" -SRC_URI[sha256sum] = "7b725e7adc88df65b88fa0044bff06a4dbb49a169f27dfbbc4b54d5e29b78711" +SRC_URI[md5sum] = "7bb9a0a7cb5c751d1a94fcf9cb260bd4" +SRC_URI[sha256sum] = "40edc97e2236655114ef0fe77fa357c70fcf07c555fbe1b40d45f2dc7c90b1ed" FILES_${PN} += " \ ${datadir}/bluedevilwizard \ @@ -38,10 +38,3 @@ FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ ${OE_QMAKE_PATH_QML}/org/kde/plasma/private/bluetooth \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \ - ${OE_QMAKE_PATH_QML}/org/kde/plasma/private/bluetooth/.debug \ -" diff --git a/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb b/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb index 37eb8672..4526a881 100644 --- a/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb +++ b/recipes-kde/plasma/untier/breeze-gtk/breeze-gtk.bb @@ -4,18 +4,16 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=1ed3208c1cce3d1926ccfc5bf65db050 \ " -inherit kde-plasma +inherit kde-plasma python3native + +DEPENDS += "sassc-native cairo breeze python3-pycairo-native" PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "858a3f7cbec03e40fbd3ee6bcf24ea85" -SRC_URI[sha256sum] = "24619603b62b449df3ba7440d7e44ca83e918c3a7ddd10c494ea2619ae22122b" +SRC_URI[md5sum] = "b369b343d6dd4ef3af6d18340a83f308" +SRC_URI[sha256sum] = "4426839fb30cc088a1cedad4c542fc7c0d07a266c3c40ec03c0003ecdd10e3e5" FILES_${PN} += " \ ${datadir}/kconf_update \ ${datadir}/themes \ ${libdir}/kconf_update_bin \ " - -FILES_${PN}-dbg += " \ - ${libdir}/kconf_update_bin/.debug \ -" diff --git a/recipes-kde/plasma/untier/breeze-plymouth/breeze-plymouth.bb b/recipes-kde/plasma/untier/breeze-plymouth/breeze-plymouth.bb index ee163321..2f3963da 100644 --- a/recipes-kde/plasma/untier/breeze-plymouth/breeze-plymouth.bb +++ b/recipes-kde/plasma/untier/breeze-plymouth/breeze-plymouth.bb @@ -9,15 +9,10 @@ inherit kde-plasma DEPENDS += "plymouth" PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "9a16fa97036b5de9fa0d68d6c2d6e822" -SRC_URI[sha256sum] = "67724c35f16cd96390194756620b3c8ca8f39540718f27e7a8a8e66c522b3fe1" +SRC_URI[md5sum] = "2f48a4f199780cc8fe3d31eda54034e7" +SRC_URI[sha256sum] = "674090b5776aca915b58cfbeada45895fc51bac0e2d31509628277a2fd24c538" FILES_${PN} += " \ ${datadir}/plymouth \ ${libdir}/plymouth \ " - -FILES_${PN}-dbg += " \ - ${libdir}/plymouth/.debug \ -" - diff --git a/recipes-kde/plasma/untier/breeze/breeze.bb b/recipes-kde/plasma/untier/breeze/breeze.bb index 0333cbb6..29e10e04 100644 --- a/recipes-kde/plasma/untier/breeze/breeze.bb +++ b/recipes-kde/plasma/untier/breeze/breeze.bb @@ -27,8 +27,8 @@ DEPENDS += "\ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "4bea8ee0b3b165235ebfc2c02be6dc1c" -SRC_URI[sha256sum] = "ce1e0d54309341eac8279e5f91f1458a4a827bc01c1ce389e526f93fb775b675" +SRC_URI[md5sum] = "9c11d520682160d4704cddb8386d3de8" +SRC_URI[sha256sum] = "4be0b50deb6a3b42e3c09461ebef76f0af758c400c998b627bc72931d8b3fe50" FILES_${PN} += " \ ${datadir}/color-schemes \ @@ -45,10 +45,4 @@ FILES_${PN} += " \ ${libdir}/kconf_update_bin \ " -FILES_${PN}-dbg += " \ - ${libdir}/*/.debug \ - ${libdir}/*/*/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ -" - RDEPENDS_${PN} += "milou" diff --git a/recipes-kde/plasma/untier/discover/discover.bb b/recipes-kde/plasma/untier/discover/discover.bb index 1b1ad68d..8fbc6ba7 100644 --- a/recipes-kde/plasma/untier/discover/discover.bb +++ b/recipes-kde/plasma/untier/discover/discover.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-plasma gtk-icon-cache PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "e14211fc2b0d995d3cf142168056c144" -SRC_URI[sha256sum] = "d172ce8a5288e64920512a975985382e09c202b454633ffd88fedfe785f63b5e" +SRC_URI[md5sum] = "1ffd8fe39532ef5093e42d4b330de5dd" +SRC_URI[sha256sum] = "2b38184677542fabfe6e45217d838570487126aab2242e57129493dc0362d5ac" DEPENDS += " \ qtdeclarative \ @@ -39,10 +39,4 @@ FILES_${PN} += " \ ${OE_QMAKE_PATH_QML} \ " -FILES_${PN}-dbg += " \ - ${libdir}/plasma-discover/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ - ${OE_QMAKE_PATH_QML}/org/kde/*/.debug \ -" - RDEPENDS_${PN} += "python3 kirigami" diff --git a/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb b/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb index b25ee215..75006958 100644 --- a/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb +++ b/recipes-kde/plasma/untier/kde-cli-tools/kde-cli-tools.bb @@ -12,10 +12,10 @@ DEPENDS += " \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qtx11extras", "",d)} \ \ kauth-native \ - kconfig \ kconfig-native \ kdoctools-native \ kcoreaddons-native \ + kpackage-native \ kactivities \ kiconthemes \ ki18n \ @@ -27,8 +27,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "d008931a914d5748da62f6667915c7d6" -SRC_URI[sha256sum] = "de8b4f6fd3e80d0b7eb6c2b9ace965da6c8c40864263905b468795642dbdf385" +SRC_URI[md5sum] = "882890f64e5143e67e061f6267feea5f" +SRC_URI[sha256sum] = "ef7ac31b6499739779b2c4e1ecbde3500346ca805875e2f93ca6928494f62adf" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" @@ -38,9 +38,3 @@ FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ ${libdir}/libkdeinit5_kcmshell5.so \ " - -FILES_${PN}-dbg += " \ - ${libdir}/*/.debug \ - ${libdir}/${BPN}/*/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb b/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb index f057c599..5c12845a 100644 --- a/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb +++ b/recipes-kde/plasma/untier/kde-gtk-config/kde-gtk-config.bb @@ -24,8 +24,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "f2bf818be2ebeca91985e01278f6d93f" -SRC_URI[sha256sum] = "c8f746ea7b09fdc0b7d4debc55d1af56d87e9bec003e7ee6005e1240da4dbdb6" +SRC_URI[md5sum] = "fc76a4f8bdb2a031fdadff946514ae3d" +SRC_URI[sha256sum] = "488f678d65352f74b96149371f49098be8f22adbdbceb9d2699e8beeb4115cfb" FILES_${PN} += " \ ${datadir}/kservices5 \ @@ -33,7 +33,3 @@ FILES_${PN} += " \ ${datadir}/icons \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb index c9d1e7b3..1231bf9b 100644 --- a/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb +++ b/recipes-kde/plasma/untier/kdeplasma-addons/kdeplasma-addons.bb @@ -34,8 +34,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "16c0b5f4737a9fce99018d49858cb47d" -SRC_URI[sha256sum] = "499267cc978610c38961848f8870567f017265463ad544763c912802b59cb969" +SRC_URI[md5sum] = "a1b032662fd6267b7bf0e8a0ff627db0" +SRC_URI[sha256sum] = "364faceba87e8ae4d9d515615a022316cc1115d75e56fe305ee671ff3ab73c1c" FILES_${PN} += " \ ${datadir}/icons \ diff --git a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb index a1c0f0c1..a8868840 100644 --- a/recipes-kde/plasma/untier/kgamma5/kgamma5.bb +++ b/recipes-kde/plasma/untier/kgamma5/kgamma5.bb @@ -19,15 +19,11 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "3c3ba960cca9349126dcafcbf702eab1" -SRC_URI[sha256sum] = "2134ff79b14550c448b497126b4d7b587fa43bdb231878d617ec227380a40a09" +SRC_URI[md5sum] = "cb4e1b8f8d4b4f3bf53a35b7bb02fe48" +SRC_URI[sha256sum] = "be0a76bf328dedeb9911d9d560e625a10850ea438374f39c22e17291abcd9689" FILES_${PN} += " \ ${datadir}/kgamma \ ${datadir}/kservices5 \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb index bd057160..603f69b9 100644 --- a/recipes-kde/plasma/untier/khotkeys/khotkeys.bb +++ b/recipes-kde/plasma/untier/khotkeys/khotkeys.bb @@ -31,16 +31,11 @@ DEPENDS += "\ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "c38e8d0902ba37f5308cb7f05047072b" -SRC_URI[sha256sum] = "a267fac05ace69522a5972f6e5cba2436ffc9ac8e386d30c8da0f15aa2f47a0c" +SRC_URI[md5sum] = "9eebf70f99a2eb0d0a62285d47a8542e" +SRC_URI[sha256sum] = "85d6705dec38e38d259bc9a721a75a9bd4abde636a1d7406bc1dc5390d6dd33e" FILES_${PN} += " \ ${datadir}/kservices5 \ ${datadir}/dbus-1 \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \ -" diff --git a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb index 9ce574fb..caa28ad1 100644 --- a/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb +++ b/recipes-kde/plasma/untier/kinfocenter/kinfocenter.bb @@ -39,8 +39,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "34c5a84a8d6a135cb947b6ecd17803ee" -SRC_URI[sha256sum] = "2cc73fac179bd9bcf5c9ed82c9aec6c861e414d70d0042435882da76c66b09da" +SRC_URI[md5sum] = "8064140c272452f7610e35b714930ca4" +SRC_URI[sha256sum] = "996788d374e53d1d50093a88641c7cde791b3ba1c890ed72d5ee5507aece1066" SRC_URI += "file://0001-fix-build-in-x11-less-environments.patch" FILES_${PN} += " \ @@ -51,8 +51,3 @@ FILES_${PN} += " \ \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ -" diff --git a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb index 061ff38b..5d1e1613 100644 --- a/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb +++ b/recipes-kde/plasma/untier/kmenuedit/kmenuedit.bb @@ -29,8 +29,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "68bb90533998367a5a207132b91b0ac3" -SRC_URI[sha256sum] = "8fa4548ac8cfe1c30223279dd09b1f7270ea1ed64f52026a21678bddd9738a26" +SRC_URI[md5sum] = "50e642a3d5949443e161ea0d4eeaadea" +SRC_URI[sha256sum] = "4b5d390e8f5f8af4f2120dfa22b43b64889858a573f8e14c22bd5e15fb85ebe8" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" diff --git a/recipes-kde/plasma/untier/kscreen/kscreen.bb b/recipes-kde/plasma/untier/kscreen/kscreen.bb index bc493c6c..90ed5863 100644 --- a/recipes-kde/plasma/untier/kscreen/kscreen.bb +++ b/recipes-kde/plasma/untier/kscreen/kscreen.bb @@ -28,8 +28,8 @@ DEPENDS += "\ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "2fd69bedd600e7bfa8e4cae6e2425fc9" -SRC_URI[sha256sum] = "26b107c07ded53d1dd7c93814c59c76086cfd9019d18997f1491e290498414b3" +SRC_URI[md5sum] = "0efcace3965f868e4b474f501c4c3130" +SRC_URI[sha256sum] = "0e9945afce9d616ab34da5a985410aac8fd3d9f15630db74d53e6540ad0af8c7" FILES_${PN} += " \ ${datadir}/k*_kscreen \ @@ -38,8 +38,3 @@ FILES_${PN} += " \ ${datadir}/plasma \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \ -" diff --git a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb index 30872fb7..1a8382ac 100644 --- a/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb +++ b/recipes-kde/plasma/untier/kscreenlocker/kscreenlocker.bb @@ -29,8 +29,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "f46412c02e11d53723c89a1f7505a3dd" -SRC_URI[sha256sum] = "e2731b79f26910dda11c281705d0eb4db404f8a9610e20da3099862644b3f3ba" +SRC_URI[md5sum] = "d7ae9eaa8ff3208df01935fc0cd0c28a" +SRC_URI[sha256sum] = "cafe0b7b2ce65e1cf86e6b87f8281380d531949c445e22a23714b1bce2bbf42d" SRC_URI += "file://kde.pam" @@ -48,7 +48,3 @@ FILES_${PN} += " \ ${sysconfdir} \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb index 7e1240ac..7b99b514 100644 --- a/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb +++ b/recipes-kde/plasma/untier/ksshaskpass/ksshaskpass.bb @@ -21,5 +21,5 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "878b25b3c87b13030b303c7f667c450a" -SRC_URI[sha256sum] = "f502f79cba90867d21bc8d23a0c5d9b75a6e7c3f42d8d60feef83c8967e246b2" +SRC_URI[md5sum] = "86f4c45eac9db936b22b84cb75c35598" +SRC_URI[sha256sum] = "3a39bb7d0f2eba303d28ed0cb0df76ae7b12c58c205ec335ba92acacc96132ff" diff --git a/recipes-kde/plasma/untier/ksysguard/ksysguard.bb b/recipes-kde/plasma/untier/ksysguard/ksysguard.bb index ea991902..ce8cf381 100644 --- a/recipes-kde/plasma/untier/ksysguard/ksysguard.bb +++ b/recipes-kde/plasma/untier/ksysguard/ksysguard.bb @@ -28,8 +28,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "abc6602d3f0d986a07d8b00684599ca9" -SRC_URI[sha256sum] = "214eedfc8f341b2b13218da67bbdb843d52c7638be38937f427adf308588123f" +SRC_URI[md5sum] = "39a526781799088e251305f17945e784" +SRC_URI[sha256sum] = "38219e61ce3e1bac0463b8d8f538f582e55976750f01cd44b2be105c7d53afdb" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" @@ -39,6 +39,3 @@ FILES_${PN} += " \ ${datadir}/icons \ ${libdir}/libkdeinit5_ksysguard.so \ " - -FILES_${PN}-dbg += " \ -" diff --git a/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb b/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb index 25b7ba28..99ddd24f 100644 --- a/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb +++ b/recipes-kde/plasma/untier/kwallet-pam/kwallet-pam.bb @@ -14,8 +14,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "d548ae1d4b1850cc65093128a411304a" -SRC_URI[sha256sum] = "384a0c5fcfefb94a83163a0ab47cf567d292ef08c8c62ae4e9c9d30e4a35c594" +SRC_URI[md5sum] = "6ebd5b3e62be468b4a5841bcce624093" +SRC_URI[sha256sum] = "239de5e3472366aa4247f109f3f026ec3313b6e28e6cea184140cc3145727bf0" SRC_URI += " \ file://0001-use-pkgconfig-to-find-libgcrypt.patch \ " @@ -23,4 +23,3 @@ SRC_URI += " \ EXTRA_OECMAKE += "-DCMAKE_INSTALL_LIBDIR=${base_libdir}" FILES_${PN} += "${base_libdir}/security" -FILES_${PN}-dbg += "${base_libdir}/security/.debug" diff --git a/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb b/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb index 30bdc8f1..7d0ca484 100644 --- a/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb +++ b/recipes-kde/plasma/untier/kwayland-integration/kwayland-integration.bb @@ -13,13 +13,9 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "16d278360004a80db9c5a6baa2f7781b" -SRC_URI[sha256sum] = "98f3d07b4c8dc2ff9c4d7b49479d68ef44aab28ff4ca8ad79db11a331c22800b" +SRC_URI[md5sum] = "f5ceb5dbfcf2d3f590b9115c446b35df" +SRC_URI[sha256sum] = "7000f3fc7802e8dc9cb0825fd2cc4c5e2619e80fa12536e4e7cfdd33ad4b2b3f" FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/*/.debug \ -" diff --git a/recipes-kde/plasma/untier/kwin/files/0002-Make-building-of-QPA-wayland-plugin-an-option.patch b/recipes-kde/plasma/untier/kwin/files/0001-Make-building-of-QPA-wayland-plugin-an-option.patch similarity index 100% rename from recipes-kde/plasma/untier/kwin/files/0002-Make-building-of-QPA-wayland-plugin-an-option.patch rename to recipes-kde/plasma/untier/kwin/files/0001-Make-building-of-QPA-wayland-plugin-an-option.patch diff --git a/recipes-kde/plasma/untier/kwin/files/0001-fix-build-for-qtbase-without-session-management.patch b/recipes-kde/plasma/untier/kwin/files/0001-fix-build-for-qtbase-without-session-management.patch deleted file mode 100644 index fbe791a4..00000000 --- a/recipes-kde/plasma/untier/kwin/files/0001-fix-build-for-qtbase-without-session-management.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 3e8eab8c8350333d5d86fb52b3a1c89002632ecd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 11 Dec 2015 22:33:39 +0100 -Subject: [PATCH] fix build for qtbase without session management -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller ---- - main_x11.cpp | 2 ++ - sm.cpp | 4 ++++ - workspace.cpp | 12 ++++++++++-- - workspace.h | 2 ++ - 4 files changed, 18 insertions(+), 2 deletions(-) - -diff --git a/main_x11.cpp b/main_x11.cpp -index 2c13743..742a5af 100644 ---- a/main_x11.cpp -+++ b/main_x11.cpp -@@ -148,10 +148,12 @@ void ApplicationX11::performStartup() - Application::setX11ScreenNumber(QX11Info::appScreen()); - } - -+#ifndef QT_NO_SESSIONMANAGER - // QSessionManager for some reason triggers a very early commitDataRequest - // and updates the key - before we create the workspace and load the session - // data -> store and pass to the workspace constructor - m_originalSessionKey = sessionKey(); -+#endif - - owner.reset(new KWinSelectionOwner(Application::x11ScreenNumber())); - connect(owner.data(), &KSelectionOwner::failedToClaimOwnership, []{ -diff --git a/sm.cpp b/sm.cpp -index 6852390..efa2e82 100644 ---- a/sm.cpp -+++ b/sm.cpp -@@ -56,6 +56,7 @@ static KConfig *sessionConfig(QString id, QString key) - return config; - } - -+#ifndef QT_NO_SESSIONMANAGER - void Workspace::saveState(QSessionManager &sm) - { - // If the session manager is ksmserver, save stacking -@@ -92,6 +93,7 @@ void Workspace::commitData(QSessionManager &sm) - if (!sm.isPhase2()) - sessionSaveStarted(); - } -+#endif - - // Workspace - -@@ -215,8 +217,10 @@ void Workspace::loadSessionInfo(const QString &key) - // NOTICE: qApp->sessionKey() is outdated when this gets invoked - // the key parameter is cached from the application constructor. - session.clear(); -+#ifndef QT_NO_SESSIONMANAGER - KConfigGroup cg(sessionConfig(qApp->sessionId(), key), "Session"); - addSessionInfo(cg); -+#endif - } - - void Workspace::addSessionInfo(KConfigGroup &cg) -diff --git a/workspace.cpp b/workspace.cpp -index 02ccf5a..3c83ec1 100644 ---- a/workspace.cpp -+++ b/workspace.cpp -@@ -152,10 +152,12 @@ Workspace::Workspace(const QString &sessionKey) - - delayFocusTimer = 0; - -+#ifndef QT_NO_SESSIONMANAGER - if (!sessionKey.isEmpty()) - loadSessionInfo(sessionKey); - connect(qApp, &QGuiApplication::commitDataRequest, this, &Workspace::commitData); - connect(qApp, &QGuiApplication::saveStateRequest, this, &Workspace::saveState); -+#endif - - RuleBook::create(this)->load(); - -@@ -397,7 +399,9 @@ void Workspace::initWithX11() - // TODO: only in X11 mode - // Extra NETRootInfo instance in Client mode is needed to get the values of the properties - NETRootInfo client_info(connection(), NET::ActiveWindow | NET::CurrentDesktop); -+#ifndef QT_NO_SESSIONMANAGER - if (!qApp->isSessionRestored()) -+#endif - m_initialDesktop = client_info.currentDesktop(); - if (!VirtualDesktopManager::self()->setCurrent(m_initialDesktop)) - VirtualDesktopManager::self()->setCurrent(1); -@@ -406,7 +410,9 @@ void Workspace::initWithX11() - rootInfo->setActiveWindow(None); - focusToNull(); - -+#ifndef QT_NO_SESSIONMANAGER - if (!qApp->isSessionRestored()) -+#endif - ++block_focus; // Because it will be set below - - { -@@ -472,7 +478,10 @@ void Workspace::initWithX11() - - // TODO: only on X11? - AbstractClient* new_active_client = nullptr; -- if (!qApp->isSessionRestored()) { -+#ifndef QT_NO_SESSIONMANAGER -+ if (!qApp->isSessionRestored()) -+#endif -+ { - --block_focus; - new_active_client = findClient(Predicate::WindowMatch, client_info.activeWindow()); - } -diff --git a/workspace.h b/workspace.h -index 0653064..c3c0a02 100644 ---- a/workspace.h -+++ b/workspace.h -@@ -441,9 +441,11 @@ private Q_SLOTS: - void slotDesktopCountChanged(uint previousCount, uint newCount); - void slotCurrentDesktopChanged(uint oldDesktop, uint newDesktop); - -+#ifndef QT_NO_SESSIONMANAGER - // session management - void saveState(QSessionManager &sm); - void commitData(QSessionManager &sm); -+#endif - - Q_SIGNALS: - /** --- -2.5.0 - diff --git a/recipes-kde/plasma/untier/kwin/kwin.bb b/recipes-kde/plasma/untier/kwin/kwin.bb index 91dcd1b5..7003fb21 100644 --- a/recipes-kde/plasma/untier/kwin/kwin.bb +++ b/recipes-kde/plasma/untier/kwin/kwin.bb @@ -56,13 +56,12 @@ DEPENDS += " \ kdoctools-native \ " -PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "3d9ce77dd5671b514d9943c5119fca61" -SRC_URI[sha256sum] = "d146dd3742400684328b5ae268b24ebfb118b2cce75ab1b8994ea883491a323d" +PV = "${PLASMA_FIXUP_VERSION}" +SRC_URI[md5sum] = "d297109766835e43cea21af920b88b3c" +SRC_URI[sha256sum] = "3c7b5ced440cf9ecd23b5905727cea4730188fbfe6388b4fcdb5eb3f52323147" SRC_URI += " \ - file://0001-fix-build-for-qtbase-without-session-management.patch \ - file://0002-Make-building-of-QPA-wayland-plugin-an-option.patch \ + file://0001-Make-building-of-QPA-wayland-plugin-an-option.patch \ " # pure X11 environments fail to build wayland plugin @@ -73,12 +72,12 @@ CXXFLAGS_append_mx6 += " -DLINUX=1" FILES_${PN} += " \ ${datadir}/config.kcfg \ - ${datadir}/kservices5 \ - ${datadir}/kwincompositing \ ${datadir}/dbus-1 \ - ${datadir}/icons \ - ${datadir}/*5 \ ${datadir}/kconf_update \ + ${datadir}/k*5 \ + ${datadir}/kpackage \ + ${datadir}/kwincompositing \ + ${datadir}/icons \ ${OE_QMAKE_PATH_PLUGINS} \ ${OE_QMAKE_PATH_QML} \ ${libdir}/kconf_update_bin \ @@ -91,16 +90,6 @@ FILES_${PN} += " \ ${libdir}/*.so \ " -FILES_${PN}-dbg += " \ - ${libdir}/*/.debug \ - ${libdir}/*/*/.debug \ - ${libdir}/*/*/*/.debug \ - ${libdir}/*/*/*/*/.debug \ - ${libdir}/*/*/*/*/*/.debug \ - ${libdir}/*/*/*/*/*/*/.debug \ - ${libdir}/*/*/*/*/*/*/*/.debug \ -" - RDEPENDS_${PN} += " \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland", "xserver-xorg-xwayland", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "qtwayland", "",d)} \ diff --git a/recipes-kde/plasma/untier/kwrited/kwrited.bb b/recipes-kde/plasma/untier/kwrited/kwrited.bb index 720b1541..ccdecdbd 100644 --- a/recipes-kde/plasma/untier/kwrited/kwrited.bb +++ b/recipes-kde/plasma/untier/kwrited/kwrited.bb @@ -16,8 +16,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "9f36e858f57d24098c2ddb5987bf200e" -SRC_URI[sha256sum] = "5b5a5260763dd9d3999a24ceeef70495225554e50163241bf9418963d8e61fb1" +SRC_URI[md5sum] = "c568256c56e2a2fa22e642a8bd43bfa5" +SRC_URI[sha256sum] = "fb3cd2b588f23ecd71d3ac476457cd1e0881172bda9879f4d465e43b9dad0d76" SRC_URI += " \ file://0001-fix-build-for-qtbase-without-session-management.patch \ diff --git a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb index 3f7ab5a0..20a23f4d 100644 --- a/recipes-kde/plasma/untier/libkscreen/libkscreen.bb +++ b/recipes-kde/plasma/untier/libkscreen/libkscreen.bb @@ -10,8 +10,8 @@ inherit kde-plasma DEPENDS += "${@bb.utils.contains("DISTRO_FEATURES", "x11", "virtual/libx11 qtx11extras", "", d)}" PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "6cafec0732d42a11618b0f7843b9cdb7" -SRC_URI[sha256sum] = "1f20ab00ec5d8a2e99dd400c3cace8d84347a527449fb0e838d0cbaecd72a6d8" +SRC_URI[md5sum] = "705f767f74d225a7d3e54863c28e8774" +SRC_URI[sha256sum] = "728f3c0f3bed38e75b8319a2452da9f864911c4b8206f354d536e2a21e9aee3b" SRC_URI += " \ file://0001-fix-configuration-build-on-x-less-systems.patch \ @@ -21,8 +21,3 @@ FILES_${PN} += " \ ${datadir}/dbus-1 \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/kf5/kscreen/.debug \ - ${libexecdir}/kf5/.debug \ -" diff --git a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb index f5b86c84..59a4c82b 100644 --- a/recipes-kde/plasma/untier/libksysguard/libksysguard.bb +++ b/recipes-kde/plasma/untier/libksysguard/libksysguard.bb @@ -17,7 +17,6 @@ DEPENDS += " \ ki18n \ kwindowsystem \ kcompletion \ - kauth \ kwidgetsaddons \ kiconthemes \ kconfigwidgets \ @@ -28,8 +27,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "8b43076fe3d8845d7f890721a90b8210" -SRC_URI[sha256sum] = "2233a024aa1d19c0f0d4142ae436df44cf98e0de3203da1a62556891779ad4d9" +SRC_URI[md5sum] = "94d5a8505d3ecc69726aa9deb592bf97" +SRC_URI[sha256sum] = "d2e22a6ed3cb04c1b398f4609faa8eea10a97d89c29230c544ab57d643598e15" FILES_${PN} += " \ ${datadir}/dbus-1 \ diff --git a/recipes-kde/plasma/untier/milou/milou.bb b/recipes-kde/plasma/untier/milou/milou.bb index 6ee939ec..43796a33 100644 --- a/recipes-kde/plasma/untier/milou/milou.bb +++ b/recipes-kde/plasma/untier/milou/milou.bb @@ -22,8 +22,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "ea0c7fe6cf49049b9a68b9d0094634b9" -SRC_URI[sha256sum] = "6e567177f3deccc5794e7c214e68e811a26c7ed3a1e63488ff41451b7fc973b6" +SRC_URI[md5sum] = "95d1078a08dcf21266a9cce51bac9dc6" +SRC_URI[sha256sum] = "017c8e26583926eb15936227236d19e120868775521b7bdc64e86b9f5b4d38df" FILES_${PN} += " \ ${datadir}/k*5 \ @@ -31,8 +31,3 @@ FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ ${OE_QMAKE_PATH_QML} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_QML}/*/*/*/.debug \ -" diff --git a/recipes-kde/plasma/untier/oxygen-fonts/oxygen-fonts.bb b/recipes-kde/plasma/untier/oxygen-fonts/oxygen-fonts.bb index ec01146f..45627132 100644 --- a/recipes-kde/plasma/untier/oxygen-fonts/oxygen-fonts.bb +++ b/recipes-kde/plasma/untier/oxygen-fonts/oxygen-fonts.bb @@ -19,6 +19,3 @@ EXTRA_OECMAKE += "-DOXYGEN_FONT_INSTALL_DIR=${datadir}/fonts/truetype/oxygen" FILES_${PN} += " \ ${datadir}/fonts \ " - -FILES_${PN}-dbg += " \ -" diff --git a/recipes-kde/plasma/untier/oxygen/oxygen.bb b/recipes-kde/plasma/untier/oxygen/oxygen.bb index 5121ff24..b3026985 100644 --- a/recipes-kde/plasma/untier/oxygen/oxygen.bb +++ b/recipes-kde/plasma/untier/oxygen/oxygen.bb @@ -25,8 +25,8 @@ DEPENDS += " \ PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "a194273fcb39e57b694121d258188a7a" -SRC_URI[sha256sum] = "1f4c1e7c94204af3d146670df4a6a271b433b23b4543b6ad5adcfb9aad8ebde5" +SRC_URI[md5sum] = "b0224262aaea0611a5304e9586d9ddbf" +SRC_URI[sha256sum] = "6bb7e108291f1b82881de71a1df99429e90922e8fb2318d99a7002be6b4c0628" SRC_URI += "file://0001-kstyle-add-an-option-BUILD_OXYGEN_SETTINGS-disabled-.patch" PACKAGECONFIG ??= "" @@ -39,8 +39,3 @@ FILES_${PN} += " \ ${datadir}/plasma \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ -" diff --git a/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb b/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb index 9d5b95d8..a4df8dc5 100644 --- a/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb +++ b/recipes-kde/plasma/untier/plasma-browser-integration/plasma-browser-integration.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING-GPL3;md5=d32239bcb673463ab874e80d47fae504" inherit kde-plasma gettext PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "7a1b10a5dc4b28600a9f3f13de800bd5" -SRC_URI[sha256sum] = "b50c4ac698070ec57ee5446e2166aa9bab037c679d4eb8da85675787ab898d3f" +SRC_URI[md5sum] = "dcede75af2b44e7dba52164f52a8a37a" +SRC_URI[sha256sum] = "59c984d174ab484899b9b1d7d4600f5be3152d8bbed2fb8f44cdbf617e510ad6" DEPENDS += " \ kauth-native \ diff --git a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb index c9d9dc79..c55c43d3 100644 --- a/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb +++ b/recipes-kde/plasma/untier/plasma-desktop/plasma-desktop.bb @@ -13,7 +13,6 @@ DEPENDS += " \ qtsvg \ qtdeclarative \ \ - kauth \ kauth-native \ plasma-framework \ kdoctools \ @@ -49,9 +48,9 @@ DEPENDS += " \ fontconfig \ " -PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "2db6c86391fcb083a0ff079a14875821" -SRC_URI[sha256sum] = "721c684085268726591a93c11db251cddf13b2ea094d8d1f7aa9beadfc42b049" +PV = "${PLASMA_FIXUP_VERSION}" +SRC_URI[md5sum] = "0aedba1ccd551bf3137cbadedf140c3c" +SRC_URI[sha256sum] = "21e54d489817751173049122410737db641a8e58955b84264a4ec861e302ff8a" SRC_URI += "file://0001-Ensure-xkb_base-is-not-empty-instead-of-checking-if-.patch" @@ -70,20 +69,10 @@ FILES_${PN} += " \ \ ${libdir}/libkdeinit5_kaccess.so \ ${OE_QMAKE_PATH_QML} \ - ${libdir}/kauth \ ${OE_QMAKE_PATH_PLUGINS} \ ${libdir}/kconf_update_bin \ " -FILES_${PN}-dbg += " \ - ${libdir}/*/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \ - ${OE_QMAKE_PATH_QML}/org/kde/*/*/.debug \ - ${OE_QMAKE_PATH_QML}/org/kde/*/*/*/.debug \ -" - RDEPENDS_${PN} += " \ qtgraphicaleffects \ qtquickcontrols-qmlplugins \ diff --git a/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb b/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb index d954aa06..779750fc 100644 --- a/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb +++ b/recipes-kde/plasma/untier/plasma-integration/plasma-integration.bb @@ -26,14 +26,10 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "14289404eeff5fd571aefbe2a025dc86" -SRC_URI[sha256sum] = "68a43e222ed8c6d6f8dca780a6ad59a5d46fc040fff7542ca3ef87d21f584e4a" +SRC_URI[md5sum] = "509f18cd766b6a63de42eaf3d8d91946" +SRC_URI[sha256sum] = "659c4a8c5b890cdf41b788e0609f680b00d6f609610d46af8656484057141c23" FILES_${PN} += " \ ${datadir}/kconf_update \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ -" diff --git a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb index fe3f6236..7ef01cbd 100644 --- a/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb +++ b/recipes-kde/plasma/untier/plasma-nm/plasma-nm.bb @@ -46,8 +46,8 @@ DEPENDS += " \ # MobileBroadbandProviderInfo PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "3e1200ad29cae12d7672902164449403" -SRC_URI[sha256sum] = "b3cfa41e0116b896a121ffe5ae0d6bc4cbc0f599d89e7fddff0feb8595525292" +SRC_URI[md5sum] = "46492d319950a48f3a192f1d883a4020" +SRC_URI[sha256sum] = "7fe3d72bd81f57cf2df0fcb33e957355110efe31f4b1a71a4c0b6ca121813cd1" # do not move so-libs to -dev package FILES_SOLIBSDEV = "" @@ -62,10 +62,3 @@ FILES_${PN} += " \ ${OE_QMAKE_PATH_QML} \ ${libdir}/*.so \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/.debug \ -" diff --git a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb index 1838c2b6..c03768e6 100644 --- a/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb +++ b/recipes-kde/plasma/untier/plasma-pa/plasma-pa.bb @@ -25,8 +25,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "bf60a089095cfeca423a2e1dfc7fc627" -SRC_URI[sha256sum] = "e3629b417d4830c0e4c5f4a4a26392c4e44e98c54bd51676a56391ff940aaca2" +SRC_URI[md5sum] = "97752f6f9a57d39eaa1b68b99f5880af" +SRC_URI[sha256sum] = "450476c3eb8175e339615b93e0cf5cbc1dd7abdbe2b25e87b0b292555a8b70d2" FILES_SOLIBSDEV = "" @@ -42,8 +42,3 @@ FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ ${OE_QMAKE_PATH_QML} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/*/.debug \ - ${OE_QMAKE_PATH_QML}/*/*/*/*/*/.debug \ -" diff --git a/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb b/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb index 743f0f4b..483f9ebd 100644 --- a/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb +++ b/recipes-kde/plasma/untier/plasma-vault/plasma-vault.bb @@ -9,8 +9,8 @@ LIC_FILES_CHKSUM = " \ inherit kde-plasma gtk-icon-cache PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "cd1c28ad7d047861634fa091cec5cd29" -SRC_URI[sha256sum] = "9975923ff4985d0dbce5d2746bf977246605fd6f010f81662da20d5b12478abb" +SRC_URI[md5sum] = "f2c1e4e95bf01106c2f9b434366258c3" +SRC_URI[sha256sum] = "5e26547c97cfba5f209df239298869c24d2ba2bb0594e90eb0d985f0b16dc9d7" DEPENDS += " \ kauth-native \ diff --git a/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb b/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb index 22b5c7b0..ad6b3b12 100644 --- a/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb +++ b/recipes-kde/plasma/untier/plasma-workspace-wallpapers/plasma-workspace-wallpapers.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ inherit kde-plasma PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "5896ef78ebf9b4784ed1fb44c4af1d69" -SRC_URI[sha256sum] = "268e936fe184c74e46e1de99b419bb5d189d7dbdeca5ec3e71b34799c1066ccf" +SRC_URI[md5sum] = "7006c1d844dd8d23fa6c4e18af645860" +SRC_URI[sha256sum] = "043b459e801d33caad8743f1133eb27edebb42171b08393bda92ea69ccd6fa75" FILES_${PN} += "${datadir}/wallpapers" diff --git a/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb b/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb index c8a9ab9d..35e011e4 100644 --- a/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb +++ b/recipes-kde/plasma/untier/polkit-kde-agent-1/polkit-kde-agent-1.bb @@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=5c213a7de3f013310bd272cdb6eb7a24 \ " -inherit kde-plasma gettext +inherit kde-plasma gettext distro_features_check + +REQUIRED_DISTRO_FEATURE = "polkit" DEPENDS += " \ ki18n \ @@ -21,8 +23,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "25e9a3d1745d0c11d8568074229671a3" -SRC_URI[sha256sum] = "abda7dcd87a57430a0174e76d0e81fd8612df40960a90c95d920941b9eec7edf" +SRC_URI[md5sum] = "4b364062f59fb9599ef7c60fbcc1d9e2" +SRC_URI[sha256sum] = "5e7b4db91293b00c0267b73a1d5186cd65bcd8d2d369b10f5f4fd59fe029f41d" SRC_URI += "file://0001-fix-build-for-QT_NO_SESSIONMANAGER.patch" diff --git a/recipes-kde/plasma/untier/powerdevil/powerdevil.bb b/recipes-kde/plasma/untier/powerdevil/powerdevil.bb index d9db012e..d9c18135 100644 --- a/recipes-kde/plasma/untier/powerdevil/powerdevil.bb +++ b/recipes-kde/plasma/untier/powerdevil/powerdevil.bb @@ -9,7 +9,6 @@ inherit kde-plasma gettext DEPENDS += " \ bluez-qt \ kactivities \ - kauth \ kauth-native \ kidletime \ kconfig \ @@ -30,8 +29,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "fdb962c816db14a40c5e455c6f25523a" -SRC_URI[sha256sum] = "634858948fbee9054a8d28a91d26c4355a9d15f52ae6767331d25b66e5f91e13" +SRC_URI[md5sum] = "72da38b000b84ebb350b2842c22438bb" +SRC_URI[sha256sum] = "24acaef3e78b8cea665ca12ade119d8e589de74cc5bf0bdcc7398201e998f1b8" FILES_${PN} += " \ ${datadir}/k*5 \ @@ -41,9 +40,4 @@ FILES_${PN} += " \ ${OE_QMAKE_PATH_PLUGINS} \ " -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_PLUGINS}/*/*/.debug \ -" - RDEPENDS_${PN} += "upower" diff --git a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb index 55f47db2..5c734507 100644 --- a/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb +++ b/recipes-kde/plasma/untier/sddm-kcm/sddm-kcm.bb @@ -14,7 +14,6 @@ DEPENDS += " \ kconfig-native \ ki18n \ kxmlgui \ - kauth \ kauth-native \ kconfigwidgets \ kio \ @@ -23,8 +22,8 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "1a28a56b8b76b2c84c9d880f546274c4" -SRC_URI[sha256sum] = "9fbd6af14d2c3b8be917c94a3c09f38a8de2730250d51edd2f6820f481d3b10f" +SRC_URI[md5sum] = "b2a458ec19d39cdecc969b1e5ad226dd" +SRC_URI[sha256sum] = "026a2ab9746d0705c5069b48d3bc6b641119a44f62fa68a0b155b334c34577d7" RDEPENDS_${PN} = "sddm" @@ -33,10 +32,4 @@ FILES_${PN} += " \ ${datadir}/dbus-1 \ ${datadir}/polkit-1 \ ${OE_QMAKE_PATH_PLUGINS} \ - ${libdir}/kauth \ -" - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${libdir}/kauth/.debug \ " diff --git a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb index 96919730..cc47087e 100644 --- a/recipes-kde/plasma/untier/systemsettings/systemsettings.bb +++ b/recipes-kde/plasma/untier/systemsettings/systemsettings.bb @@ -32,16 +32,12 @@ DEPENDS += " \ plasma-workspace \ " -PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "1c119822295205f625c7fcc6ea7b01bb" -SRC_URI[sha256sum] = "9e7a49e4448b708e6e62891f5bc2b8205f78cd828cb2da1cd0574d944e9a9e3e" +PV = "${PLASMA_FIXUP_VERSION}" +SRC_URI[md5sum] = "4f27f409f8660e5656cfae2c7fe2c4a3" +SRC_URI[sha256sum] = "42095b95a7866aa667e30c15a7ebc9b00225fdb4f06668510fdf63a18573102f" FILES_${PN} += " \ ${datadir}/k*5 \ ${datadir}/kpackage \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-kde/plasma/untier/user-manager/user-manager.bb b/recipes-kde/plasma/untier/user-manager/user-manager.bb index 6be13ac8..35bcd8d9 100644 --- a/recipes-kde/plasma/untier/user-manager/user-manager.bb +++ b/recipes-kde/plasma/untier/user-manager/user-manager.bb @@ -16,14 +16,10 @@ DEPENDS += " \ " PV = "${PLASMA_VERSION}" -SRC_URI[md5sum] = "fbd60bfb9e66c72311e233817b94e809" -SRC_URI[sha256sum] = "4bdfd365c6af222d0982fc02a36d8df6d341d81e1eafca288d4bfe3091351c84" +SRC_URI[md5sum] = "c1b015e2c94995c1e336204900d77929" +SRC_URI[sha256sum] = "444b9a69f3347caa81ab1c1baaabb135a9cae783c1e91cc7e40c3626fb784ca1" FILES_${PN} += " \ ${datadir}/kservices5 \ ${OE_QMAKE_PATH_PLUGINS} \ " - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ -" diff --git a/recipes-liri/liri-browser/liri-browser_git.bb b/recipes-liri/liri-browser/liri-browser_git.bb index 3937f8bf..ca2cab1e 100644 --- a/recipes-liri/liri-browser/liri-browser_git.bb +++ b/recipes-liri/liri-browser/liri-browser_git.bb @@ -1,21 +1,22 @@ SUMMARY = "LIRI Web browser" -LICENSE = "GPLv3" +LICENSE = "BSD-3-Clause & GPLv3" LIC_FILES_CHKSUM = " \ + file://LICENSE.BSD;md5=45ba01a83fedf3882c6bb7f5c8eb7a6c \ file://LICENSE.GPLv3;md5=8f0e2cd40e05189ec81232da84bd6e1a \ " -inherit qmake5 +inherit liri gtk-icon-cache PV = "0.0.0+git${SRCPV}" -SRC_URI = "git://github.com/lirios/browser.git;branch=develop" -SRCREV = "4f27d0b1abb85ad0166482128570b158c3b446aa" +SRCREV = "fb91e85c560a451879431eaaa4d8985d9ec3bfad" S = "${WORKDIR}/git" DEPENDS += " \ - qtdeclarative \ - qtquickcontrols2 \ - fluid \ + qtsvg \ + qtgraphicaleffects \ + qtwebengine \ + liri-fluid \ " do_configure_prepend() { diff --git a/recipes-liri/liri-calculator/liri-calculator_git.bb b/recipes-liri/liri-calculator/liri-calculator_git.bb index 41b6ceac..13ceadfb 100644 --- a/recipes-liri/liri-calculator/liri-calculator_git.bb +++ b/recipes-liri/liri-calculator/liri-calculator_git.bb @@ -1,25 +1,21 @@ SUMMARY = "LIRI Calculator" LICENSE = "GPLv3" LIC_FILES_CHKSUM = " \ - file://LICENSE;md5=8f0e2cd40e05189ec81232da84bd6e1a \ + file://LICENSE.GPLv3;md5=8f0e2cd40e05189ec81232da84bd6e1a \ " -inherit qmake5 - -PV = "0.0.0+git${SRCPV}" - -SRC_URI = "git://github.com/lirios/calculator.git" -SRCREV = "b86e70b2e408004408459349db3a7f1a7316570a" -S = "${WORKDIR}/git" +inherit liri gtk-icon-cache DEPENDS += " \ - qtdeclarative \ qtquickcontrols2 \ - fluid \ + liri-fluid \ " -# don't share ideas where to install binary -do_install() { - install -d ${D}/${bindir} - install -m 0755 ${B}/liri-calculator ${D}/${bindir}/ -} +SRCREV = "7caf7cf9ede6729f71de54ce6e8ed678056b8530" +S = "${WORKDIR}/git" +PV = "1.2.0+git${SRCPV}" + +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${datadir}/icons \ +" diff --git a/recipes-liri/liri-cmake-shared/liri-cmake-shared_git.bb b/recipes-liri/liri-cmake-shared/liri-cmake-shared_git.bb index df2c3fbe..f4056a73 100644 --- a/recipes-liri/liri-cmake-shared/liri-cmake-shared_git.bb +++ b/recipes-liri/liri-cmake-shared/liri-cmake-shared_git.bb @@ -10,8 +10,7 @@ inherit liri DEPENDS = "cmake-native" PV = "1.0.0+git${SRCPV}" - -SRCREV = "4d888a8674c03411f4f2124b71e206133795d444" +SRCREV = "655e4a9130c3c5293e3d8e7e72fba2a945f8d1c8" S = "${WORKDIR}/git" FILES_${PN}-dev += "${datadir}/LiriCMakeShared" diff --git a/recipes-liri/liri-eglfs/liri-eglfs/0001-Do-not-enable-recording-by-default-it-requires-GLES3.patch b/recipes-liri/liri-eglfs/liri-eglfs/0001-Do-not-enable-recording-by-default-it-requires-GLES3.patch new file mode 100644 index 00000000..e36b7f62 --- /dev/null +++ b/recipes-liri/liri-eglfs/liri-eglfs/0001-Do-not-enable-recording-by-default-it-requires-GLES3.patch @@ -0,0 +1,29 @@ +From 63a7de68a3df67647a26261a412a51275c5de677 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 31 Jan 2019 12:25:01 +0100 +Subject: [PATCH] Do not enable recording by default - it requires GLES3 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Andreas Müller +--- + src/plugins/platforms/eglfs/api/qeglfsscreen_p.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h b/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h +index 9b1e072..e3f0901 100644 +--- a/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h ++++ b/src/plugins/platforms/eglfs/api/qeglfsscreen_p.h +@@ -104,7 +104,7 @@ private: + EGLSurface m_surface; + QPlatformCursor *m_cursor; + bool m_modeChangeRequested = false; +- bool m_recordingEnabled = true; ++ bool m_recordingEnabled = false; + + friend class QEglFSWindow; + }; +-- +2.20.1 + diff --git a/recipes-liri/liri-eglfs/liri-eglfs_git.bb b/recipes-liri/liri-eglfs/liri-eglfs_git.bb index f62613f7..cb7a843e 100644 --- a/recipes-liri/liri-eglfs/liri-eglfs_git.bb +++ b/recipes-liri/liri-eglfs/liri-eglfs_git.bb @@ -8,16 +8,19 @@ LIC_FILES_CHKSUM = " \ inherit liri DEPENDS += " \ - liri-libliri \ - liri-qtudev \ - libinput \ + fontconfig \ drm \ virtual/libgbm \ + virtual/egl \ + virtual/libgles2 \ + libinput \ + liri-libliri \ + liri-qtudev \ " PV = "0.0.0+git${SRCPV}" - -SRCREV = "ad69d7331af5ea34a18f13da9ec18755fae92edb" +SRCREV = "7bbc508bc03ab0f6a6b1633b322a83db5d99ab5b" +SRC_URI += "file://0001-Do-not-enable-recording-by-default-it-requires-GLES3.patch" S = "${WORKDIR}/git" FILES_${PN} += " \ diff --git a/recipes-liri/liri-files/liri-files_git.bb b/recipes-liri/liri-files/liri-files_git.bb index 7cdd4f3a..71a4fe69 100644 --- a/recipes-liri/liri-files/liri-files_git.bb +++ b/recipes-liri/liri-files/liri-files_git.bb @@ -1,25 +1,29 @@ SUMMARY = "File manager" LICENSE = "GPLv3" LIC_FILES_CHKSUM = " \ - file://LICENSE.GPLv3;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPLv3;md5=1ebbd3e34237af26da5dc08a4e440464 \ " inherit liri -PV = "0.1.0+git${SRCPV}" +PV = "0.2.0+git${SRCPV}" -SRCREV = "4f3ea283907e11342a024e6272d660f7578c7e57" +SRCREV = "0d46d331cc107b9feb74570fe93edf5883da3265" S = "${WORKDIR}/git" DEPENDS += " \ qttools \ + qtquickcontrols2 \ taglib \ - fluid \ + liri-fluid \ " EXTRA_OECMAKE += "-DQt5LinguistTools_DIR=${STAGING_LIBDIR_NATIVE}/cmake/Qt5LinguistTools" -FILES_${PN} += "${OE_QMAKE_PATH_QML} ${datadir}" +FILES_${PN} += " \ + ${datadir}/metainfo \ + ${OE_QMAKE_PATH_QML} \ +" RREPLACES_${PN} = "swordfish" RPROVIDES_${PN} = "swordfish" diff --git a/recipes-liri/liri-fluid/liri-fluid_git.bb b/recipes-liri/liri-fluid/liri-fluid_git.bb index 1c79af6e..1919efee 100644 --- a/recipes-liri/liri-fluid/liri-fluid_git.bb +++ b/recipes-liri/liri-fluid/liri-fluid_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ inherit liri gtk-icon-cache PV = "1.1.0+git${SRCPV}" -SRCREV = "ec6f8d84d4290ce37e3c25aeb3ed1cc69cd222f1" +SRCREV = "9eefdc9b5ca691441b4f312b6b63e11669f39ca5" S = "${WORKDIR}/git" DEPENDS += " \ @@ -33,3 +33,7 @@ FILES_${PN}-dev += " \ ${datadir}/metainfo \ ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \ " + +RDEPENDS_${PN} += " \ + qtsvg-plugins \ +" diff --git a/recipes-liri/liri-libliri/liri-libliri_git.bb b/recipes-liri/liri-libliri/liri-libliri_git.bb index 470ebae3..f15f5c4e 100644 --- a/recipes-liri/liri-libliri/liri-libliri_git.bb +++ b/recipes-liri/liri-libliri/liri-libliri_git.bb @@ -7,15 +7,11 @@ LIC_FILES_CHKSUM = " \ inherit liri -DEPENDS += "libqtxdg" - PV = "0.9.0+git${SRCPV}" -SRCREV = "303ae04affbdb6bfd8979692e4423fd3491ce9e9" +SRCREV = "fb7784a92a3abe45504076f7debc7eb5b6c5d795" S = "${WORKDIR}/git" FILES_${PN} += " \ - ${libdir}/libLiri1*.so \ ${OE_QMAKE_PATH_QML}/Liri \ " -FILES_SOLIBSDEV = "" diff --git a/recipes-liri/liri-materialdecoration/liri-materialdecoration_git.bb b/recipes-liri/liri-materialdecoration/liri-materialdecoration_git.bb new file mode 100644 index 00000000..4dc434ce --- /dev/null +++ b/recipes-liri/liri-materialdecoration/liri-materialdecoration_git.bb @@ -0,0 +1,16 @@ +SUMMARY = "Client-side decoration for all Qt-based Wayland clients" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = " \ + file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ +" + +inherit liri + +PV = "1.1.0+git${SRCPV}" + +SRCREV = "2079487116c6c794af3a15452342a69293039b46" +S = "${WORKDIR}/git" + +FILES_${PN} += " \ + ${libdir}/plugins \ +" diff --git a/recipes-liri/liri-networkmanager/liri-networkmanager_git.bb b/recipes-liri/liri-networkmanager/liri-networkmanager_git.bb index e9edc44b..43faea4b 100644 --- a/recipes-liri/liri-networkmanager/liri-networkmanager_git.bb +++ b/recipes-liri/liri-networkmanager/liri-networkmanager_git.bb @@ -8,7 +8,7 @@ inherit liri PV = "0.9.0+git${SRCPV}" -SRCREV = "5d3e76b7e9daedbdf92ec349ebf9653f2a933813" +SRCREV = "5640b931e17cc24ccf13d20a001d60f381ded426" S = "${WORKDIR}/git" DEPENDS += " \ diff --git a/recipes-liri/liri-player/liri-player_git.bb b/recipes-liri/liri-player/liri-player_git.bb new file mode 100644 index 00000000..0a5afa7a --- /dev/null +++ b/recipes-liri/liri-player/liri-player_git.bb @@ -0,0 +1,23 @@ +SUMMARY = "Cross-platform media player" +LICENSE = "AGPLv3" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=4e2aee3f50167a8482c5b569294ffe7a \ +" + +inherit qmake5 + +DEPENDS += " \ + qtmultimedia \ + vlc \ +" + +LIRI_GIT_BRANCH ?= "develop" +SRC_URI = "gitsm://github.com/lirios/${@'${BPN}'.replace('liri-', '')}.git;protocol=git;branch=${LIRI_GIT_BRANCH}" +SRCREV = "dceddc6f941ee7249e7253a88b7e4f34251fc83f" +S = "${WORKDIR}/git" +PV = "0.0.0+git${SRCPV}" + +do_install() { + install -d ${D}${bindir} + install -m 755 ${B}/liri-player ${D}${bindir} +} diff --git a/recipes-liri/liri-power-manager/liri-power-manager_git.bb b/recipes-liri/liri-power-manager/liri-power-manager_git.bb index d57b5069..e4d54d19 100644 --- a/recipes-liri/liri-power-manager/liri-power-manager_git.bb +++ b/recipes-liri/liri-power-manager/liri-power-manager_git.bb @@ -8,7 +8,7 @@ inherit liri gsettings PV = "0.9.0+git${SRCPV}" -SRCREV = "2164b6d8e15ddab562b1b51792b5b0515d06bbcd" +SRCREV = "22c9288d32c33569a1886a061f461e1735b546f0" S = "${WORKDIR}/git" DEPENDS += " \ @@ -22,7 +22,7 @@ DEPENDS += " \ solid \ " -EXTRA_OECMAKE = "-DINSTALL_SYSCONFDIR=${sysconfdir}" +EXTRA_OECMAKE += "-DINSTALL_SYSCONFDIR=${sysconfdir}" FILES_${PN} += " \ ${datadir}/liri-settings \ diff --git a/recipes-liri/liri-pulseaudio/liri-pulseaudio_git.bb b/recipes-liri/liri-pulseaudio/liri-pulseaudio_git.bb index a06386a1..9fbfe479 100644 --- a/recipes-liri/liri-pulseaudio/liri-pulseaudio_git.bb +++ b/recipes-liri/liri-pulseaudio/liri-pulseaudio_git.bb @@ -10,7 +10,7 @@ REQUIRED_DISTRO_FEATURES = "pulseaudio" PV = "0.9.0+git${SRCPV}" -SRCREV = "fdfb2e9bb9142cf2704b3e1a7d0ef9db9c1481fb" +SRCREV = "fdd90a3555b01ad12bec5ce8b5071f54f155d5a0" S = "${WORKDIR}/git" DEPENDS += " \ diff --git a/recipes-liri/liri-qml-xwayland/liri-qml-xwayland_git.bb b/recipes-liri/liri-qml-xwayland/liri-qml-xwayland_git.bb new file mode 100644 index 00000000..aaf88936 --- /dev/null +++ b/recipes-liri/liri-qml-xwayland/liri-qml-xwayland_git.bb @@ -0,0 +1,20 @@ +SUMMARY = "QML plugin with an XWayland implementation for QML compositors" +LICENSE = "LGPLv3" +LIC_FILES_CHKSUM = " \ + file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ +" + +inherit liri distro_features_check + +REQUIRED_DISTRO_FEATURES = "wayland" + +PV = "0.10.0+git${SRCPV}" +SRCREV = "ce9b71bd470c92966e18ba7154c3677b0a9b7819" +S = "${WORKDIR}/git" + +DEPENDS += " \ + xcb-util-cursor \ + qtwayland \ +" + +FILES_${PN} += "${OE_QMAKE_PATH_QML}" diff --git a/recipes-liri/liri-qtaccountsservice/liri-qtaccountsservice_git.bb b/recipes-liri/liri-qtaccountsservice/liri-qtaccountsservice_git.bb index 0393366c..7efc34d5 100644 --- a/recipes-liri/liri-qtaccountsservice/liri-qtaccountsservice_git.bb +++ b/recipes-liri/liri-qtaccountsservice/liri-qtaccountsservice_git.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = " \ inherit liri PV = "1.2.0+git${SRCPV}" -SRCREV = "a92567854891555226501ba200bf4faabc16c4c9" +SRCREV = "b36a9ad942ecade869ac8b98afae8a45bd8a3fa7" S = "${WORKDIR}/git" FILES_${PN} += "${OE_QMAKE_PATH_QML}" diff --git a/recipes-liri/liri-qtgsettings/liri-qtgsettings_git.bb b/recipes-liri/liri-qtgsettings/liri-qtgsettings_git.bb index ecfc38a6..420f7d47 100644 --- a/recipes-liri/liri-qtgsettings/liri-qtgsettings_git.bb +++ b/recipes-liri/liri-qtgsettings/liri-qtgsettings_git.bb @@ -9,7 +9,9 @@ inherit liri DEPENDS += "glib-2.0" PV = "1.0.0+git${SRCPV}" -SRCREV = "a368ce3564fd8715e50ecae52a862d30f565ad97" +SRCREV = "3132cd4e46d8a2069594e36cb5be1eac36727a6a" S = "${WORKDIR}/git" FILES_${PN} += "${OE_QMAKE_PATH_QML}" + +RDEPENDS_${PN} += "dconf" diff --git a/recipes-liri/liri-screencast/liri-screencast_git.bb b/recipes-liri/liri-screencast/liri-screencast_git.bb index 328f6c6f..5c80e110 100644 --- a/recipes-liri/liri-screencast/liri-screencast_git.bb +++ b/recipes-liri/liri-screencast/liri-screencast_git.bb @@ -11,5 +11,5 @@ DEPENDS += " \ " PV = "0.9.0+git${SRCPV}" -SRCREV = "07eae89d912521271584c2acb7388774690f0d30" +SRCREV = "be5513df82650effacb3818351c1062e30923476" S = "${WORKDIR}/git" diff --git a/recipes-liri/liri-screenshot/liri-screenshot_git.bb b/recipes-liri/liri-screenshot/liri-screenshot_git.bb index a32e37f4..fcf9c692 100644 --- a/recipes-liri/liri-screenshot/liri-screenshot_git.bb +++ b/recipes-liri/liri-screenshot/liri-screenshot_git.bb @@ -11,5 +11,5 @@ DEPENDS += " \ " PV = "0.9.0+git${SRCPV}" -SRCREV = "636d1becbfa8fef00bc34865761176bcafe77939" +SRCREV = "50839f8dc7dfb21f7e44ef1657ffc84683624961" S = "${WORKDIR}/git" diff --git a/recipes-liri/liri-settings/liri-settings_git.bb b/recipes-liri/liri-settings/liri-settings_git.bb index 2381017c..a1533b32 100644 --- a/recipes-liri/liri-settings/liri-settings_git.bb +++ b/recipes-liri/liri-settings/liri-settings_git.bb @@ -10,14 +10,14 @@ REQUIRED_DISTRO_FEATURES = "wayland" PV = "0.9.0+git${SRCPV}" -SRCREV = "d5f5881da698fcb5e5b8e9e9176b85cd9f9cccbc" +SRCREV = "0e689bd1f7cc019e8e0809242aab544eb4f6c993" S = "${WORKDIR}/git" DEPENDS += " \ qtquickcontrols2 \ + liri-libliri \ liri-qtaccountsservice \ liri-fluid \ - libqtxdg \ polkit \ xkeyboard-config \ " diff --git a/recipes-liri/liri-shell/files/0001-find-host-s-git.patch b/recipes-liri/liri-shell/files/0001-find-host-s-git.patch deleted file mode 100644 index 4a1719bd..00000000 --- a/recipes-liri/liri-shell/files/0001-find-host-s-git.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 396f499db585e0be7029224ec6855b7f554d786f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 24 Apr 2015 13:29:02 +0200 -Subject: [PATCH] find host's git -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -we don't build git-native - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Andreas Müller ---- - cmake/GetGitRevision.cmake | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/cmake/GetGitRevision.cmake b/cmake/GetGitRevision.cmake -index 692b6c4..c2ff81e 100644 ---- a/cmake/GetGitRevision.cmake -+++ b/cmake/GetGitRevision.cmake -@@ -33,7 +33,10 @@ - function(create_git_head_revision_file _file _target) - if(IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.git) - if(NOT GIT_FOUND) -- find_package(Git QUIET) -+ execute_process(COMMAND which git -+ OUTPUT_VARIABLE GIT_EXECUTABLE -+ ERROR_QUIET -+ OUTPUT_STRIP_TRAILING_WHITESPACE) - endif() - - add_custom_target(gitsha1-${_target} --- -1.9.3 - diff --git a/recipes-liri/liri-shell/files/0002-remove-Werror-from-build-flags.patch b/recipes-liri/liri-shell/files/0002-remove-Werror-from-build-flags.patch deleted file mode 100644 index 71885990..00000000 --- a/recipes-liri/liri-shell/files/0002-remove-Werror-from-build-flags.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b0b124b194fbb614778f64b56c1a8b95aa4bd898 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 9 Feb 2017 22:50:28 +0100 -Subject: [PATCH] remove -Werror from build flags -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -workaround build for Raspi2/CortexA7 (hope I get all types) - -| /usr/include/qt5/QtCore/qlist.h:495:34: error: cast from 'QList::Node*' to 'QVariant*' increases required alignment of target type [-Werror=cast-align] - -| /usr/include/qt5/QtCore/qhash.h:235:16: error: cast from 'QHashData::Node*' to 'QHash::Node* {aka QHashNode*}' increases required alignment of target type [-Werror=cast-align] - -| /usr/include/qt5/QtCore/qobject_impl.h:163:13: error: switch missing default case [-Werror=switch-default] - -Signed-off-by: Andreas Müller ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b8ba5b8..e2b19ea 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -54,7 +54,7 @@ endif() - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu90") - - # Build flags --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Werror -Wall -Wextra -Wformat -Wswitch-default -Wunused-parameter -pedantic -std=c++11") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Wall -Wextra -Wformat -Wswitch-default -Wunused-parameter -pedantic -std=c++11") - - # qCDebug() uses zero variadic arguments, so we need to disable this warning - # as it would become an error with -Werror --- -2.9.3 - diff --git a/recipes-liri/liri-shell/liri-shell_git.bb b/recipes-liri/liri-shell/liri-shell_git.bb index 46d5bf6d..15bc7244 100644 --- a/recipes-liri/liri-shell/liri-shell_git.bb +++ b/recipes-liri/liri-shell/liri-shell_git.bb @@ -1,56 +1,48 @@ SUMMARY = "Responsive shell for Liri OS" -LICENSE = "GPLv3" +LICENSE = "LGPLv3 & GPLv3" LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ + file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ " -inherit liri systemd pythonnative distro_features_check +inherit liri pythonnative distro_features_check gsettings REQUIRED_DISTRO_FEATURES = "wayland pam" -SRC_URI += " \ - file://0001-find-host-s-git.patch \ - file://0002-remove-Werror-from-build-flags.patch \ -" PV = "0.9.0+git${SRCPV}" -SRCREV = "9f5ed08fe14820e6f5e03b91410dd280f3678430" +SRCREV = "bc130914550f2592f3d426beff54cb5cc6b30d5b" S = "${WORKDIR}/git" DEPENDS += " \ - qtwayland-native \ - qtaccountsservice \ libpam \ - vibe \ - liri-wayland \ - liri-workspace \ + qtquickcontrols2 \ + qtsvg \ + liri-libliri \ + liri-qtaccountsservice \ + liri-qtgsettings \ + liri-eglfs \ + solid \ + polkit-qt-1 \ + pipewire \ " EXTRA_OECMAKE += " \ - -DSYSTEMD_USER_UNIT_DIR=${systemd_system_unitdir} \ + -DINSTALL_SYSCONFDIR=${sysconfdir} \ + -DINSTALL_SYSTEMDUSERUNITDIR=${systemd_user_unitdir} \ + -DLIRI_SHELL_DEVELOPMENT_BUILD=ON \ " -SYSTEMD_SERVICE_${PN} = "liri.service" - -# for starter scripts -RDEPENDS_${PN} = "qttools-tools qtwayland-plugins" - -# REVISIT optionals -RRECOMMENDS_${PN} += " \ - liri-wallpapers \ - paper-icon-theme \ - qtvirtualkeyboard-qmlplugins \ +RDEPENDS_${PN} += " \ + qttools-tools \ + qtwayland-plugins \ + qtgraphicaleffects-qmlplugins \ " FILES_${PN} += " \ - ${datadir} \ - ${systemd_unitdir} \ - ${OE_QMAKE_PATH_QML}/Liri \ - ${OE_QMAKE_PATH_PLUGINS} \ -" - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_QML}/Liri/*/.debug \ + ${systemd_user_unitdir} \ + ${datadir}/wayland-sessions \ + ${datadir}/desktop-directories \ + ${OE_QMAKE_PATH_QML} \ " RREPLACES_${PN} = "hawaii-shell" diff --git a/recipes-liri/liri-terminal/files/0001-remove-Werror-from-build-flags.patch b/recipes-liri/liri-terminal/files/0001-remove-Werror-from-build-flags.patch deleted file mode 100644 index 679a458e..00000000 --- a/recipes-liri/liri-terminal/files/0001-remove-Werror-from-build-flags.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8030b37301f63ff5afdc659c48a2f6490da68af0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 9 Feb 2017 22:32:15 +0100 -Subject: [PATCH] remove -Werror from build flags -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -workaround build for Raspi2/CortexA7 (hope I get all types) - -| /usr/include/qt5/QtCore/qlist.h:495:34: error: cast from 'QList::Node*' to 'QVariant*' increases required alignment of target type [-Werror=cast-align] - -| /usr/include/qt5/QtCore/qhash.h:235:16: error: cast from 'QHashData::Node*' to 'QHash::Node* {aka QHashNode*}' increases required alignment of target type [-Werror=cast-align] - -| liri-terminal/0.0.0+gitAUTOINC+1b428ebf54-r0/git/lib/CharacterColor.h:259:3: error: this 'if' clause does not guard... [-Werror=misleading-indentation] - -| liri-terminal/0.0.0+gitAUTOINC+1b428ebf54-r0/git/lib/CharacterColor.h:273:10: error: switch missing default case [-Werror=switch-default] - -Signed-off-by: Andreas Müller ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index eeb1597..545fb0b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -42,7 +42,7 @@ include(KDECompilerSettings) - include(KDECMakeSettings) - - # Build flags --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Werror -Wall -Wextra -Wformat -Wswitch-default -Wunused-parameter -pedantic -std=c++11") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Wall -Wextra -Wformat -Wswitch-default -Wunused-parameter -pedantic -std=c++11") - - # qCDebug() uses zero variadic arguments, so we need to disable this warning - # as it would become an error with -Werror --- -2.9.3 - diff --git a/recipes-liri/liri-terminal/liri-terminal_git.bb b/recipes-liri/liri-terminal/liri-terminal_git.bb index 446b1fff..14e6fdb4 100644 --- a/recipes-liri/liri-terminal/liri-terminal_git.bb +++ b/recipes-liri/liri-terminal/liri-terminal_git.bb @@ -1,29 +1,25 @@ -SUMMARY = "Terminal emulator" +SUMMARY = "A Material Design terminal" LICENSE = "GPLv3" LIC_FILES_CHKSUM = " \ - file://LICENSE.GPLv3;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ + file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ " inherit liri gsettings -SRC_URI += "file://0001-remove-Werror-from-build-flags.patch" -PV = "0.0.0+git${SRCPV}" -SRCREV = "62acaf9f943e1cdf1b57c87eb8ca2abd1d24a75d" +DEPENDS += " \ + liri-fluid \ + liri-qtgsettings \ +" + +PV = "0.2.0+git${SRCPV}" +SRCREV = "819ab01ac704a214eb31eb610b43d9ad1d909839" S = "${WORKDIR}/git" -DEPENDS += " \ - vibe \ -" - FILES_${PN} += " \ - ${datadir}/glib-2.0/schemas \ - ${datadir}/appdata \ - ${datadir}/applications \ - ${OE_QMAKE_PATH_QML}/Liri/Terminal \ -" - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_QML}/Liri/*/.debug \ + ${datadir}/metainfo \ + ${datadir}/${PN}/color-schemes \ + ${datadir}/${PN}/kb-layouts \ + ${OE_QMAKE_PATH_QML} \ " RREPLACES_${PN} = "hawaii-terminal" diff --git a/recipes-liri/liri-text/liri-text_git.bb b/recipes-liri/liri-text/liri-text_git.bb new file mode 100644 index 00000000..7ceeeba1 --- /dev/null +++ b/recipes-liri/liri-text/liri-text_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "Material Design text editor" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = " \ + file://LICENSE.GPLv3;md5=7702f203b58979ebbc31bfaeb44f219c \ +" + +inherit liri gtk-icon-cache + +DEPENDS += " \ + qtquickcontrols2 \ + liri-fluid \ + sqlite3 \ +" + +PV = "0.4.1+git${SRCPV}" + +SRCREV = "3f5b6040dcddfa86dd43f456c7e7dd67d8f1ade8" +S = "${WORKDIR}/git" + +FILES_${PN} += " \ + ${datadir}/icons \ + ${datadir}/metainfo \ + ${datadir}/liri-text/language-specs \ +" diff --git a/recipes-liri/liri-themes/liri-themes_git.bb b/recipes-liri/liri-themes/liri-themes_git.bb index 9ecd85a3..d67d7822 100644 --- a/recipes-liri/liri-themes/liri-themes_git.bb +++ b/recipes-liri/liri-themes/liri-themes_git.bb @@ -8,28 +8,34 @@ inherit liri PV = "0.9.0+git${SRCPV}" -SRCREV = "884d5faa15f53627c3ca2e3f2e5872e7b157ef25" +SRCREV = "7300b146a21c052dc96736e41464dab6dd9ce51f" S = "${WORKDIR}/git" -PACKAGES = " \ +EXTRA_OECMAKE += " \ + -DINSTALL_GRUBDIR=/boot/grub \ +" + +do_install_append() { + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-initramfs', '', 'rm -rf ${D}${datadir}/plymouth', d)} +} + +PACKAGES += " \ ${PN}-grub \ - ${PN}-plymouth \ ${PN}-sddm \ + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-initramfs', '${PN}-plymouth', '', d)} \ " RDEPENDS_${PN}-plymouth += " \ plymouth \ plymouth-set-default-theme \ " -RDEPENDS_${PN}-sddm += " \ - liri-shell \ -" +FILES_${PN} += "${datadir}/color-schemes" FILES_${PN}-grub += "/boot/grub/themes" FILES_${PN}-plymouth += "${datadir}/plymouth/themes" FILES_${PN}-sddm += "${datadir}/sddm/themes" -pkg_postinst_${PN}() { -#!/bin/sh -plymouth-set-default-theme -R lirios +# there is no plymouth-native yet +pkg_postinst_ontarget_${PN}-plymouth() { + plymouth-set-default-theme -R lirios } diff --git a/recipes-liri/liri-wayland/liri-wayland_git.bb b/recipes-liri/liri-wayland/liri-wayland_git.bb deleted file mode 100644 index 1f9f6fb8..00000000 --- a/recipes-liri/liri-wayland/liri-wayland_git.bb +++ /dev/null @@ -1,60 +0,0 @@ -SUMMARY = "Support library to make Qt-based Wayland compositors development easier" -LICENSE = "LGPLv3 | GPLv3" -LIC_FILES_CHKSUM = " \ - file://LICENSE.GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ - file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ -" - -inherit liri distro_features_check cmake_auto_align_paths cmake_lib - -REQUIRED_DISTRO_FEATURES = "wayland" - -PV = "0.9.0.1+git${SRCPV}" - -SRCREV = "1a9c1fd63a46e265f271b54c6042609d58826d3f" -S = "${WORKDIR}/git" - -DEPENDS += " \ - ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcb-util-cursor libxcursor', '', d)} \ - wayland \ - qtwayland \ - qtwayland-native \ - glib-2.0 \ - virtual/egl \ - libinput \ -" - -# egl packageconfig factored out to make it easy for BSP layers to pick what -# machines need -PACKAGECONFIG_EGL ?= "kms" - -PACKAGECONFIG ??= " \ - protocols \ - ${PACKAGECONFIG_EGL} \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "xwayland", "",d)} \ -" -PACKAGECONFIG[kms] = "-DENABLE_EGLDEVICEINTEGRATION_KMS:BOOL=ON,-DENABLE_EGLDEVICEINTEGRATION_KMS:BOOL=OFF,drm,libgbm" -PACKAGECONFIG[brcm] = "-DENABLE_EGLDEVICEINTEGRATION_BRCM:BOOL=ON -DBcmHost_PREFIX:PATH=/usr,-DENABLE_EGLDEVICEINTEGRATION_BRCM:BOOL=OFF" -PACKAGECONFIG[protocols] = "-DUSE_LOCAL_WAYLAND_PROTOCOLS:BOOL=OFF,-DUSE_LOCAL_WAYLAND_PROTOCOLS:BOOL=ON,wayland-protocols" -PACKAGECONFIG[xwayland] = "-DENABLE_XWAYLAND:BOOL=ON,-DENABLE_XWAYLAND:BOOL=OFF,libxcb xserver-xorg,xserver-xorg-xwayland" - -# cross libs / headers -CMAKE_ALIGN_SYSROOT[1] = "LiriPlatform, -S${libdir}/lib, -s${OE_QMAKE_PATH_HOST_LIBS}/lib" -CMAKE_ALIGN_SYSROOT[2] = "LiriPlatform, -S${includedir}, -s${CMAKE_QT5_EX_PATH_HOST_HEADERS}" -CMAKE_ALIGN_SYSROOT[3] = "LiriWaylandClient, -S${includedir}, -s${CMAKE_QT5_EX_PATH_HOST_HEADERS}" -CMAKE_ALIGN_SYSROOT[4] = "LiriWaylandServer, -S${includedir}, -s${CMAKE_QT5_EX_PATH_HOST_HEADERS}" - -FILES_${PN} += " \ - ${OE_QMAKE_PATH_PLUGINS} \ - ${OE_QMAKE_PATH_QML}/Liri \ -" - -FILES_${PN}-dbg += " \ - ${OE_QMAKE_PATH_PLUGINS}/.debug \ - ${OE_QMAKE_PATH_QML}/Liri/*/.debug \ -" - -FILES_${PN}-dev += " \ - ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \ -" diff --git a/recipes-liri/packagegroups/liri-world.bb b/recipes-liri/packagegroups/liri-world.bb index c6fca3d1..da691989 100644 --- a/recipes-liri/packagegroups/liri-world.bb +++ b/recipes-liri/packagegroups/liri-world.bb @@ -5,31 +5,35 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup RDEPENDS_${PN} = " \ + liri-browser \ + liri-calculator \ liri-eglfs \ + liri-files \ liri-fluid \ liri-libliri \ + liri-materialdecoration \ liri-networkmanager \ + liri-player \ liri-power-manager \ ${@bb.utils.contains("DISTRO_FEATURES", "pulseaudio", "liri-pulseaudio", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "liri-qml-xwayland", "",d)} \ liri-qtaccountsservice \ liri-qtgsettings \ liri-qtudev \ liri-screencast \ liri-screenshot \ liri-settings \ + ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "liri-shell", "",d)} \ + liri-terminal \ + liri-text \ + liri-themes liri-themes-sddm \ + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'meta-initramfs', 'liri-themes-plymouth', '', d)} \ liri-wallpapers \ " #LAYERDEPENDS_meta-qt5-extra += "gnome-layer" +# liri-calamares-branding \ # ${@bb.utils.contains("DISTRO_FEATURES", "flatpak", "liri-appcenter", "",d)} -# liri-browser -# liri-calculator -# liri-files -# ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "liri-shell", "",d)} -# liri-terminal -# liri-themes-grub liri-themes-plymouth liri-themes-sddm -# ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "liri-wayland", "",d)} # paper-icon-theme -# vibe - +# liri-themes-grub diff --git a/recipes-liri/vibe/files/0001-remove-Werror-from-build-flags.patch b/recipes-liri/vibe/files/0001-remove-Werror-from-build-flags.patch deleted file mode 100644 index 2ef977b9..00000000 --- a/recipes-liri/vibe/files/0001-remove-Werror-from-build-flags.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d16f258df1e7e7069002ee87aacec5d5426d204e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 9 Feb 2017 22:10:26 +0100 -Subject: [PATCH] remove -Werror from build flags -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -workaround build for Raspi2/CortexA7 (hope I get all types) - -| vibe/0.9.0+gitAUTOINC+a2a8337b53-r0/git/declarative/policykit/listener_p.cpp:78:30: error: ISO C++11 requires at least one argument for the "..." in a variadic macro [-Werror] - -| /usr/include/qt5/QtCore/qlist.h:495:34: error: cast from 'QList::Node*' to 'QVariant*' increases required alignment of target type [-Werror=cast-align] - -| /usr/include/qt5/QtCore/qhash.h:235:16: error: cast from 'QHashData::Node*' to 'QHash::Node* {aka QHashNode*}' increases required alignment of target type [-Werror=cast-align] - -| /usr/include/qt5/QtCore/qobject_impl.h:163:13: error: switch missing default case [-Werror=switch-default] - -Signed-off-by: Andreas Müller ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e3c1959..e97c301 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -45,7 +45,7 @@ include(KDECMakeSettings) - find_package(PkgConfig) - - # Build flags --set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Werror -Wall -Wextra -Wformat -Wswitch-default -Wunused-parameter -pedantic -std=c++11") -+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden -Wall -Wextra -Wformat -Wswitch-default -Wunused-parameter -pedantic -std=c++11") - - # qCDebug() uses zero variadic arguments, so we need to disable this warning - # as it would become an error with -Werror --- -2.9.3 - diff --git a/recipes-liri/vibe/vibe_git.bb b/recipes-liri/vibe/vibe_git.bb deleted file mode 100644 index c2d24946..00000000 --- a/recipes-liri/vibe/vibe_git.bb +++ /dev/null @@ -1,34 +0,0 @@ -SUMMARY = "A collection of core classes used throught Liri" -LICENSE = "LGPLv3" -LIC_FILES_CHKSUM = " \ - file://LICENSE.LGPLv3;md5=e6a600fd5e1d9cbde2d983680233ad02 \ -" - -inherit liri distro_features_check - -REQUIRED_DISTRO_FEATURES = "pulseaudio" - -SRC_URI += "file://0001-remove-Werror-from-build-flags.patch" -PV = "0.9.0+git${SRCPV}" -SRCREV = "8a2163a38d324869a247a103e65848f76ab1c432" -S = "${WORKDIR}/git" - -DEPENDS += " \ - solid \ - kwallet \ - networkmanager-qt \ - modemmanager-qt \ - networkmanager \ - modemmanager \ - pulseaudio \ - libqtxdg \ - fluid \ -" - -RDEPENDS_${PN} += "pulseaudio-server" - -FILES_${PN} += "${OE_QMAKE_PATH_QML}" - -RREPLACES_${PN} = "libhawaii" -RPROVIDES_${PN} = "libhawaii" -RCONFLICTS_${PN} = "libhawaii" diff --git a/recipes-lxqt/compton-conf/compton-conf_git.bb b/recipes-lxqt/compton-conf/compton-conf_git.bb index 55c1cef0..28e580b3 100644 --- a/recipes-lxqt/compton-conf/compton-conf_git.bb +++ b/recipes-lxqt/compton-conf/compton-conf_git.bb @@ -6,8 +6,8 @@ inherit lxqt pkgconfig DEPENDS += "libconfig" -SRCREV = "c6a6dd01d53fcb5c778e3d2d76371f1e034ab676" -PV = "0.4.0" +SRCREV = "af5d2fcd138180e5ff64ee0dcd70311dde5faf38" +PV = "0.14.1" FILES_${PN} += "${datadir}/${BPN}/compton.conf.example" diff --git a/recipes-lxqt/libfm-qt/files/0001-fix-cross-include-path.patch b/recipes-lxqt/libfm-qt/files/0001-fix-cross-include-path.patch deleted file mode 100644 index 6a4287a0..00000000 --- a/recipes-lxqt/libfm-qt/files/0001-fix-cross-include-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d77352eb287f457d0fb43689cbbbcd864097a9f2 Mon Sep 17 00:00:00 2001 -From: Max Krummenacher -Date: Mon, 21 May 2018 11:16:35 +0000 -Subject: [PATCH] fix cross include path - -src/CMakeLists.txt uses the FM_INCLUDE_DIR variable to specify an additonal -includedir. FM_INCLUDE_DIR is read from the pkg config variable includedir -which does not get modified by the pkg config sysroot, so we add an "-I" -statement pointing to the build host's /usr/include which throws a compiler -warning and a OE QA WARNING. - -| cc1plus: warning: include location "/usr/include/libfm" is unsafe for cross-compilation [-Wpoison-system-directories] - -| WARNING: libfm-qt-0.12.0-r0 do_package_qa: QA Issue: libfm-qt: The compile log indicates that host include and/or library paths were used. - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Max Krummenacher ---- - src/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0695854..bd6a715 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -142,7 +142,7 @@ target_include_directories(${LIBFM_QT_LIBRARY_NAME} - PRIVATE "${Qt5Gui_PRIVATE_INCLUDE_DIRS}" - PUBLIC - "${FM_INCLUDE_DIRS}" -- "${FM_INCLUDE_DIR}/libfm" # to workaround incorrect #include in fm-actions. -+ "$ENV{PKG_CONFIG_SYSROOT_DIR}${FM_INCLUDE_DIR}/libfm" # to workaround incorrect #include in fm-actions. - "${MENUCACHE_INCLUDE_DIRS}" - "${XCB_INCLUDE_DIRS}" - "${EXIF_INCLUDE_DIRS}" --- -2.13.6 - diff --git a/recipes-lxqt/libfm-qt/libfm-qt_git.bb b/recipes-lxqt/libfm-qt/libfm-qt_git.bb index 4dfe20dd..087e2dbd 100644 --- a/recipes-lxqt/libfm-qt/libfm-qt_git.bb +++ b/recipes-lxqt/libfm-qt/libfm-qt_git.bb @@ -6,15 +6,17 @@ REQUIRED_DISTRO_FEATURES = "x11" inherit lxqt pkgconfig distro_features_check cmake_auto_align_paths cmake_lib mime -DEPENDS += "qtx11extras glib-2.0 libfm menu-cache libxcb liblxqt" +DEPENDS += "qtx11extras glib-2.0 libexif menu-cache libxcb liblxqt" CMAKE_ALIGN_FILES_FIND = "*targets.cmake" -SRC_URI += "file://0001-fix-cross-include-path.patch" -SRCREV = "422f867a94442fdfe5db06836403b5bc7b5c68db" -PV = "0.13.1" +SRCREV = "50a8f20c82443b00702a61f150ab4c0d71878116" +PV = "0.14.1" -FILES_${PN} += "${datadir}/mime" +FILES_${PN} += " \ + ${datadir}/mime \ + ${datadir}/${BPN}/*.list \ +" RRECOMMENDS_${PN} = "gvfs gvfsd-trash eject" diff --git a/recipes-lxqt/liblxqt/liblxqt_git.bb b/recipes-lxqt/liblxqt/liblxqt_git.bb index 3bde9a3b..38fdc629 100644 --- a/recipes-lxqt/liblxqt/liblxqt_git.bb +++ b/recipes-lxqt/liblxqt/liblxqt_git.bb @@ -8,8 +8,8 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "qttools libqtxdg kwindowsystem libxscrnsaver polkit-qt-1" -SRCREV = "d9f9f62e48de432ce2fe3e9c4c91f21dc089d777" -PV = "0.13.0" +SRCREV = "5ce41d8ffa31b2f80983237bfa0488a942a07621" +PV = "0.14.1" EXTRA_OECMAKE += " \ -DCMAKE_INSTALL_DATAROOTDIR=share \ @@ -24,6 +24,6 @@ RREPLACES_${PN} += "lxqt-common" RCONFLICTS_${PN} += "lxqt-common" FILES_${PN} += " \ - /usr/share/polkit-1/ \ - /usr/share/lxqt/ \ + ${datadir}/polkit-1/ \ + ${datadir}/lxqt/power.conf \ " diff --git a/recipes-lxqt/libqtxdg/libqtxdg_git.bb b/recipes-lxqt/libqtxdg/libqtxdg_git.bb index 3eb311b9..396206b5 100644 --- a/recipes-lxqt/libqtxdg/libqtxdg_git.bb +++ b/recipes-lxqt/libqtxdg/libqtxdg_git.bb @@ -14,7 +14,7 @@ EXTRA_OECMAKE += " \ -DQTXDGX_ICONENGINEPLUGIN_INSTALL_PATH=${OE_QMAKE_PATH_PLUGINS}/iconengines \ " -SRCREV = "3d586ec6179f30723b44342cb116986cdf90be77" -PV = "3.2.0" +SRCREV = "98b317aa92d2be55349f1c891aeba0504f7f3c02" +PV = "3.3.1" FILES_${PN} += "${OE_QMAKE_PATH_PLUGINS}/iconengines" diff --git a/recipes-lxqt/libsysstat/libsysstat_git.bb b/recipes-lxqt/libsysstat/libsysstat_git.bb index 514e7236..32f18bbf 100644 --- a/recipes-lxqt/libsysstat/libsysstat_git.bb +++ b/recipes-lxqt/libsysstat/libsysstat_git.bb @@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da" inherit lxqt -SRCREV = "01a61d1c8f27fe8f9cd175967de687d2e9fdbbbf" -PV = "0.4.1" +SRCREV = "938bc6a5ca14bd883598ca645c06916e413af329" +PV = "0.4.2" diff --git a/recipes-lxqt/lximage-qt/lximage-qt_git.bb b/recipes-lxqt/lximage-qt/lximage-qt_git.bb index d1005460..7591eff3 100644 --- a/recipes-lxqt/lximage-qt/lximage-qt_git.bb +++ b/recipes-lxqt/lximage-qt/lximage-qt_git.bb @@ -8,7 +8,7 @@ inherit lxqt pkgconfig distro_features_check gtk-icon-cache mime DEPENDS += "qtx11extras qtsvg libfm-qt libexif libxfixes" -SRCREV = "a577151ae6935dfa890b961f2dff833d21e3a4a9" -PV = "0.7.0" +SRCREV = "6c2efe769d0514846c78e4a9147f3425440643ec" +PV = "0.14.1" FILES_${PN} += "${datadir}/icons" diff --git a/recipes-lxqt/lxqt-about/lxqt-about_git.bb b/recipes-lxqt/lxqt-about/lxqt-about_git.bb index 31296125..a66b2b49 100644 --- a/recipes-lxqt/lxqt-about/lxqt-about_git.bb +++ b/recipes-lxqt/lxqt-about/lxqt-about_git.bb @@ -8,5 +8,5 @@ DEPENDS += " \ liblxqt \ " -SRCREV = "f085a04cbf523a961ac6110a5c5ab7c669b53652" -PV = "0.13.0" +SRCREV = "152141f080cfb98ee03741f36fc5d1dde2c8a96e" +PV = "0.14.1" diff --git a/recipes-lxqt/lxqt-admin/lxqt-admin_git.bb b/recipes-lxqt/lxqt-admin/lxqt-admin_git.bb index 2e229885..b1b32244 100644 --- a/recipes-lxqt/lxqt-admin/lxqt-admin_git.bb +++ b/recipes-lxqt/lxqt-admin/lxqt-admin_git.bb @@ -8,8 +8,8 @@ DEPENDS += " \ liblxqt \ " -SRCREV = "01ae9e61c49a781dcdda933f147b0c3964979293" -PV = "0.13.0" +SRCREV = "3a185198850afa7bc925eeaa46324af6c2c55e0b" +PV = "0.14.1" FILES_${PN} += "${datadir}/polkit-1" diff --git a/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb b/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb index a7495abb..5dd39adc 100644 --- a/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb +++ b/recipes-lxqt/lxqt-build-tools/lxqt-build-tools_git.bb @@ -3,16 +3,13 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://BSD-3-Clause;md5=a8987c1fd6930fe14ae46b4d72e53770" # lxqt.bbclass adds an inherit on this recipe -inherit cmake_qt5_extra cmake_lib +inherit cmake_qt5_extra do_configure_append() { sed -i 's:set(LXQT_ETC_XDG_DIR.*:set(LXQT_ETC_XDG_DIR "${sysconfdir}/xdg"):' ${B}/install/LXQtConfigVars.cmake } SRC_URI = "git://github.com/lxde/${BPN}.git;protocol=git;branch=master" -SRCREV = "61ed15b7346771a0e24dfeed0f244596fb08fdce" -PV = "0.5.0" +SRCREV = "3934e9cd7ae20b7ecb1829b9007c201cb1211b77" +PV = "0.6.0" S = "${WORKDIR}/git" - -CMAKE_ALIGN_SYSROOT[1] = "lxqt-build-tools, -sgcc-ar, -S${TARGET_PREFIX}gcc-ar" -CMAKE_ALIGN_SYSROOT[2] = "lxqt-build-tools, -sgcc-ranlib, -S${TARGET_PREFIX}gcc-ranlib" diff --git a/recipes-lxqt/lxqt-config/lxqt-config_git.bb b/recipes-lxqt/lxqt-config/lxqt-config_git.bb index 7b92f511..892dd4e8 100644 --- a/recipes-lxqt/lxqt-config/lxqt-config_git.bb +++ b/recipes-lxqt/lxqt-config/lxqt-config_git.bb @@ -6,15 +6,12 @@ inherit lxqt distro_features_check gtk-icon-cache REQUIRED_DISTRO_FEATURES = "x11" -DEPENDS += "qtsvg liblxqt libkscreen libxcursor" +DEPENDS += "qtsvg liblxqt libkscreen libxcursor xf86-input-libinput" -SRCREV = "9bd6ae9205909f70101aebaa7f316478965905fe" -PV = "0.13.0" +SRCREV = "12e8c8f0819e1ed1bf54986ce7aa5e9cba2b55ea" +PV = "0.14.1" -# there are no dev files / pack liblxqt-config-cursor.so correctly FILES_${PN} += " \ ${datadir}/icons \ ${datadir}/lxqt/icons \ - ${libdir}/liblxqt-config-cursor.so \ " -FILES_${PN}-dev = "" diff --git a/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb b/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb index 36979475..6dfcfebb 100644 --- a/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb +++ b/recipes-lxqt/lxqt-globalkeys/lxqt-globalkeys_git.bb @@ -8,5 +8,5 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "liblxqt" -SRCREV = "6bb0e30c9cbda5e7995d01b815692ff46294dda6" -PV = "0.13.0" +SRCREV = "69dfa8d9ee668bc72d5f7dccb414ea6f6acd40b5" +PV = "0.14.1" diff --git a/recipes-lxqt/lxqt-l10n/lxqt-l10n_git.bb b/recipes-lxqt/lxqt-l10n/lxqt-l10n_git.bb deleted file mode 100644 index 8988d0d7..00000000 --- a/recipes-lxqt/lxqt-l10n/lxqt-l10n_git.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "Translations of LXQt" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da" - -inherit lxqt qt5-translation - -DEPENDS += "liblxqt" - -SRCREV = "91a536e5dec55d0b90ddaa8425d392fe9d7d7d8f" -PV = "0.13.0" - -ALLOW_EMPTY_${PN} = "1" diff --git a/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb b/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb index f4b4ed1f..160ee964 100644 --- a/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb +++ b/recipes-lxqt/lxqt-notificationd/lxqt-notificationd_git.bb @@ -6,5 +6,5 @@ inherit lxqt DEPENDS += "liblxqt libqtxdg kwindowsystem" -SRCREV = "488b7f82e4b12d94e5f988648c69e1f27aa99046" -PV = "0.13.0" +SRCREV = "ff3a3e54868eb934f7f807ff7d77b2b5e537ac27" +PV = "0.14.1" diff --git a/recipes-lxqt/lxqt-openssh-askpass/lxqt-openssh-askpass_git.bb b/recipes-lxqt/lxqt-openssh-askpass/lxqt-openssh-askpass_git.bb index b8037a01..1d075a04 100644 --- a/recipes-lxqt/lxqt-openssh-askpass/lxqt-openssh-askpass_git.bb +++ b/recipes-lxqt/lxqt-openssh-askpass/lxqt-openssh-askpass_git.bb @@ -6,5 +6,5 @@ inherit lxqt DEPENDS += "liblxqt" -SRCREV = "53d8d4efe765d4bb234c9e9ec94f64b03680b103" -PV = "0.13.0" +SRCREV = "841727f0a5bab2b64b0adce8a52d1ddb17265657" +PV = "0.14.1" diff --git a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb index 6069bdc9..a8d7bac6 100644 --- a/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb +++ b/recipes-lxqt/lxqt-panel/lxqt-panel_git.bb @@ -18,10 +18,11 @@ DEPENDS += " \ SRC_URI += " \ file://0001-add-Qt5-X11Extras-to-QTX_LIBRARIES.patch \ " -SRCREV = "7d97a5e331a05b4fd06a729a58d47cef0f584c5f" -PV = "0.13.0" +SRCREV = "823a29c5254aecd51b89a8f009e279a2899a1aac" +PV = "0.14.1" PACKAGECONFIG[cpu_plugin] = "-DCPULOAD_PLUGIN=Yes,-DCPULOAD_PLUGIN=No, libstatgrab" +PACKAGECONFIG[dom] = "-DDOM_PLUGIN=Yes,-DDOM_PLUGIN=No" PACKAGECONFIG[mount_plugin] = "-DMOUNT_PLUGIN=Yes,-DMOUNT_PLUGIN=No, solid" PACKAGECONFIG[networkmonitor_plugin] = "-DNETWORKMONITOR_PLUGIN=Yes,-DNETWORKMONITOR_PLUGIN=No, libstatgrab" PACKAGECONFIG[sensor_plugin] = "-DSENSORS_PLUGIN=Yes,-DSENSORS_PLUGIN=No, lmsensors" @@ -29,7 +30,7 @@ PACKAGECONFIG[sysstat_plugin] = "-DSYSSTAT_PLUGIN=Yes,-DSYSSTAT_PLUGIN=No, libsy PACKAGECONFIG[volume_alsa_plugin] = "-DVOLUME_USE_ALSA=Yes,-DVOLUME_USE_ALSA=No, alsa-lib" PACKAGECONFIG[volume_pulse_plugin] = "-DVOLUME_USE_PULSEAUDIO=Yes,-DVOLUME_USE_PULSEAUDIO=No, pulseaudio, pavucontrol-qt" -PACKAGECONFIG ??= "cpu_plugin mount_plugin networkmonitor_plugin sensor_plugin sysstat_plugin volume_alsa_plugin volume_pulse_plugin" +PACKAGECONFIG ??= "cpu_plugin dom mount_plugin networkmonitor_plugin sensor_plugin sysstat_plugin volume_alsa_plugin volume_pulse_plugin" FILES_${PN} += " \ ${datadir}/lxqt/panel.conf \ diff --git a/recipes-lxqt/lxqt-policykit/lxqt-policykit_git.bb b/recipes-lxqt/lxqt-policykit/lxqt-policykit_git.bb index 754e6556..8909adbd 100644 --- a/recipes-lxqt/lxqt-policykit/lxqt-policykit_git.bb +++ b/recipes-lxqt/lxqt-policykit/lxqt-policykit_git.bb @@ -6,5 +6,5 @@ inherit lxqt pkgconfig DEPENDS += "polkit-qt-1 liblxqt libqtxdg" -SRCREV = "60c1322a23ababb4cf46dae11db8f74826473bd7" -PV = "0.13.0" +SRCREV = "81da4c5294f36236376474c92d52ec1d367634ec" +PV = "0.14.1" diff --git a/recipes-lxqt/lxqt-powermanagement/lxqt-powermanagement_git.bb b/recipes-lxqt/lxqt-powermanagement/lxqt-powermanagement_git.bb index 1eed0078..8ce38c40 100644 --- a/recipes-lxqt/lxqt-powermanagement/lxqt-powermanagement_git.bb +++ b/recipes-lxqt/lxqt-powermanagement/lxqt-powermanagement_git.bb @@ -8,7 +8,7 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "qtsvg liblxqt libqtxdg solid kidletime" -SRCREV = "af56a1d21d074d7bd5eebdfd56b076d3c1815f44" -PV = "0.13.0" +SRCREV = "fc1add5b00ba85520a7598a13366ae0fe01bbc90" +PV = "0.14.1" FILES_${PN} += "${datadir}/icons" diff --git a/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb b/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb index 86c17823..6c5f62b2 100644 --- a/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb +++ b/recipes-lxqt/lxqt-qtplugin/lxqt-qtplugin_git.bb @@ -6,8 +6,8 @@ inherit lxqt DEPENDS += "liblxqt libdbusmenu-qt5 libfm-qt" -SRCREV = "a335a6f2f5115f01fd3933f8ac3ed6918f99027c" -PV = "0.13.0" +SRCREV = "07e10038af7f6cc93e6bd7927e910c060bf2e357" +PV = "0.14.0" SRC_URI += " \ file://0001-set-installation-path-fixed-cmake-query-returns-sysr.patch \ " diff --git a/recipes-lxqt/lxqt-runner/lxqt-runner_git.bb b/recipes-lxqt/lxqt-runner/lxqt-runner_git.bb index 10a26632..f2c4e617 100644 --- a/recipes-lxqt/lxqt-runner/lxqt-runner_git.bb +++ b/recipes-lxqt/lxqt-runner/lxqt-runner_git.bb @@ -8,8 +8,5 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "qtscript libqtxdg lxqt-globalkeys menu-cache muparser" -SRCREV = "aa5f0b43aafe42c352da25a26fc6d95bb3f6de38" -PV = "0.13.0" - -# REVISIT: These are poluted by host paths -FILES_${PN}-dev += "${datadir}/lxqt/lxqt-runner/*.cmake" +SRCREV = "2a4c73b023c0f31f5294e3a527219e5585199bb5" +PV = "0.14.1" diff --git a/recipes-lxqt/lxqt-session/files/0001-do-not-check-for-xdg-udser-dirs-at-build-time-it-is-.patch b/recipes-lxqt/lxqt-session/files/0001-do-not-check-for-xdg-udser-dirs-at-build-time-it-is-.patch index 069263ca..31ef5606 100644 --- a/recipes-lxqt/lxqt-session/files/0001-do-not-check-for-xdg-udser-dirs-at-build-time-it-is-.patch +++ b/recipes-lxqt/lxqt-session/files/0001-do-not-check-for-xdg-udser-dirs-at-build-time-it-is-.patch @@ -1,11 +1,8 @@ From 22ce88122c616771e715873cc715b1ded65f0b52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 14 Nov 2017 14:11:19 +0100 +Date: Sun, 27 Jan 2019 23:51:28 +0100 Subject: [PATCH] do not check for xdg-udser-dirs at build time - it is a runtime dependency -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit Upstream-Status: Inappropriate [embedded specific] @@ -15,19 +12,19 @@ Signed-off-by: Andreas Müller 1 file changed, 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3cd4112..a400535 100644 +index 1b9905d..86dce96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -26,9 +26,6 @@ find_package(KF5WindowSystem REQUIRED) - - find_package(lxqt REQUIRED) +@@ -32,9 +32,6 @@ find_package(lxqt ${LXQT_MINIMUM_VERSION} REQUIRED) + find_package(X11 REQUIRED) + message(STATUS "Building with Qt${Qt5Core_VERSION}") -# Please don't move, must be after lxqt -find_package(XdgUserDirs REQUIRED) - - if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE Release) - endif() + # Patch Version + set(LXQT_SESSION_PATCH_VERSION 1) + -- -2.9.5 +2.20.1 diff --git a/recipes-lxqt/lxqt-session/lxqt-session_git.bb b/recipes-lxqt/lxqt-session/lxqt-session_git.bb index 898f414f..c227e390 100644 --- a/recipes-lxqt/lxqt-session/lxqt-session_git.bb +++ b/recipes-lxqt/lxqt-session/lxqt-session_git.bb @@ -9,8 +9,8 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "liblxqt kwindowsystem" SRC_URI += "file://0001-do-not-check-for-xdg-udser-dirs-at-build-time-it-is-.patch" -SRCREV = "74e18f354587add8c05e51a4be6366fc9aadb59e" -PV = "0.13.0" +SRCREV = "02a93f295a2abe86da3efce8e2d98c49fd923b73" +PV = "0.14.1" FILES_${PN} += " \ ${datadir}/lxqt/*.conf \ diff --git a/recipes-lxqt/lxqt-sudo/lxqt-sudo_git.bb b/recipes-lxqt/lxqt-sudo/lxqt-sudo_git.bb index ecd04638..30bc6f34 100644 --- a/recipes-lxqt/lxqt-sudo/lxqt-sudo_git.bb +++ b/recipes-lxqt/lxqt-sudo/lxqt-sudo_git.bb @@ -6,5 +6,5 @@ inherit lxqt pkgconfig DEPENDS += "liblxqt" -SRCREV = "12271ddd3b022c52411728e57938b5f44760c0d0" -PV = "0.13.0" +SRCREV = "2237ac6f85edcc339b3cdcef35385ef204589ac2" +PV = "0.14.1" diff --git a/recipes-lxqt/lxqt-themes/lxqt-themes_git.bb b/recipes-lxqt/lxqt-themes/lxqt-themes_git.bb index d25b96e0..5b3012a8 100644 --- a/recipes-lxqt/lxqt-themes/lxqt-themes_git.bb +++ b/recipes-lxqt/lxqt-themes/lxqt-themes_git.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da" inherit lxqt pkgconfig gtk-icon-cache -SRCREV = "601b21a9b2dd8707173bb5a89bc8d9e2b195b386" -PV = "0.13.0" +SRCREV = "810e244bb55a0d5a27567ef9482413b48ea39a7d" +PV = "0.14.0" FILES_${PN} += " \ ${datadir}/lxqt \ diff --git a/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch b/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch index 09ee27b8..8a39001b 100644 --- a/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch +++ b/recipes-lxqt/obconf-qt/files/0001-finding-sed-does-not-work-and-is-not-neccessary.patch @@ -1,35 +1,34 @@ From 19c7b3eaa79eb7d6ed9037d6c9efac422356889d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 23 Jul 2015 16:34:45 +0200 +Date: Mon, 28 Jan 2019 00:00:43 +0100 Subject: [PATCH] finding sed does not work and is not neccessary -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Signed-off-by: Andreas Müller +Upstream-Status: Pending + +Signed-off-by: Andreas Müller --- CMakeLists.txt | 2 -- src/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9ed9cf4..5a611d2 100644 +index 49ff915..86de6b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -2,8 +2,6 @@ project(obconf-qt) - # newer cmake is required for CMAKE_AUTOMOC Qt support - cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) +@@ -6,8 +6,6 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR) + # versions. + project(obconf-qt) -find_program(SED_PROGRAM sed) - include(GNUInstallDirs) - set(LXQTBT_MINIMUM_VERSION "0.5.0") + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 88196b4..fb2d6bb 100644 +index deff6e8..bbdc191 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -48,7 +48,7 @@ set_property(SOURCE ${obconf-qt_UI_H} PROPERTY SKIP_AUTOMOC ON) +@@ -39,7 +39,7 @@ set_property(SOURCE ${obconf-qt_UI_H} PROPERTY SKIP_AUTOMOC ON) # but we don't want that. Fix it with sed. add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ui_obconf_fixed.h @@ -39,5 +38,5 @@ index 88196b4..fb2d6bb 100644 # DEPENDS MAIN_DEPENDENCY ${obconf-qt_UI_H} -- -2.13.6 +2.20.1 diff --git a/recipes-lxqt/obconf-qt/obconf-qt_git.bb b/recipes-lxqt/obconf-qt/obconf-qt_git.bb index da8b50d6..23415c87 100644 --- a/recipes-lxqt/obconf-qt/obconf-qt_git.bb +++ b/recipes-lxqt/obconf-qt/obconf-qt_git.bb @@ -7,7 +7,7 @@ inherit lxqt pkgconfig DEPENDS += "qtx11extras openbox" SRC_URI += "file://0001-finding-sed-does-not-work-and-is-not-neccessary.patch" -SRCREV = "056881dd2c941936124bafe6657c111ca0627586" -PV = "0.13.0" +SRCREV = "2d67ed426a1fde62e1300b2e1e4db8724ca51d6c" +PV = "0.14.1" FILES_${PN} += "${datadir}/icons" diff --git a/recipes-lxqt/packagegroups/lxqt-world.bb b/recipes-lxqt/packagegroups/lxqt-world.bb index 4a49ee82..0ecfb3ab 100644 --- a/recipes-lxqt/packagegroups/lxqt-world.bb +++ b/recipes-lxqt/packagegroups/lxqt-world.bb @@ -6,31 +6,31 @@ inherit packagegroup RDEPENDS_${PN} = " \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "compton-conf", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libfm-qt", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "liblxqt", "",d)} \ libqtxdg \ libsysstat \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lximage-qt", "",d)} \ lxmenu-data \ - lxqt-about \ - lxqt-admin \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-about", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-admin", "",d)} \ + lxqt-build-tools \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-config", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-globalkeys", "",d)} \ - lxqt-l10n \ - lxqt-notificationd \ - lxqt-openssh-askpass \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-notificationd", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-openssh-askpass", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-panel", "",d)} \ - lxqt-policykit \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-policykit", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-powermanagement", "",d)} \ - lxqt-qtplugin \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-qtplugin", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-runner", "",d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-session", "",d)} \ - lxqt-sudo \ - menu-cache \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obconf-qt", "",d)} \ - pavucontrol-qt \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pcmanfm-qt", "",d)} \ - qtermwidget \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qterminal", "",d)} \ - lxqt-l10n \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "lxqt-sudo", "",d)} \ lxqt-themes \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "obconf-qt", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pavucontrol-qt", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "pcmanfm-qt", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qps", "",d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "qterminal", "",d)} \ + qtermwidget \ " diff --git a/recipes-lxqt/pavucontrol-qt/pavucontrol-qt_git.bb b/recipes-lxqt/pavucontrol-qt/pavucontrol-qt_git.bb index a1344bd3..bddb89ac 100644 --- a/recipes-lxqt/pavucontrol-qt/pavucontrol-qt_git.bb +++ b/recipes-lxqt/pavucontrol-qt/pavucontrol-qt_git.bb @@ -6,7 +6,7 @@ inherit lxqt DEPENDS += "glib-2.0 liblxqt pulseaudio" -SRCREV = "fe41fed80452c1788f03d9746921f5962bacad4a" -PV = "0.4.0" +SRCREV = "97d2950abe74c0b40dcde1e30c6e5119c0392370" +PV = "0.14.1" RDEPENDS_${PN} += "pulseaudio-server" diff --git a/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_git.bb b/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_git.bb index 46fe8e16..03c57eb8 100644 --- a/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_git.bb +++ b/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_git.bb @@ -8,7 +8,11 @@ inherit lxqt pkgconfig distro_features_check DEPENDS += "libfm-qt" -SRCREV = "5ada22db99d3acd05c250fe3409dac8ecf7a3380" -PV = "0.13.0" +SRCREV = "9a91aa161936713bb317e77f7973d707c284e370" +PV = "0.14.1" + +FILES_${PN} += " \ + ${datadir}/${BPN}/lxqt/settings.conf \ +" RRECOMMENDS_${PN} = "gvfs gvfsd-trash eject" diff --git a/recipes-lxqt/qps/qps_git.bb b/recipes-lxqt/qps/qps_git.bb new file mode 100644 index 00000000..68ce7936 --- /dev/null +++ b/recipes-lxqt/qps/qps_git.bb @@ -0,0 +1,14 @@ +SUMMARY = "The Qt process manager" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b" + +inherit lxqt pkgconfig gtk-icon-cache + +DEPENDS += "qtx11extras qttools" + +SRCREV = "f418b91afccffbed31744c1e23e220ad79985acf" +PV = "1.10.20" + +FILES_${PN} += " \ + ${datadir}/icons \ +" diff --git a/recipes-lxqt/qterminal/qterminal_git.bb b/recipes-lxqt/qterminal/qterminal_git.bb index 39eed914..bd5285ef 100644 --- a/recipes-lxqt/qterminal/qterminal_git.bb +++ b/recipes-lxqt/qterminal/qterminal_git.bb @@ -8,8 +8,8 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS += "qtermwidget qtx11extras" -SRCREV = "aeb2f1f570d7a1773a5eb586e4b56c3218a78cea" -PV = "0.9.0" +SRCREV = "6e243af21c6304b1e5a788b481fa13ed7da6c863" +PV = "0.14.1" S = "${WORKDIR}/git" diff --git a/recipes-lxqt/qtermwidget/qtermwidget_git.bb b/recipes-lxqt/qtermwidget/qtermwidget_git.bb index 61720107..c3180ec1 100644 --- a/recipes-lxqt/qtermwidget/qtermwidget_git.bb +++ b/recipes-lxqt/qtermwidget/qtermwidget_git.bb @@ -4,8 +4,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4641e94ec96f98fabc56ff9cc48be14b" inherit lxqt -SRCREV = "3079cbea3f48cb65d765bf952fe0a56e73e2b70d" -PV = "0.9.0" +SRCREV = "456e3568092d2d111c61e414cb20743f24c9388c" +PV = "0.14.1" #EXTRA_OECMAKE += "-DUSE_QT5=ON -DBUILD_DESIGNER_PLUGIN=OFF" diff --git a/recipes-misc/recipes-graphics/ntk/ntk_git.bb b/recipes-misc/recipes-graphics/ntk/ntk_git.bb index 3644f762..ceba5b56 100644 --- a/recipes-misc/recipes-graphics/ntk/ntk_git.bb +++ b/recipes-misc/recipes-graphics/ntk/ntk_git.bb @@ -22,6 +22,10 @@ DEPENDS = " \ libxft \ " +WAF_EXTRA_CONF = " \ + --libdir=${libdir} \ +" + do_install_append() { rm ${D}${libdir}/libntk.a rm ${D}${libdir}/libntk.a.1 diff --git a/recipes-misc/recipes-graphics/qpdfview/qpdfview_0.4.16.bb b/recipes-misc/recipes-graphics/qpdfview/qpdfview_0.4.16.bb index 647c252b..1079092e 100644 --- a/recipes-misc/recipes-graphics/qpdfview/qpdfview_0.4.16.bb +++ b/recipes-misc/recipes-graphics/qpdfview/qpdfview_0.4.16.bb @@ -4,13 +4,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS += "cups poppler qtsvg" -SRC_URI = "https://launchpad.net/qpdfview/trunk/${PV}/+download/${PN}-${PV}.tar.gz" +SRC_URI = "https://launchpad.net/qpdfview/trunk/${PV}/+download/${BPN}-${PV}.tar.gz" SRC_URI[md5sum] = "4b317c4536332a7fe437abe50eca1716" SRC_URI[sha256sum] = "fad416e8fefc3057fa1b8d12d964c7eccd16dffe0307a0d6e9d55a543294da7f" inherit qmake5 QMAKE_PROFILES = "${S}/qpdfview.pro" -EXTRA_QMAKEVARS_PRE += "CONFIG+=without_ps CONFIG+=without_djvu" +EXTRA_QMAKEVARS_PRE += " \ + CONFIG+=without_ps \ + CONFIG+=without_djvu \ + PLUGIN_INSTALL_PATH=${libdir}/${BPN} \ +" FILES_${PN} += "${datadir}" diff --git a/recipes-misc/recipes-hardhelper/pulseview/pulseview_0.4.1.bb b/recipes-misc/recipes-hardhelper/pulseview/pulseview_0.4.1.bb new file mode 100644 index 00000000..81d7b1a5 --- /dev/null +++ b/recipes-misc/recipes-hardhelper/pulseview/pulseview_0.4.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "PulseView is a Qt based logic analyzer, oscilloscope and MSO GUI for sigrok." +HOMEPAGE = "http://sigrok.org/wiki/Main_Page" + +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS = "libsigrok qtbase qtsvg boost" + +PACKAGECONFIG[decode] = "-DENABLE_DECODE=TRUE,-DENABLE_DECODE=FALSE,libsigrokdecode" + +PACKAGECONFIG ??= "decode" + +inherit cmake_qt5 + +SRC_URI = "http://sigrok.org/download/source/pulseview/pulseview-${PV}.tar.gz" + +SRC_URI[md5sum] = "6056c6e42cc6eae094110cac2351558a" +SRC_URI[sha256sum] = "9ee7ce3dd1457c6a5f5e4e9c2469903a1f070ba077ea68535cc29ef1dfac6f2f" + +FILES_${PN} += "${datadir}/*" diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/files/0002-fluidsynth-port-to-API-for-fluidsynth-version-2.0.0.patch b/recipes-misc/recipes-multimedia/calf-studio-gear/files/0002-fluidsynth-port-to-API-for-fluidsynth-version-2.0.0.patch deleted file mode 100644 index 0c845398..00000000 --- a/recipes-misc/recipes-multimedia/calf-studio-gear/files/0002-fluidsynth-port-to-API-for-fluidsynth-version-2.0.0.patch +++ /dev/null @@ -1,73 +0,0 @@ -From bba03b6080dc198f3513b5c29fe1ba4ff9e4aa59 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 10 Oct 2018 00:22:46 +0200 -Subject: [PATCH] fluidsynth: port to API for fluidsynth version > 2.0.0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Build tested with fluidsynth 1.1.11 and 2.0.1 - -Upstream-Status: Submitted [1] - -[1] https://github.com/calf-studio-gear/calf/pull/203 - -Signed-off-by: Andreas Müller ---- - src/fluidsynth.cpp | 25 +++++++++++++++++++++++++ - 1 file changed, 25 insertions(+) - -diff --git a/src/fluidsynth.cpp b/src/fluidsynth.cpp -index c5d307d7..54023dc8 100644 ---- a/src/fluidsynth.cpp -+++ b/src/fluidsynth.cpp -@@ -74,6 +74,7 @@ fluid_synth_t *fluidsynth_audio_module::create_synth(int &new_sfid) - new_sfid = sid; - - fluid_sfont_t* sfont = fluid_synth_get_sfont(s, 0); -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - soundfont_name = (*sfont->get_name)(sfont); - - sfont->iteration_start(sfont); -@@ -92,6 +93,26 @@ fluid_synth_t *fluidsynth_audio_module::create_synth(int &new_sfid) - if (first_preset == -1) - first_preset = id; - } -+#else -+ soundfont_name = fluid_sfont_get_name(sfont); -+ -+ fluid_sfont_iteration_start(sfont); -+ -+ string preset_list; -+ fluid_preset_t* tmp; -+ int first_preset = -1; -+ while((tmp = fluid_sfont_iteration_next(sfont))) -+ { -+ string pname = fluid_preset_get_name(tmp); -+ int bank = fluid_preset_get_banknum(tmp); -+ int num = fluid_preset_get_num(tmp); -+ int id = num + 128 * bank; -+ sf_preset_names[id] = pname; -+ preset_list += calf_utils::i2s(id) + "\t" + pname + "\n"; -+ if (first_preset == -1) -+ first_preset = id; -+ } -+#endif - if (first_preset != -1) - { - fluid_synth_bank_select(s, 0, first_preset >> 7); -@@ -134,7 +155,11 @@ void fluidsynth_audio_module::update_preset_num(int channel) - { - fluid_preset_t *p = fluid_synth_get_channel_preset(synth, channel); - if (p) -+#if FLUIDSYNTH_VERSION_MAJOR < 2 - last_selected_presets[channel] = p->get_num(p) + 128 * p->get_banknum(p); -+#else -+ last_selected_presets[channel] = fluid_preset_get_num(p) + 128 * fluid_preset_get_banknum(p); -+#endif - else - last_selected_presets[channel] = -1; - status_serial++; --- -2.14.4 - diff --git a/recipes-misc/recipes-multimedia/distrho/dpf-plugins/0001-Disable-modgui-we-don-t-support-modgui.patch b/recipes-misc/recipes-multimedia/distrho/dpf-plugins/0001-Disable-modgui-we-don-t-support-modgui.patch deleted file mode 100644 index 65ba5748..00000000 --- a/recipes-misc/recipes-multimedia/distrho/dpf-plugins/0001-Disable-modgui-we-don-t-support-modgui.patch +++ /dev/null @@ -1,71 +0,0 @@ -From b38a77eb0739e7830c5843927090ba8ed57285ee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sat, 19 May 2018 21:43:38 +0200 -Subject: [PATCH] Disable modgui - we don't support modgui -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller ---- - plugins/Kars/DistrhoPluginInfo.h | 2 +- - plugins/MVerb/DistrhoPluginInfo.h | 2 +- - plugins/Nekobi/DistrhoPluginInfo.h | 2 +- - plugins/PingPongPan/DistrhoPluginInfo.h | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/plugins/Kars/DistrhoPluginInfo.h b/plugins/Kars/DistrhoPluginInfo.h -index 127e4f9..9e24e62 100644 ---- a/plugins/Kars/DistrhoPluginInfo.h -+++ b/plugins/Kars/DistrhoPluginInfo.h -@@ -26,6 +26,6 @@ - #define DISTRHO_PLUGIN_IS_SYNTH 1 - #define DISTRHO_PLUGIN_NUM_INPUTS 0 - #define DISTRHO_PLUGIN_NUM_OUTPUTS 1 --#define DISTRHO_PLUGIN_USES_MODGUI 1 -+#define DISTRHO_PLUGIN_USES_MODGUI 0 - - #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED -diff --git a/plugins/MVerb/DistrhoPluginInfo.h b/plugins/MVerb/DistrhoPluginInfo.h -index f7b0a35..04b94e0 100644 ---- a/plugins/MVerb/DistrhoPluginInfo.h -+++ b/plugins/MVerb/DistrhoPluginInfo.h -@@ -28,7 +28,7 @@ - #define DISTRHO_PLUGIN_NUM_INPUTS 2 - #define DISTRHO_PLUGIN_NUM_OUTPUTS 2 - #define DISTRHO_PLUGIN_WANT_PROGRAMS 1 --#define DISTRHO_PLUGIN_USES_MODGUI 1 -+#define DISTRHO_PLUGIN_USES_MODGUI 0 - - #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:ReverbPlugin" - -diff --git a/plugins/Nekobi/DistrhoPluginInfo.h b/plugins/Nekobi/DistrhoPluginInfo.h -index 9c90f7a..79be755 100644 ---- a/plugins/Nekobi/DistrhoPluginInfo.h -+++ b/plugins/Nekobi/DistrhoPluginInfo.h -@@ -27,6 +27,6 @@ - #define DISTRHO_PLUGIN_IS_SYNTH 1 - #define DISTRHO_PLUGIN_NUM_INPUTS 0 - #define DISTRHO_PLUGIN_NUM_OUTPUTS 1 --#define DISTRHO_PLUGIN_USES_MODGUI 1 -+#define DISTRHO_PLUGIN_USES_MODGUI 0 - - #endif // DISTRHO_PLUGIN_INFO_H_INCLUDED -diff --git a/plugins/PingPongPan/DistrhoPluginInfo.h b/plugins/PingPongPan/DistrhoPluginInfo.h -index 6cd3d37..7e66838 100644 ---- a/plugins/PingPongPan/DistrhoPluginInfo.h -+++ b/plugins/PingPongPan/DistrhoPluginInfo.h -@@ -26,7 +26,7 @@ - #define DISTRHO_PLUGIN_NUM_INPUTS 2 - #define DISTRHO_PLUGIN_NUM_OUTPUTS 2 - #define DISTRHO_PLUGIN_WANT_PROGRAMS 1 --#define DISTRHO_PLUGIN_USES_MODGUI 1 -+#define DISTRHO_PLUGIN_USES_MODGUI 0 - - #define DISTRHO_PLUGIN_LV2_CATEGORY "lv2:SpatialPlugin" - --- -2.14.3 - diff --git a/recipes-misc/recipes-multimedia/ftgl/files/0001-use-pkg-config-to-find-freetype2.patch b/recipes-misc/recipes-multimedia/ftgl/files/0001-use-pkg-config-to-find-freetype2.patch deleted file mode 100644 index cf03cd0f..00000000 --- a/recipes-misc/recipes-multimedia/ftgl/files/0001-use-pkg-config-to-find-freetype2.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8bb183926078b6dd54048fb6820838fe7b6e6163 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 23 Oct 2016 22:46:43 +0200 -Subject: [PATCH] use pkg-config to find freetype2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: inappropriate [OE specific] - -Signed-off-by: Andreas Müller ---- - configure.ac | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 53560ea..b5bb6a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -41,8 +41,13 @@ AC_CHECK_FUNCS(strndup) - - AC_PATH_X - --AC_CHECK_FT2([9.0.3],[], -- [AC_MSG_ERROR([FreeType2 is required to compile this library])]) -+PKG_CHECK_MODULES(FT2, freetype2, -+ CFLAGS="$CFLAGS $FT2_CFLAGS" -+ LIBS="$LIBS $FT2_LIBS", -+ AC_MSG_ERROR([FreeType2 is required to compile this library]) -+) -+AC_SUBST([FT2_CFLAGS]) -+AC_SUBST([FT2_LIBS]) - - AC_PATH_XTRA - --- -2.5.5 - diff --git a/recipes-misc/recipes-multimedia/ftgl/files/0002-Makefile.am-remove-useless-and-breaking-code.patch b/recipes-misc/recipes-multimedia/ftgl/files/0002-Makefile.am-remove-useless-and-breaking-code.patch deleted file mode 100644 index 7f0187c1..00000000 --- a/recipes-misc/recipes-multimedia/ftgl/files/0002-Makefile.am-remove-useless-and-breaking-code.patch +++ /dev/null @@ -1,36 +0,0 @@ -From daabb4110661c4358ec73293d5c0b2106f567c1f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 23 Oct 2016 23:54:14 +0200 -Subject: [PATCH] Makefile.am: remove useless and breaking code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller ---- - Makefile.am | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 89a8a7f..e582a34 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -24,15 +24,6 @@ EXTRA_DIST = \ - m4 \ - $(NULL) - --# Print out an informative summary. --all-local: -- @$(ECHO) "Done." -- @$(ECHO) -- @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \ -- $(ECHO) "---" ;\ -- $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\ -- fi -- @$(ECHO) - - # Upload documentation - DOC = docs/html docs/latex/ftgl.pdf --- -2.5.5 - diff --git a/recipes-misc/recipes-multimedia/ftgl/ftgl_2.1.3-rc5.bb b/recipes-misc/recipes-multimedia/ftgl/ftgl_2.1.3-rc5.bb deleted file mode 100644 index a1e9ddac..00000000 --- a/recipes-misc/recipes-multimedia/ftgl/ftgl_2.1.3-rc5.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "OpenGL frontend to Freetype 2" -HOMEPAGE = "https://sourceforge.net/projects/ftgl/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4" - -inherit autotools pkgconfig - -DEPENDS += " \ - freetype \ - freeglut \ -" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-use-pkg-config-to-find-freetype2.patch \ - file://0002-Makefile.am-remove-useless-and-breaking-code.patch \ -" -SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503" -SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59" - -S = "${WORKDIR}/ftgl-2.1.3~rc5" - -CFLAGS += "-lm" diff --git a/recipes-misc/recipes-multimedia/helm/files/0001-Makefile-remove-machine-detection-it-won-t-work-for-.patch b/recipes-misc/recipes-multimedia/helm/files/0001-Makefile-remove-machine-detection-it-won-t-work-for-.patch deleted file mode 100644 index d57abb8e..00000000 --- a/recipes-misc/recipes-multimedia/helm/files/0001-Makefile-remove-machine-detection-it-won-t-work-for-.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 67d0e6ca6474cddc181d137e5a3b1a2d7d665a6f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 1 Aug 2017 23:44:30 +0200 -Subject: [PATCH] Makefile: remove machine detection - it won't work for oe -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Inappropriate [openembedded specific] - -Signed-off-by: Andreas Müller ---- - Makefile | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/Makefile b/Makefile -index b652a8b..d2fe67f 100644 ---- a/Makefile -+++ b/Makefile -@@ -18,17 +18,6 @@ ifdef DPKG - PDEBLDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) - endif - --MACHINE := $(shell sh -c 'uname -m 2> /dev/null || echo not') --ifneq (,$(findstring aarch,$(MACHINE))) -- SIMDFLAGS := -march=armv8-a -mtune=cortex-a53 --else --ifneq (,$(findstring arm,$(MACHINE))) -- SIMDFLAGS := -march=armv8-a -mtune=cortex-a53 -mfpu=neon-fp-armv8 -mfloat-abi=hard --else -- SIMDFLAGS := -msse2 --endif --endif -- - - PROGRAM = helm - BIN = $(DESTDIR)/usr/bin --- -2.9.4 - diff --git a/recipes-misc/recipes-multimedia/helm/files/0003-use-standard-vst-path.patch b/recipes-misc/recipes-multimedia/helm/files/0003-use-standard-vst-path.patch deleted file mode 100644 index cb1766e0..00000000 --- a/recipes-misc/recipes-multimedia/helm/files/0003-use-standard-vst-path.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b6937b83618cee3e88c42071a5353fcb684d31bb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 2 Aug 2017 00:06:26 +0200 -Subject: [PATCH] use standard vst path -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 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index b652a8b..61e223b 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,7 +34,7 @@ PROGRAM = helm - BIN = $(DESTDIR)/usr/bin - BINFILE = $(BIN)/$(PROGRAM) - LV2 = $(DESTDIR)/$(LIBDIR)/lv2/$(PROGRAM).lv2 --VSTDIR = $(DESTDIR)/$(LIBDIR)/lxvst -+VSTDIR = $(DESTDIR)/$(LIBDIR)/vst - VST = $(VSTDIR)/$(PROGRAM).so - SYSDATA = $(DESTDIR)/usr/share/$(PROGRAM) - IMAGES = $(SYSDATA)/icons --- -2.9.4 - diff --git a/recipes-misc/recipes-multimedia/hydrogen/files/0001-remove-qt5_use_modules.patch b/recipes-misc/recipes-multimedia/hydrogen/files/0001-remove-qt5_use_modules.patch deleted file mode 100644 index 3f29f5d4..00000000 --- a/recipes-misc/recipes-multimedia/hydrogen/files/0001-remove-qt5_use_modules.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 2363281ce7bc2919fdef7c4ce2d9862f1a84460d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 3 Jun 2018 17:29:00 +0200 -Subject: [PATCH] remove qt5_use_modules -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* it is not necessary - all libs are linked -* was removed in Qt 5.11 - -Upstream-Status: Submitted [1] - -[1] https://github.com/hydrogen-music/hydrogen/pull/618 - -Signed-off-by: Andreas Müller ---- - src/gui/CMakeLists.txt | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt -index b753c26a..c800445c 100644 ---- a/src/gui/CMakeLists.txt -+++ b/src/gui/CMakeLists.txt -@@ -54,7 +54,6 @@ TARGET_LINK_LIBRARIES(hydrogen - hydrogen-core-${VERSION} - Qt5::Widgets - ) --qt5_use_modules(hydrogen Widgets) - ADD_DEPENDENCIES(hydrogen hydrogen-core-${VERSION}) - - INSTALL(TARGETS hydrogen RUNTIME DESTINATION bin BUNDLE DESTINATION bin ) --- -2.14.3 - diff --git a/recipes-misc/recipes-multimedia/lv2/lv2-native.bb b/recipes-misc/recipes-multimedia/lv2/lv2-native.bb deleted file mode 100644 index 0b50e441..00000000 --- a/recipes-misc/recipes-multimedia/lv2/lv2-native.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${BPN}.inc - -inherit native - -do_install() { - # the header - install -d ${D}/${includedir} - install -m 0644 ${S}/lv2/lv2plug.in/ns/lv2core/lv2.h ${D}/${includedir}/ - install -d ${D}/${includedir}/lv2/lv2plug.in/ns/lv2core - install -m 0644 ${S}/lv2/lv2plug.in/ns/lv2core/lv2.h ${D}/${includedir}/lv2/lv2plug.in/ns/lv2core/ -} diff --git a/recipes-misc/recipes-multimedia/lv2/lv2.inc b/recipes-misc/recipes-multimedia/lv2/lv2.inc deleted file mode 100644 index c8a42ae6..00000000 --- a/recipes-misc/recipes-multimedia/lv2/lv2.inc +++ /dev/null @@ -1,8 +0,0 @@ -SUMMARY = "LV2 is an open standard for audio plugins" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://COPYING;md5=0383f162366b0c5a316292759a55d292" - -PV = "1.14.0" -SRC_URI = "http://lv2plug.in/spec/lv2-${PV}.tar.bz2" -SRC_URI[md5sum] = "0b56285a77aac3c93b50c36203aa91ee" -SRC_URI[sha256sum] = "b8052683894c04efd748c81b95dd065d274d4e856c8b9e58b7c3da3db4e71d32" diff --git a/recipes-misc/recipes-multimedia/polyphone/files/0002-config.ccp-include-QAction-explicitly-to-fix-build-w.patch b/recipes-misc/recipes-multimedia/polyphone/files/0002-config.ccp-include-QAction-explicitly-to-fix-build-w.patch deleted file mode 100644 index 1ddfac5c..00000000 --- a/recipes-misc/recipes-multimedia/polyphone/files/0002-config.ccp-include-QAction-explicitly-to-fix-build-w.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 7d3e26b46cb5ce191cd1c91347c9ddfa15199f63 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 3 Jun 2018 21:09:24 +0200 -Subject: [PATCH] config.ccp: include QAction explicitly to fix build with Qt - 5.11 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes many errors like: -| ../git/trunk/configuration/config.cpp:363:55: error: invalid use of incomplete type 'class QAction' -| ui->listActions->addItem(_actionList.at(i)->text().replace("&", "")); -| ^~ -| In file included from ../recipe-sysroot/usr/include/qt5/QtWidgets/qdialog.h:44:0, -| from ../recipe-sysroot/usr/include/qt5/QtWidgets/qcolordialog.h:45, -| from ../recipe-sysroot/usr/include/qt5/QtWidgets/QColorDialog:1, -| from ../git/trunk/configuration/config.cpp:27: - -Upstream-Status: Submitted [1] - -[1] https://github.com/davy7125/polyphone/pull/32 - -Signed-off-by: Andreas Müller ---- - configuration/config.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configuration/config.cpp b/configuration/config.cpp -index 93b30cb..90b304f 100644 ---- a/configuration/config.cpp -+++ b/configuration/config.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include "config.h" - #include "ui_config.h" - #include "mainwindow.h" --- -2.14.3 - diff --git a/recipes-misc/recipes-multimedia/qm-dsp/qm-dsp_1.7.1.bb b/recipes-misc/recipes-multimedia/qm-dsp/qm-dsp_1.7.1.bb deleted file mode 100644 index 3ca0f92b..00000000 --- a/recipes-misc/recipes-multimedia/qm-dsp/qm-dsp_1.7.1.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "A C++ library of functions for DSP and Music Informatics purposes" -HOMEPAGE = "https://code.soundsoftware.ac.uk/projects/qm-dsp" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" - - -SRC_URI = "https://code.soundsoftware.ac.uk/attachments/download/1582/${BPN}-${PV}.tar.gz " -SRC_URI[md5sum] = "9c7a7b15926000e15a9e3c7c06492e58" -SRC_URI[sha256sum] = "2b203f6dabd0475f13b356945827ae90a4ba4a4bbde935ffc334b50a9c782561" - -# we cannot use files in build/linux - these are x86 polluted - so set flags here -CFLAGSADD = "-DNDEBUG -fPIC -ffast-math -DUSE_PTHREADS -I./include" -CFLAGS += "${CFLAGSADD}" -CXXFLAGS += "${CFLAGSADD}" - -do_compile_prepend() { - cp build/general/Makefile.inc Makefile -} - -do_install() { - # stolen https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=qm-dsp - cd ${S} - install -Dm644 -t ${D}/usr/lib libqm-dsp.a - install -Dm644 -t ${D}/usr/include/qm-dsp/base base/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/chromagram dsp/chromagram/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/keydetection dsp/keydetection/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/mfcc dsp/mfcc/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/onsets dsp/onsets/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/phasevocoder dsp/phasevocoder/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/rateconversion dsp/rateconversion/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/rhythm dsp/rhythm/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/segmentation dsp/segmentation/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/signalconditioning dsp/signalconditioning/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/tempotracking dsp/tempotracking/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/tonal dsp/tonal/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/transforms dsp/transforms/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/dsp/wavelet dsp/wavelet/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/maths maths/*.h - install -Dm644 -t ${D}/usr/include/qm-dsp/thread thread/*.h -} diff --git a/recipes-misc/recipes-multimedia/wolf-shaper/wolf-shaper_0.1.6.bb b/recipes-misc/recipes-multimedia/wolf-shaper/wolf-shaper_0.1.6.bb deleted file mode 100644 index c1c29a00..00000000 --- a/recipes-misc/recipes-multimedia/wolf-shaper/wolf-shaper_0.1.6.bb +++ /dev/null @@ -1,37 +0,0 @@ -SUMMARY = "Wolf Shaper is a waveshaper plugin with a graph editor" -HOMEPAGE = "https://pdesaulniers.github.io/wolf-shaper/" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4fe869ee987a340198fb0d54c55c47f1" - -DEPENDS = " \ - jack \ - dssi \ - lv2 \ -" - -inherit autotools-brokensep pkgconfig lv2-postinst-helper - -SRC_URI = "gitsm://github.com/pdesaulniers/wolf-shaper.git" -SRCREV = "adc67b3f923917b6b42f545451e6d4932f721e97" -S = "${WORKDIR}/git" - -export PREFIX="${prefix}" - -do_compile() { - # manipulate Makefile/scripts to keep lv2_ttl_generator-calls in script for lv2-postinst-helper - sed -i 's|"$GEN" "./$FILE"|echo lv2-ttl-generator `pwd`/$FILE >> ${LV2-TURTLE-BUILD-DATA}|g' ${S}/dpf/utils/generate-ttl.sh - - NOOPT=true \ - SKIP_STRIPPING=true \ - BUILD_VST2=true \ - BUILD_LV2=true \ - BUILD_DSSI=true \ - BUILD_JACK=true \ - oe_runmake -} - -FILES_${PN} += " \ - ${libdir}/dssi \ - ${libdir}/lv2 \ - ${libdir}/vst \ -" diff --git a/recipes-misc/recipes-multimedia/zyn/zyn.inc b/recipes-misc/recipes-multimedia/zyn/zyn.inc deleted file mode 100644 index 6a1c71e9..00000000 --- a/recipes-misc/recipes-multimedia/zyn/zyn.inc +++ /dev/null @@ -1,69 +0,0 @@ -HOMEPAGE = "http://zynaddsubfx.sourceforge.net" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=21fa88a5e50a1c608d22612c1fbe1971" - -inherit cmake lv2-postinst-helper pkgconfig gtk-icon-cache distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -DEPENDS += " \ - virtual/libx11 \ - alsa-lib \ - jack \ - portaudio-v19 \ - dssi \ - lv2 \ - liblo \ - zlib \ - libmxml \ - libxpm \ -" - -CXXFLAGS += "-ftree-vectorize -ffast-math -DNDEBUG" - -FILESEXTRAPATHS_prepend := "${THISDIR}/zyn:" - -SRC_URI = " \ - gitsm://github.com/zynaddsubfx/zynaddsubfx.git \ - file://0001-No-target-specific-asm.patch \ - file://0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch \ - file://0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch \ - file://0004-Keep-our-build-flags.patch \ -" -SRCREV = "6f8a61f6ee74316e471495f040660318a339d0c7" -PV = "3.0.3+git${SRCPV}" -S = "${WORKDIR}/git" - -do_configure_prepend() { - # reconfigure? - if [ ! -f ${LV2-TURTLE-BUILD-DATA} ] ; then - # We cannot run lv2-ttl-generator in cross environment so - # manipulate CMakeLists.txt to keep commands in file - sed -i 's|../../lv2-ttl-generator|lv2-ttl-generator|g' `find ${S} -name CMakeLists.txt` - sed -i 's|lv2-ttl-generator $> ${LV2-TURTLE-BUILD-DATA}|g' `find ${S} -name CMakeLists.txt` - else - rm -f ${LV2-TURTLE-BUILD-DATA} - fi -} - -do_compile_append() { - # Create dummy lv2-turtles to make install happy - cd ${B}/src/Plugin/ - for dir in `find -type d -mindepth 1 -maxdepth 1`; do - if [ -d $dir/lv2 ] ; then - echo ${LV2-DUMMY-TURTLE-STR} > $dir/lv2/manifest.ttl - echo ${LV2-DUMMY-TURTLE-STR} > $dir/lv2/presets.ttl - for so in `find $dir -name '*.so' -mindepth 2 -maxdepth 2`; do - pluginname=`basename $so | sed 's|.so||g'` - echo ${LV2-DUMMY-TURTLE-STR} > $dir/lv2/$pluginname.ttl - done - fi - done -} - -FILES_${PN} += " \ - ${libdir}/dssi \ - ${libdir}/lv2 \ - ${libdir}/vst \ -" - diff --git a/recipes-misc/recipes-multimedia/amsynth/amsynth_git.bb b/recipes-musicians/amsynth/amsynth_git.bb similarity index 56% rename from recipes-misc/recipes-multimedia/amsynth/amsynth_git.bb rename to recipes-musicians/amsynth/amsynth_git.bb index 6a507574..be676f49 100644 --- a/recipes-misc/recipes-multimedia/amsynth/amsynth_git.bb +++ b/recipes-musicians/amsynth/amsynth_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://amsynth.github.io/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=67b604758dd265c185ce36fcf76a889d" -inherit autotools pkgconfig gtk-icon-cache gettext +inherit autotools pkgconfig gtk-icon-cache gettext pack_audio_plugins DEPENDS += " \ gtk+ \ @@ -25,9 +25,27 @@ PACKAGECONFIG[jack] = "--with-jack,--without-jack,jack" PACKAGECONFIG[sndfile] = "--with-sndfile,--without-sndfile,libsndfile1" PACKAGECONFIG[lv2] = "--with-lv2,--without-lv2,lv2" -FILES_${PN} += " \ - ${datadir}/appdata \ - ${libdir}/dssi \ - ${libdir}/lv2 \ - ${libdir}/vst \ +PACKAGES =+ "${PN}-standalone" +FILES_${PN}-standalone += " \ + ${datadir}/appdata/amsynth.appdata.xml \ + ${datadir}/applications \ + ${datadir}/icons \ + ${bindir} \ " + +FILES_${PN}-dssi += " \ + ${datadir}/appdata/dssi-amsynth-plugin.metainfo.xml \ +" + +FILES_${PN}-lv2 += " \ + ${datadir}/appdata/lv2-amsynth-plugin.metainfo.xml \ +" + +FILES_${PN}-vst += " \ + ${datadir}/appdata/vst-amsynth-plugin.metainfo.xml \ +" + +RDEPENDS_${PN}-standalone += "${PN}" +RDEPENDS_${PN}-dssi += "${PN}" +RDEPENDS_${PN}-lv2 += "${PN}" +RDEPENDS_${PN}-vst += "${PN}" diff --git a/recipes-misc/recipes-multimedia/ardour/ardour5_git.bb b/recipes-musicians/ardour/ardour5_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/ardour/ardour5_git.bb rename to recipes-musicians/ardour/ardour5_git.bb diff --git a/recipes-misc/recipes-multimedia/ardour/files/0001-remove-all-build-flags-that-cause-trouble-for-cross-.patch b/recipes-musicians/ardour/files/0001-remove-all-build-flags-that-cause-trouble-for-cross-.patch similarity index 100% rename from recipes-misc/recipes-multimedia/ardour/files/0001-remove-all-build-flags-that-cause-trouble-for-cross-.patch rename to recipes-musicians/ardour/files/0001-remove-all-build-flags-that-cause-trouble-for-cross-.patch diff --git a/recipes-misc/recipes-multimedia/ardour/files/0002-Use-ARM-NEON-intrinsics-if-available-for-mixing-func.patch b/recipes-musicians/ardour/files/0002-Use-ARM-NEON-intrinsics-if-available-for-mixing-func.patch similarity index 100% rename from recipes-misc/recipes-multimedia/ardour/files/0002-Use-ARM-NEON-intrinsics-if-available-for-mixing-func.patch rename to recipes-musicians/ardour/files/0002-Use-ARM-NEON-intrinsics-if-available-for-mixing-func.patch diff --git a/recipes-misc/recipes-multimedia/ardour/files/0003-Prevent-excessive-meter-redraws-for-inactive-meters-.patch b/recipes-musicians/ardour/files/0003-Prevent-excessive-meter-redraws-for-inactive-meters-.patch similarity index 100% rename from recipes-misc/recipes-multimedia/ardour/files/0003-Prevent-excessive-meter-redraws-for-inactive-meters-.patch rename to recipes-musicians/ardour/files/0003-Prevent-excessive-meter-redraws-for-inactive-meters-.patch diff --git a/recipes-misc/recipes-multimedia/ardour/files/0004-Prevent-excessive-meter-redraws-for-inactive-meters-.patch b/recipes-musicians/ardour/files/0004-Prevent-excessive-meter-redraws-for-inactive-meters-.patch similarity index 100% rename from recipes-misc/recipes-multimedia/ardour/files/0004-Prevent-excessive-meter-redraws-for-inactive-meters-.patch rename to recipes-musicians/ardour/files/0004-Prevent-excessive-meter-redraws-for-inactive-meters-.patch diff --git a/recipes-misc/recipes-multimedia/ardour/files/0005-Follow-fluidsynth-s-API-changes-introduced-with-2.0..patch b/recipes-musicians/ardour/files/0005-Follow-fluidsynth-s-API-changes-introduced-with-2.0..patch similarity index 100% rename from recipes-misc/recipes-multimedia/ardour/files/0005-Follow-fluidsynth-s-API-changes-introduced-with-2.0..patch rename to recipes-musicians/ardour/files/0005-Follow-fluidsynth-s-API-changes-introduced-with-2.0..patch diff --git a/recipes-misc/recipes-multimedia/ardour/files/ardour5.desktop b/recipes-musicians/ardour/files/ardour5.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/ardour/files/ardour5.desktop rename to recipes-musicians/ardour/files/ardour5.desktop diff --git a/recipes-misc/recipes-multimedia/aubio/aubio_0.4.7.bb b/recipes-musicians/aubio/aubio_0.4.7.bb similarity index 100% rename from recipes-misc/recipes-multimedia/aubio/aubio_0.4.7.bb rename to recipes-musicians/aubio/aubio_0.4.7.bb diff --git a/recipes-misc/recipes-multimedia/aubio/files/0001-do-not-build-tests.patch b/recipes-musicians/aubio/files/0001-do-not-build-tests.patch similarity index 100% rename from recipes-misc/recipes-multimedia/aubio/files/0001-do-not-build-tests.patch rename to recipes-musicians/aubio/files/0001-do-not-build-tests.patch diff --git a/recipes-misc/recipes-multimedia/audio-tweaks/audio-tweaks_1.0.bb b/recipes-musicians/audio-tweaks/audio-tweaks_1.0.bb similarity index 100% rename from recipes-misc/recipes-multimedia/audio-tweaks/audio-tweaks_1.0.bb rename to recipes-musicians/audio-tweaks/audio-tweaks_1.0.bb diff --git a/recipes-misc/recipes-multimedia/audio-tweaks/files/95-audio-tweaks.conf b/recipes-musicians/audio-tweaks/files/95-audio-tweaks.conf similarity index 100% rename from recipes-misc/recipes-multimedia/audio-tweaks/files/95-audio-tweaks.conf rename to recipes-musicians/audio-tweaks/files/95-audio-tweaks.conf diff --git a/recipes-misc/recipes-multimedia/bristol/bristol_0.60.11.bb b/recipes-musicians/bristol/bristol_0.60.11.bb similarity index 100% rename from recipes-misc/recipes-multimedia/bristol/bristol_0.60.11.bb rename to recipes-musicians/bristol/bristol_0.60.11.bb diff --git a/recipes-misc/recipes-multimedia/bristol/files/0001-Do-not-force-sse.patch b/recipes-musicians/bristol/files/0001-Do-not-force-sse.patch similarity index 100% rename from recipes-misc/recipes-multimedia/bristol/files/0001-Do-not-force-sse.patch rename to recipes-musicians/bristol/files/0001-Do-not-force-sse.patch diff --git a/recipes-misc/recipes-multimedia/bristol/files/0002-Do-not-include-alsa-iatomic.h.patch b/recipes-musicians/bristol/files/0002-Do-not-include-alsa-iatomic.h.patch similarity index 100% rename from recipes-misc/recipes-multimedia/bristol/files/0002-Do-not-include-alsa-iatomic.h.patch rename to recipes-musicians/bristol/files/0002-Do-not-include-alsa-iatomic.h.patch diff --git a/recipes-misc/recipes-multimedia/bristol/files/0003-bristoljackstats-do-not-overwrite-LDFLAGS.patch b/recipes-musicians/bristol/files/0003-bristoljackstats-do-not-overwrite-LDFLAGS.patch similarity index 100% rename from recipes-misc/recipes-multimedia/bristol/files/0003-bristoljackstats-do-not-overwrite-LDFLAGS.patch rename to recipes-musicians/bristol/files/0003-bristoljackstats-do-not-overwrite-LDFLAGS.patch diff --git a/recipes-misc/recipes-multimedia/bristol/files/0004-Avoid-crosscompile-warnings.patch b/recipes-musicians/bristol/files/0004-Avoid-crosscompile-warnings.patch similarity index 100% rename from recipes-misc/recipes-multimedia/bristol/files/0004-Avoid-crosscompile-warnings.patch rename to recipes-musicians/bristol/files/0004-Avoid-crosscompile-warnings.patch diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/files/0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch b/recipes-musicians/calf-studio-gear/calf/0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch similarity index 100% rename from recipes-misc/recipes-multimedia/calf-studio-gear/files/0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch rename to recipes-musicians/calf-studio-gear/calf/0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch diff --git a/recipes-musicians/calf-studio-gear/calf/0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch b/recipes-musicians/calf-studio-gear/calf/0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch new file mode 100644 index 00000000..5a993079 --- /dev/null +++ b/recipes-musicians/calf-studio-gear/calf/0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch @@ -0,0 +1,33 @@ +From 579ce205281dc47c94b0e6392decac9763397a9d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 13 Jan 2019 12:14:52 +0100 +Subject: [PATCH] fluidsynth: Activate synth.dynamic-sample-loading for + fluidsynth >=2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This reduces soundfont load time and memory consumption significantly + +Signed-off-by: Andreas Müller +--- + src/fluidsynth.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/fluidsynth.cpp b/src/fluidsynth.cpp +index 54023dc8..14c018e3 100644 +--- a/src/fluidsynth.cpp ++++ b/src/fluidsynth.cpp +@@ -59,6 +59,9 @@ fluid_synth_t *fluidsynth_audio_module::create_synth(int &new_sfid) + std::fill(set_presets, set_presets + 16, -1); + fluid_settings_t *new_settings = new_fluid_settings(); + fluid_settings_setnum(new_settings, "synth.sample-rate", srate); ++#if FLUIDSYNTH_VERSION_MAJOR >= 2 ++ fluid_settings_setint(new_settings, "synth.dynamic-sample-loading", 1); ++#endif + fluid_synth_t *s = new_fluid_synth(new_settings); + if (!soundfont.empty()) + { +-- +2.20.1 + diff --git a/recipes-musicians/calf-studio-gear/calf/0003-Fix-detection-of-LV2-for-latest-git.patch b/recipes-musicians/calf-studio-gear/calf/0003-Fix-detection-of-LV2-for-latest-git.patch new file mode 100644 index 00000000..4a299908 --- /dev/null +++ b/recipes-musicians/calf-studio-gear/calf/0003-Fix-detection-of-LV2-for-latest-git.patch @@ -0,0 +1,39 @@ +From 021850be25992b8a090182a05ad62660414c964f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 19 Jan 2019 21:48:29 +0100 +Subject: [PATCH 1/2] Fix detection of LV2 for latest git +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +LV2 removed lv2-core.pc in [1]. So find lv2 and set required version to 1.1.4 +which was released in September 2016 and should be avalaible on most +environments. This should be compatible to LV2 1.1.14 because from pkg-config +point of view lv2-core.pc and lv2.pc look similar. + +Upstream-Status: Submitted [2] + +[1] https://github.com/drobilla/lv2/commit/4db67120efca2d4c200d2e1ba5cf3d7b97cab97e +[2] https://github.com/calf-studio-gear/calf/pull/213 + +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 b9c3d500..a0368773 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -79,7 +79,7 @@ if test "$JACK_FOUND" = "yes"; then + PKG_CHECK_MODULES(JACK_RENAME_PORT, jack >= 1.9.11, JACK_HAS_RENAME="yes", JACK_HAS_RENAME_DUMMY="no") + fi + +-PKG_CHECK_MODULES(LV2_DEPS, lv2core >= 6, LV2_FOUND="yes", LV2_FOUND="no") ++PKG_CHECK_MODULES(LV2_DEPS, lv2 >= 1.1.14, LV2_FOUND="yes", LV2_FOUND="no") + + PKG_CHECK_MODULES(LASH_DEPS, lash-1.0 >= 0.6.0, + AC_CHECK_LIB([lash], [lash_client_is_being_restored], LASH_0_6_FOUND="yes", LASH_0_6_FOUND="no"), +-- +2.20.1 + diff --git a/recipes-musicians/calf-studio-gear/calf/0004-Find-headers-for-all-versions-of-LV2.patch b/recipes-musicians/calf-studio-gear/calf/0004-Find-headers-for-all-versions-of-LV2.patch new file mode 100644 index 00000000..6d7eae30 --- /dev/null +++ b/recipes-musicians/calf-studio-gear/calf/0004-Find-headers-for-all-versions-of-LV2.patch @@ -0,0 +1,75 @@ +From 855cf20b9bb9fec30b72fa05a9b4cd28a1b4d35d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 19 Jan 2019 23:00:49 +0100 +Subject: [PATCH 2/2] Find headers for all versions of LV2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Submitted [1] + +[1] https://github.com/calf-studio-gear/calf/pull/213 + +Signed-off-by: Andreas Müller +--- + src/calf/lv2_options.h | 2 +- + src/calf/lv2_ui.h | 2 +- + src/calf/lv2wrap.h | 2 +- + src/makerdf.cpp | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/calf/lv2_options.h b/src/calf/lv2_options.h +index 29568b8d..d66153da 100644 +--- a/src/calf/lv2_options.h ++++ b/src/calf/lv2_options.h +@@ -20,7 +20,7 @@ + #include + + #include "lv2_urid.h" +-#include "lv2.h" ++#include "lv2/lv2plug.in/ns/lv2core/lv2.h" + + #define LV2_OPTIONS_URI "http://lv2plug.in/ns/ext/options" + #define LV2_OPTIONS_PREFIX LV2_OPTIONS_URI "#" +diff --git a/src/calf/lv2_ui.h b/src/calf/lv2_ui.h +index b802ec59..c3e60822 100644 +--- a/src/calf/lv2_ui.h ++++ b/src/calf/lv2_ui.h +@@ -27,7 +27,7 @@ + + #include + +-#include "lv2.h" ++#include "lv2/lv2plug.in/ns/lv2core/lv2.h" + + #define LV2_UI_URI "http://lv2plug.in/ns/extensions/ui" + #define LV2_UI_PREFIX LV2_UI_URI "#" +diff --git a/src/calf/lv2wrap.h b/src/calf/lv2wrap.h +index 8d6b13c4..d19eae7b 100644 +--- a/src/calf/lv2wrap.h ++++ b/src/calf/lv2wrap.h +@@ -25,7 +25,7 @@ + + #include + #include +-#include ++#include "lv2/lv2plug.in/ns/lv2core/lv2.h" + #include + #include + #include +diff --git a/src/makerdf.cpp b/src/makerdf.cpp +index 0b6cec5c..9f782534 100644 +--- a/src/makerdf.cpp ++++ b/src/makerdf.cpp +@@ -22,7 +22,7 @@ + #include + #include + #if USE_LV2 +-#include ++#include "lv2/lv2plug.in/ns/lv2core/lv2.h" + #include + #include + #include +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/calf-studio-gear/calf_git.bb b/recipes-musicians/calf-studio-gear/calf_git.bb similarity index 82% rename from recipes-misc/recipes-multimedia/calf-studio-gear/calf_git.bb rename to recipes-musicians/calf-studio-gear/calf_git.bb index 15931e17..324950f7 100644 --- a/recipes-misc/recipes-multimedia/calf-studio-gear/calf_git.bb +++ b/recipes-musicians/calf-studio-gear/calf_git.bb @@ -9,9 +9,11 @@ LIC_FILES_CHKSUM = " \ SRC_URI = " \ git://github.com/calf-studio-gear/calf.git \ file://0001-Do-store-calfmakerdf-commandline-for-later-use-in-qe.patch \ - file://0002-fluidsynth-port-to-API-for-fluidsynth-version-2.0.0.patch \ + file://0002-fluidsynth-Activate-synth.dynamic-sample-loading-for.patch \ + file://0003-Fix-detection-of-LV2-for-latest-git.patch \ + file://0004-Find-headers-for-all-versions-of-LV2.patch \ " -SRCREV = "cd53de64cca49e04dc1773c39cda58dd0ba49452" +SRCREV = "e5c08dc2483c444d18d24a37c395274002320f5c" S = "${WORKDIR}/git" PV = "0.90.1" @@ -26,7 +28,10 @@ DEPENDS += " \ lv2 \ " -EXTRA_OECONF += "--enable-experimental" +EXTRA_OECONF += " \ + --with-lv2-dir=${libdir}/lv2 \ + --enable-experimental \ +" do_configure_prepend() { sed -i 's:%QEMUCOMMAND%:${WORKDIR}/QemuCommands:g' `find ${S} -name Makefile.am` diff --git a/recipes-misc/recipes-multimedia/carla/carla/0001-do-not-try-to-cross-run-carla-lv2-export.patch b/recipes-musicians/carla/carla/0001-do-not-try-to-cross-run-carla-lv2-export.patch similarity index 100% rename from recipes-misc/recipes-multimedia/carla/carla/0001-do-not-try-to-cross-run-carla-lv2-export.patch rename to recipes-musicians/carla/carla/0001-do-not-try-to-cross-run-carla-lv2-export.patch diff --git a/recipes-misc/recipes-multimedia/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch b/recipes-musicians/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch similarity index 100% rename from recipes-misc/recipes-multimedia/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch rename to recipes-musicians/carla/carla/0002-Do-not-try-to-find-Qt5-host-bins-it-won-t-work.patch diff --git a/recipes-misc/recipes-multimedia/carla/carla/0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch b/recipes-musicians/carla/carla/0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch similarity index 100% rename from recipes-misc/recipes-multimedia/carla/carla/0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch rename to recipes-musicians/carla/carla/0003-Fluidsynths-Ensure-fluidsynth-s-defaults-are-set-onc.patch diff --git a/recipes-misc/recipes-multimedia/carla/carla/0004-Fixes-for-fluidsynth-2.0.0.patch b/recipes-musicians/carla/carla/0004-Fixes-for-fluidsynth-2.0.0.patch similarity index 100% rename from recipes-misc/recipes-multimedia/carla/carla/0004-Fixes-for-fluidsynth-2.0.0.patch rename to recipes-musicians/carla/carla/0004-Fixes-for-fluidsynth-2.0.0.patch diff --git a/recipes-misc/recipes-multimedia/carla/carla_git.bb b/recipes-musicians/carla/carla_git.bb similarity index 88% rename from recipes-misc/recipes-multimedia/carla/carla_git.bb rename to recipes-musicians/carla/carla_git.bb index 7d15bdeb..b8dfa0b9 100644 --- a/recipes-misc/recipes-multimedia/carla/carla_git.bb +++ b/recipes-musicians/carla/carla_git.bb @@ -19,13 +19,14 @@ PV = "1.9.11+git${SRCPV}" REQUIRED_DISTRO_FEATURES = "x11" -inherit qmake5_base autotools-brokensep pkgconfig qemu-ext distro_features_check mime gtk-icon-cache python3native +inherit qmake5_base pkgconfig qemu-ext distro_features_check mime gtk-icon-cache + +B = "${S}" DEPENDS += " \ + python3-pyqt5-native \ qtbase-native \ qtbase \ - python3-pyqt5-native \ - python3-pyqt5 \ gtk+ \ gtk+3 \ liblo \ @@ -36,7 +37,6 @@ DEPENDS += " \ EXTRA_OEMAKE += " \ DEFAULT_QT=5 \ - PREFIX=${prefix} \ NOOPT=true \ HAVE_PYQT=true \ HAVE_PYQT4=false \ @@ -55,6 +55,10 @@ do_compile_append() { ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', 'carla-lv2-export')} } +do_install() { + oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install +} + FILES_${PN} += " \ ${datadir}/icons \ ${datadir}/mime \ diff --git a/recipes-misc/recipes-multimedia/chromaprint/chromaprint_1.4.2.bb b/recipes-musicians/chromaprint/chromaprint_git.bb similarity index 51% rename from recipes-misc/recipes-multimedia/chromaprint/chromaprint_1.4.2.bb rename to recipes-musicians/chromaprint/chromaprint_git.bb index 028a48ed..c501807b 100644 --- a/recipes-misc/recipes-multimedia/chromaprint/chromaprint_1.4.2.bb +++ b/recipes-musicians/chromaprint/chromaprint_git.bb @@ -10,10 +10,13 @@ DEPENDS += " \ ffmpeg \ " -EXTRA_OECMAKE += " \ - ${@bb.utils.contains('TUNE_FEATURES', 'neon', '-DFFT_LIB=fftw3f', '', d)} \ -" -SRC_URI = "https://bitbucket.org/acoustid/${BPN}/downloads/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "895c42ba6d769840a2e10e507ad9f14d" -SRC_URI[sha256sum] = "989609a7e841dd75b34ee793bd1d049ce99a8f0d444b3cea39d57c3e5d26b4d4" +SRC_URI = "git://github.com/acoustid/chromaprint.git" +SRCREV = "ecd2edd73315530d4f9c1b1186aee24c63a7b6c2" +PV = "1.4.3" +S = "${WORKDIR}/git" + +EXTRA_OECMAKE += " \ + ${@bb.utils.contains('TUNE_FEATURES', 'neon', '-DFFT_LIB=fftw3f', '', d)} \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +" diff --git a/recipes-misc/recipes-multimedia/csound/csound_git.bb b/recipes-musicians/csound/csound_git.bb similarity index 95% rename from recipes-misc/recipes-multimedia/csound/csound_git.bb rename to recipes-musicians/csound/csound_git.bb index f1c91c6e..a8baa499 100644 --- a/recipes-misc/recipes-multimedia/csound/csound_git.bb +++ b/recipes-musicians/csound/csound_git.bb @@ -45,6 +45,7 @@ LUA_VERSION = "5.3" EXTRA_OECMAKE += " \ -DUSE_DOUBLE=OFF \ -DPYTHON_MODULE_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} \ + -DUSE_LIB64=${@bb.utils.contains("baselib", "lib64", "ON", "OFF",d)} \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" diff --git a/recipes-misc/recipes-multimedia/csound/files/0001-Do-not-set-include-path-to-usr-local-include.patch b/recipes-musicians/csound/files/0001-Do-not-set-include-path-to-usr-local-include.patch similarity index 100% rename from recipes-misc/recipes-multimedia/csound/files/0001-Do-not-set-include-path-to-usr-local-include.patch rename to recipes-musicians/csound/files/0001-Do-not-set-include-path-to-usr-local-include.patch diff --git a/recipes-misc/recipes-multimedia/csound/files/0002-Do-not-use-try_run-for-portaudio.patch b/recipes-musicians/csound/files/0002-Do-not-use-try_run-for-portaudio.patch similarity index 100% rename from recipes-misc/recipes-multimedia/csound/files/0002-Do-not-use-try_run-for-portaudio.patch rename to recipes-musicians/csound/files/0002-Do-not-use-try_run-for-portaudio.patch diff --git a/recipes-misc/recipes-multimedia/csound/files/0003-strict-aliasing-errors.patch b/recipes-musicians/csound/files/0003-strict-aliasing-errors.patch similarity index 100% rename from recipes-misc/recipes-multimedia/csound/files/0003-strict-aliasing-errors.patch rename to recipes-musicians/csound/files/0003-strict-aliasing-errors.patch diff --git a/recipes-misc/recipes-multimedia/csound/files/0004-Engine-csound_orc_semantics.c-Fix-build-with-gcc8.patch b/recipes-musicians/csound/files/0004-Engine-csound_orc_semantics.c-Fix-build-with-gcc8.patch similarity index 100% rename from recipes-misc/recipes-multimedia/csound/files/0004-Engine-csound_orc_semantics.c-Fix-build-with-gcc8.patch rename to recipes-musicians/csound/files/0004-Engine-csound_orc_semantics.c-Fix-build-with-gcc8.patch diff --git a/recipes-misc/recipes-multimedia/csound/files/0005-InOut-pmidi.c-Fix-build-with-gcc8.patch b/recipes-musicians/csound/files/0005-InOut-pmidi.c-Fix-build-with-gcc8.patch similarity index 100% rename from recipes-misc/recipes-multimedia/csound/files/0005-InOut-pmidi.c-Fix-build-with-gcc8.patch rename to recipes-musicians/csound/files/0005-InOut-pmidi.c-Fix-build-with-gcc8.patch diff --git a/recipes-misc/recipes-multimedia/csound/files/0006-fixed-unsafe-use-of-strncpy.patch b/recipes-musicians/csound/files/0006-fixed-unsafe-use-of-strncpy.patch similarity index 100% rename from recipes-misc/recipes-multimedia/csound/files/0006-fixed-unsafe-use-of-strncpy.patch rename to recipes-musicians/csound/files/0006-fixed-unsafe-use-of-strncpy.patch diff --git a/recipes-misc/recipes-multimedia/csound/files/0007-util1-csd_util-cs.c-Fix-build-with-gcc8.patch b/recipes-musicians/csound/files/0007-util1-csd_util-cs.c-Fix-build-with-gcc8.patch similarity index 100% rename from recipes-misc/recipes-multimedia/csound/files/0007-util1-csd_util-cs.c-Fix-build-with-gcc8.patch rename to recipes-musicians/csound/files/0007-util1-csd_util-cs.c-Fix-build-with-gcc8.patch diff --git a/recipes-misc/recipes-multimedia/csound/files/0008-Fix-build-with-fluidsynth-version-2.0.0.patch b/recipes-musicians/csound/files/0008-Fix-build-with-fluidsynth-version-2.0.0.patch similarity index 100% rename from recipes-misc/recipes-multimedia/csound/files/0008-Fix-build-with-fluidsynth-version-2.0.0.patch rename to recipes-musicians/csound/files/0008-Fix-build-with-fluidsynth-version-2.0.0.patch diff --git a/recipes-misc/recipes-multimedia/device-control/lpd8editor/files/lpd8-editor.desktop b/recipes-musicians/device-control/lpd8editor/files/lpd8-editor.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/device-control/lpd8editor/files/lpd8-editor.desktop rename to recipes-musicians/device-control/lpd8editor/files/lpd8-editor.desktop diff --git a/recipes-misc/recipes-multimedia/device-control/lpd8editor/lpd8editor_0.0.10.bb b/recipes-musicians/device-control/lpd8editor/lpd8editor_0.0.10.bb similarity index 74% rename from recipes-misc/recipes-multimedia/device-control/lpd8editor/lpd8editor_0.0.10.bb rename to recipes-musicians/device-control/lpd8editor/lpd8editor_0.0.10.bb index bdf5e303..a2b47701 100644 --- a/recipes-misc/recipes-multimedia/device-control/lpd8editor/lpd8editor_0.0.10.bb +++ b/recipes-musicians/device-control/lpd8editor/lpd8editor_0.0.10.bb @@ -14,11 +14,11 @@ SRC_URI = " \ git://github.com/charlesfleche/lpd8editor.git \ file://lpd8-editor.desktop \ " -SRCREV = "bd15bd689329194a3c5c3d727c2318629b027e3a" -PV = "0.0.10" +SRCREV = "5ca6f2b90889893e0633b23ffe0e4a014096656a" +PV = "0.0.12" S = "${WORKDIR}/git" do_install_append() { install -Dm 644 ${WORKDIR}/lpd8-editor.desktop ${D}/${datadir}/applications/lpd8-editor.desktop - install -Dm 644 ${S}/icon.svg ${D}/${datadir}/icons/hicolor/scalable/apps/lpd8-editor.svg + install -Dm 644 ${S}/lpd8editor.svg ${D}/${datadir}/icons/hicolor/scalable/apps/lpd8-editor.svg } diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports-extra.bb b/recipes-musicians/distrho/distrho-ports-extra.bb similarity index 91% rename from recipes-misc/recipes-multimedia/distrho/distrho-ports-extra.bb rename to recipes-musicians/distrho/distrho-ports-extra.bb index 0ca09a7f..8ca9ba41 100644 --- a/recipes-misc/recipes-multimedia/distrho/distrho-ports-extra.bb +++ b/recipes-musicians/distrho/distrho-ports-extra.bb @@ -20,7 +20,7 @@ PV = "0.0.0+git${SRCPV}" REQUIRED_DISTRO_FEATURES = "x11 opengl" -inherit lv2-postinst-helper distro_features_check +inherit lv2-postinst-helper distro_features_check pack_audio_plugins # distro-ports dependency for special hack script / libs DEPENDS += " \ @@ -59,9 +59,11 @@ do_install() { FILES_${PN} += " \ ${libdir}/cabbage* \ - ${libdir}/lv2 \ - ${libdir}/vst \ " +# for common (?) cabbage files +RDEPENDS_${PN}-lv2 += "${PN}" +RDEPENDS_${PN}-vst += "${PN}" + # Have not found what causes stripping - debugging of plugins is unlikely INSANE_SKIP_${PN} = "already-stripped" diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb b/recipes-musicians/distrho/distrho-ports.bb similarity index 95% rename from recipes-misc/recipes-multimedia/distrho/distrho-ports.bb rename to recipes-musicians/distrho/distrho-ports.bb index dd89def5..be008e6d 100644 --- a/recipes-misc/recipes-multimedia/distrho/distrho-ports.bb +++ b/recipes-musicians/distrho/distrho-ports.bb @@ -31,7 +31,7 @@ SRC_URI[linuxsynths-vex-patches2.sha256sum] = "378cff261dab333c5f29246b6f3f557e0 REQUIRED_DISTRO_FEATURES = "x11 opengl" -inherit lv2-postinst-helper distro_features_check +inherit lv2-postinst-helper distro_features_check pack_audio_plugins DEPENDS += " \ premake3-native \ @@ -82,12 +82,7 @@ do_install() { } PACKAGES =+ "${PN}-presets" -RDEPENDS_${PN}-presets = "${PN}" - -FILES_${PN} += " \ - ${libdir}/lv2 \ - ${libdir}/vst \ -" +RDEPENDS_${PN}-presets = "${PN}-lv2" FILES_${PN}-presets = "${libdir}/lv2/*.preset.lv2" diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch b/recipes-musicians/distrho/distrho-ports/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch similarity index 100% rename from recipes-misc/recipes-multimedia/distrho/distrho-ports/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch rename to recipes-musicians/distrho/distrho-ports/0001-disable-pitchedDelay-it-uses-double-precision-SSE2-b.patch diff --git a/recipes-misc/recipes-multimedia/distrho/distrho-ports/0002-Refine-Plugin-do-not-include-xmmintrin.h.patch b/recipes-musicians/distrho/distrho-ports/0002-Refine-Plugin-do-not-include-xmmintrin.h.patch similarity index 100% rename from recipes-misc/recipes-multimedia/distrho/distrho-ports/0002-Refine-Plugin-do-not-include-xmmintrin.h.patch rename to recipes-musicians/distrho/distrho-ports/0002-Refine-Plugin-do-not-include-xmmintrin.h.patch diff --git a/recipes-misc/recipes-multimedia/distrho/dpf-plugins.bb b/recipes-musicians/distrho/dpf-plugins.bb similarity index 58% rename from recipes-misc/recipes-multimedia/distrho/dpf-plugins.bb rename to recipes-musicians/distrho/dpf-plugins.bb index 2b411f0d..cf23774e 100644 --- a/recipes-misc/recipes-multimedia/distrho/dpf-plugins.bb +++ b/recipes-musicians/distrho/dpf-plugins.bb @@ -6,16 +6,15 @@ LIC_FILES_CHKSUM = " \ SRC_URI = " \ git://github.com/DISTRHO/DPF-Plugins.git \ - file://0001-Disable-modgui-we-don-t-support-modgui.patch \ " -SRCREV = "6454c590a2b5402195e655b1386358210e067dfd" +SRCREV = "3adff289617ed32f9d0cb679b05e430531cbf0dd" S = "${WORKDIR}/git" -PV = "v1.1" +PV = "v1.1+git${SRCPV}" REQUIRED_DISTRO_FEATURES = "x11 opengl" -inherit lv2-postinst-helper distro_features_check pkgconfig +inherit qemu-ext distro_features_check pkgconfig pack_audio_plugins # TODO standalones: DEPEND jack / install / *.desktop DEPENDS += " \ @@ -27,9 +26,18 @@ DEPENDS += " \ do_compile_prepend() { export NOOPT=true - rm -f ${LV2-TURTLE-BUILD-DATA} - # manipulate Makefile/scripts to keep lv2_ttl_generator-calls in script for lv2-postinst-helper - sed -i 's|$GEN ./$FILE|echo lv2-ttl-generator `pwd`/$FILE >> ${LV2-TURTLE-BUILD-DATA}|g' ${S}/dpf/utils/generate-ttl.sh + rm -f ${WORKDIR}/lv2_ttl_generator-data + # manipulate scripts to keep lv2_ttl_generator-calls in script for qemu + sed -i 's|"$GEN" "./$FILE"|echo `pwd`/$FILE >> ${WORKDIR}/lv2_ttl_generator-data|g' ${S}/dpf/utils/generate-ttl.sh +} + +do_compile_append() { + # build ttl-files must be done in quemu + for sofile in `cat ${WORKDIR}/lv2_ttl_generator-data`; do + cd `dirname ${sofile}` + echo "QEMU lv2_ttl_generator for ${sofile}..." + ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${S}/dpf/utils/lv2_ttl_generator')} ${sofile} || echo "ERROR: for QEMU lv2_ttl_generator for ${sofile}!" + done } do_install() { @@ -42,7 +50,7 @@ do_install() { for plugindir in `find ${S}/bin/ -maxdepth 1 -name *.lv2`; do lv2dir=${D}${libdir}/lv2/`basename $plugindir` install -d $lv2dir - for plugin in `find $plugindir -name *.so`; do + for plugin in `find $plugindir -type f`; do install -m 644 $plugin $lv2dir/ done done @@ -53,11 +61,5 @@ do_install() { done } -FILES_${PN} += " \ - ${libdir}/ladspa \ - ${libdir}/lv2 \ - ${libdir}/vst \ -" - # Have not found what causes stripping - debugging of plugins is unlikely INSANE_SKIP_${PN} = "already-stripped" diff --git a/recipes-misc/recipes-multimedia/distrho/lv2-ttl-generator.bb b/recipes-musicians/distrho/lv2-ttl-generator.bb similarity index 100% rename from recipes-misc/recipes-multimedia/distrho/lv2-ttl-generator.bb rename to recipes-musicians/distrho/lv2-ttl-generator.bb diff --git a/recipes-musicians/drmr/drmr/0001-CMake-Keep-build-system-flags.patch b/recipes-musicians/drmr/drmr/0001-CMake-Keep-build-system-flags.patch new file mode 100644 index 00000000..ddf4931f --- /dev/null +++ b/recipes-musicians/drmr/drmr/0001-CMake-Keep-build-system-flags.patch @@ -0,0 +1,36 @@ +From bc0b880e8f6c352d3ad6f6af02beb4e4c9d82bcb Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 18 Jan 2019 19:15:57 +0100 +Subject: [PATCH] CMake: Keep build system flags +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes builds for cross/sysrooted build systems which set lots of flags to +tailor build. + +Upstream-Status: Submitted [1] + +[1] https://github.com/nicklan/drmr/pull/22 + +Signed-off-by: Andreas Müller +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7380842..1d0e174 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.6) + project (DrMr) + + set(LV2_INSTALL_DIR lib/lv2 CACHE PATH "Specifies where the LV2 libraries should be installed") +-set(CMAKE_C_FLAGS "-Wall") ++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") + + # Availble options + option(USE_NKNOB "Use custom NKnob widgets for gain/pan instead of Gtk sliders" ON) +-- +2.20.1 + diff --git a/recipes-musicians/drmr/drmr_git.bb b/recipes-musicians/drmr/drmr_git.bb new file mode 100644 index 00000000..26fa5a33 --- /dev/null +++ b/recipes-musicians/drmr/drmr_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "An LV2 sampler plugin that plays hydrogen drum kits " +HOMEPAGE = "https://github.com/nicklan/drmr" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +DEPENDS += " \ + libsndfile1 \ + libsamplerate0 \ + lv2 \ + expat \ + gtk+ \ +" + +inherit cmake pkgconfig + +SRC_URI = " \ + git://github.com/nicklan/drmr.git;branch=lv2unstable \ + file://0001-CMake-Keep-build-system-flags.patch \ +" +SRCREV = "f244f3b09bb290dd6a4b9c14d4abaf69e9861f9d" +S = "${WORKDIR}/git" +PV = "0.0.0+git${SRCPV}" + + +EXTRA_OECMAKE = " \ + -DLV2_INSTALL_DIR:PATH=${baselib}/lv2 \ +" + +FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-musicians/drobilla/files/0001-Do-not-inject-usr-local-include-to-include-paths.patch b/recipes-musicians/drobilla/files/0001-Do-not-inject-usr-local-include-to-include-paths.patch new file mode 100644 index 00000000..90dd363a --- /dev/null +++ b/recipes-musicians/drobilla/files/0001-Do-not-inject-usr-local-include-to-include-paths.patch @@ -0,0 +1,31 @@ +From 36b834661ac4169db20c682bddfdcdf96df5a2f7 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 19 Jan 2019 00:44:13 +0100 +Subject: [PATCH] Do not inject /usr/local/include to include paths +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller +--- + waflib/extras/autowaf.py | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/waflib/extras/autowaf.py b/waflib/extras/autowaf.py +index feaae3c6..119c95b5 100644 +--- a/waflib/extras/autowaf.py ++++ b/waflib/extras/autowaf.py +@@ -189,8 +189,6 @@ def check_pkg(conf, name, **args): + if 'COMPILER_CXX' in conf.env: + conf.env.append_value('CXXFLAGS', ['-isystem', path]) + +- conf.env.append_value('CXXFLAGS', ['-isystem', '/usr/local/include']) +- + def normpath(path): + if sys.platform == 'win32': + return os.path.normpath(path).replace('\\', '/') +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/drobilla/ganv_1.4.2.bb b/recipes-musicians/drobilla/ganv_git.bb similarity index 63% rename from recipes-misc/recipes-multimedia/drobilla/ganv_1.4.2.bb rename to recipes-musicians/drobilla/ganv_git.bb index c94b4462..23400791 100644 --- a/recipes-misc/recipes-multimedia/drobilla/ganv_1.4.2.bb +++ b/recipes-musicians/drobilla/ganv_git.bb @@ -12,6 +12,10 @@ DEPENDS += " \ gtkmm \ " -SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "30c2c36d0c64d0a3b73e0bc7c564861c" -SRC_URI[sha256sum] = "145028ade1567f258de6ad58ad0f7941646208d261028a9b74eb61126e2dfa3c" +SRC_URI = " \ + git://git.drobilla.net/ganv.git;protocol=http \ + file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \ +" +SRCREV = "ccc9b971ab206fa3dc32a432a3e76db976192f58" +S = "${WORKDIR}/git" +PV = "1.4.2+git${SRCPV}" diff --git a/recipes-musicians/drobilla/ingen_git.bb b/recipes-musicians/drobilla/ingen_git.bb new file mode 100644 index 00000000..62f4b7d9 --- /dev/null +++ b/recipes-musicians/drobilla/ingen_git.bb @@ -0,0 +1,57 @@ +SUMMARY = "Ingen is a modular audio processing system for Jack and LV2 based systems" +HOMEPAGE = "http://drobilla.net/software/ingen" +LICENSE = "AGPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=73f1eb20517c55bf9493b7dd6e480788" + +inherit waf pkgconfig gtk-icon-cache pack_audio_plugins pythonnative + +DEPENDS += " \ + boost \ + gtkmm \ + lilv \ + suil \ + raul \ + ganv \ + portaudio-v19 \ +" + +SRC_URI = " \ + git://github.com/drobilla/ingen.git \ + file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \ +" +SRCREV = "cc3d7ef610e5f93086eb46406cc600ee81a23e98" +S = "${WORKDIR}/git" +PV = "0.5.1+git${SRCPV}" + +DOCDEPENDS = " \ + lv2-native \ + doxygen-native \ + graphviz-native \ + gdk-pixbuf-native \ + libpng-native \ + python-rdflib-native \ + python-isodate-native \ + python-six-native \ +" +PACKAGECONFIG[doc] = "--docs,,${DOCDEPENDS}" + +PACKAGES =+ "${PN}-standalone ${PN}-python" + +FILES_SOLIBSDEV = "${libdir}/libingen${SOLIBSDEV}" + +FILES_${PN} += " \ + ${libdir}/libingen_*.so \ +" + +FILES_${PN}-standalone = " \ + ${datadir}/applications \ + ${datadir}/icons \ + ${bindir}/ingen \ +" + +# pyton tools are not expected to work: we do not have rdflib yet +FILES_${PN}-python = " \ + ${bindir}/ingenams \ + ${bindir}/ingenish \ + ${PYTHON_SITEPACKAGES_DIR} \ +" diff --git a/recipes-musicians/drobilla/jalv_git.bb b/recipes-musicians/drobilla/jalv_git.bb new file mode 100644 index 00000000..155e5938 --- /dev/null +++ b/recipes-musicians/drobilla/jalv_git.bb @@ -0,0 +1,32 @@ +SUMMARY = "Jalv is a simple but fully featured LV2 host for Jack" +HOMEPAGE = "http://drobilla.net/software/jalv" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=eb60cfffc455677d4f11cf7f36c12093" + +inherit waf pkgconfig gtk-icon-cache + +DEPENDS += " \ + qtbase-native \ + lv2 \ + lilv \ + serd \ + sord \ + sratom \ + suil \ + jack \ + gtkmm \ + gtk+3 \ + qtbase \ +" + +SRC_URI = " \ + git://github.com/drobilla/jalv.git \ + file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \ +" +SRCREV = "8311df91cc212adf3220acfcb50ab63414fe9dd6" +S = "${WORKDIR}/git" +PV = "1.6.0+git${SRCPV}" + +FILES_${PN} += " \ + ${libdir}/jack \ +" diff --git a/recipes-misc/recipes-multimedia/drobilla/lilv_0.24.2.bb b/recipes-musicians/drobilla/lilv_0.24.4.bb similarity index 62% rename from recipes-misc/recipes-multimedia/drobilla/lilv_0.24.2.bb rename to recipes-musicians/drobilla/lilv_0.24.4.bb index 6b28fcbc..ed1aac7b 100644 --- a/recipes-misc/recipes-multimedia/drobilla/lilv_0.24.2.bb +++ b/recipes-musicians/drobilla/lilv_0.24.4.bb @@ -8,7 +8,7 @@ inherit waf bash-completion pkgconfig DEPENDS += "lv2 serd sord sratom" SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "cae7e1700f83b0f1272f437919a68458" -SRC_URI[sha256sum] = "f7ec65b1c1f1734ded3a6c051bbaf50f996a0b8b77e814a33a34e42bce50a522" +SRC_URI[md5sum] = "fb340958a6df5a683bf25e291493dc4d" +SRC_URI[sha256sum] = "c33b84b7a6e8e8fffb412fbcd6f69e59ca297ef3e29d829249b4ccc94f634438" -EXTRA_OECONF = "--configdir=${sysconfdir}" +EXTRA_OECONF = "--configdir=${sysconfdir} --dyn-manifest" diff --git a/recipes-musicians/drobilla/lv2-native.bb b/recipes-musicians/drobilla/lv2-native.bb new file mode 100644 index 00000000..c7ed05f7 --- /dev/null +++ b/recipes-musicians/drobilla/lv2-native.bb @@ -0,0 +1,5 @@ +require ${BPN}.inc + +inherit native + + diff --git a/recipes-misc/recipes-multimedia/lv2/lv2.bb b/recipes-musicians/drobilla/lv2.bb similarity index 84% rename from recipes-misc/recipes-multimedia/lv2/lv2.bb rename to recipes-musicians/drobilla/lv2.bb index 7372a44b..9dc05861 100644 --- a/recipes-misc/recipes-multimedia/lv2/lv2.bb +++ b/recipes-musicians/drobilla/lv2.bb @@ -1,7 +1,5 @@ require ${BPN}.inc -inherit waf pkgconfig - DEPENDS = "gtk+ libsndfile1" EXTRA_OECONF = "--libdir=${libdir}" diff --git a/recipes-musicians/drobilla/lv2.inc b/recipes-musicians/drobilla/lv2.inc new file mode 100644 index 00000000..48f3dd45 --- /dev/null +++ b/recipes-musicians/drobilla/lv2.inc @@ -0,0 +1,13 @@ +SUMMARY = "LV2 is an open standard for audio plugins" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=0383f162366b0c5a316292759a55d292" + +SRC_URI = " \ + git://github.com/drobilla/lv2.git \ + file://0001-Output-more-details-on-import-error-to-catch-missing.patch \ +" +S = "${WORKDIR}/git" +SRCREV = "96a6283a5fe023c59113242631f337da5f0eb278" +PV = "1.14.0+git${SRCPV}" + +inherit waf pkgconfig diff --git a/recipes-musicians/drobilla/lv2/0001-Output-more-details-on-import-error-to-catch-missing.patch b/recipes-musicians/drobilla/lv2/0001-Output-more-details-on-import-error-to-catch-missing.patch new file mode 100644 index 00000000..9fbcb69e --- /dev/null +++ b/recipes-musicians/drobilla/lv2/0001-Output-more-details-on-import-error-to-catch-missing.patch @@ -0,0 +1,56 @@ +From bc96caf97d32168abefde038e9353685a14fa64d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 21 Jan 2019 22:38:05 +0100 +Subject: [PATCH] Output more details on import error to catch missing + dependencies +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Updream-Status: Pending + +Signed-off-by: Andreas Müller +--- + lv2specgen/lv2docgen.py | 3 ++- + lv2specgen/lv2specgen.py | 6 ++++-- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/lv2specgen/lv2docgen.py b/lv2specgen/lv2docgen.py +index 23a239d..685f32e 100755 +--- a/lv2specgen/lv2docgen.py ++++ b/lv2specgen/lv2docgen.py +@@ -28,7 +28,8 @@ __contact__ = 'devel@lists.lv2plug.in' + + try: + import rdflib +-except ImportError: ++except ImportError as imperror: ++ print(imperror) + sys.exit('Error importing rdflib') + + doap = rdflib.Namespace('http://usefulinc.com/ns/doap#') +diff --git a/lv2specgen/lv2specgen.py b/lv2specgen/lv2specgen.py +index ddd0ba5..c86157e 100755 +--- a/lv2specgen/lv2specgen.py ++++ b/lv2specgen/lv2specgen.py +@@ -63,13 +63,15 @@ try: + from pygments.lexer import RegexLexer, include, bygroups + from pygments.token import Text, Comment, Operator, Keyword, Name, String, Literal, Punctuation + have_pygments = True +-except ImportError: ++except ImportError as imperror: ++ print(imperror) + print("Error importing pygments, syntax highlighting disabled") + have_pygments = False + + try: + import rdflib +-except ImportError: ++except ImportError as imperror: ++ print(imperror) + sys.exit("Error importing rdflib") + + # Global Variables +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/drobilla/mda-lv2_1.2.2.bb b/recipes-musicians/drobilla/mda-lv2_1.2.2.bb similarity index 91% rename from recipes-misc/recipes-multimedia/drobilla/mda-lv2_1.2.2.bb rename to recipes-musicians/drobilla/mda-lv2_1.2.2.bb index aadaea98..20187eee 100644 --- a/recipes-misc/recipes-multimedia/drobilla/mda-lv2_1.2.2.bb +++ b/recipes-musicians/drobilla/mda-lv2_1.2.2.bb @@ -13,5 +13,9 @@ SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "1962f48c54eafe52a3d2471cd3072aa8" SRC_URI[sha256sum] = "a476c31ed9f8b009ebacc32a02d06ba9584c0d0d03f03dd62b1354d10a030442" +EXTRA_OECONF = " \ + --lv2dir=${libdir}/lv2 \ +" + FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-misc/recipes-multimedia/drobilla/patchage_1.0.0.bb b/recipes-musicians/drobilla/patchage_git.bb similarity index 62% rename from recipes-misc/recipes-multimedia/drobilla/patchage_1.0.0.bb rename to recipes-musicians/drobilla/patchage_git.bb index 262be20b..05749cc9 100644 --- a/recipes-misc/recipes-multimedia/drobilla/patchage_1.0.0.bb +++ b/recipes-musicians/drobilla/patchage_git.bb @@ -12,10 +12,10 @@ DEPENDS += " \ ganv \ " -SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "d16a3fc045faff7fd70f3b4769b65698" -SRC_URI[sha256sum] = "6b21d74ef1b54fa62be8d6ba65ca8b61c7b6b5230cc85e093527081239bfeda9" - -FILES_${PN} += " \ - ${datadir}/icons \ +SRC_URI = " \ + git://git.drobilla.net/patchage.git;protocol=http \ + file://0001-Do-not-inject-usr-local-include-to-include-paths.patch \ " +SRCREV = "b69a38d171758c6e979d74541fc21d12b7e6abda" +PV = "1.0.0+git${SRCPV}" +S = "${WORKDIR}/git" diff --git a/recipes-musicians/drobilla/raul_git.bb b/recipes-musicians/drobilla/raul_git.bb new file mode 100644 index 00000000..5fc451b4 --- /dev/null +++ b/recipes-musicians/drobilla/raul_git.bb @@ -0,0 +1,12 @@ +SUMMARY = "Raul is a utility library primarily aimed at audio/musical applications" +DESCRIPTION = "Raul (Realtime Audio Utility Library) is a C++ utility library primarily aimed at audio/musical applications" +HOMEPAGE = "https://drobilla.net/software/raul" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +inherit waf + +SRC_URI = "git://github.com/drobilla/raul.git" +SRCREV = "5eb7a555de2291f4df8c75ce261c555552725beb" +S = "${WORKDIR}/git" +PV = "0.8.10+git${SRCPV}" diff --git a/recipes-misc/recipes-multimedia/drobilla/serd_0.28.0.bb b/recipes-musicians/drobilla/serd_0.30.0.bb similarity index 67% rename from recipes-misc/recipes-multimedia/drobilla/serd_0.28.0.bb rename to recipes-musicians/drobilla/serd_0.30.0.bb index d0e20cbc..d64043f9 100644 --- a/recipes-misc/recipes-multimedia/drobilla/serd_0.28.0.bb +++ b/recipes-musicians/drobilla/serd_0.30.0.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7aceb3a3edc99517b08f5cdd557e11fb" inherit waf SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "21480095ad8919d4716bbd1a1bfc36c9" -SRC_URI[sha256sum] = "1df21a8874d256a9f3d51a18b8c6e2539e8092b62cc2674b110307e93f898aec" +SRC_URI[md5sum] = "82243362b8b5a47dd46dac7ae893f562" +SRC_URI[sha256sum] = "6efb0efa5c2155e6bbac941cddeeabb7ed26d70a57d24178894ff169d8f6cefb" diff --git a/recipes-misc/recipes-multimedia/drobilla/sord_0.16.0.bb b/recipes-musicians/drobilla/sord_0.16.2.bb similarity index 68% rename from recipes-misc/recipes-multimedia/drobilla/sord_0.16.0.bb rename to recipes-musicians/drobilla/sord_0.16.2.bb index a0dd7178..191cfc47 100644 --- a/recipes-misc/recipes-multimedia/drobilla/sord_0.16.0.bb +++ b/recipes-musicians/drobilla/sord_0.16.2.bb @@ -8,5 +8,5 @@ inherit waf pkgconfig DEPENDS += "libpcre serd" SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "010313c3baf5b8a4a639e9ee45310af6" -SRC_URI[sha256sum] = "9d3cb2c9966e93f537f37377171f162023cea6784ca069699be4a7770c8a035a" +SRC_URI[md5sum] = "eb1d1c62ffb5153d5e1f5d12a3b7279b" +SRC_URI[sha256sum] = "09f51174dd8f3efbd95f44f0bb0b165f08e066e052d40095de59de787987da8d" diff --git a/recipes-misc/recipes-multimedia/drobilla/sratom_0.6.0.bb b/recipes-musicians/drobilla/sratom_0.6.2.bb similarity index 69% rename from recipes-misc/recipes-multimedia/drobilla/sratom_0.6.0.bb rename to recipes-musicians/drobilla/sratom_0.6.2.bb index 74a38024..a5de2fe3 100644 --- a/recipes-misc/recipes-multimedia/drobilla/sratom_0.6.0.bb +++ b/recipes-musicians/drobilla/sratom_0.6.2.bb @@ -8,5 +8,5 @@ inherit waf pkgconfig DEPENDS += "lv2 serd sord" SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "76f085e6d41bba57f4dc2a5ffeff9dde" -SRC_URI[sha256sum] = "440ac2b1f4f0b7878f8b95698faa1e8f8c50929a498f68ec5d066863626a3d43" +SRC_URI[md5sum] = "aa3c540032da43cf6cf68f684983d7f5" +SRC_URI[sha256sum] = "0a514a55d6b6cb7b5d6f32d1dcb78a1e6e54537fa22fce533e4ef6adf240e853" diff --git a/recipes-musicians/drobilla/suil/0001-Do-not-try-to-build-macOS-cocoa.patch b/recipes-musicians/drobilla/suil/0001-Do-not-try-to-build-macOS-cocoa.patch new file mode 100644 index 00000000..7e3b6993 --- /dev/null +++ b/recipes-musicians/drobilla/suil/0001-Do-not-try-to-build-macOS-cocoa.patch @@ -0,0 +1,41 @@ +From e557abec62aa4c9c90ae50db3fe938a97e910288 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 26 Dec 2018 22:39:08 +0100 +Subject: [PATCH] Do not try to build macOS cocoa +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Seems the headers are installed for unknown reason - so make sure support is +remains disabled. + +Fixes: +| arm-mortsgna-linux-gnueabi-g++: error: ../suil-0.10.2/src/cocoa_in_qt5.mm: Objective-C++ compiler not installed on this system + +Upstream-Status: Pending [1] + +[1] https://github.com/drobilla/suil/issues/6 + +Signed-off-by: Andreas Müller +--- + wscript | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/wscript b/wscript +index 89ab039..352e569 100644 +--- a/wscript ++++ b/wscript +@@ -91,10 +91,6 @@ def configure(conf): + if not conf.options.no_qt5: + autowaf.check_pkg(conf, 'Qt5Widgets', uselib_store='QT5', + atleast_version='5.1.0', mandatory=False) +- if conf.check_cxx(header_name = 'QMacCocoaViewContainer', +- uselib = 'QT5', +- mandatory = False): +- autowaf.define(conf, 'SUIL_WITH_COCOA_IN_QT5', 1) + + conf.check_cc(define_name = 'HAVE_LIBDL', + lib = 'dl', +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/drobilla/suil_0.10.0.bb b/recipes-musicians/drobilla/suil_0.10.2.bb similarity index 57% rename from recipes-misc/recipes-multimedia/drobilla/suil_0.10.0.bb rename to recipes-musicians/drobilla/suil_0.10.2.bb index f7752553..db98100d 100644 --- a/recipes-misc/recipes-multimedia/drobilla/suil_0.10.0.bb +++ b/recipes-musicians/drobilla/suil_0.10.2.bb @@ -9,8 +9,11 @@ REQUIRED_DISTRO_FEATURES = "x11" DEPENDS = "gtk+ gtk+3 qtbase lv2" -SRC_URI = "http://download.drobilla.net/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "ba2f6bf631d8f3686772c2b5c9467628" -SRC_URI[sha256sum] = "9895c531f80c7e89a2b4b47de589d73b70bf48db0b0cfe56e5d54237ea4b8848" +SRC_URI = " \ + http://download.drobilla.net/${BPN}-${PV}.tar.bz2 \ + file://0001-Do-not-try-to-build-macOS-cocoa.patch \ +" +SRC_URI[md5sum] = "e92d656b5faf999226642cdbe595976d" +SRC_URI[sha256sum] = "9f445910627fb30f4c182b9ee00d1030324910d8a9ce7c9654c34465411da401" FILES_${PN} += "${libdir}/suil-0" diff --git a/recipes-misc/recipes-multimedia/drumgizmo/drumgizmo-native.bb b/recipes-musicians/drumgizmo/drumgizmo-native.bb similarity index 100% rename from recipes-misc/recipes-multimedia/drumgizmo/drumgizmo-native.bb rename to recipes-musicians/drumgizmo/drumgizmo-native.bb diff --git a/recipes-misc/recipes-multimedia/drumgizmo/drumgizmo.bb b/recipes-musicians/drumgizmo/drumgizmo.bb similarity index 100% rename from recipes-misc/recipes-multimedia/drumgizmo/drumgizmo.bb rename to recipes-musicians/drumgizmo/drumgizmo.bb diff --git a/recipes-misc/recipes-multimedia/drumgizmo/drumgizmo.inc b/recipes-musicians/drumgizmo/drumgizmo.inc similarity index 100% rename from recipes-misc/recipes-multimedia/drumgizmo/drumgizmo.inc rename to recipes-musicians/drumgizmo/drumgizmo.inc diff --git a/recipes-misc/recipes-multimedia/drumgizmo/files/0001-automake-enable-subdir-objects.patch b/recipes-musicians/drumgizmo/files/0001-automake-enable-subdir-objects.patch similarity index 100% rename from recipes-misc/recipes-multimedia/drumgizmo/files/0001-automake-enable-subdir-objects.patch rename to recipes-musicians/drumgizmo/files/0001-automake-enable-subdir-objects.patch diff --git a/recipes-misc/recipes-multimedia/drumgizmo/files/0002-Use-native-rcgen.patch b/recipes-musicians/drumgizmo/files/0002-Use-native-rcgen.patch similarity index 100% rename from recipes-misc/recipes-multimedia/drumgizmo/files/0002-Use-native-rcgen.patch rename to recipes-musicians/drumgizmo/files/0002-Use-native-rcgen.patch diff --git a/recipes-misc/recipes-multimedia/drumgizmo/files/drumgizmo.desktop b/recipes-musicians/drumgizmo/files/drumgizmo.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/drumgizmo/files/drumgizmo.desktop rename to recipes-musicians/drumgizmo/files/drumgizmo.desktop diff --git a/recipes-misc/recipes-multimedia/drumstick/drumstick_1.1.1.bb b/recipes-musicians/drumstick/drumstick_1.1.1.bb similarity index 100% rename from recipes-misc/recipes-multimedia/drumstick/drumstick_1.1.1.bb rename to recipes-musicians/drumstick/drumstick_1.1.1.bb diff --git a/recipes-misc/recipes-multimedia/drumstick/files/0001-Do-not-set-lib-suffix-oe-will-take-care.patch b/recipes-musicians/drumstick/files/0001-Do-not-set-lib-suffix-oe-will-take-care.patch similarity index 100% rename from recipes-misc/recipes-multimedia/drumstick/files/0001-Do-not-set-lib-suffix-oe-will-take-care.patch rename to recipes-musicians/drumstick/files/0001-Do-not-set-lib-suffix-oe-will-take-care.patch diff --git a/recipes-misc/recipes-multimedia/dssi-vst/dssi-vst_git.bb b/recipes-musicians/dssi-vst/dssi-vst_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/dssi-vst/dssi-vst_git.bb rename to recipes-musicians/dssi-vst/dssi-vst_git.bb diff --git a/recipes-misc/recipes-multimedia/dssi/dssi_1.1.1.bb b/recipes-musicians/dssi/dssi_1.1.1.bb similarity index 100% rename from recipes-misc/recipes-multimedia/dssi/dssi_1.1.1.bb rename to recipes-musicians/dssi/dssi_1.1.1.bb diff --git a/recipes-misc/recipes-multimedia/gmidimonitor/files/gmidimonitor-alsa.desktop b/recipes-musicians/gmidimonitor/files/gmidimonitor-alsa.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/gmidimonitor/files/gmidimonitor-alsa.desktop rename to recipes-musicians/gmidimonitor/files/gmidimonitor-alsa.desktop diff --git a/recipes-misc/recipes-multimedia/gmidimonitor/files/gmidimonitor-jack.desktop b/recipes-musicians/gmidimonitor/files/gmidimonitor-jack.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/gmidimonitor/files/gmidimonitor-jack.desktop rename to recipes-musicians/gmidimonitor/files/gmidimonitor-jack.desktop diff --git a/recipes-misc/recipes-multimedia/gmidimonitor/gmidimonitor_3.6.bb b/recipes-musicians/gmidimonitor/gmidimonitor_3.6.bb similarity index 100% rename from recipes-misc/recipes-multimedia/gmidimonitor/gmidimonitor_3.6.bb rename to recipes-musicians/gmidimonitor/gmidimonitor_3.6.bb diff --git a/recipes-misc/recipes-multimedia/guitarix/files/0001-do-not-perform-link-test-durin-cross-build.patch b/recipes-musicians/guitarix/guitarix/0001-do-not-perform-link-test-durin-cross-build.patch similarity index 100% rename from recipes-misc/recipes-multimedia/guitarix/files/0001-do-not-perform-link-test-durin-cross-build.patch rename to recipes-musicians/guitarix/guitarix/0001-do-not-perform-link-test-durin-cross-build.patch diff --git a/recipes-misc/recipes-multimedia/guitarix/guitarix_0.37.3.bb b/recipes-musicians/guitarix/guitarix_0.37.3.bb similarity index 100% rename from recipes-misc/recipes-multimedia/guitarix/guitarix_0.37.3.bb rename to recipes-musicians/guitarix/guitarix_0.37.3.bb diff --git a/recipes-musicians/guitarix/gxplugins.lv2/0001-Adjust-Makefiles-for-cross-compiling.patch b/recipes-musicians/guitarix/gxplugins.lv2/0001-Adjust-Makefiles-for-cross-compiling.patch new file mode 100644 index 00000000..af8d607b --- /dev/null +++ b/recipes-musicians/guitarix/gxplugins.lv2/0001-Adjust-Makefiles-for-cross-compiling.patch @@ -0,0 +1,826 @@ +From 50092b8f2c5c2c6de3de90d97f75b6fd475b8b5d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 27 Jan 2019 00:37:05 +0100 +Subject: [PATCH] Adjust Makefiles for cross-compiling +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + GxAxisFace.lv2/Makefile | 36 +++--------------- + GxBoobTube.lv2/Makefile | 34 ++--------------- + GxBottleRocket.lv2/Makefile | 38 +++---------------- + .../gui/gx_bottlerocket_x11ui.c | 2 +- + GxCreamMachine.lv2/Makefile | 34 ++--------------- + GxDOP250.lv2/Makefile | 36 +++--------------- + GxFz1b.lv2/Makefile | 38 +++---------------- + GxFz1s.lv2/Makefile | 38 +++---------------- + GxGuvnor.lv2/Makefile | 32 ++-------------- + GxHeathkit.lv2/Makefile | 36 +++--------------- + GxHotBox.lv2/Makefile | 37 +++--------------- + GxHotBox.lv2/gui/gx_hotbox_x11ui.c | 2 +- + GxHyperion.lv2/Makefile | 32 ++-------------- + GxHyperion.lv2/gui/gx_hyperion_x11ui.c | 2 +- + GxKnightFuzz.lv2/Makefile | 36 +++--------------- + GxLiquidDrive.lv2/Makefile | 36 +++--------------- + GxMicroAmp.lv2/Makefile | 36 +++--------------- + GxQuack.lv2/Makefile | 38 +++---------------- + GxSD1.lv2/Makefile | 38 +++---------------- + GxSD2Lead.lv2/Makefile | 36 +++--------------- + GxSVT.lv2/Makefile | 36 +++--------------- + GxSaturator.lv2/Makefile | 32 ++-------------- + GxSlowGear.lv2/Makefile | 32 ++-------------- + GxSunFace.lv2/Makefile | 36 +++--------------- + GxSuperFuzz.lv2/Makefile | 32 ++-------------- + GxSuppaToneBender.lv2/Makefile | 32 ++-------------- + GxSuppaToneBender.lv2/gui/gx_vstb_x11ui.c | 2 +- + GxToneMachine.lv2/Makefile | 32 ++-------------- + GxTubeDistortion.lv2/Makefile | 36 +++--------------- + GxUVox720k.lv2/Makefile | 32 ++-------------- + GxVBassPreAmp.lv2/Makefile | 38 +++---------------- + GxVBassPreAmp.lv2/gui/gx_voxbass_x11ui.c | 2 +- + GxValveCaster.lv2/Makefile | 36 +++--------------- + GxVintageFuzzMaster.lv2/Makefile | 32 ++-------------- + GxVmk2.lv2/Makefile | 34 ++--------------- + GxVoodoFuzz.lv2/Makefile | 32 ++-------------- + GxVoodoFuzz.lv2/gui/gx_voodoo_x11ui.c | 2 +- + 37 files changed, 145 insertions(+), 950 deletions(-) + +diff --git a/GxAxisFace.lv2/Makefile b/GxAxisFace.lv2/Makefile +index 1193800..ea27187 100644 +--- a/GxAxisFace.lv2/Makefile ++++ b/GxAxisFace.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,9 +49,9 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o + + clean : + @rm -f $(NAME).so +diff --git a/GxBoobTube.lv2/Makefile b/GxBoobTube.lv2/Makefile +index 66cf7eb..1f81fcd 100644 +--- a/GxBoobTube.lv2/Makefile ++++ b/GxBoobTube.lv2/Makefile +@@ -38,7 +12,7 @@ + -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -84,8 +58,8 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch.png + @$(ECHO) $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch.png -o pswitch.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch.png -o pswitch.o + + clean : + @rm -f $(NAME).so +diff --git a/GxBottleRocket.lv2/Makefile b/GxBottleRocket.lv2/Makefile +index e7efdcc..b01970f 100644 +--- a/GxBottleRocket.lv2/Makefile ++++ b/GxBottleRocket.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,10 +49,10 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o +- -@cd ./gui && ld -r -b binary frame.png -o frame.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o + + clean : + @rm -f $(NAME).so +diff --git a/GxCreamMachine.lv2/Makefile b/GxCreamMachine.lv2/Makefile +index 53c1dc6..a8b3604 100644 +--- a/GxCreamMachine.lv2/Makefile ++++ b/GxCreamMachine.lv2/Makefile +@@ -36,7 +10,7 @@ + # set compile flags + CXXFLAGS += -I. -I./dsp -I./plugin -I./dsp/zita-resampler-1.1.0 -I./dsp/zita-resampler-1.1.0/zita-resampler -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -73,8 +47,8 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch.png -o pswitch.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch.png -o pswitch.o + + clean : + @rm -f $(NAME).so +diff --git a/GxDOP250.lv2/Makefile b/GxDOP250.lv2/Makefile +index ba27784..a797bb4 100644 +--- a/GxDOP250.lv2/Makefile ++++ b/GxDOP250.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,9 +49,9 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o + + clean : + @rm -f $(NAME).so +diff --git a/GxFz1b.lv2/Makefile b/GxFz1b.lv2/Makefile +index 72df63a..6311726 100644 +--- a/GxFz1b.lv2/Makefile ++++ b/GxFz1b.lv2/Makefile +@@ -38,7 +12,7 @@ + -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,10 +49,10 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o +- -@cd ./gui && ld -r -b binary frame.png -o frame.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o + + clean : + @rm -f $(NAME).so +diff --git a/GxFz1s.lv2/Makefile b/GxFz1s.lv2/Makefile +index fd5af20..1de0565 100644 +--- a/GxFz1s.lv2/Makefile ++++ b/GxFz1s.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,10 +49,10 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o +- -@cd ./gui && ld -r -b binary frame.png -o frame.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o + + clean : + @rm -f $(NAME).so +diff --git a/GxGuvnor.lv2/Makefile b/GxGuvnor.lv2/Makefile +index 065acf1..5dc4406 100644 +--- a/GxGuvnor.lv2/Makefile ++++ b/GxGuvnor.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,7 +49,7 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o + + clean : + @rm -f $(NAME).so +diff --git a/GxHeathkit.lv2/Makefile b/GxHeathkit.lv2/Makefile +index 1669295..ae5ba5d 100644 +--- a/GxHeathkit.lv2/Makefile ++++ b/GxHeathkit.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,9 +49,9 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o + + clean : + @rm -f $(NAME).so +diff --git a/GxHotBox.lv2/Makefile b/GxHotBox.lv2/Makefile +index 8df2752..16d805f 100644 +--- a/GxHotBox.lv2/Makefile ++++ b/GxHotBox.lv2/Makefile +@@ -38,7 +13,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,10 +50,10 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o +- -@cd ./gui && ld -r -b binary frame.png -o frame.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o + + clean : + @rm -f $(NAME).so +diff --git a/GxHyperion.lv2/Makefile b/GxHyperion.lv2/Makefile +index 86f8b88..2bc01e0 100644 +--- a/GxHyperion.lv2/Makefile ++++ b/GxHyperion.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,7 +49,7 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o + + clean : + @rm -f $(NAME).so +diff --git a/GxKnightFuzz.lv2/Makefile b/GxKnightFuzz.lv2/Makefile +index 16d13b8..02a9713 100644 +--- a/GxKnightFuzz.lv2/Makefile ++++ b/GxKnightFuzz.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,9 +49,9 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o + + clean : + @rm -f $(NAME).so +diff --git a/GxLiquidDrive.lv2/Makefile b/GxLiquidDrive.lv2/Makefile +index 92796e6..537923d 100644 +--- a/GxLiquidDrive.lv2/Makefile ++++ b/GxLiquidDrive.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,9 +49,9 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o + + clean : + @rm -f $(NAME).so +diff --git a/GxMicroAmp.lv2/Makefile b/GxMicroAmp.lv2/Makefile +index 60818f0..556ade0 100644 +--- a/GxMicroAmp.lv2/Makefile ++++ b/GxMicroAmp.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,9 +49,9 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o + + clean : + @rm -f $(NAME).so +diff --git a/GxQuack.lv2/Makefile b/GxQuack.lv2/Makefile +index 2aed99f..a39c911 100644 +--- a/GxQuack.lv2/Makefile ++++ b/GxQuack.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -70,10 +44,10 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o +- -@cd ./gui && ld -r -b binary frame.png -o frame.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o + + clean : + @rm -f $(NAME).so +diff --git a/GxSD1.lv2/Makefile b/GxSD1.lv2/Makefile +index 3b98ee0..4cbfc6a 100644 +--- a/GxSD1.lv2/Makefile ++++ b/GxSD1.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,10 +49,10 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o +- -@cd ./gui && ld -r -b binary frame.png -o frame.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o + + clean : + @rm -f $(NAME).so +diff --git a/GxSD2Lead.lv2/Makefile b/GxSD2Lead.lv2/Makefile +index 7759f91..0f7bb91 100644 +--- a/GxSD2Lead.lv2/Makefile ++++ b/GxSD2Lead.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,9 +49,9 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o + + clean : + @rm -f $(NAME).so +diff --git a/GxSVT.lv2/Makefile b/GxSVT.lv2/Makefile +index 74a96a8..a8bc7f6 100644 +--- a/GxSVT.lv2/Makefile ++++ b/GxSVT.lv2/Makefile +@@ -38,7 +12,7 @@ + -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,9 +49,9 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o + + clean : + @rm -f $(NAME).so +diff --git a/GxSaturator.lv2/Makefile b/GxSaturator.lv2/Makefile +index 62aea02..5c71786 100644 +--- a/GxSaturator.lv2/Makefile ++++ b/GxSaturator.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,7 +49,7 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o + + clean : + @rm -f $(NAME).so +diff --git a/GxSlowGear.lv2/Makefile b/GxSlowGear.lv2/Makefile +index 6b236a1..ad72d70 100644 +--- a/GxSlowGear.lv2/Makefile ++++ b/GxSlowGear.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,7 +49,7 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o + + clean : + @rm -f $(NAME).so +diff --git a/GxSunFace.lv2/Makefile b/GxSunFace.lv2/Makefile +index 428539b..ded15f6 100644 +--- a/GxSunFace.lv2/Makefile ++++ b/GxSunFace.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,9 +49,9 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o + + clean : + @rm -f $(NAME).so +diff --git a/GxSuperFuzz.lv2/Makefile b/GxSuperFuzz.lv2/Makefile +index c3fe9f2..b102d7c 100644 +--- a/GxSuperFuzz.lv2/Makefile ++++ b/GxSuperFuzz.lv2/Makefile +@@ -38,7 +12,7 @@ + -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,7 +49,7 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o + + clean : + @rm -f $(NAME).so +diff --git a/GxSuppaToneBender.lv2/Makefile b/GxSuppaToneBender.lv2/Makefile +index ab640c2..e79fc1c 100644 +--- a/GxSuppaToneBender.lv2/Makefile ++++ b/GxSuppaToneBender.lv2/Makefile +@@ -38,7 +12,7 @@ + -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,7 +49,7 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o + + clean : + @rm -f $(NAME).so +diff --git a/GxToneMachine.lv2/Makefile b/GxToneMachine.lv2/Makefile +index 92b7825..43f3668 100644 +--- a/GxToneMachine.lv2/Makefile ++++ b/GxToneMachine.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,7 +49,7 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o + + clean : + @rm -f $(NAME).so +diff --git a/GxTubeDistortion.lv2/Makefile b/GxTubeDistortion.lv2/Makefile +index dfb58e5..1839ed7 100644 +--- a/GxTubeDistortion.lv2/Makefile ++++ b/GxTubeDistortion.lv2/Makefile +@@ -38,7 +12,7 @@ + -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,9 +49,9 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o + + clean : + @rm -f $(NAME).so +diff --git a/GxUVox720k.lv2/Makefile b/GxUVox720k.lv2/Makefile +index 3933ea2..705dd6c 100644 +--- a/GxUVox720k.lv2/Makefile ++++ b/GxUVox720k.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,7 +49,7 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o + + clean : + @rm -f $(NAME).so +diff --git a/GxVBassPreAmp.lv2/Makefile b/GxVBassPreAmp.lv2/Makefile +index bc60ce1..fd6a707 100644 +--- a/GxVBassPreAmp.lv2/Makefile ++++ b/GxVBassPreAmp.lv2/Makefile +@@ -38,7 +12,7 @@ + -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,10 +49,10 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch_on.png gui/pswitch_off.png gui/frame.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch_on.png -o pswitch_on.o +- -@cd ./gui && ld -r -b binary pswitch_off.png -o pswitch_off.o +- -@cd ./gui && ld -r -b binary frame.png -o frame.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_on.png -o pswitch_on.o ++ -@cd ./gui && $(LD) -r -b binary pswitch_off.png -o pswitch_off.o ++ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o + + clean : + @rm -f $(NAME).so +diff --git a/GxValveCaster.lv2/Makefile b/GxValveCaster.lv2/Makefile +index 54c6df5..bbfc7e9 100644 +--- a/GxValveCaster.lv2/Makefile ++++ b/GxValveCaster.lv2/Makefile +@@ -39,7 +13,7 @@ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + DEBUGFLAGS += -I. -I./dsp -I./plugin -fPIC -DPIC -O2 -Wall -D DEBUG + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -85,8 +59,8 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/pswitch.png + @$(ECHO) $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary pswitch.png -o pswitch.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pswitch.png -o pswitch.o + + clean : + @rm -f $(NAME).so +diff --git a/GxVintageFuzzMaster.lv2/Makefile b/GxVintageFuzzMaster.lv2/Makefile +index 03ff63e..0f96ffd 100644 +--- a/GxVintageFuzzMaster.lv2/Makefile ++++ b/GxVintageFuzzMaster.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,7 +49,7 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o + + clean : + @rm -f $(NAME).so +diff --git a/GxVmk2.lv2/Makefile b/GxVmk2.lv2/Makefile +index 53c6dc6..74c9fa2 100644 +--- a/GxVmk2.lv2/Makefile ++++ b/GxVmk2.lv2/Makefile +@@ -38,7 +12,7 @@ + -fPIC -DPIC -O2 -Wall -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,8 +49,8 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png gui/frame.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o +- -@cd ./gui && ld -r -b binary frame.png -o frame.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary frame.png -o frame.o + + clean : + @rm -f $(NAME).so +diff --git a/GxVoodoFuzz.lv2/Makefile b/GxVoodoFuzz.lv2/Makefile +index 2f00294..fdd609a 100644 +--- a/GxVoodoFuzz.lv2/Makefile ++++ b/GxVoodoFuzz.lv2/Makefile +@@ -38,7 +12,7 @@ + -funroll-loops -ffast-math -fomit-frame-pointer -fstrength-reduce \ + -fdata-sections -Wl,--gc-sections $(SSE_CFLAGS) + LDFLAGS += -I. -shared -lm +- GUI_LDFLAGS += -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 ++ GUI_LDFLAGS = $(LDFLAGS) -I./gui -shared -lm `pkg-config --cflags --libs cairo` -L/usr/X11/lib -lX11 + # invoke build files + OBJECTS = plugin/$(NAME).cpp + GUI_OBJECTS = gui/$(NAME)_x11ui.c +@@ -75,7 +49,7 @@ endif + #@build resource object files + $(RES_OBJECTS) : gui/pedal.png + @echo $(LGREEN)"generate resource files,"$(NONE) +- -@cd ./gui && ld -r -b binary pedal.png -o pedal.o ++ -@cd ./gui && $(LD) -r -b binary pedal.png -o pedal.o + + clean : + @rm -f $(NAME).so +-- +2.20.1 + diff --git a/recipes-musicians/guitarix/gxplugins.lv2_git.bb b/recipes-musicians/guitarix/gxplugins.lv2_git.bb new file mode 100644 index 00000000..0f8caea2 --- /dev/null +++ b/recipes-musicians/guitarix/gxplugins.lv2_git.bb @@ -0,0 +1,31 @@ +SUMMARY = "A set of extra lv2 plugins from the guitarix project" +HOMEPAGE = "https://github.com/brummer10/GxPlugins.lv2" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d" + +SRC_URI = " \ + gitsm://github.com/brummer10/GxPlugins.lv2.git \ + file://0001-Adjust-Makefiles-for-cross-compiling.patch \ +" +SRCREV = "63f19485984c002caddec734a9ee94faad2acb55" +S = "${WORKDIR}/git" +PV = "0.6" + +inherit pkgconfig + +DEPENDS += " \ + cairo \ + virtual/libx11 \ + lv2 \ +" + +do_compile() { + oe_runmake SSE_CFLAGS= STRIP=echo +} + +do_install() { + oe_runmake DESTDIR=${D} PREFIX=${prefix} INSTALL_DIR=${libdir}/lv2 install +} + + +FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-misc/recipes-multimedia/helm/files/0002-do-not-create-ttl-files-it-won-t-work-fo-cross.patch b/recipes-musicians/helm/files/0001-do-not-create-ttl-files-it-won-t-work-fo-cross.patch similarity index 100% rename from recipes-misc/recipes-multimedia/helm/files/0002-do-not-create-ttl-files-it-won-t-work-fo-cross.patch rename to recipes-musicians/helm/files/0001-do-not-create-ttl-files-it-won-t-work-fo-cross.patch diff --git a/recipes-misc/recipes-multimedia/helm/files/0004-set-VECTORIZE_LOOP-for-gcc.patch b/recipes-musicians/helm/files/0002-set-VECTORIZE_LOOP-for-gcc.patch similarity index 100% rename from recipes-misc/recipes-multimedia/helm/files/0004-set-VECTORIZE_LOOP-for-gcc.patch rename to recipes-musicians/helm/files/0002-set-VECTORIZE_LOOP-for-gcc.patch diff --git a/recipes-misc/recipes-multimedia/helm/files/0005-use-single-precision-floats-it-performs-much-better.patch b/recipes-musicians/helm/files/0003-use-single-precision-floats-it-performs-much-better.patch similarity index 100% rename from recipes-misc/recipes-multimedia/helm/files/0005-use-single-precision-floats-it-performs-much-better.patch rename to recipes-musicians/helm/files/0003-use-single-precision-floats-it-performs-much-better.patch diff --git a/recipes-misc/recipes-multimedia/helm/helm_git.bb b/recipes-musicians/helm/helm_git.bb similarity index 63% rename from recipes-misc/recipes-multimedia/helm/helm_git.bb rename to recipes-musicians/helm/helm_git.bb index 04c96a43..ace05f4e 100644 --- a/recipes-misc/recipes-multimedia/helm/helm_git.bb +++ b/recipes-musicians/helm/helm_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://tytel.org/helm/" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -inherit autotools-brokensep qemu-ext distro_features_check gtk-icon-cache +inherit qemu-ext distro_features_check gtk-icon-cache pack_audio_plugins REQUIRED_DISTRO_FEATURES = "x11" @@ -22,11 +22,9 @@ DEPENDS += " \ SRC_URI += " \ git://github.com/mtytel/helm.git \ - file://0001-Makefile-remove-machine-detection-it-won-t-work-for-.patch \ - file://0002-do-not-create-ttl-files-it-won-t-work-fo-cross.patch \ - file://0003-use-standard-vst-path.patch \ - file://0004-set-VECTORIZE_LOOP-for-gcc.patch \ - file://0005-use-single-precision-floats-it-performs-much-better.patch \ + file://0001-do-not-create-ttl-files-it-won-t-work-fo-cross.patch \ + file://0002-set-VECTORIZE_LOOP-for-gcc.patch \ + file://0003-use-single-precision-floats-it-performs-much-better.patch \ " SRCREV = "927d2ed27f71a735c3ff2a1226ce3129d1544e7e" PV = "0.9.0" @@ -49,13 +47,26 @@ do_configure_prepend() { IFS="$OIFS" } -do_compile_append() { +do_compile() { + oe_runmake 'SIMDFLAGS=' ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${S}/builds/linux/LV2/lv2_ttl_generator')} ${S}/builds/linux/LV2/build/helm.so cp *.ttl ${S}/builds/linux/LV2/helm.lv2/ } -FILES_${PN} += " \ +do_install() { + oe_runmake 'DESTDIR=${D}' 'SIMDFLAGS=' 'LIBDIR=${libdir}' 'VSTDIR=${D}${libdir}/vst' install + rm -f ${datadir}/helm/patches/*.patch + rm -f ${datadir}/helm/patches/series +} + +PACKAGES =+ "${PN}-standalone" + +FILES_${PN}-standalone = " \ + ${datadir}/applications \ ${datadir}/icons \ - ${libdir}/lv2 \ - ${libdir}/vst \ + ${bindir} \ " + +RDEPENDS_${PN}-standalone += "${PN}" +RDEPENDS_${PN}-lv2 += "${PN}" +RDEPENDS_${PN}-vst += "${PN}" diff --git a/recipes-misc/recipes-multimedia/hydrogen/files/0002-hydrogen.default.conf-do-not-show-developer-warnings.patch b/recipes-musicians/hydrogen/files/0001-hydrogen.default.conf-do-not-show-developer-warnings.patch similarity index 100% rename from recipes-misc/recipes-multimedia/hydrogen/files/0002-hydrogen.default.conf-do-not-show-developer-warnings.patch rename to recipes-musicians/hydrogen/files/0001-hydrogen.default.conf-do-not-show-developer-warnings.patch diff --git a/recipes-misc/recipes-multimedia/hydrogen/files/0003-Fix-man-installation-path.patch b/recipes-musicians/hydrogen/files/0002-Fix-man-installation-path.patch similarity index 97% rename from recipes-misc/recipes-multimedia/hydrogen/files/0003-Fix-man-installation-path.patch rename to recipes-musicians/hydrogen/files/0002-Fix-man-installation-path.patch index 03e68638..f493320b 100644 --- a/recipes-misc/recipes-multimedia/hydrogen/files/0003-Fix-man-installation-path.patch +++ b/recipes-musicians/hydrogen/files/0002-Fix-man-installation-path.patch @@ -20,7 +20,7 @@ index 96dbf47a..5149e78f 100644 @@ -361,7 +361,7 @@ IF(NOT MINGW AND NOT APPLE) INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_PREFIX}/share/appdata") INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.desktop DESTINATION "${CMAKE_INSTALL_PREFIX}/share/applications") - INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "/usr/share/pixmaps") + INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${H2_UNIX_ICON_PATH}") - INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/man/man1") + INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1") ENDIF() diff --git a/recipes-misc/recipes-multimedia/hydrogen/hydrogen_git.bb b/recipes-musicians/hydrogen/hydrogen_git.bb similarity index 74% rename from recipes-misc/recipes-multimedia/hydrogen/hydrogen_git.bb rename to recipes-musicians/hydrogen/hydrogen_git.bb index 0ccf3844..ed1437bc 100644 --- a/recipes-misc/recipes-multimedia/hydrogen/hydrogen_git.bb +++ b/recipes-musicians/hydrogen/hydrogen_git.bb @@ -28,17 +28,20 @@ DEPENDS += " \ cppunit \ " -# drumkits taken from http://www.hydrogen-music.org/feeds/drumkit_list.php (sf: http -> https) -# NOTE: download of drumkits might fail -> repeat builds of this recipe usually helps +# drumkits URIs from http://hydrogen-music.org/feeds/drumkit_list.php (downloaded to WORKDIR) +# NOTES: +# * Licenses are included in drumkit_list.php +# * download of drumkits might fail -> repeat builds of this recipe usually helps SRC_URI = " \ git://github.com/hydrogen-music/hydrogen.git \ - file://0001-remove-qt5_use_modules.patch \ - file://0002-hydrogen.default.conf-do-not-show-developer-warnings.patch \ - file://0003-Fix-man-installation-path.patch \ + file://0001-hydrogen.default.conf-do-not-show-developer-warnings.patch \ + file://0002-Fix-man-installation-path.patch \ \ - http://hydrogen-music.org/drumkits/Audiophob.h2drumkit;downloadfilename=Audiophob.tar.gz;name=Audiophob;subdir=drumkits \ - http://hydrogen-music.org/drumkits/belofilms_GuitarStrums.h2drumkit;downloadfilename=belofilms_GuitarStrums.tar.gz;name=belofilms_GuitarStrums;subdir=drumkits \ + http://hydrogen-music.org/feeds/drumkit_list.php;name=drumkit-list \ + \ + http://hydro.smoors.de/Audiophob.h2drumkit;downloadfilename=Audiophob.tar.gz;name=Audiophob;subdir=drumkits \ + http://hydro.smoors.de/belofilms_GuitarStrums.h2drumkit;downloadfilename=belofilms_GuitarStrums.tar.gz;name=belofilms_GuitarStrums;subdir=drumkits \ https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/BJA_Pacific.h2drumkit;downloadfilename=BJA_Pacific.tar.gz;name=BJA_Pacific;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/Boss_DR-110.h2drumkit;downloadfilename=Boss_DR-110.tar.gz;name=Boss_DR-110;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/3355606kit.h2drumkit;downloadfilename=3355606kit.tar.gz;name=3355606kit;subdir=drumkits \ @@ -48,41 +51,50 @@ SRC_URI = " \ https://downloads.sourceforge.net/hydrogen/ColomboAcousticDrumkit.h2drumkit;downloadfilename=ColomboAcousticDrumkit.tar.gz;name=ColomboAcousticDrumkit;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/YamahaVintageKit.h2drumkit;downloadfilename=YamahaVintageKit.tar.gz;name=YamahaVintageKit;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/DeathMetal.h2drumkit;downloadfilename=DeathMetal.tar.gz;name=DeathMetal;subdir=drumkits \ - http://hydrogen-music.org/drumkits/Denon%20CRB-90.h2drumkit;downloadfilename=Denon_CRB-90.tar.gz;name=Denon_CRB-90;subdir=drumkits \ - http://hydrogen-music.org/drumkits/Drumkit%20excepcional.h2drumkit;downloadfilename=Drumkit_excepcional.tar.gz;name=Drumkit_excepcional;subdir=drumkits \ + http://hydro.smoors.de/Denon%20CRB-90.h2drumkit;downloadfilename=Denon-CRB-90.tar.gz;name=Denon-CRB-90;subdir=drumkits \ + http://hydro.smoors.de/Drumkit%20excepcional.h2drumkit;downloadfilename=Drumkit_excepcional.tar.gz;name=Drumkit_excepcional;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/EasternHop-1.h2drumkit;downloadfilename=EasternHop-1.tar.gz;name=EasternHop-1;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/ElectricEmpireKit.h2drumkit;downloadfilename=ElectricEmpireKit.tar.gz;name=ElectricEmpireKit;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/ErnysPercussion.h2drumkit;downloadfilename=ErnysPercussion.tar.gz;name=ErnysPercussion;subdir=drumkits \ https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/ForzeeStereo.h2drumkit;downloadfilename=ForzeeStereo.tar.gz;name=ForzeeStereo;subdir=drumkits \ - http://hydrogen-music.org/drumkits/Gimme%20A%20Hand%201.0.h2drumkit;downloadfilename=Gimme_A_Hand_1_0.tar.gz;name=Gimme_A_Hand_1_0;subdir=drumkits \ - http://www.hydrogen-music.org/drumkits/Flac_GSCW-1.h2drumkit;downloadfilename=Flac_GSCW-1.tar.gz;name=Flac_GSCW-1;subdir=drumkits \ - http://www.hydrogen-music.org/drumkits/Flac_GSCW-2.h2drumkit;downloadfilename=Flac_GSCW-2.tar.gz;name=Flac_GSCW-2;subdir=drumkits \ + https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/Gimme%20A%20Hand%201.0.h2drumkit;downloadfilename=Gimme_A_Hand_1_0.tar.gz;name=Gimme_A_Hand_1_0;subdir=drumkits \ + http://hydro.smoors.de/Flac_GSCW-1.h2drumkit;downloadfilename=Flac_GSCW-1.tar.gz;name=Flac_GSCW-1;subdir=drumkits \ + http://hydro.smoors.de/Flac_GSCW-2.h2drumkit;downloadfilename=Flac_GSCW-2.tar.gz;name=Flac_GSCW-2;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/HardElectro1.h2drumkit;downloadfilename=HardElectro1.tar.gz;name=HardElectro1;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/HipHop-1.h2drumkit;downloadfilename=HipHop-1.tar.gz;name=HipHop-1;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/HipHop-2.h2drumkit;downloadfilename=HipHop-2.tar.gz;name=HipHop-2;subdir=drumkits \ https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/K-27_Trash_Kit.h2drumkit;downloadfilename=K-27_Trash_Kit.tar.gz;name=K-27_Trash_Kit;subdir=drumkits \ - http://hydrogen-music.org/drumkits/Lightning1024.h2drumkit;downloadfilename=Lightning1024.tar.gz;name=Lightning1024;subdir=drumkits \ + http://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/Lightning1024.h2drumkit;downloadfilename=Lightning1024.tar.gz;name=Lightning1024;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/Millo-Drums_v.1.h2drumkit;downloadfilename=Millo-Drums_v_1.tar.gz;name=Millo-Drums_v_1;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/Millo_MultiLayered2.h2drumkit;downloadfilename=Millo_MultiLayered2.tar.gz;name=Millo_MultiLayered2;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/Millo_MultiLayered3.h2drumkit;downloadfilename=Millo_MultiLayered3.tar.gz;name=Millo_MultiLayered3;subdir=drumkits \ - http://hydrogen-music.org/drumkits/Roland_MC-307_CR78&Cheaps.h2drumkit;downloadfilename=Roland_MC-307_CR78_Cheaps.tar.gz;name=Roland_MC-307_CR78_Cheaps;subdir=drumkits \ - http://hydrogen-music.org/drumkits/Roland_MC-307_TR-606.h2drumkit;downloadfilename=Roland_MC-307_TR-606.tar.gz;name=Roland_MC-307_TR-606;subdir=drumkits \ - http://hydrogen-music.org/drumkits/Roland_MC-307_TR-808.h2drumkit;downloadfilename=Roland_MC-307_TR-808.tar.gz;name=Roland_MC-307_TR-808;subdir=drumkits \ - http://hydrogen-music.org/drumkits/Roland_MC-307_TR-909.h2drumkit;downloadfilename=Roland_MC-307_TR-909.tar.gz;name=Roland_MC-307_TR-909;subdir=drumkits \ - http://hydrogen-music.org/drumkits/Roland_MC-307_Techno1.h2drumkit;downloadfilename=Roland_MC-307_Techno1.tar.gz;name=Roland_MC-307_Techno1;subdir=drumkits \ - http://hydrogen-music.org/drumkits/rumpf_kit_z01_h2.h2drumkit;downloadfilename=rumpf_kit_z01_h2.tar.gz;name=rumpf_kit_z01_h2;subdir=drumkits \ + http://hydro.smoors.de/Roland_MC-307_CR78&Cheaps.h2drumkit;downloadfilename=Roland_MC-307_CR78_Cheaps.tar.gz;name=Roland_MC-307_CR78_Cheaps;subdir=drumkits \ + http://hydro.smoors.de/Roland_MC-307_TR-606.h2drumkit;downloadfilename=Roland_MC-307_TR-606.tar.gz;name=Roland_MC-307_TR-606;subdir=drumkits \ + http://hydro.smoors.de/Roland_MC-307_TR-808.h2drumkit;downloadfilename=Roland_MC-307_TR-808.tar.gz;name=Roland_MC-307_TR-808;subdir=drumkits \ + http://hydro.smoors.de/Roland_MC-307_TR-909.h2drumkit;downloadfilename=Roland_MC-307_TR-909.tar.gz;name=Roland_MC-307_TR-909;subdir=drumkits \ + http://hydro.smoors.de/Roland_MC-307_Techno1.h2drumkit;downloadfilename=Roland_MC-307_Techno1.tar.gz;name=Roland_MC-307_Techno1;subdir=drumkits \ + http://hydro.smoors.de/rumpf_kit_z01_h2.h2drumkit;downloadfilename=rumpf_kit_z01_h2.tar.gz;name=rumpf_kit_z01_h2;subdir=drumkits \ + https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/SF3007-2011-Set-03.h2drumkit;downloadfilename=SF3007-2011-Set-03.tar.gz;name=SF3007-2011-Set-03;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/Synthie-1.h2drumkit;downloadfilename=Synthie-1.tar.gz;name=Synthie-1;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/TD-7kit.h2drumkit;downloadfilename=TD-7kit.tar.gz;name=TD-7kit;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/Techno-1.h2drumkit;downloadfilename=Techno-1.tar.gz;name=Techno-1;subdir=drumkits \ - http://hydrogen-music.org/drumkits/The%20Black%20Pearl%201.0.h2drumkit;downloadfilename=The_Black_Pearl_1_0.tar.gz;name=The_Black_Pearl_1_0;subdir=drumkits \ + https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/The%20Black%20Pearl%201.0.h2drumkit;downloadfilename=The_Black_Pearl_1_0.tar.gz;name=The_Black_Pearl_1_0;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/TR808909.h2drumkit;downloadfilename=TR808909.tar.gz;name=TR808909;subdir=drumkits \ https://downloads.sourceforge.net/hydrogen/VariBreaks.h2drumkit;downloadfilename=VariBreaks.tar.gz;name=VariBreaks;subdir=drumkits \ + \ + https://freewavesamples.com/files/KawaiXD-5Kit.h2drumkit;downloadfilename=KawaiXD-5Kit.tar.gz;name=KawaiXD-5Kit;subdir=drumkits \ + https://freewavesamples.com/files/RolandJD-990Kit.h2drumkit;downloadfilename=RolandJD-990Kit.tar;name=RolandJD-990Kit;subdir=drumkits \ + https://freewavesamples.com/files/YamahaRX15Kit.h2drumkit;downloadfilename=YamahaRX15Kit.tar.gz;name=YamahaRX15Kit;subdir=drumkits \ + https://freewavesamples.com/files/YamahaTG-55Kit.h2drumkit;downloadfilename=YamahaTG-55Kit.tar.gz;name=YamahaTG-55Kit;subdir=drumkits \ " -SRCREV = "2cbb04f85d84bddb5a8a1caf614837cbe5323292" -PV ="0.9.7+git${SRCPV}" +SRCREV = "538eaeb9f4e9be2febf02e36a08e3e9fca2ae317" +PV ="1.0.0~beta1+git${SRCPV}" S = "${WORKDIR}/git" +SRC_URI[drumkit-list.md5sum] = "d7c54dba04092112fb012c1a0acc6404" +SRC_URI[drumkit-list.sha256sum] = "c4ddfcff63e57e72ab376a9b85a1fdf7ba47ec244dcca45ab95984adfd585780" + SRC_URI[Audiophob.md5sum] = "24cb2577a447bbd72aab769aacb3e8b4" SRC_URI[Audiophob.sha256sum] = "70b71304221a1287f257ed9a03bfb221af6ce335deec3a3385237e6be6fa9e0c" @@ -116,8 +128,8 @@ SRC_URI[YamahaVintageKit.sha256sum] = "17005f5c79d92af3caef52ea313b1ac5bc49f1eef SRC_URI[DeathMetal.md5sum] = "0465025dcf6659657b773874d168c27b" SRC_URI[DeathMetal.sha256sum] = "7ae4f8e7bf52b84637100b6f781e94752ad738626cff912c7704522ea692fbe7" -SRC_URI[Denon_CRB-90.md5sum] = "bcb4424b46938d0a2a5c94cbd4248c1f" -SRC_URI[Denon_CRB-90.sha256sum] = "6a2b743b73a0e3df110bef830ccedec4560964e7f7af7b7810dc9d9b6e66e075" +SRC_URI[Denon-CRB-90.md5sum] = "bcb4424b46938d0a2a5c94cbd4248c1f" +SRC_URI[Denon-CRB-90.sha256sum] = "6a2b743b73a0e3df110bef830ccedec4560964e7f7af7b7810dc9d9b6e66e075" SRC_URI[Drumkit_excepcional.md5sum] = "49151a17ea5534cd08a9bc58d6972997" SRC_URI[Drumkit_excepcional.sha256sum] = "634cd9f40a00d8ac6bb1791aadd953fc92536838b206f7f374024bc34b920689" @@ -185,6 +197,9 @@ SRC_URI[Roland_MC-307_Techno1.sha256sum] = "4a99341192ef8774049c10eaf4678358289f SRC_URI[rumpf_kit_z01_h2.md5sum] = "927094c3712ba0a3724a77e74b2102e9" SRC_URI[rumpf_kit_z01_h2.sha256sum] = "83f24b15c82d0b34ceaeeb86c5283201b7dd3f5e32b53dfd222d04886bc98740" +SRC_URI[SF3007-2011-Set-03.md5sum] = "f0b243f7bbc0c4c04977b2efa96a07b4" +SRC_URI[SF3007-2011-Set-03.sha256sum] = "cffa12c5a176d9c9532bafacba773c0a0f7e2fe71ea5a14dae402d2de0726ccb" + SRC_URI[Synthie-1.md5sum] = "33f02627ac1489e4ab52c5f078c538b9" SRC_URI[Synthie-1.sha256sum] = "adcc4a3023708fab46108acfc99dfc04e2b2b62bb21aa87ed8a027ccbb46b576" @@ -203,11 +218,24 @@ SRC_URI[TR808909.sha256sum] = "4637f0c39b488074943030d6cb0274f3e35d1da221eb6d078 SRC_URI[VariBreaks.md5sum] = "a9c305829cd23c28ffd1647cb5c0bdfd" SRC_URI[VariBreaks.sha256sum] = "ed7bfa21abc05712ea89860b7e680808d14d567d49377fbc65914a9dd518e14d" +SRC_URI[KawaiXD-5Kit.md5sum] = "ae974ec4550b64654cfb1fe42fe110af" +SRC_URI[KawaiXD-5Kit.sha256sum] = "e3da8b98d8d5804e6ca9c047f2140430f12f8d4ae3db8ec4740f9364467c19ed" + +SRC_URI[RolandJD-990Kit.md5sum] = "ef5ecfdea55835789c143c0bc3ac15e9" +SRC_URI[RolandJD-990Kit.sha256sum] = "0ae58586d479ecb0d9b850d832be0483a8aad28eaa7fa46be0d1956d45b0b50c" + +SRC_URI[YamahaRX15Kit.md5sum] = "9f143e9f764b1b0341a3e5a528bf3f13" +SRC_URI[YamahaRX15Kit.sha256sum] = "04b7b7d5d56e4b5f6b7daa3579f594df66a5edb776f705413c1d3d2da90e5bd2" + +SRC_URI[YamahaTG-55Kit.md5sum] = "cf95db46c05287aaa1a18dff0b0ce335" +SRC_URI[YamahaTG-55Kit.sha256sum] = "8dba9f8fa7027606765b3b9bd3d11470e39919683a8676b1598d96c2f7df1462" + inherit cmake_qt5 manpages -CMAKE_FLAGS = " \ +EXTRA_OECMAKE = " \ -DWANT_DEBUG=OFF \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ " do_install_append() { diff --git a/recipes-misc/recipes-multimedia/infamousplugins/infamousplugins_0.2.04.bb b/recipes-musicians/infamousplugins/infamousplugins_0.2.04.bb similarity index 90% rename from recipes-misc/recipes-multimedia/infamousplugins/infamousplugins_0.2.04.bb rename to recipes-musicians/infamousplugins/infamousplugins_0.2.04.bb index 247d258a..080935a4 100644 --- a/recipes-misc/recipes-multimedia/infamousplugins/infamousplugins_0.2.04.bb +++ b/recipes-musicians/infamousplugins/infamousplugins_0.2.04.bb @@ -19,4 +19,8 @@ SRC_URI = " \ SRCREV = "970a5de32393cc92ab2144d6a8a5e92b302dc9b5" S = "${WORKDIR}/git" +EXTRA_OECMAKE += " \ + -DLIBDIR=${baselib} \ +" + FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-misc/recipes-multimedia/kokkinizita/clthreads/0001-Align-Makefile.patch b/recipes-musicians/kokkinizita/clthreads/0001-Align-Makefile.patch similarity index 100% rename from recipes-misc/recipes-multimedia/kokkinizita/clthreads/0001-Align-Makefile.patch rename to recipes-musicians/kokkinizita/clthreads/0001-Align-Makefile.patch diff --git a/recipes-misc/recipes-multimedia/kokkinizita/clthreads_2.4.2.bb b/recipes-musicians/kokkinizita/clthreads_2.4.2.bb similarity index 100% rename from recipes-misc/recipes-multimedia/kokkinizita/clthreads_2.4.2.bb rename to recipes-musicians/kokkinizita/clthreads_2.4.2.bb diff --git a/recipes-misc/recipes-multimedia/kokkinizita/clxclient/0001-Align-Makefile.patch b/recipes-musicians/kokkinizita/clxclient/0001-Align-Makefile.patch similarity index 100% rename from recipes-misc/recipes-multimedia/kokkinizita/clxclient/0001-Align-Makefile.patch rename to recipes-musicians/kokkinizita/clxclient/0001-Align-Makefile.patch diff --git a/recipes-misc/recipes-multimedia/kokkinizita/clxclient_3.9.2.bb b/recipes-musicians/kokkinizita/clxclient_3.9.2.bb similarity index 100% rename from recipes-misc/recipes-multimedia/kokkinizita/clxclient_3.9.2.bb rename to recipes-musicians/kokkinizita/clxclient_3.9.2.bb diff --git a/recipes-misc/recipes-multimedia/kokkinizita/zita-convolver/0001-Align-Makefile.patch b/recipes-musicians/kokkinizita/zita-convolver/0001-Align-Makefile.patch similarity index 100% rename from recipes-misc/recipes-multimedia/kokkinizita/zita-convolver/0001-Align-Makefile.patch rename to recipes-musicians/kokkinizita/zita-convolver/0001-Align-Makefile.patch diff --git a/recipes-misc/recipes-multimedia/kokkinizita/zita-convolver_4.0.3.bb b/recipes-musicians/kokkinizita/zita-convolver_4.0.3.bb similarity index 100% rename from recipes-misc/recipes-multimedia/kokkinizita/zita-convolver_4.0.3.bb rename to recipes-musicians/kokkinizita/zita-convolver_4.0.3.bb diff --git a/recipes-misc/recipes-multimedia/kokkinizita/zita-resampler/0001-Align-Makefiles.patch b/recipes-musicians/kokkinizita/zita-resampler/0001-Align-Makefiles.patch similarity index 100% rename from recipes-misc/recipes-multimedia/kokkinizita/zita-resampler/0001-Align-Makefiles.patch rename to recipes-musicians/kokkinizita/zita-resampler/0001-Align-Makefiles.patch diff --git a/recipes-misc/recipes-multimedia/kokkinizita/zita-resampler_1.6.2.bb b/recipes-musicians/kokkinizita/zita-resampler_1.6.2.bb similarity index 100% rename from recipes-misc/recipes-multimedia/kokkinizita/zita-resampler_1.6.2.bb rename to recipes-musicians/kokkinizita/zita-resampler_1.6.2.bb diff --git a/recipes-misc/recipes-multimedia/ladspa/files/0001-do-not-pin-build-flags-use-defaults.patch b/recipes-musicians/ladspa/files/0001-do-not-pin-build-flags-use-defaults.patch similarity index 100% rename from recipes-misc/recipes-multimedia/ladspa/files/0001-do-not-pin-build-flags-use-defaults.patch rename to recipes-musicians/ladspa/files/0001-do-not-pin-build-flags-use-defaults.patch diff --git a/recipes-misc/recipes-multimedia/ladspa/files/0002-Fix-_init-and-_fini-multiple-definition.patch b/recipes-musicians/ladspa/files/0002-Fix-_init-and-_fini-multiple-definition.patch similarity index 100% rename from recipes-misc/recipes-multimedia/ladspa/files/0002-Fix-_init-and-_fini-multiple-definition.patch rename to recipes-musicians/ladspa/files/0002-Fix-_init-and-_fini-multiple-definition.patch diff --git a/recipes-misc/recipes-multimedia/ladspa/files/0002-Use-fallback-for-plugindir-in-case-env.-var-LADSPA_P.patch b/recipes-musicians/ladspa/files/0002-Use-fallback-for-plugindir-in-case-env.-var-LADSPA_P.patch similarity index 100% rename from recipes-misc/recipes-multimedia/ladspa/files/0002-Use-fallback-for-plugindir-in-case-env.-var-LADSPA_P.patch rename to recipes-musicians/ladspa/files/0002-Use-fallback-for-plugindir-in-case-env.-var-LADSPA_P.patch diff --git a/recipes-misc/recipes-multimedia/ladspa/ladspa-sdk_1.13.bb b/recipes-musicians/ladspa/ladspa-sdk_1.13.bb similarity index 100% rename from recipes-misc/recipes-multimedia/ladspa/ladspa-sdk_1.13.bb rename to recipes-musicians/ladspa/ladspa-sdk_1.13.bb diff --git a/recipes-misc/recipes-multimedia/liblo/files/0001-Fix-build-with-GCC-8.patch b/recipes-musicians/liblo/files/0001-Fix-build-with-GCC-8.patch similarity index 100% rename from recipes-misc/recipes-multimedia/liblo/files/0001-Fix-build-with-GCC-8.patch rename to recipes-musicians/liblo/files/0001-Fix-build-with-GCC-8.patch diff --git a/recipes-misc/recipes-multimedia/liblo/liblo_0.29.bb b/recipes-musicians/liblo/liblo_0.29.bb similarity index 100% rename from recipes-misc/recipes-multimedia/liblo/liblo_0.29.bb rename to recipes-musicians/liblo/liblo_0.29.bb diff --git a/recipes-misc/recipes-multimedia/libmp4v2/libmp4v2_git.bb b/recipes-musicians/libmp4v2/libmp4v2_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/libmp4v2/libmp4v2_git.bb rename to recipes-musicians/libmp4v2/libmp4v2_git.bb diff --git a/recipes-misc/recipes-multimedia/libsmf/libsmf_git.bb b/recipes-musicians/libsmf/libsmf_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/libsmf/libsmf_git.bb rename to recipes-musicians/libsmf/libsmf_git.bb diff --git a/recipes-misc/recipes-multimedia/libxmp/libxmp_4.4.1.bb b/recipes-musicians/libxmp/libxmp_4.4.1.bb similarity index 100% rename from recipes-misc/recipes-multimedia/libxmp/libxmp_4.4.1.bb rename to recipes-musicians/libxmp/libxmp_4.4.1.bb diff --git a/recipes-musicians/linuxsampler/libgig_4.1.0.bb b/recipes-musicians/linuxsampler/libgig_4.1.0.bb new file mode 100644 index 00000000..5fa754d3 --- /dev/null +++ b/recipes-musicians/linuxsampler/libgig_4.1.0.bb @@ -0,0 +1,19 @@ +SUMMARY = "GigaStudio/Gigasampler, DLS, AKAI, SoundFont, KORG file access library" +HOMEPAGE = "http://www.linuxsampler.org" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = " \ + file://COPYING;md5=526c29250ae72f6933cdc01414b9943b \ +" + +DEPENDS = " \ + util-linux \ + libsndfile1 \ +" + +inherit autotools pkgconfig lib_package + +SRC_URI = "http://download.linuxsampler.org/packages/${BPN}-${PV}.tar.bz2" +SRC_URI[md5sum] = "a2ad3f933d13332b7a2ea68de20fa4b7" +SRC_URI[sha256sum] = "06a280278a323963042acdf13b092644cceb43ef367fcbb9ca7bbedff132bd0b" + +FILES_SOLIBSDEV = "${libdir}/${BPN}/lib*${SOLIBSDEV}" diff --git a/recipes-misc/recipes-multimedia/lmms/lmms-native.bb b/recipes-musicians/lmms/lmms-native.bb similarity index 100% rename from recipes-misc/recipes-multimedia/lmms/lmms-native.bb rename to recipes-musicians/lmms/lmms-native.bb diff --git a/recipes-misc/recipes-multimedia/lmms/lmms.bb b/recipes-musicians/lmms/lmms.bb similarity index 100% rename from recipes-misc/recipes-multimedia/lmms/lmms.bb rename to recipes-musicians/lmms/lmms.bb diff --git a/recipes-misc/recipes-multimedia/lmms/lmms.inc b/recipes-musicians/lmms/lmms.inc similarity index 75% rename from recipes-misc/recipes-multimedia/lmms/lmms.inc rename to recipes-musicians/lmms/lmms.inc index d3203633..f4b4c94e 100644 --- a/recipes-misc/recipes-multimedia/lmms/lmms.inc +++ b/recipes-musicians/lmms/lmms.inc @@ -4,6 +4,6 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=751419260aa954499f7abaabaa882bbe" SRC_URI = "gitsm://github.com/LMMS/${BPN}.git;branch=stable-1.2" -SRCREV = "d8fb07ff52ee87a290ad7e69d0851cfb1c20d261" +SRCREV = "55eb831507250b236de80e63d376083dde0b3ae1" S = "${WORKDIR}/git" -PV = "1.2.0-rc7+git${SRCPV}" +PV = "1.2.0~rc8+git${SRCPV}" diff --git a/recipes-misc/recipes-multimedia/lmms/lmms/0001-Find-native-bin2res.patch b/recipes-musicians/lmms/lmms/0001-Find-native-bin2res.patch similarity index 100% rename from recipes-misc/recipes-multimedia/lmms/lmms/0001-Find-native-bin2res.patch rename to recipes-musicians/lmms/lmms/0001-Find-native-bin2res.patch diff --git a/recipes-misc/recipes-multimedia/lmms/lmms/0002-zynaddsubfx-link-agains-X11.patch b/recipes-musicians/lmms/lmms/0002-zynaddsubfx-link-agains-X11.patch similarity index 100% rename from recipes-misc/recipes-multimedia/lmms/lmms/0002-zynaddsubfx-link-agains-X11.patch rename to recipes-musicians/lmms/lmms/0002-zynaddsubfx-link-agains-X11.patch diff --git a/recipes-misc/recipes-multimedia/lmms/lmms/0003-CMake-rpmalloc-Do-not-overwrite-CMAKE_C_FLAGS.patch b/recipes-musicians/lmms/lmms/0003-CMake-rpmalloc-Do-not-overwrite-CMAKE_C_FLAGS.patch similarity index 100% rename from recipes-misc/recipes-multimedia/lmms/lmms/0003-CMake-rpmalloc-Do-not-overwrite-CMAKE_C_FLAGS.patch rename to recipes-musicians/lmms/lmms/0003-CMake-rpmalloc-Do-not-overwrite-CMAKE_C_FLAGS.patch diff --git a/recipes-misc/recipes-multimedia/lmms/lmms/0004-carlabase-Do-not-add-RPATH-to-carlabase.patch b/recipes-musicians/lmms/lmms/0004-carlabase-Do-not-add-RPATH-to-carlabase.patch similarity index 100% rename from recipes-misc/recipes-multimedia/lmms/lmms/0004-carlabase-Do-not-add-RPATH-to-carlabase.patch rename to recipes-musicians/lmms/lmms/0004-carlabase-Do-not-add-RPATH-to-carlabase.patch diff --git a/recipes-misc/recipes-multimedia/lrdf/lrdf_0.5.0.bb b/recipes-musicians/lrdf/lrdf_0.5.0.bb similarity index 100% rename from recipes-misc/recipes-multimedia/lrdf/lrdf_0.5.0.bb rename to recipes-musicians/lrdf/lrdf_0.5.0.bb diff --git a/recipes-musicians/lsp-plugins/lsp-plugins-native.bb b/recipes-musicians/lsp-plugins/lsp-plugins-native.bb new file mode 100644 index 00000000..42cf56c8 --- /dev/null +++ b/recipes-musicians/lsp-plugins/lsp-plugins-native.bb @@ -0,0 +1,28 @@ +require ${BPN}.inc + +FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}-native:" + +inherit native + +DEPENDS += " \ + php-native \ + lv2-native \ + libsndfile1-native \ +" + +SRC_URI+= "file://0001-Adjust-native-build.patch" + +EXTRA_OEMAKE += " \ + BUILD_PLATFORM=Linux \ + PREFIX=${prefix} \ +" + +do_compile_prepend() { + export BUILD_MODULES="src" +} + +do_install() { + install -d ${D}${bindir} + install -m 755 ${B}/.build/*.exe ${D}${bindir} +} + diff --git a/recipes-musicians/lsp-plugins/lsp-plugins-native/0001-Adjust-native-build.patch b/recipes-musicians/lsp-plugins/lsp-plugins-native/0001-Adjust-native-build.patch new file mode 100644 index 00000000..36ba930f --- /dev/null +++ b/recipes-musicians/lsp-plugins/lsp-plugins-native/0001-Adjust-native-build.patch @@ -0,0 +1,72 @@ +From 1234ce86f2516148a6854247d9bd46f9adf87f94 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 12 Jan 2019 22:26:43 +0100 +Subject: [PATCH] Adjust native build +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + Makefile | 6 +++--- + src/utils/Makefile | 24 ++++++++---------------- + 2 files changed, 11 insertions(+), 19 deletions(-) + +diff --git a/Makefile b/Makefile +index c918fb11..282d590d 100644 +--- a/Makefile ++++ b/Makefile +@@ -39,10 +39,10 @@ export CC = g++ + export PHP = php + export LD = ld + export LDFLAGS = $(LD_ARCH) -L$(LD_PATH) +-export SO_FLAGS = $(CC_ARCH) -Wl,-rpath,$(LD_PATH) -Wl,-z,relro,-z,now -Wl,--gc-sections -shared -Llibrary -lc -fPIC ++export SO_FLAGS = $(CC_ARCH) -Wl,-z,relro,-z,now -Wl,--gc-sections -shared -Llibrary -lc -fPIC + export MERGE_FLAGS = $(LD_ARCH) -r +-export EXE_TEST_FLAGS = $(CC_ARCH) -Wl,-rpath,$(LD_PATH) +-export EXE_FLAGS = $(CC_ARCH) -Wl,-rpath,$(LD_PATH) -Wl,-z,relro,-z,now -Wl,--gc-sections ++export EXE_TEST_FLAGS = $(CC_ARCH) ++export EXE_FLAGS = $(CC_ARCH) -Wl,-z,relro,-z,now -Wl,--gc-sections + + # Objects + export OBJ_CORE = $(OBJDIR)/core.o +diff --git a/src/utils/Makefile b/src/utils/Makefile +index 0d9b57f9..c372c850 100644 +--- a/src/utils/Makefile ++++ b/src/utils/Makefile +@@ -5,22 +5,14 @@ SUBDIRS = + OBJ_FILES = $(OBJ_CORE) $(OBJ_METADATA) + OBJ_LIBS = $(PTHREAD_LIBS) $(MATH_LIBS) + +-ifeq ($(findstring lv2,$(BUILD_MODULES)),lv2) +- MODULES += $(UTL_GENTTL) +- FILELIST += lv2_genttl.o +-endif +-ifeq ($(findstring vst,$(BUILD_MODULES)),vst) +- MODULES += $(UTL_VSTMAKE) +- FILELIST += vst_genmake.o +-endif +-ifeq ($(findstring jack,$(BUILD_MODULES)),jack) +- MODULES += $(UTL_JACKMAKE) +- FILELIST += jack_genmake.o +-endif +-ifeq ($(findstring doc,$(BUILD_MODULES)),doc) +- MODULES += $(UTL_GENPHP) +- FILELIST += gen_php.o +-endif ++MODULES += $(UTL_GENTTL) ++FILELIST += lv2_genttl.o ++MODULES += $(UTL_VSTMAKE) ++FILELIST += vst_genmake.o ++MODULES += $(UTL_JACKMAKE) ++FILELIST += jack_genmake.o ++MODULES += $(UTL_GENPHP) ++FILELIST += gen_php.o + + FILES = $(addprefix $(OBJDIR)/, $(FILELIST)) + +-- +2.20.1 + diff --git a/recipes-musicians/lsp-plugins/lsp-plugins.bb b/recipes-musicians/lsp-plugins/lsp-plugins.bb new file mode 100644 index 00000000..7d2f8cb3 --- /dev/null +++ b/recipes-musicians/lsp-plugins/lsp-plugins.bb @@ -0,0 +1,52 @@ +require ${BPN}.inc + +inherit distro_features_check pack_audio_plugins + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS += " \ + ${BPN}-native \ + php-native \ + cairo \ + gtk+ \ + gtk+3 \ + jack \ + libsndfile1 \ + ladspa-sdk \ + lv2 \ +" + +SRC_URI += " \ + file://0001-Makefile-align-for-oe-cross-build.patch \ +" + +ARM_INSTRUCTION_SET = "arm" + +def profile_handler(d): + profile = d.getVar('DEFAULTTUNE', True) + features = d.getVar('TUNE_FEATURES', True).split() + if 'armv7a' in features or 'armv7ve' in features: + profile = 'armv7a' + return profile + +EXTRA_OEMAKE += " \ + BUILD_PLATFORM=Linux \ + BUILD_PROFILE=${@profile_handler(d)} \ + PREFIX=${prefix} \ +" + +do_compile_prepend() { + export LDLDFLAGS="`echo $LDFLAGS | sed 's:-Wl,::g'`" + export CC="${CXX}" + export CC_ARCH="${CXXFLAGS}" +} + + +do_install() { + ${MAKE} ${EXTRA_OEMAKE} DESTDIR=${D} install +} + +FILES_${PN} += "${libdir}/lsp-plugins-jack-core-${PV}.so" + +PACKAGES =+ "${PN}-standalone" +FILES_${PN}-standalone = "${bindir}" diff --git a/recipes-musicians/lsp-plugins/lsp-plugins.inc b/recipes-musicians/lsp-plugins/lsp-plugins.inc new file mode 100644 index 00000000..8fcd4ec8 --- /dev/null +++ b/recipes-musicians/lsp-plugins/lsp-plugins.inc @@ -0,0 +1,11 @@ +SUMMARY = "LSP (Linux Studio Plugins) is a collection of open-source plugins" +HOMEPAGE = "http://lsp-plug.in/" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404" + +SRC_URI = "git://github.com/sadko4u/lsp-plugins.git" +SRCREV = "1d41a52f6b2236f38670c2d3a28ab97c419a4754" +S = "${WORKDIR}/git" +PV = "1.1.5" + +do_configure[noexec] = "1" diff --git a/recipes-musicians/lsp-plugins/lsp-plugins/0001-Makefile-align-for-oe-cross-build.patch b/recipes-musicians/lsp-plugins/lsp-plugins/0001-Makefile-align-for-oe-cross-build.patch new file mode 100644 index 00000000..0575d3fe --- /dev/null +++ b/recipes-musicians/lsp-plugins/lsp-plugins/0001-Makefile-align-for-oe-cross-build.patch @@ -0,0 +1,181 @@ +From dd67553614ad90bb7454122b219f1cc1ef62d716 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Wed, 2 Jan 2019 23:04:53 +0100 +Subject: [PATCH] Makefiles: align for oe-cross-build + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Andreas Müller +--- + Makefile | 19 ++++++++----------- + scripts/make/configure.mk | 7 ------- + src/core/Makefile | 2 +- + src/dsp/Makefile | 2 +- + src/metadata/Makefile | 2 +- + src/plugins/Makefile | 2 +- + src/test/Makefile | 2 +- + src/ui/ws/x11/Makefile | 2 +- + 8 files changed, 14 insertions(+), 24 deletions(-) + +diff --git a/Makefile b/Makefile +index c918fb1..2f20248 100644 +--- a/Makefile ++++ b/Makefile +@@ -35,14 +35,11 @@ export BASEDIR = ${CURDIR} + export INCLUDE = ${INC_FLAGS} + export MAKE_OPTS = -s + export CFLAGS = $(CC_ARCH) -std=c++98 -fdata-sections -pthread -ffunction-sections -fno-exceptions -fno-asynchronous-unwind-tables -Wall -pipe -fno-rtti $(CC_FLAGS) -DLSP_MAIN_VERSION=\"$(VERSION)\" -DLSP_INSTALL_PREFIX=\"$(PREFIX)\" +-export CC = g++ + export PHP = php +-export LD = ld +-export LDFLAGS = $(LD_ARCH) -L$(LD_PATH) +-export SO_FLAGS = $(CC_ARCH) -Wl,-rpath,$(LD_PATH) -Wl,-z,relro,-z,now -Wl,--gc-sections -shared -Llibrary -lc -fPIC ++export SO_FLAGS = $(CC_ARCH) $(LDFLAGS) -Wl,-z,relro,-z,now -Wl,--gc-sections -shared -Llibrary -lc -fPIC + export MERGE_FLAGS = $(LD_ARCH) -r +-export EXE_TEST_FLAGS = $(CC_ARCH) -Wl,-rpath,$(LD_PATH) +-export EXE_FLAGS = $(CC_ARCH) -Wl,-rpath,$(LD_PATH) -Wl,-z,relro,-z,now -Wl,--gc-sections ++export EXE_TEST_FLAGS = $(CC_ARCH) ++export EXE_FLAGS = $(CC_ARCH) $(LDFLAGS) -Wl,-z,relro,-z,now -Wl,--gc-sections + + # Objects + export OBJ_CORE = $(OBJDIR)/core.o +@@ -69,11 +66,11 @@ export BIN_PROFILE = $(OBJDIR)/$(ARTIFACT_ID)-profile + export BIN_TEST = $(OBJDIR)/$(ARTIFACT_ID)-test + + # Utils +-export UTL_GENTTL = $(OBJDIR)/lv2_genttl.exe +-export UTL_VSTMAKE = $(OBJDIR)/vst_genmake.exe +-export UTL_JACKMAKE = $(OBJDIR)/jack_genmake.exe +-export UTL_GENPHP = $(OBJDIR)/gen_php.exe +-export UTL_RESGEN = $(OBJDIR)/gen_resources.exe ++export UTL_GENTTL = lv2_genttl.exe ++export UTL_VSTMAKE = vst_genmake.exe ++export UTL_JACKMAKE = jack_genmake.exe ++export UTL_GENPHP = gen_php.exe ++export UTL_RESGEN = gen_resources.exe + export UTL_FILES = $(UTL_GENTTL) $(UTL_VSTMAKE) $(UTL_GENPHP) $(UTL_RESGEN) + + # Files +diff --git a/scripts/make/configure.mk b/scripts/make/configure.mk +index 5603a8f..498a5e5 100644 +--- a/scripts/make/configure.mk ++++ b/scripts/make/configure.mk +@@ -53,12 +53,10 @@ export RELEASES + + # Configure compiler and linker flags + LD_ARCH = +-CC_ARCH = + LD_PATH = + + # Build profile + ifeq ($(BUILD_PROFILE),i586) +- CC_ARCH = -m32 + ifeq ($(BUILD_PLATFORM), Linux) + LD_ARCH = -m elf_i386 + endif +@@ -69,7 +67,6 @@ ifeq ($(BUILD_PROFILE),i586) + endif + + ifeq ($(BUILD_PROFILE),x86_64) +- CC_ARCH = -m64 + ifeq ($(BUILD_PLATFORM), Linux) + LD_ARCH = -m elf_x86_64 + endif +@@ -80,21 +77,17 @@ ifeq ($(BUILD_PROFILE),x86_64) + endif + + ifeq ($(BUILD_PROFILE),armv6a) +- CC_ARCH = -march=armv6-a + LD_PATH = /usr/lib64:/lib64:/usr/local/lib64 + endif + + ifeq ($(BUILD_PROFILE),armv7a) +- CC_ARCH = -march=armv7-a + LD_PATH = /usr/lib64:/lib64:/usr/local/lib64 + endif + + ifeq ($(BUILD_PROFILE),armv8a) +- CC_ARCH = -march=armv8-a + LD_PATH = /usr/lib:/lib:/usr/local/lib + endif + +-export CC_ARCH + export LD_ARCH + export LD_PATH + +diff --git a/src/core/Makefile b/src/core/Makefile +index 1db8603..33aa15d 100644 +--- a/src/core/Makefile ++++ b/src/core/Makefile +@@ -13,4 +13,4 @@ $(FILES): + + $(OBJ_CORE): $(FILES) + @echo " $(LD) $(notdir $(OBJ_CORE))" +- @$(LD) -o $(OBJ_CORE) -r $(LDFLAGS) $(FILES) ++ @$(LD) -o $(OBJ_CORE) -r $(LDLDFLAGS) $(FILES) +diff --git a/src/dsp/Makefile b/src/dsp/Makefile +index 97ed47f..7e099cd 100644 +--- a/src/dsp/Makefile ++++ b/src/dsp/Makefile +@@ -42,7 +42,7 @@ all: $(OBJ_DSP) + + $(OBJ_DSP): $(LINK_OBJECTS) + @echo " $(LD) $(notdir $(OBJ_DSP))" +- @$(LD) -o $(OBJ_DSP) -r $(LDFLAGS) $(LINK_OBJECTS) ++ @$(LD) -o $(OBJ_DSP) -r $(LDLDFLAGS) $(LINK_OBJECTS) + + $(DSP_IMPL) $(BITS_IMPL) $(NATIVE_IMPL) $(X86_IMPL) $(ARM_IMPL): + @echo " $(CC) $(FILE)" +diff --git a/src/metadata/Makefile b/src/metadata/Makefile +index b3206ed..1f840de 100644 +--- a/src/metadata/Makefile ++++ b/src/metadata/Makefile +@@ -10,7 +10,7 @@ target: all + + $(OBJ_METADATA): $(FILES) + @echo " $(LD) $(notdir $(OBJ_METADATA))" +- @$(LD) -o $(OBJ_METADATA) -r $(LDFLAGS) $(FILES) ++ @$(LD) -o $(OBJ_METADATA) -r $(LDLDFLAGS) $(FILES) + + $(FILES): + @echo " $(CC) $(FILE)" +diff --git a/src/plugins/Makefile b/src/plugins/Makefile +index 09bc4ce..7295c0f 100644 +--- a/src/plugins/Makefile ++++ b/src/plugins/Makefile +@@ -8,7 +8,7 @@ all: $(OBJ_PLUGINS) + + $(OBJ_PLUGINS): $(FILES) $(SUBDIRS) + @echo " $(LD) $(notdir $(OBJ_PLUGINS))" +- @$(LD) -o $(OBJ_PLUGINS) -r $(LDFLAGS) $(FILES) ++ @$(LD) -o $(OBJ_PLUGINS) -r $(LDLDFLAGS) $(FILES) + + $(FILES): + @echo " $(CC) $(FILE)" +diff --git a/src/test/Makefile b/src/test/Makefile +index 4f225d0..fe5d5b2 100644 +--- a/src/test/Makefile ++++ b/src/test/Makefile +@@ -13,5 +13,5 @@ $(FILES): + + $(OBJ_TEST_CORE): $(FILES) + @echo " $(LD) $(notdir $(OBJ_TEST_CORE))" +- @$(LD) -o $(OBJ_TEST_CORE) -r $(LDFLAGS) $(FILES) ++ @$(LD) -o $(OBJ_TEST_CORE) -r $(LDLDFLAGS) $(FILES) + +diff --git a/src/ui/ws/x11/Makefile b/src/ui/ws/x11/Makefile +index 649c6a4..5e45dd2 100644 +--- a/src/ui/ws/x11/Makefile ++++ b/src/ui/ws/x11/Makefile +@@ -8,7 +8,7 @@ all: $(OBJ_WS_X11_CORE) + + $(OBJ_WS_X11_CORE): $(FILES) + @echo " $(LD) $(notdir $(@))" +- @$(LD) -o $(OBJ_WS_X11_CORE) $(LDFLAGS) -r $(FILES) ++ @$(LD) -o $(OBJ_WS_X11_CORE) $(LDLDFLAGS) -r $(FILES) + + $(FILES): + @echo " $(CC) $(FILE)" +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/mixxx/mixxx/0001-do-not-check-for-known-machine-types.patch b/recipes-musicians/mixxx/mixxx/0001-do-not-check-for-known-machine-types.patch similarity index 100% rename from recipes-misc/recipes-multimedia/mixxx/mixxx/0001-do-not-check-for-known-machine-types.patch rename to recipes-musicians/mixxx/mixxx/0001-do-not-check-for-known-machine-types.patch diff --git a/recipes-misc/recipes-multimedia/mixxx/mixxx/0002-force-using-system-soundtouch.patch b/recipes-musicians/mixxx/mixxx/0002-force-using-system-soundtouch.patch similarity index 100% rename from recipes-misc/recipes-multimedia/mixxx/mixxx/0002-force-using-system-soundtouch.patch rename to recipes-musicians/mixxx/mixxx/0002-force-using-system-soundtouch.patch diff --git a/recipes-misc/recipes-multimedia/mixxx/mixxx/0003-align-path-of-qt-build-tools-to-our-needs.patch b/recipes-musicians/mixxx/mixxx/0003-align-path-of-qt-build-tools-to-our-needs.patch similarity index 100% rename from recipes-misc/recipes-multimedia/mixxx/mixxx/0003-align-path-of-qt-build-tools-to-our-needs.patch rename to recipes-musicians/mixxx/mixxx/0003-align-path-of-qt-build-tools-to-our-needs.patch diff --git a/recipes-misc/recipes-multimedia/mixxx/mixxx/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch b/recipes-musicians/mixxx/mixxx/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch similarity index 100% rename from recipes-misc/recipes-multimedia/mixxx/mixxx/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch rename to recipes-musicians/mixxx/mixxx/0004-add-vamp-float-math-build-option-to-force-vamp-calcu.patch diff --git a/recipes-misc/recipes-multimedia/mixxx/mixxx/0005-Do-not-add-QT-libdir-it-injectst-usr-lib-these-days.patch b/recipes-musicians/mixxx/mixxx/0005-Do-not-add-QT-libdir-it-injectst-usr-lib-these-days.patch similarity index 100% rename from recipes-misc/recipes-multimedia/mixxx/mixxx/0005-Do-not-add-QT-libdir-it-injectst-usr-lib-these-days.patch rename to recipes-musicians/mixxx/mixxx/0005-Do-not-add-QT-libdir-it-injectst-usr-lib-these-days.patch diff --git a/recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb b/recipes-musicians/mixxx/mixxx_git.bb similarity index 95% rename from recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb rename to recipes-musicians/mixxx/mixxx_git.bb index 780f43a7..462ff1a0 100644 --- a/recipes-misc/recipes-multimedia/mixxx/mixxx_git.bb +++ b/recipes-musicians/mixxx/mixxx_git.bb @@ -66,6 +66,9 @@ EXTRA_OESCONS += " \ " # perftools=1 +# If we export in do_install only, mixxx is compiled twice +export LIBDIR="${libdir}" + do_install_prepend() { install -d ${D}${prefix} sed -i 's:/etc/udev:${D}/etc/udev:g' ${S}/src/SConscript diff --git a/recipes-misc/recipes-multimedia/muse/muse/0001-fluidsynth-Follow-API-change-introduced-in-fluidsynt.patch b/recipes-musicians/muse/muse/0001-fluidsynth-Follow-API-change-introduced-in-fluidsynt.patch similarity index 100% rename from recipes-misc/recipes-multimedia/muse/muse/0001-fluidsynth-Follow-API-change-introduced-in-fluidsynt.patch rename to recipes-musicians/muse/muse/0001-fluidsynth-Follow-API-change-introduced-in-fluidsynt.patch diff --git a/recipes-misc/recipes-multimedia/muse/muse_git.bb b/recipes-musicians/muse/muse_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/muse/muse_git.bb rename to recipes-musicians/muse/muse_git.bb diff --git a/recipes-misc/recipes-multimedia/nekobee/nekobee.bb b/recipes-musicians/nekobee/nekobee.bb similarity index 100% rename from recipes-misc/recipes-multimedia/nekobee/nekobee.bb rename to recipes-musicians/nekobee/nekobee.bb diff --git a/recipes-misc/recipes-multimedia/openav/arty-fx/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch b/recipes-musicians/openav/arty-fx/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch similarity index 100% rename from recipes-misc/recipes-multimedia/openav/arty-fx/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch rename to recipes-musicians/openav/arty-fx/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch diff --git a/recipes-misc/recipes-multimedia/openav/arty-fx/0002-avtk-remove-sse-flags-they-work-on-intel-hardware-on.patch b/recipes-musicians/openav/arty-fx/0002-avtk-remove-sse-flags-they-work-on-intel-hardware-on.patch similarity index 100% rename from recipes-misc/recipes-multimedia/openav/arty-fx/0002-avtk-remove-sse-flags-they-work-on-intel-hardware-on.patch rename to recipes-musicians/openav/arty-fx/0002-avtk-remove-sse-flags-they-work-on-intel-hardware-on.patch diff --git a/recipes-misc/recipes-multimedia/openav/arty-fx_1.3.bb b/recipes-musicians/openav/arty-fx_1.3.bb similarity index 100% rename from recipes-misc/recipes-multimedia/openav/arty-fx_1.3.bb rename to recipes-musicians/openav/arty-fx_1.3.bb diff --git a/recipes-misc/recipes-multimedia/openav/fabla/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch b/recipes-musicians/openav/fabla/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch similarity index 100% rename from recipes-misc/recipes-multimedia/openav/fabla/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch rename to recipes-musicians/openav/fabla/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch diff --git a/recipes-misc/recipes-multimedia/openav/fabla_git.bb b/recipes-musicians/openav/fabla_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/openav/fabla_git.bb rename to recipes-musicians/openav/fabla_git.bb diff --git a/recipes-misc/recipes-multimedia/openav/luppp/0001-CMake-Remove-arch-detection-it-detects-build-host.patch b/recipes-musicians/openav/luppp/0001-CMake-Remove-arch-detection-it-detects-build-host.patch similarity index 100% rename from recipes-misc/recipes-multimedia/openav/luppp/0001-CMake-Remove-arch-detection-it-detects-build-host.patch rename to recipes-musicians/openav/luppp/0001-CMake-Remove-arch-detection-it-detects-build-host.patch diff --git a/recipes-misc/recipes-multimedia/openav/luppp_git.bb b/recipes-musicians/openav/luppp_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/openav/luppp_git.bb rename to recipes-musicians/openav/luppp_git.bb diff --git a/recipes-misc/recipes-multimedia/openav/openav-presets_git.bb b/recipes-musicians/openav/openav-presets_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/openav/openav-presets_git.bb rename to recipes-musicians/openav/openav-presets_git.bb diff --git a/recipes-misc/recipes-multimedia/openav/sorcer/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch b/recipes-musicians/openav/sorcer/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch similarity index 100% rename from recipes-misc/recipes-multimedia/openav/sorcer/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch rename to recipes-musicians/openav/sorcer/0001-Do-not-overwrite-build-flags-it-causes-trouble-for-m.patch diff --git a/recipes-misc/recipes-multimedia/openav/sorcer_git.bb b/recipes-musicians/openav/sorcer_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/openav/sorcer_git.bb rename to recipes-musicians/openav/sorcer_git.bb diff --git a/recipes-musicians/pipewire/pipewire_0.2.4.bb b/recipes-musicians/pipewire/pipewire_0.2.4.bb new file mode 100644 index 00000000..833a26c8 --- /dev/null +++ b/recipes-musicians/pipewire/pipewire_0.2.4.bb @@ -0,0 +1,30 @@ +SUMMARY = "Multimedia processing graphs" +HOMEPAGE = "http://pipewire.org/" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=d8153c6e65986f862a0550ca74a3ed73 \ + file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \ +" + +inherit meson + +DEPENDS += " \ + dbus \ + glib-2.0 \ + alsa-lib \ + v4l-utils \ + gstreamer1.0 \ + gstreamer1.0-plugins-base \ +" + +SRC_URI = "git://github.com/PipeWire/pipewire.git" +SRCREV = "14ebb85e7482c5b7963d2e647608464f5cd148bb" +S = "${WORKDIR}/git" + +FILES_${PN} += " \ + ${systemd_user_unitdir} \ + ${libdir}/pipewire-0.2 \ + ${libdir}/spa \ + ${libdir}/gstreamer-1.0 \ +" + diff --git a/recipes-misc/recipes-multimedia/polyphone/files/0001-align-compiler-switches-constants-for-cross-compilin.patch b/recipes-musicians/polyphone/files/0001-align-compiler-switches-constants-for-cross-compilin.patch similarity index 65% rename from recipes-misc/recipes-multimedia/polyphone/files/0001-align-compiler-switches-constants-for-cross-compilin.patch rename to recipes-musicians/polyphone/files/0001-align-compiler-switches-constants-for-cross-compilin.patch index f975ad3b..d60bea5c 100644 --- a/recipes-misc/recipes-multimedia/polyphone/files/0001-align-compiler-switches-constants-for-cross-compilin.patch +++ b/recipes-musicians/polyphone/files/0001-align-compiler-switches-constants-for-cross-compilin.patch @@ -1,105 +1,102 @@ From 0c780e129ca63304eb5602496f070c5d66b2ef0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 8 Jan 2017 04:00:00 +0100 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 28 Dec 2018 23:12:22 +0100 Subject: [PATCH] align compiler switches / constants for cross compiling on - varous machines -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit + various machines Upstream-Status: Pending -Signed-off-by: Andreas Müller +Signed-off-by: Andreas Müller --- lib/sfarklib/sfklCoding.cpp | 10 +++------- lib/sfarklib/sfklCrunch.cpp | 2 +- lib/sfarklib/wcc.h | 8 +------- - polyphone.pro | 3 +-- - 4 files changed, 6 insertions(+), 17 deletions(-) + polyphone.pro | 11 +---------- + 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/lib/sfarklib/sfklCoding.cpp b/lib/sfarklib/sfklCoding.cpp -index 0749393..19b1e27 100644 +index d7f2ffd..eb522f9 100644 --- a/lib/sfarklib/sfklCoding.cpp +++ b/lib/sfarklib/sfklCoding.cpp @@ -230,7 +230,7 @@ int ReadHeader(V2_FILEHEADER *FileHeader, BYTE *fbuf, int bufsize) - HeaderLen = V2_FILEHEADER_SIZE - sizeof(FileHeader->FileName) + strlen(FileHeader->FileName) + 1; - - // If we get this far, there's a good chance we've got the header... -- #ifdef __BIG_ENDIAN__ -+ #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - // FixEndians of all multi-byte integers (currently only relevent to Mac) - #define FIXENDIAN(field) FixEndian(&(FileHeader->field), sizeof(FileHeader->field)) - FIXENDIAN(Flags); FIXENDIAN(OriginalSize); FIXENDIAN(CompressedSize); + HeaderLen = V2_FILEHEADER_SIZE - sizeof(FileHeader->FileName) + strlen(FileHeader->FileName) + 1; + + // If we get this far, there's a good chance we've got the header... +-#ifdef __BIG_ENDIAN__ ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + // FixEndians of all multi-byte integers (currently only relevent to Mac) + #define FIXENDIAN(field) FixEndian(&(FileHeader->field), sizeof(FileHeader->field)) + FIXENDIAN(Flags); FIXENDIAN(OriginalSize); FIXENDIAN(CompressedSize); @@ -526,7 +526,7 @@ int ProcessNextBlock(BLOCK_DATA *Blk) - DecompressFast(Blk, NumWords); // Decompress - - //printf("B4 WriteOutputFile: %ld\n", adler32(0, (const BYTE *) Blk->SrcBuf, n) & 0xffff); -- #ifdef __BIG_ENDIAN__ -+ #if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - #define WFIX(I) s = bp[I+0]; bp[I+0] = bp[I+1]; bp[I+1] = s; - BYTE *bp = (BYTE *) Blk->SrcBuf; BYTE *ep = bp + n; - do { + DecompressFast(Blk, NumWords); // Decompress + + //printf("B4 WriteOutputFile: %ld\n", adler32(0, (const BYTE *) Blk->SrcBuf, n) & 0xffff); +-#ifdef __BIG_ENDIAN__ ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + #define WFIX(I) s = bp[I+0]; bp[I+0] = bp[I+1]; bp[I+1] = s; + BYTE *bp = (BYTE *) Blk->SrcBuf; BYTE *ep = bp + n; + do { @@ -844,15 +844,11 @@ int Decode(const char *InFileName, const char *ReqOutFileName) - // Adjust integer held at *num for this machine's endian system - void FixEndian(void *num, int nsize) - { --#ifdef __BIG_ENDIAN__ -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - int i; - BYTE bb[4]; - for (i = 0; i < nsize; i++) bb[i] = ((BYTE *) num)[i]; - for (i = 0; i < nsize; i++) ((BYTE *) num)[i] = bb[nsize-1-i]; --#else -- #ifndef __LITTLE_ENDIAN__ -- #error ENDIAN system undefined -- #endif - #endif - } - + // Adjust integer held at *num for this machine's endian system + void FixEndian(void *num, int nsize) + { +-#ifdef __BIG_ENDIAN__ ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + int i; + BYTE bb[4]; + for (i = 0; i < nsize; i++) bb[i] = ((BYTE *) num)[i]; + for (i = 0; i < nsize; i++) ((BYTE *) num)[i] = bb[nsize-1-i]; +-#else +-#ifndef __LITTLE_ENDIAN__ +-#error ENDIAN system undefined +-#endif + #endif + } + diff --git a/lib/sfarklib/sfklCrunch.cpp b/lib/sfarklib/sfklCrunch.cpp -index 6eefe16..7c5c153 100644 +index 6b91da3..6a82c57 100644 --- a/lib/sfarklib/sfklCrunch.cpp +++ b/lib/sfarklib/sfklCrunch.cpp @@ -72,7 +72,7 @@ static BYTE nb[1 << (AWORD_BITS-1)]; // Array to hold number of bits needed to r - bioBits = LOWBITS(bioBits, bioRemBits) - - // ========================================================================= --#ifdef __BIG_ENDIAN__ -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - - #define WFIX(I) s = bp[I+0]; bp[I+0] = bp[I+1]; bp[I+1] = s; - // Read from disk if needed, and fix endians + bioBits = LOWBITS(bioBits, bioRemBits) + + // ========================================================================= +-#ifdef __BIG_ENDIAN__ ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + + #define WFIX(I) s = bp[I+0]; bp[I+0] = bp[I+1]; bp[I+1] = s; + // Read from disk if needed, and fix endians diff --git a/lib/sfarklib/wcc.h b/lib/sfarklib/wcc.h -index 0a6739f..d9b44fb 100644 +index 7330cb2..0cf5677 100644 --- a/lib/sfarklib/wcc.h +++ b/lib/sfarklib/wcc.h @@ -17,12 +17,6 @@ - // You should have received a copy of the GNU General Public License - // along with sfArkLib. If not, see . - --#ifndef __BIG_ENDIAN__ --#ifndef __LITTLE_ENDIAN__ --#error ENDIAN system undefined --#endif --#endif -- - #include "sfArkLib.h" - - // ------------------------------------------------------------------------------------ + // You should have received a copy of the GNU General Public License + // along with sfArkLib. If not, see . + +-#ifndef __BIG_ENDIAN__ +-#ifndef __LITTLE_ENDIAN__ +-#error ENDIAN system undefined +-#endif +-#endif +- + #include "sfArkLib.h" + + // ------------------------------------------------------------------------------------ @@ -126,7 +120,7 @@ typedef ULONG BIOWORD2; - #define RETURN_ON_ERROR() if (GlobalErrorFlag != SFARKLIB_SUCCESS) return(GlobalErrorFlag) - #define JUMP_ON_ERROR(label) if (GlobalErrorFlag != SFARKLIB_SUCCESS) goto label - --#ifdef __BIG_ENDIAN__ -+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ - #define FIX_ENDIAN16(w) ((((BYTE) w) << 8) | (((USHORT)w) >> 8)) - #else - #define FIX_ENDIAN16(w) (w) + #define RETURN_ON_ERROR() if (GlobalErrorFlag != SFARKLIB_SUCCESS) return(GlobalErrorFlag) + #define JUMP_ON_ERROR(label) if (GlobalErrorFlag != SFARKLIB_SUCCESS) goto label + +-#ifdef __BIG_ENDIAN__ ++#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + #define FIX_ENDIAN16(w) ((((BYTE) w) << 8) | (((USHORT)w) >> 8)) + #else + #define FIX_ENDIAN16(w) (w) diff --git a/polyphone.pro b/polyphone.pro -index 9aef72c..d10ccfa 100644 +index 40e1f52..7e00fb4 100644 --- a/polyphone.pro +++ b/polyphone.pro -@@ -385,7 +385,6 @@ RESOURCES += ressources.qrc \ +@@ -752,7 +752,6 @@ RESOURCES += resources.qrc # SfArk extraction (what a mess!) @@ -107,8 +104,8 @@ index 9aef72c..d10ccfa 100644 INCLUDEPATH += lib/sfarklib HEADERS += lib/sfarklib/sfArkLib.h \ lib/sfarklib/wcc.h \ -@@ -414,13 +413,6 @@ macx { - ExtraCompiler.input = SPECIAL_SOURCE +@@ -779,13 +778,5 @@ macx { + ExtraCompiler.input = SPECIAL_SOURCES ExtraCompiler.variable_out = OBJECTS ExtraCompiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_IN_BASE}$${QMAKE_EXT_OBJ} -win32 { @@ -117,12 +114,11 @@ index 9aef72c..d10ccfa 100644 -equals(QMAKE_CXX, g++) { - ExtraCompiler.commands = $${QMAKE_CXX} -fPIC -D__LITTLE_ENDIAN__ -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} -} --equals(QMAKE_CXX, clang++) { +-macx { - ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -D__LITTLE_ENDIAN__ -mno-sse -mfpmath=387 $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} -} +ExtraCompiler.commands = $${QMAKE_CXX} $(CXXFLAGS) -fPIC $(INCPATH) -c ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT} -+ QMAKE_EXTRA_COMPILERS += ExtraCompiler -- -2.14.3 +2.20.1 diff --git a/recipes-misc/recipes-multimedia/polyphone/files/polyphone.desktop b/recipes-musicians/polyphone/files/polyphone.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/polyphone/files/polyphone.desktop rename to recipes-musicians/polyphone/files/polyphone.desktop diff --git a/recipes-misc/recipes-multimedia/polyphone/files/polyphone.mime b/recipes-musicians/polyphone/files/polyphone.mime similarity index 100% rename from recipes-misc/recipes-multimedia/polyphone/files/polyphone.mime rename to recipes-musicians/polyphone/files/polyphone.mime diff --git a/recipes-misc/recipes-multimedia/polyphone/polyphone_1.9.bb b/recipes-musicians/polyphone/polyphone_2.0.1.bb similarity index 73% rename from recipes-misc/recipes-multimedia/polyphone/polyphone_1.9.bb rename to recipes-musicians/polyphone/polyphone_2.0.1.bb index d57c7871..49d01434 100644 --- a/recipes-misc/recipes-multimedia/polyphone/polyphone_1.9.bb +++ b/recipes-musicians/polyphone/polyphone_2.0.1.bb @@ -1,7 +1,7 @@ SUMMARY = "Soundfont editor" HOMEPAGE = "http://polyphone-soundfonts.com/en/" LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://main.cpp;beginline=6;endline=18;md5=092eabd5b12b1c1d876a94e06601bd81" +LIC_FILES_CHKSUM = "file://main.cpp;beginline=6;endline=18;md5=11e8b245e7c8a15dafd52bc856ef3ff1" inherit qmake5 gtk-icon-cache mime @@ -23,10 +23,9 @@ SRC_URI = " \ file://polyphone.desktop \ file://polyphone.mime \ file://0001-align-compiler-switches-constants-for-cross-compilin.patch \ - file://0002-config.ccp-include-QAction-explicitly-to-fix-build-w.patch \ " -SRCREV = "13beb7119bc573af3f5e595ae2989034c226e355" -S = "${WORKDIR}/git/trunk" +SRCREV = "9f9720f4fded286f253e85fc708ee9bbba507eb5" +S = "${WORKDIR}/git/sources" do_configure_prepend() { sed -i \ @@ -37,10 +36,10 @@ do_configure_prepend() { do_install() { install -d ${D}${bindir} - install -m 0755 ${B}/RELEASE/polyphone ${D}${bindir}/ + install -m 0755 ${B}/bin/polyphone ${D}${bindir}/ install -d ${D}${datadir}/pixmaps - install -m 0644 ${S}/ressources/polyphone.png ${D}${datadir}/pixmaps/ + install -m 0644 ${S}/resources/polyphone.png ${D}${datadir}/pixmaps/ install -d ${D}${datadir}/applications install -m 0644 ${WORKDIR}/${BPN}.desktop ${D}${datadir}/applications/ diff --git a/recipes-misc/recipes-multimedia/portmidi/files/0001-do-not-build-java-application-to-set-midi-defaults.patch b/recipes-musicians/portmidi/files/0001-do-not-build-java-application-to-set-midi-defaults.patch similarity index 100% rename from recipes-misc/recipes-multimedia/portmidi/files/0001-do-not-build-java-application-to-set-midi-defaults.patch rename to recipes-musicians/portmidi/files/0001-do-not-build-java-application-to-set-midi-defaults.patch diff --git a/recipes-misc/recipes-multimedia/portmidi/files/0002-fix-compilation-du-to-unkown-functions.patch b/recipes-musicians/portmidi/files/0002-fix-compilation-du-to-unkown-functions.patch similarity index 100% rename from recipes-misc/recipes-multimedia/portmidi/files/0002-fix-compilation-du-to-unkown-functions.patch rename to recipes-musicians/portmidi/files/0002-fix-compilation-du-to-unkown-functions.patch diff --git a/recipes-misc/recipes-multimedia/portmidi/files/0003-fix-format-security..patch b/recipes-musicians/portmidi/files/0003-fix-format-security..patch similarity index 100% rename from recipes-misc/recipes-multimedia/portmidi/files/0003-fix-format-security..patch rename to recipes-musicians/portmidi/files/0003-fix-format-security..patch diff --git a/recipes-misc/recipes-multimedia/portmidi/files/fedora-portmidi-cmake.patch b/recipes-musicians/portmidi/files/fedora-portmidi-cmake.patch similarity index 100% rename from recipes-misc/recipes-multimedia/portmidi/files/fedora-portmidi-cmake.patch rename to recipes-musicians/portmidi/files/fedora-portmidi-cmake.patch diff --git a/recipes-misc/recipes-multimedia/portmidi/portmidi_217.bb b/recipes-musicians/portmidi/portmidi_217.bb similarity index 100% rename from recipes-misc/recipes-multimedia/portmidi/portmidi_217.bb rename to recipes-musicians/portmidi/portmidi_217.bb diff --git a/recipes-misc/recipes-multimedia/projectm/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-musicians/projectm/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch similarity index 100% rename from recipes-misc/recipes-multimedia/projectm/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch rename to recipes-musicians/projectm/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch diff --git a/recipes-misc/recipes-multimedia/projectm/files/0002-Makefile.am-Fix-installation-with-DESTDIR-set.patch b/recipes-musicians/projectm/files/0002-Makefile.am-Fix-installation-with-DESTDIR-set.patch similarity index 100% rename from recipes-misc/recipes-multimedia/projectm/files/0002-Makefile.am-Fix-installation-with-DESTDIR-set.patch rename to recipes-musicians/projectm/files/0002-Makefile.am-Fix-installation-with-DESTDIR-set.patch diff --git a/recipes-misc/recipes-multimedia/projectm/projectm_git.bb b/recipes-musicians/projectm/projectm_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/projectm/projectm_git.bb rename to recipes-musicians/projectm/projectm_git.bb diff --git a/recipes-musicians/qm-dsp/qm-dsp_1.7.1.bb b/recipes-musicians/qm-dsp/qm-dsp_1.7.1.bb new file mode 100644 index 00000000..06c4abcf --- /dev/null +++ b/recipes-musicians/qm-dsp/qm-dsp_1.7.1.bb @@ -0,0 +1,40 @@ +SUMMARY = "A C++ library of functions for DSP and Music Informatics purposes" +HOMEPAGE = "https://code.soundsoftware.ac.uk/projects/qm-dsp" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=cbbd794e2a0a289b9dfcc9f513d1996e" + + +SRC_URI = "https://code.soundsoftware.ac.uk/attachments/download/1582/${BPN}-${PV}.tar.gz " +SRC_URI[md5sum] = "9c7a7b15926000e15a9e3c7c06492e58" +SRC_URI[sha256sum] = "2b203f6dabd0475f13b356945827ae90a4ba4a4bbde935ffc334b50a9c782561" + +# we cannot use files in build/linux - these are x86 polluted - so set flags here +CFLAGSADD = "-DNDEBUG -fPIC -ffast-math -DUSE_PTHREADS -I./include" +CFLAGS += "${CFLAGSADD}" +CXXFLAGS += "${CFLAGSADD}" + +do_compile_prepend() { + cp build/general/Makefile.inc Makefile +} + +do_install() { + # stolen https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=qm-dsp + cd ${S} + install -Dm644 -t ${D}${libdir} libqm-dsp.a + install -Dm644 -t ${D}${includedir}/qm-dsp/base base/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/chromagram dsp/chromagram/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/keydetection dsp/keydetection/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/mfcc dsp/mfcc/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/onsets dsp/onsets/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/phasevocoder dsp/phasevocoder/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/rateconversion dsp/rateconversion/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/rhythm dsp/rhythm/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/segmentation dsp/segmentation/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/signalconditioning dsp/signalconditioning/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/tempotracking dsp/tempotracking/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/tonal dsp/tonal/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/transforms dsp/transforms/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/dsp/wavelet dsp/wavelet/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/maths maths/*.h + install -Dm644 -t ${D}${includedir}/qm-dsp/thread thread/*.h +} diff --git a/recipes-misc/recipes-multimedia/qmidiarp/files/0001-remove-code-to-find-qtwidget-headers-it-finds-host-s.patch b/recipes-musicians/qmidiarp/files/0001-remove-code-to-find-qtwidget-headers-it-finds-host-s.patch similarity index 100% rename from recipes-misc/recipes-multimedia/qmidiarp/files/0001-remove-code-to-find-qtwidget-headers-it-finds-host-s.patch rename to recipes-musicians/qmidiarp/files/0001-remove-code-to-find-qtwidget-headers-it-finds-host-s.patch diff --git a/recipes-misc/recipes-multimedia/qmidiarp/files/0002-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-musicians/qmidiarp/files/0002-find-native-qt-build-tools-by-configure-options-auto.patch similarity index 100% rename from recipes-misc/recipes-multimedia/qmidiarp/files/0002-find-native-qt-build-tools-by-configure-options-auto.patch rename to recipes-musicians/qmidiarp/files/0002-find-native-qt-build-tools-by-configure-options-auto.patch diff --git a/recipes-misc/recipes-multimedia/qmidiarp/files/qmidiarp-alsa.desktop b/recipes-musicians/qmidiarp/files/qmidiarp-alsa.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/qmidiarp/files/qmidiarp-alsa.desktop rename to recipes-musicians/qmidiarp/files/qmidiarp-alsa.desktop diff --git a/recipes-misc/recipes-multimedia/qmidiarp/files/qmidiarp-jack.desktop b/recipes-musicians/qmidiarp/files/qmidiarp-jack.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/qmidiarp/files/qmidiarp-jack.desktop rename to recipes-musicians/qmidiarp/files/qmidiarp-jack.desktop diff --git a/recipes-misc/recipes-multimedia/qmidiarp/qmidiarp_0.6.5.bb b/recipes-musicians/qmidiarp/qmidiarp_0.6.5.bb similarity index 100% rename from recipes-misc/recipes-multimedia/qmidiarp/qmidiarp_0.6.5.bb rename to recipes-musicians/qmidiarp/qmidiarp_0.6.5.bb diff --git a/recipes-misc/recipes-multimedia/qmmp/files/0001-Remove-freebsd-compilation-support.patch b/recipes-musicians/qmmp/files/0001-Remove-freebsd-compilation-support.patch similarity index 100% rename from recipes-misc/recipes-multimedia/qmmp/files/0001-Remove-freebsd-compilation-support.patch rename to recipes-musicians/qmmp/files/0001-Remove-freebsd-compilation-support.patch diff --git a/recipes-misc/recipes-multimedia/qmmp/files/0002-Hardcode-projectM-configuration-file-location.patch b/recipes-musicians/qmmp/files/0002-Hardcode-projectM-configuration-file-location.patch similarity index 100% rename from recipes-misc/recipes-multimedia/qmmp/files/0002-Hardcode-projectM-configuration-file-location.patch rename to recipes-musicians/qmmp/files/0002-Hardcode-projectM-configuration-file-location.patch diff --git a/recipes-misc/recipes-multimedia/qmmp/qmmp_1.2.4.bb b/recipes-musicians/qmmp/qmmp_1.3.1.bb similarity index 79% rename from recipes-misc/recipes-multimedia/qmmp/qmmp_1.2.4.bb rename to recipes-musicians/qmmp/qmmp_1.3.1.bb index b325ae6a..87d6202c 100644 --- a/recipes-misc/recipes-multimedia/qmmp/qmmp_1.2.4.bb +++ b/recipes-musicians/qmmp/qmmp_1.3.1.bb @@ -34,9 +34,12 @@ SRC_URI = " \ file://0001-Remove-freebsd-compilation-support.patch \ file://0002-Hardcode-projectM-configuration-file-location.patch \ " -SRC_URI[md5sum] = "70bddb784419996383ce3876a48bd62b" -SRC_URI[sha256sum] = "224904f073e3921a080dca008e6c99e3d606f5442d1df08835cba000a069ae66" +SRC_URI[md5sum] = "827963a73facb802c8f684a3762c6b8b" +SRC_URI[sha256sum] = "1cd2dd430a12e987720d30832e9ead8220ce9fcc9b871d45bed0e4bbe25fbeb6" inherit cmake_qt5 -FILES_${PN} += "${datadir}" +FILES_${PN} += " \ + ${datadir} \ + ${libdir}/qmmp-1.3 \ +" diff --git a/recipes-misc/recipes-multimedia/qt-gstreamer/files/0001-Fix-compilation-with-GStreamer-1-5-1.patch b/recipes-musicians/qt-gstreamer/files/0001-Fix-compilation-with-GStreamer-1-5-1.patch similarity index 100% rename from recipes-misc/recipes-multimedia/qt-gstreamer/files/0001-Fix-compilation-with-GStreamer-1-5-1.patch rename to recipes-musicians/qt-gstreamer/files/0001-Fix-compilation-with-GStreamer-1-5-1.patch diff --git a/recipes-misc/recipes-multimedia/qt-gstreamer/files/0002-FindQt4or5.cmake-Optionally-create-qt5_use_modules-t.patch b/recipes-musicians/qt-gstreamer/files/0002-FindQt4or5.cmake-Optionally-create-qt5_use_modules-t.patch similarity index 100% rename from recipes-misc/recipes-multimedia/qt-gstreamer/files/0002-FindQt4or5.cmake-Optionally-create-qt5_use_modules-t.patch rename to recipes-musicians/qt-gstreamer/files/0002-FindQt4or5.cmake-Optionally-create-qt5_use_modules-t.patch diff --git a/recipes-misc/recipes-multimedia/qt-gstreamer/files/0003-Make-QML-installation-path-configurable.patch b/recipes-musicians/qt-gstreamer/files/0003-Make-QML-installation-path-configurable.patch similarity index 100% rename from recipes-misc/recipes-multimedia/qt-gstreamer/files/0003-Make-QML-installation-path-configurable.patch rename to recipes-musicians/qt-gstreamer/files/0003-Make-QML-installation-path-configurable.patch diff --git a/recipes-misc/recipes-multimedia/qt-gstreamer/qt-gstreamer_1.2.0.bb b/recipes-musicians/qt-gstreamer/qt-gstreamer_1.2.0.bb similarity index 100% rename from recipes-misc/recipes-multimedia/qt-gstreamer/qt-gstreamer_1.2.0.bb rename to recipes-musicians/qt-gstreamer/qt-gstreamer_1.2.0.bb diff --git a/recipes-misc/recipes-multimedia/rncbc/drumkv1_0.9.3.bb b/recipes-musicians/rncbc/drumkv1_0.9.5.bb similarity index 89% rename from recipes-misc/recipes-multimedia/rncbc/drumkv1_0.9.3.bb rename to recipes-musicians/rncbc/drumkv1_0.9.5.bb index a05779fc..078d8f39 100644 --- a/recipes-misc/recipes-multimedia/rncbc/drumkv1_0.9.3.bb +++ b/recipes-musicians/rncbc/drumkv1_0.9.5.bb @@ -17,11 +17,11 @@ inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ git://github.com/TuriSc/hydrogen2drumkv1.py.git;name=hydrogen2drumkv1;destsuffix=hydrogen2drumkv1 \ - file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ file://0002-Remove-extra-rpath.patch \ " -SRC_URI[md5sum] = "1523c576c5f4be72b979de3ef68a8c49" -SRC_URI[sha256sum] = "8ac9525e4698642053d1a79811489792746d17910fe6165de44ddeebfddd6828" +SRC_URI[md5sum] = "826afa3fea4933f24d7e9988367a64b9" +SRC_URI[sha256sum] = "06151455568eb7de54834ca06ef95ce56ff7e29662459d40c99fe49c1fe6ffab" SRCREV_hydrogen2drumkv1 = "4ca8af8f1433dce33f675ae68e95429c9eed084e" diff --git a/recipes-misc/recipes-multimedia/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-musicians/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch similarity index 100% rename from recipes-misc/recipes-multimedia/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch rename to recipes-musicians/rncbc/files/0001-find-native-qt-build-tools-by-configure-options-auto.patch diff --git a/recipes-misc/recipes-multimedia/rncbc/files/0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-musicians/rncbc/files/0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch similarity index 100% rename from recipes-misc/recipes-multimedia/rncbc/files/0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch rename to recipes-musicians/rncbc/files/0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch diff --git a/recipes-misc/recipes-multimedia/rncbc/files/0002-Remove-extra-rpath.patch b/recipes-musicians/rncbc/files/0002-Remove-extra-rpath.patch similarity index 86% rename from recipes-misc/recipes-multimedia/rncbc/files/0002-Remove-extra-rpath.patch rename to recipes-musicians/rncbc/files/0002-Remove-extra-rpath.patch index 4e0082c2..3931a1be 100644 --- a/recipes-misc/recipes-multimedia/rncbc/files/0002-Remove-extra-rpath.patch +++ b/recipes-musicians/rncbc/files/0002-Remove-extra-rpath.patch @@ -28,9 +28,9 @@ index 4aa3349..d9d4415 100644 + LIBS += -l$${NAME} -l$${NAME}_ui } - QT += xml + QT += widgets xml diff --git a/src/src_lv2.pro b/src/src_lv2.pro -index b9e5565..8d28f61 100644 +index 069e1ee..6eb8485 100644 --- a/src/src_lv2.pro +++ b/src/src_lv2.pro @@ -59,7 +59,7 @@ unix { @@ -43,23 +43,23 @@ index b9e5565..8d28f61 100644 QT -= gui diff --git a/src/src_lv2ui.pro b/src/src_lv2ui.pro -index cabf198..07d32db 100644 +index 50f5798..7b0bad4 100644 --- a/src/src_lv2ui.pro +++ b/src/src_lv2ui.pro -@@ -71,7 +71,7 @@ unix { +@@ -59,7 +59,7 @@ unix { - QMAKE_CLEAN += $${TARGET_LV2UI}.so $${TARGET_LV2UI}.ttl + QMAKE_CLEAN += $${TARGET_LV2UI}.so - LIBS += -l$${NAME} -l$${NAME}_ui -L$${NAME}.lv2 -Wl,-rpath,$${LIBDIR}:$${LV2DIR}/$${NAME}.lv2 + LIBS += -l$${NAME} -l$${NAME}_ui -L$${NAME}.lv2 } - QT += xml + QT += widgets xml diff --git a/src/src_ui.pro b/src/src_ui.pro -index 1abc4a0..014e380 100644 +index 081e3af..132d5b4 100644 --- a/src/src_ui.pro +++ b/src/src_ui.pro -@@ -71,7 +71,7 @@ unix { +@@ -69,7 +69,7 @@ unix { target.path = $${LIBDIR} @@ -67,7 +67,4 @@ index 1abc4a0..014e380 100644 + LIBS += -l$${NAME} } - QT += xml --- -2.14.4 - + QT += widgets xml diff --git a/recipes-misc/recipes-multimedia/rncbc/padthv1/0001-Build-against-fftw3f-that-supports-NEON-on-ARM.patch b/recipes-musicians/rncbc/padthv1/0001-Build-against-fftw3f-that-supports-NEON-on-ARM.patch similarity index 100% rename from recipes-misc/recipes-multimedia/rncbc/padthv1/0001-Build-against-fftw3f-that-supports-NEON-on-ARM.patch rename to recipes-musicians/rncbc/padthv1/0001-Build-against-fftw3f-that-supports-NEON-on-ARM.patch diff --git a/recipes-misc/recipes-multimedia/rncbc/padthv1/padthv1.conf b/recipes-musicians/rncbc/padthv1/padthv1.conf similarity index 100% rename from recipes-misc/recipes-multimedia/rncbc/padthv1/padthv1.conf rename to recipes-musicians/rncbc/padthv1/padthv1.conf diff --git a/recipes-misc/recipes-multimedia/rncbc/padthv1_0.9.3.bb b/recipes-musicians/rncbc/padthv1_0.9.5.bb similarity index 90% rename from recipes-misc/recipes-multimedia/rncbc/padthv1_0.9.3.bb rename to recipes-musicians/rncbc/padthv1_0.9.5.bb index eebf79e5..ff63dd44 100644 --- a/recipes-misc/recipes-multimedia/rncbc/padthv1_0.9.3.bb +++ b/recipes-musicians/rncbc/padthv1_0.9.5.bb @@ -20,14 +20,14 @@ FFTWSINGLEPATCH = "${@bb.utils.contains('TUNE_FEATURES', 'neon', 'file://0001-Bu SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ http://linuxsynths.com/Padthv1PatchesDemos/Padthv1Patches.tar.gz;name=linuxsynths-padthv1-presets;subdir=linuxsynths-padthv1-presets \ - file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ \ ${FFTWSINGLEPATCH} \ file://0002-Remove-extra-rpath.patch \ file://padthv1.conf \ " -SRC_URI[md5sum] = "d014db4f3b9bf54599955535c9c5bae6" -SRC_URI[sha256sum] = "6609925d4b0b32aa2eb33782f3d0f9029b72f2d8269cbfe2c417bfd73912fc94" +SRC_URI[md5sum] = "aaaf3dc7fdeac004b04b6232f24eec8d" +SRC_URI[sha256sum] = "70c11342c473e230d2df19be4f5e6fcd475af45eda7189fed2d9593f9693a131" SRC_URI[linuxsynths-padthv1-presets.md5sum] = "951484ad2fe404d233a704d444147827" SRC_URI[linuxsynths-padthv1-presets.sha256sum] = "ad9eadc707784b6931955b1fc63308b9e5dc59d24903e6405e9d34d30794fd0b" diff --git a/recipes-misc/recipes-multimedia/rncbc/qjackctl/QjackCtl.conf b/recipes-musicians/rncbc/qjackctl/QjackCtl.conf similarity index 100% rename from recipes-misc/recipes-multimedia/rncbc/qjackctl/QjackCtl.conf rename to recipes-musicians/rncbc/qjackctl/QjackCtl.conf diff --git a/recipes-misc/recipes-multimedia/rncbc/qjackctl_0.5.5.bb b/recipes-musicians/rncbc/qjackctl_0.5.6.bb similarity index 90% rename from recipes-misc/recipes-multimedia/rncbc/qjackctl_0.5.5.bb rename to recipes-musicians/rncbc/qjackctl_0.5.6.bb index adcaf2d7..a3f45f82 100644 --- a/recipes-misc/recipes-multimedia/rncbc/qjackctl_0.5.5.bb +++ b/recipes-musicians/rncbc/qjackctl_0.5.6.bb @@ -20,8 +20,8 @@ SRC_URI = " \ file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ file://QjackCtl.conf \ " -SRC_URI[md5sum] = "b7aacaf61493ad43e3c2d92ac41d9400" -SRC_URI[sha256sum] = "e5eb7b9249ba22f5301645f792eb34e7306b9002594eb945c9941a9586c2ffe7" +SRC_URI[md5sum] = "5cb4159ac37231dc592d61cb7e0411ea" +SRC_URI[sha256sum] = "b20aac64365aeac90beaf5d414c2125da48242945040c14ee6c3b153d35a9572" EXTRA_OECONF = " \ --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \ diff --git a/recipes-misc/recipes-multimedia/rncbc/qmidictl/0001-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-musicians/rncbc/qmidictl/0001-find-native-qt-build-tools-by-configure-options-auto.patch similarity index 100% rename from recipes-misc/recipes-multimedia/rncbc/qmidictl/0001-find-native-qt-build-tools-by-configure-options-auto.patch rename to recipes-musicians/rncbc/qmidictl/0001-find-native-qt-build-tools-by-configure-options-auto.patch diff --git a/recipes-misc/recipes-multimedia/rncbc/qmidictl_0.5.2.bb b/recipes-musicians/rncbc/qmidictl_0.5.3.bb similarity index 79% rename from recipes-misc/recipes-multimedia/rncbc/qmidictl_0.5.2.bb rename to recipes-musicians/rncbc/qmidictl_0.5.3.bb index 31b32318..6605e364 100644 --- a/recipes-misc/recipes-multimedia/rncbc/qmidictl_0.5.2.bb +++ b/recipes-musicians/rncbc/qmidictl_0.5.3.bb @@ -14,10 +14,10 @@ inherit qmake5_base autotools-brokensep gtk-icon-cache qt5-translation SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ " -SRC_URI[md5sum] = "ba4adc67cff39d91fe5e99268006e9ad" -SRC_URI[sha256sum] = "70bced8d52c113f66594f09fc875e905093fba8cdc899baf8b5e42c788c9508e" +SRC_URI[md5sum] = "c91cec2bf72278a390e3bd75ed149959" +SRC_URI[sha256sum] = "a42d7a2f3fc8090a4fa0a7696f532048071febac88d5ae5e10a0697cb1831551" EXTRA_OECONF = " \ --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \ diff --git a/recipes-musicians/rncbc/qmidinet/0001-find-native-qt-build-tools-by-configure-options-auto.patch b/recipes-musicians/rncbc/qmidinet/0001-find-native-qt-build-tools-by-configure-options-auto.patch new file mode 100644 index 00000000..35664117 --- /dev/null +++ b/recipes-musicians/rncbc/qmidinet/0001-find-native-qt-build-tools-by-configure-options-auto.patch @@ -0,0 +1,92 @@ +From 42fa0e7e4ce43def9c34af83bfff22950f00b711 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Tue, 12 Mar 2019 23:03:13 +0100 +Subject: [PATCH] find native qt build tools by configure options - auto + detection does not work + +Upstream-Status: Inappropriate [cross specific] + +Signed-off-by: Andreas Müller +--- + configure.ac | 40 +++++++++++++++------------------------- + 1 file changed, 15 insertions(+), 25 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f7d88bd..b5e0b5d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -176,27 +176,9 @@ done + # A common error message: + ac_errmsg="not found in current PATH. Maybe QT development environment isn't available." + +-# Check for proper qmake path/version alternatives. +-AC_PATH_TOOL(ac_qmake, qmake, [no], $ac_path) +-if test "x$ac_qmake" = "xno"; then +- AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path) +- ac_qmake=$ac_cv_qmake +-fi +- +-# Check for proper Qt major version. +-AC_CACHE_CHECK([for Qt major version], [ac_cv_qt_version_major], [ +- ac_cv_qt_version_major=$($ac_qmake -query QT_VERSION | cut -d'.' -f1) +- ac_cv_qt_version_major=$(($ac_cv_qt_version_major + 0)) +-]) +-ac_qt_version_major=$ac_cv_qt_version_major +-if test $ac_qt_version_major -ne 5; then +- AC_PATH_TOOL(ac_cv_qmake, qmake-qt5, [no], $ac_path) +- ac_qmake=$ac_cv_qmake +-fi +- +-if test "x$ac_qmake" = "xno"; then +- AC_MSG_ERROR([qmake-qt5 $ac_errmsg (qt5-devel)]) +-fi ++AC_ARG_WITH(qmake, ++ AC_HELP_STRING([--with-qmake=PATH], [use alternate qmake path]), ++ [ac_qmake="$withval"], [ac_qmake="no"]) + + # Check for proper Qt install path. + AC_CACHE_CHECK([for Qt install path], [ac_cv_qt_install_path], [ +@@ -249,28 +231,36 @@ AC_CACHE_CHECK([for Qt library version >= 5.1], + ]) + + # Check for Qt moc utility. +-AC_PATH_TOOL(ac_moc, moc, [no], $ac_path) ++AC_ARG_WITH(moc, ++ AC_HELP_STRING([--with-moc=PATH], [use alternate moc path]), ++ [ac_moc="$withval"], [ac_moc="no"]) + if test "x$ac_moc" = "xno"; then + AC_MSG_ERROR([moc $ac_errmsg]) + fi + AC_SUBST(ac_moc) + + # Check for Qt uic utility. +-AC_PATH_TOOL(ac_uic, uic, [no], $ac_path) ++AC_ARG_WITH(uic, ++ AC_HELP_STRING([--with-uic=PATH], [use alternate uic path]), ++ [ac_uic="$withval"], [ac_uic="no"]) + if test "x$ac_uic" = "xno"; then + AC_MSG_ERROR([uic $ac_errmsg]) + fi + AC_SUBST(ac_uic) + + # Check for Qt lupdate utility. +-AC_PATH_TOOL(ac_lupdate, lupdate, [no], $ac_path) ++AC_ARG_WITH(lupdate, ++ AC_HELP_STRING([--with-lupdate=PATH], [use alternate lupdate path]), ++ [ac_lupdate="$withval"], [ac_lupdate="no"]) + if test "x$ac_lupdate" = "xno"; then + AC_MSG_ERROR([lupdate $ac_errmsg]) + fi + AC_SUBST(ac_lupdate) + + # Check for Qt lrelease utility. +-AC_PATH_TOOL(ac_lrelease, lrelease, [no], $ac_path) ++AC_ARG_WITH(lrelease, ++ AC_HELP_STRING([--with-lrelease=PATH], [use alternate lrelease path]), ++ [ac_lrelease="$withval"], [ac_lrelease="no"]) + if test "x$ac_release" = "xno"; then + AC_MSG_ERROR([lrelease $ac_errmsg]) + fi +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/rncbc/qmidinet_0.5.2.bb b/recipes-musicians/rncbc/qmidinet_0.5.3.bb similarity index 87% rename from recipes-misc/recipes-multimedia/rncbc/qmidinet_0.5.2.bb rename to recipes-musicians/rncbc/qmidinet_0.5.3.bb index 47413fa8..380fb801 100644 --- a/recipes-misc/recipes-multimedia/rncbc/qmidinet_0.5.2.bb +++ b/recipes-musicians/rncbc/qmidinet_0.5.3.bb @@ -17,8 +17,8 @@ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \ " -SRC_URI[md5sum] = "834c55af1da1eb9f787ca390d619f1a7" -SRC_URI[sha256sum] = "dab64b3760d8250c864f5c45317fdf5c72336c57585c1d92c865b05d7d1e5c78" +SRC_URI[md5sum] = "16c8ead283aec2002422036ef7dfd374" +SRC_URI[sha256sum] = "205817e7e89ea8ab229813fcaaa7769a6a4fbb77d98b20cfff1755abc28f2652" EXTRA_OECONF = " \ --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \ diff --git a/recipes-misc/recipes-multimedia/rncbc/qsynth_0.5.4.bb b/recipes-musicians/rncbc/qsynth_0.5.5.bb similarity index 87% rename from recipes-misc/recipes-multimedia/rncbc/qsynth_0.5.4.bb rename to recipes-musicians/rncbc/qsynth_0.5.5.bb index a7821701..2acf0b19 100644 --- a/recipes-misc/recipes-multimedia/rncbc/qsynth_0.5.4.bb +++ b/recipes-musicians/rncbc/qsynth_0.5.5.bb @@ -19,8 +19,8 @@ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ " -SRC_URI[md5sum] = "bf82058d2ddaff989f9d1dfc58016bab" -SRC_URI[sha256sum] = "2d6befb4023f8a64f35d802991d0d413e11d0307e87485428c969b94bb2bf84e" +SRC_URI[md5sum] = "c5f090b69d101ba912e86b31e2d79c19" +SRC_URI[sha256sum] = "858f52b95642a25f570342d5cf7fafd2a2addb89d567c5b68a3545beb6fda723" EXTRA_OECONF = " \ --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \ diff --git a/recipes-misc/recipes-multimedia/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch b/recipes-musicians/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch similarity index 100% rename from recipes-misc/recipes-multimedia/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch rename to recipes-musicians/rncbc/qtractor/0001-do-nor-try-run-for-float-sse-detection.patch diff --git a/recipes-misc/recipes-multimedia/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch b/recipes-musicians/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch similarity index 74% rename from recipes-misc/recipes-multimedia/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch rename to recipes-musicians/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch index 407934bc..7f7ecd0d 100644 --- a/recipes-misc/recipes-multimedia/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch +++ b/recipes-musicians/rncbc/qtractor/0002-do-nor-try-run-for-suil-libs-detection.patch @@ -1,24 +1,21 @@ From a32a7af99c5f241a08840ce0775c9aaa0c37a792 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 16 Feb 2017 23:36:22 +0100 -Subject: [PATCH] do nor try run for suil libs detection -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 19 Jan 2019 18:55:17 +0100 +Subject: [PATCH] do nor try run for suil libs feature detection -Signed-off-by: Andreas Müller +Signed-off-by: Andreas Müller --- configure.ac | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/configure.ac b/configure.ac -index bb23d72..a5bf793 100644 +index b3de5acd..09d2ef06 100644 --- a/configure.ac +++ b/configure.ac -@@ -1250,17 +1250,7 @@ if test "x$ac_lv2_ui_show" = "xyes"; then +@@ -1229,17 +1229,7 @@ if test "x$ac_lv2_ui_show" = "xyes"; then fi - if test "x$ac_qt4" = "xno" -a "x$ac_suil" = "xyes"; then + if test "x$ac_suil" = "xyes"; then - AC_CACHE_CHECK([for LV2 UI GTK2 support (libsuil_gtk2_in_qt5)], - ac_cv_suil_gtk2_in_qt5, [ - AC_TRY_RUN([ @@ -34,10 +31,10 @@ index bb23d72..a5bf793 100644 if test "x$ac_cv_suil_gtk2_in_qt5" = "xyes"; then AC_DEFINE(CONFIG_LIBSUIL_GTK2_IN_QT5, 1, [Define if libsuil_gtk2_in_qt5 is available.]) # ac_lv2_ui_gtk2="no" -@@ -1278,17 +1268,7 @@ else +@@ -1257,17 +1247,7 @@ else fi - if test "x$ac_qt4" = "xno" -a "x$ac_suil" = "xyes"; then + if test "x$ac_suil" = "xyes"; then - AC_CACHE_CHECK([for LV2 UI X11 support (libsuil_x11_in_qt5)], - ac_cv_suil_x11_in_qt5, [ - AC_TRY_RUN([ @@ -54,5 +51,5 @@ index bb23d72..a5bf793 100644 AC_DEFINE(CONFIG_LIBSUIL_X11_IN_QT5, 1, [Define if libsuil_x11_in_qt5 is available.]) # ac_lv2_ui_x11="no" -- -2.9.3 +2.20.1 diff --git a/recipes-misc/recipes-multimedia/rncbc/qtractor/0003-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch b/recipes-musicians/rncbc/qtractor/0003-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch similarity index 84% rename from recipes-misc/recipes-multimedia/rncbc/qtractor/0003-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch rename to recipes-musicians/rncbc/qtractor/0003-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch index 692a20a6..5bbbf42b 100644 --- a/recipes-misc/recipes-multimedia/rncbc/qtractor/0003-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch +++ b/recipes-musicians/rncbc/qtractor/0003-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch @@ -1,20 +1,20 @@ From e96d295e0d6b36b9b722ad3d4c0b2013e569e9d5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Tue, 3 Oct 2017 21:45:43 +0200 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 8 Dec 2018 22:34:14 +0100 Subject: [PATCH] Add ARM NEON acceleration for time stretch - not yet tested MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Signed-off-by: Andreas Müller +Signed-off-by: Andreas Müller --- - src/qtractorTimeStretch.cpp | 58 +++++++++++++++++++++++++++++++++++++++++++++ + src/qtractorWsolaTimeStretcher.cpp | 58 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) -diff --git a/src/qtractorTimeStretch.cpp b/src/qtractorTimeStretch.cpp +diff --git a/src/qtractorWsolaTimeStretcher.cpp b/src/qtractorWsolaTimeStretcher.cpp index 751b9bc8..6461b8b9 100644 ---- a/src/qtractorTimeStretch.cpp -+++ b/src/qtractorTimeStretch.cpp +--- a/src/qtractorWsolaTimeStretcher.cpp ++++ b/src/qtractorWsolaTimeStretcher.cpp @@ -121,6 +121,60 @@ static inline float sse_cross_corr ( #endif diff --git a/recipes-misc/recipes-multimedia/rncbc/qtractor/Qtractor.conf b/recipes-musicians/rncbc/qtractor/Qtractor.conf similarity index 100% rename from recipes-misc/recipes-multimedia/rncbc/qtractor/Qtractor.conf rename to recipes-musicians/rncbc/qtractor/Qtractor.conf diff --git a/recipes-misc/recipes-multimedia/rncbc/qtractor_0.9.2.bb b/recipes-musicians/rncbc/qtractor_git.bb similarity index 89% rename from recipes-misc/recipes-multimedia/rncbc/qtractor_0.9.2.bb rename to recipes-musicians/rncbc/qtractor_git.bb index ebc2f2e6..8a9a4647 100644 --- a/recipes-misc/recipes-multimedia/rncbc/qtractor_0.9.2.bb +++ b/recipes-musicians/rncbc/qtractor_git.bb @@ -19,15 +19,16 @@ inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime qt5-transl SRC_URI = " \ git://github.com/rncbc//qtractor.git;branch=midiimportx \ - file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ \ file://0001-do-nor-try-run-for-float-sse-detection.patch \ file://0002-do-nor-try-run-for-suil-libs-detection.patch \ file://0003-Add-ARM-NEON-acceleration-for-time-stretch-not-yet-t.patch \ + \ file://Qtractor.conf \ " -SRCREV = "dbbc0b60509b5b5d3c164252855e823e7fb94a58" -PV = "0.9.2+git${SRCPV}" +SRCREV = "ebea558d470b6fc917843abcd46de117825f5469" +PV = "0.9.5+git${SRCPV}" S = "${WORKDIR}/git" EXTRA_OECONF = " \ diff --git a/recipes-misc/recipes-multimedia/rncbc/samplv1_0.9.3.bb b/recipes-musicians/rncbc/samplv1_0.9.5.bb similarity index 80% rename from recipes-misc/recipes-multimedia/rncbc/samplv1_0.9.3.bb rename to recipes-musicians/rncbc/samplv1_0.9.5.bb index 2a909700..7eec753e 100644 --- a/recipes-misc/recipes-multimedia/rncbc/samplv1_0.9.3.bb +++ b/recipes-musicians/rncbc/samplv1_0.9.5.bb @@ -15,11 +15,11 @@ inherit qmake5_base autotools-brokensep pkgconfig gtk-icon-cache mime SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ - file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ file://0002-Remove-extra-rpath.patch \ " -SRC_URI[md5sum] = "06b33585976750a74c78d0151b48f8dd" -SRC_URI[sha256sum] = "7c13e88eee193676f8eeb15c187271e90dc415b0f5de86b2907404be1dc86dfb" +SRC_URI[md5sum] = "d66714b40940804274b6ce4aceab87b3" +SRC_URI[sha256sum] = "68f73f7315af7c9175a3600dd5000c8de118f9fa529d4a060f427d4372cb0210" EXTRA_OECONF = " \ --with-qmake=${OE_QMAKE_PATH_EXTERNAL_HOST_BINS}/qmake \ diff --git a/recipes-misc/recipes-multimedia/rncbc/synthv1/synthv1.conf b/recipes-musicians/rncbc/synthv1/synthv1.conf similarity index 100% rename from recipes-misc/recipes-multimedia/rncbc/synthv1/synthv1.conf rename to recipes-musicians/rncbc/synthv1/synthv1.conf diff --git a/recipes-misc/recipes-multimedia/rncbc/synthv1_0.9.3.bb b/recipes-musicians/rncbc/synthv1_0.9.5.bb similarity index 90% rename from recipes-misc/recipes-multimedia/rncbc/synthv1_0.9.3.bb rename to recipes-musicians/rncbc/synthv1_0.9.5.bb index 6f6068a9..caaa2468 100644 --- a/recipes-misc/recipes-multimedia/rncbc/synthv1_0.9.3.bb +++ b/recipes-musicians/rncbc/synthv1_0.9.5.bb @@ -17,13 +17,13 @@ SRC_URI = " \ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BPN}-${PV}.tar.gz \ ${SOURCEFORGE_MIRROR}/project/autostatic/autostatic-synthv1-presets/autostatic-synthv1-presets1.tar.gz;name=autostatic-synthv1-presets1 \ http://linuxsynths.com/Synthv1PatchesDemos/Synthv1Patches06.tar.gz;name=linuxsynths-synthv1-presets;subdir=linuxsynths-synthv1-presets \ - file://0001-find-native-qt-build-tools-by-configure-options-auto.patch \ + file://0001-no-Qt4-find-native-qt-build-tools-by-configure-options-auto.patch \ file://0002-Remove-extra-rpath.patch \ \ file://synthv1.conf \ " -SRC_URI[md5sum] = "12c344d41c0ae71f77d44868bff0932d" -SRC_URI[sha256sum] = "4cf8cbc34661f96d8b121925d9a471ea393ae85fe7bda839c2c798296c99a838" +SRC_URI[md5sum] = "aa050d2fbe7c06c9393a2293214589f1" +SRC_URI[sha256sum] = "e1f92404f9fd67f455b8ff0dca919e891aada062a220381378acb2412b233cad" SRC_URI[autostatic-synthv1-presets1.md5sum] = "02210e5576310554cfe316fb72e88b74" SRC_URI[autostatic-synthv1-presets1.sha256sum] = "587ac8cb4cb645fc71603d1b4b351b24f3e4d9f15a53aca59c0f30cc9f66e253" diff --git a/recipes-misc/recipes-multimedia/rosegarden/rosegarden_18.06.bb b/recipes-musicians/rosegarden/rosegarden_18.06.bb similarity index 100% rename from recipes-misc/recipes-multimedia/rosegarden/rosegarden_18.06.bb rename to recipes-musicians/rosegarden/rosegarden_18.06.bb diff --git a/recipes-misc/recipes-multimedia/rtmidi/files/0001-configure.ac-do-not-run-temp-binary-in-cross-envirno.patch b/recipes-musicians/rtmidi/files/0001-configure.ac-do-not-run-temp-binary-in-cross-envirno.patch similarity index 100% rename from recipes-misc/recipes-multimedia/rtmidi/files/0001-configure.ac-do-not-run-temp-binary-in-cross-envirno.patch rename to recipes-musicians/rtmidi/files/0001-configure.ac-do-not-run-temp-binary-in-cross-envirno.patch diff --git a/recipes-misc/recipes-multimedia/rtmidi/files/0002-configure.ac-do-not-reset-CXXFLAGS.patch b/recipes-musicians/rtmidi/files/0002-configure.ac-do-not-reset-CXXFLAGS.patch similarity index 100% rename from recipes-misc/recipes-multimedia/rtmidi/files/0002-configure.ac-do-not-reset-CXXFLAGS.patch rename to recipes-musicians/rtmidi/files/0002-configure.ac-do-not-reset-CXXFLAGS.patch diff --git a/recipes-misc/recipes-multimedia/rtmidi/files/0003-configure.ac-do-not-add-absolute-prefixes-to-build-f.patch b/recipes-musicians/rtmidi/files/0003-configure.ac-do-not-add-absolute-prefixes-to-build-f.patch similarity index 100% rename from recipes-misc/recipes-multimedia/rtmidi/files/0003-configure.ac-do-not-add-absolute-prefixes-to-build-f.patch rename to recipes-musicians/rtmidi/files/0003-configure.ac-do-not-add-absolute-prefixes-to-build-f.patch diff --git a/recipes-misc/recipes-multimedia/rtmidi/rtmidi_3.0.0.bb b/recipes-musicians/rtmidi/rtmidi_3.0.0.bb similarity index 100% rename from recipes-misc/recipes-multimedia/rtmidi/rtmidi_3.0.0.bb rename to recipes-musicians/rtmidi/rtmidi_3.0.0.bb diff --git a/recipes-misc/recipes-multimedia/rubberband/files/0001-Do-not-try-to-install-librubberband-jni.so-no-java-p.patch b/recipes-musicians/rubberband/files/0001-Do-not-try-to-install-librubberband-jni.so-no-java-p.patch similarity index 100% rename from recipes-misc/recipes-multimedia/rubberband/files/0001-Do-not-try-to-install-librubberband-jni.so-no-java-p.patch rename to recipes-musicians/rubberband/files/0001-Do-not-try-to-install-librubberband-jni.so-no-java-p.patch diff --git a/recipes-misc/recipes-multimedia/rubberband/files/0002-Fix-build-for-FFTW_SINGLE_ONLY.patch b/recipes-musicians/rubberband/files/0002-Fix-build-for-FFTW_SINGLE_ONLY.patch similarity index 100% rename from recipes-misc/recipes-multimedia/rubberband/files/0002-Fix-build-for-FFTW_SINGLE_ONLY.patch rename to recipes-musicians/rubberband/files/0002-Fix-build-for-FFTW_SINGLE_ONLY.patch diff --git a/recipes-misc/recipes-multimedia/rubberband/files/0003-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch b/recipes-musicians/rubberband/files/0003-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch similarity index 100% rename from recipes-misc/recipes-multimedia/rubberband/files/0003-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch rename to recipes-musicians/rubberband/files/0003-Optional-replace-FFTW_DOUBLE_ONLY-by-FFTW_SINGLE_ONL.patch diff --git a/recipes-misc/recipes-multimedia/rubberband/rubberband_1.8.2.bb b/recipes-musicians/rubberband/rubberband_1.8.2.bb similarity index 86% rename from recipes-misc/recipes-multimedia/rubberband/rubberband_1.8.2.bb rename to recipes-musicians/rubberband/rubberband_1.8.2.bb index 01cc9ac4..d66d8bfa 100644 --- a/recipes-misc/recipes-multimedia/rubberband/rubberband_1.8.2.bb +++ b/recipes-musicians/rubberband/rubberband_1.8.2.bb @@ -24,6 +24,13 @@ SRC_URI = " \ SRC_URI[md5sum] = "db0ecb4f1a647bdaf7e43ef2ca2f7883" SRC_URI[sha256sum] = "86bed06b7115b64441d32ae53634fcc0539a50b9b648ef87443f936782f6c3ca" +EXTRA_OEMAKE += " \ + INSTALL_LIBDIR=${libdir} \ + INSTALL_VAMPDIR=${libdir}/vamp \ + INSTALL_LADSPADIR=${libdir}/ladspa \ + INSTALL_PKGDIR=${libdir}/pkgconfig \ +" + CPPFLAGS += "-ftree-vectorize -DPROCESS_SAMPLE_TYPE=float" FILES_${PN} += " \ diff --git a/recipes-misc/recipes-multimedia/setbfree/files/0001-remove-UINQHACK-it-is-used-for-OSX-builds-only-and-c.patch b/recipes-musicians/setbfree/files/0001-remove-UINQHACK-it-is-used-for-OSX-builds-only-and-c.patch similarity index 100% rename from recipes-misc/recipes-multimedia/setbfree/files/0001-remove-UINQHACK-it-is-used-for-OSX-builds-only-and-c.patch rename to recipes-musicians/setbfree/files/0001-remove-UINQHACK-it-is-used-for-OSX-builds-only-and-c.patch diff --git a/recipes-misc/recipes-multimedia/setbfree/files/0002-Do-not-check-for-fontfile.patch b/recipes-musicians/setbfree/files/0002-Do-not-check-for-fontfile.patch similarity index 100% rename from recipes-misc/recipes-multimedia/setbfree/files/0002-Do-not-check-for-fontfile.patch rename to recipes-musicians/setbfree/files/0002-Do-not-check-for-fontfile.patch diff --git a/recipes-misc/recipes-multimedia/setbfree/files/setbfree.desktop b/recipes-musicians/setbfree/files/setbfree.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/setbfree/files/setbfree.desktop rename to recipes-musicians/setbfree/files/setbfree.desktop diff --git a/recipes-misc/recipes-multimedia/setbfree/files/x42-whirl.desktop b/recipes-musicians/setbfree/files/x42-whirl.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/setbfree/files/x42-whirl.desktop rename to recipes-musicians/setbfree/files/x42-whirl.desktop diff --git a/recipes-misc/recipes-multimedia/setbfree/setbfree_git.bb b/recipes-musicians/setbfree/setbfree_git.bb similarity index 90% rename from recipes-misc/recipes-multimedia/setbfree/setbfree_git.bb rename to recipes-musicians/setbfree/setbfree_git.bb index 4b1ccb83..3d2d95ae 100644 --- a/recipes-misc/recipes-multimedia/setbfree/setbfree_git.bb +++ b/recipes-musicians/setbfree/setbfree_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://setbfree.org/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b" -inherit autotools-brokensep pkgconfig gtk-icon-cache +inherit pkgconfig gtk-icon-cache DEPENDS += " \ virtual/libgl \ @@ -30,12 +30,13 @@ S = "${WORKDIR}/git" PV = "0.8.8" EXTRA_OEMAKE += " \ - PREFIX=${prefix} \ STRIP=echo \ FONTFILE=${prefix}/share/fonts/ttf/VeraBd.ttf \ " -do_install_append() { +do_install() { + oe_runmake 'DESTDIR=${D}' PREFIX=${prefix} lv2dir=${libdir}/lv2 install + install -d ${D}${datadir}/pixmaps install -m 0644 ${S}/doc/setBfree.png ${D}${datadir}/pixmaps install -m 0644 ${S}/doc/x42-whirl.png ${D}${datadir}/pixmaps diff --git a/recipes-musicians/smbolton/fluidsynth-dssi/0001-Reduce-FSD_MAX_BURST_SIZE-512-128.patch b/recipes-musicians/smbolton/fluidsynth-dssi/0001-Reduce-FSD_MAX_BURST_SIZE-512-128.patch new file mode 100644 index 00000000..f6c0cfa8 --- /dev/null +++ b/recipes-musicians/smbolton/fluidsynth-dssi/0001-Reduce-FSD_MAX_BURST_SIZE-512-128.patch @@ -0,0 +1,33 @@ +From e37bcc39a2f6c720335a1431e1a37d142f066c3d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Mon, 14 Jan 2019 21:03:35 +0100 +Subject: [PATCH 1/2] Reduce FSD_MAX_BURST_SIZE 512 -> 128 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* This saves 96K RAM +* Tested and 'paper debugged' fsd_run_multiple_synths: There are no issues to + expect + +Signed-off-by: Andreas Müller +--- + src/fluidsynth-dssi.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/fluidsynth-dssi.h b/src/fluidsynth-dssi.h +index 6f0e57f..9f347ab 100644 +--- a/src/fluidsynth-dssi.h ++++ b/src/fluidsynth-dssi.h +@@ -59,7 +59,7 @@ + #define FSD_MAX_POLYPHONY 256 + #define FSD_DEFAULT_POLYPHONY 256 + +-#define FSD_MAX_BURST_SIZE 512 ++#define FSD_MAX_BURST_SIZE 128 + + typedef enum { + PORT_OUTPUT_LEFT = 0, +-- +2.20.1 + diff --git a/recipes-musicians/smbolton/fluidsynth-dssi/0002-Don-t-trash-unused-channels.patch b/recipes-musicians/smbolton/fluidsynth-dssi/0002-Don-t-trash-unused-channels.patch new file mode 100644 index 00000000..6fbebb7d --- /dev/null +++ b/recipes-musicians/smbolton/fluidsynth-dssi/0002-Don-t-trash-unused-channels.patch @@ -0,0 +1,50 @@ +From 3a9b7f16ce00a069decd9e4b6efbe31389fefd6d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 13 Jan 2019 11:58:39 +0100 +Subject: [PATCH 2/2] Don't trash unused channels +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* This enhances peformance: Useless buffer copies are avoided +* Patches did not make it upstream but we have them in meta-multimedia + +Signed-off-by: Andreas Müller +--- + src/fluidsynth-dssi.c | 6 +++--- + src/fluidsynth-dssi.h | 1 - + 2 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/src/fluidsynth-dssi.c b/src/fluidsynth-dssi.c +index e1e8251..11a92ee 100644 +--- a/src/fluidsynth-dssi.c ++++ b/src/fluidsynth-dssi.c +@@ -883,10 +883,10 @@ fsd_run_multiple_synths(unsigned long instance_count, LADSPA_Handle *handles, + instances[i]->pending_preset_change = -1; + } + } +- /* Trash unmapped channels by default */ ++ /* Default: Set unused by default */ + for (i = 0; i < fsd_settings.channel_count; i++) { +- l_outputs[i] = fsd_synth.bit_bucket; +- r_outputs[i] = fsd_synth.bit_bucket; ++ l_outputs[i] = NULL; ++ r_outputs[i] = NULL; + } + + /* fluid_synth_nwrite_float() works correctly in FluidSynth beginning +diff --git a/src/fluidsynth-dssi.h b/src/fluidsynth-dssi.h +index 9f347ab..c34377e 100644 +--- a/src/fluidsynth-dssi.h ++++ b/src/fluidsynth-dssi.h +@@ -117,7 +117,6 @@ struct _fsd_synth_t { + float gain; + int polyphony; + fsd_instance_t **channel_map; +- LADSPA_Data bit_bucket[FSD_MAX_BURST_SIZE]; + }; + + #endif /* _FLUIDSYNTH_DSSI_H */ +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/smbolton/fluidsynth-dssi/fluidsynth-dssi.conf b/recipes-musicians/smbolton/fluidsynth-dssi/fluidsynth-dssi.conf similarity index 73% rename from recipes-misc/recipes-multimedia/smbolton/fluidsynth-dssi/fluidsynth-dssi.conf rename to recipes-musicians/smbolton/fluidsynth-dssi/fluidsynth-dssi.conf index 1d87587e..eceb6823 100644 --- a/recipes-misc/recipes-multimedia/smbolton/fluidsynth-dssi/fluidsynth-dssi.conf +++ b/recipes-musicians/smbolton/fluidsynth-dssi/fluidsynth-dssi.conf @@ -4,3 +4,4 @@ realtime-prio=90 [synth] maxchannels=32 parallel-threads=4 +dynamic-sample-loading=1 diff --git a/recipes-misc/recipes-multimedia/smbolton/fluidsynth-dssi_1.0.0.bb b/recipes-musicians/smbolton/fluidsynth-dssi_2.0.0.bb similarity index 82% rename from recipes-misc/recipes-multimedia/smbolton/fluidsynth-dssi_1.0.0.bb rename to recipes-musicians/smbolton/fluidsynth-dssi_2.0.0.bb index 9c018d98..1d55f5d6 100644 --- a/recipes-misc/recipes-multimedia/smbolton/fluidsynth-dssi_1.0.0.bb +++ b/recipes-musicians/smbolton/fluidsynth-dssi_2.0.0.bb @@ -15,11 +15,13 @@ DEPENDS += " \ SRC_URI = " \ git://github.com/schnitzeltony/fluidsynth-dssi.git \ + file://0001-Reduce-FSD_MAX_BURST_SIZE-512-128.patch \ + file://0002-Don-t-trash-unused-channels.patch \ file://fluidsynth-dssi.conf \ " -SRCREV = "f8c0165b60042d2976c0983261a3ad8c059e2926" +SRCREV = "c9b41073031dc2ba99c43db1babc9bbfbab2ec1e" S = "${WORKDIR}/git" -PV = "1.0.0+git${SRCPV}" +#PV = "2.0.0+git${SRCPV}" do_install_append() { install -d ${D}/${sysconfdir}/skel/.config/fluidsynth-dssi diff --git a/recipes-misc/recipes-multimedia/smbolton/hexter/hexter.desktop b/recipes-musicians/smbolton/hexter/hexter.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/smbolton/hexter/hexter.desktop rename to recipes-musicians/smbolton/hexter/hexter.desktop diff --git a/recipes-misc/recipes-multimedia/smbolton/hexter/hexter.png b/recipes-musicians/smbolton/hexter/hexter.png similarity index 100% rename from recipes-misc/recipes-multimedia/smbolton/hexter/hexter.png rename to recipes-musicians/smbolton/hexter/hexter.png diff --git a/recipes-misc/recipes-multimedia/smbolton/hexter_1.1.0.bb b/recipes-musicians/smbolton/hexter_1.1.0.bb similarity index 100% rename from recipes-misc/recipes-multimedia/smbolton/hexter_1.1.0.bb rename to recipes-musicians/smbolton/hexter_1.1.0.bb diff --git a/recipes-misc/recipes-multimedia/smbolton/whysynth/whysynth.desktop b/recipes-musicians/smbolton/whysynth/whysynth.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/smbolton/whysynth/whysynth.desktop rename to recipes-musicians/smbolton/whysynth/whysynth.desktop diff --git a/recipes-misc/recipes-multimedia/smbolton/whysynth_20170701.bb b/recipes-musicians/smbolton/whysynth_20170701.bb similarity index 94% rename from recipes-misc/recipes-multimedia/smbolton/whysynth_20170701.bb rename to recipes-musicians/smbolton/whysynth_20170701.bb index f055cdef..7a4f2e5e 100644 --- a/recipes-misc/recipes-multimedia/smbolton/whysynth_20170701.bb +++ b/recipes-musicians/smbolton/whysynth_20170701.bb @@ -13,7 +13,7 @@ DEPENDS += " \ " SRC_URI = " \ - http://smbolton.com/${PN}/${PN}-${PV}.tar.bz2 \ + http://smbolton.com/${BPN}/${BPN}-${PV}.tar.bz2 \ file://whysynth.desktop \ " SRC_URI[md5sum] = "217bfeea23545c12cd0a1bc93de6ed0f" diff --git a/recipes-misc/recipes-multimedia/smbolton/xsynth-dssi/0001-replace-missing-AM_PATH_GTK-by-PKG_CHECK_MODULES.patch b/recipes-musicians/smbolton/xsynth-dssi/0001-replace-missing-AM_PATH_GTK-by-PKG_CHECK_MODULES.patch similarity index 100% rename from recipes-misc/recipes-multimedia/smbolton/xsynth-dssi/0001-replace-missing-AM_PATH_GTK-by-PKG_CHECK_MODULES.patch rename to recipes-musicians/smbolton/xsynth-dssi/0001-replace-missing-AM_PATH_GTK-by-PKG_CHECK_MODULES.patch diff --git a/recipes-misc/recipes-multimedia/smbolton/xsynth-dssi_0.9.4.bb b/recipes-musicians/smbolton/xsynth-dssi_0.9.4.bb similarity index 100% rename from recipes-misc/recipes-multimedia/smbolton/xsynth-dssi_0.9.4.bb rename to recipes-musicians/smbolton/xsynth-dssi_0.9.4.bb diff --git a/recipes-misc/recipes-multimedia/soundfont-collection/sf-tools_git.bb b/recipes-musicians/soundfont-collection/sf-tools_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/soundfont-collection/sf-tools_git.bb rename to recipes-musicians/soundfont-collection/sf-tools_git.bb diff --git a/recipes-misc/recipes-multimedia/soundfont-collection/soundfont-collection_0.0.2.bb b/recipes-musicians/soundfont-collection/soundfont-collection_0.0.2.bb similarity index 55% rename from recipes-misc/recipes-multimedia/soundfont-collection/soundfont-collection_0.0.2.bb rename to recipes-musicians/soundfont-collection/soundfont-collection_0.0.2.bb index 75130074..a242a3f3 100644 --- a/recipes-misc/recipes-multimedia/soundfont-collection/soundfont-collection_0.0.2.bb +++ b/recipes-musicians/soundfont-collection/soundfont-collection_0.0.2.bb @@ -26,23 +26,6 @@ inherit allarch SRC_URI = " \ http://download.linuxaudio.org/musical-instrument-libraries/sf2/airfont_a340u.tar.7z;subdir=linuxaudio.org;name=airfont \ http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3.tar.7z;subdir=linuxaudio.org;name=fluidr3 \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_bass.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-bass \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_brass.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-brass \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_chromaticpercussion.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-chromaticpercussion \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_drums.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-drums \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_ensemble.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-ensemble \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_ethnic.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-ethnic \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_guitar.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-guitar \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_organ.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-organ \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_percussive.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-percussive \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_pipe.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-pipe \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_piano.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-piano \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_reed.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-reed \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_soundeffects.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-soundeffects \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_strings.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-strings \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_syntheffects.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-syntheffects \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_synthlead.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-synthlead \ - http://download.linuxaudio.org/musical-instrument-libraries/sf2/fluidr3-splitted/fluidr3gm_synthpad.sf2.tar.7z;subdir=linuxaudio.org;name=fluidr3gm-synthpad \ http://download.linuxaudio.org/musical-instrument-libraries/sf2/jRhodes3.tar.7z;subdir=linuxaudio.org;name=jRhodes3 \ http://download.linuxaudio.org/musical-instrument-libraries/sf2/melloflute.tar.7z;subdir=linuxaudio.org;name=melloflute \ http://download.linuxaudio.org/musical-instrument-libraries/sf2/melloreed.tar.7z;subdir=linuxaudio.org;name=melloreed \ @@ -59,6 +42,8 @@ SRC_URI = " \ http://www.philscomputerlab.com/uploads/3/7/2/3/37231621/choriumreva.sf2;subdir=www.philscomputerlab.com;name=choriumreva \ \ https://www.dropbox.com/s/4x27l49kxcwamp5/GeneralUser_GS_1.471.zip;name=christiancollins \ + \ + https://musical-artifacts.com/artifacts/248/iw_vint.zip;subdir=musical-artifacts;name=vintage-dreams-waves \ " SRC_URI[airfont.md5sum] = "e1a0878510910b50786c9690ed7640b0" @@ -70,57 +55,6 @@ SRC_URI[avl-drumkits.sha256sum] = "46a5d0d1fd3894082ae0ecdab3396a9a1b9eecc007693 SRC_URI[fluidr3.md5sum] = "8657c8d9dfcb51aa0e3d045dd63cc053" SRC_URI[fluidr3.sha256sum] = "a62235d86c920f141a1aa2a0921ceaee167478796d9e0ac1130fd87ec50a6a02" -SRC_URI[fluidr3gm-bass.md5sum] = "3e14a74a89ee1193b3711e15c7718032" -SRC_URI[fluidr3gm-bass.sha256sum] = "56619efac4550946d1fbe74bd059e358d5cef3fcc8257f6737b66e3e7bee11fe" - -SRC_URI[fluidr3gm-brass.md5sum] = "dc6808a91c0f8e6dfe566f2e776c4910" -SRC_URI[fluidr3gm-brass.sha256sum] = "775295ae26f84cf6fb2069a176644bbc0038a42d5767fdd7ef218084091ef408" - -SRC_URI[fluidr3gm-chromaticpercussion.md5sum] = "b74fcfd86cbfe61819a11dc8b64ec998" -SRC_URI[fluidr3gm-chromaticpercussion.sha256sum] = "c7850249adc7a667527129e3e1f7bae401d699df689f02b9ca2e526e06746388" - -SRC_URI[fluidr3gm-drums.md5sum] = "768911e416da5de0abfbfc467a0d0f5a" -SRC_URI[fluidr3gm-drums.sha256sum] = "f961c6684880ae025912fcf4498ccdb0cb64d6e4f9329584efe85f51a41afb06" - -SRC_URI[fluidr3gm-ensemble.md5sum] = "ffb5f6eea836d485cbeaecb45bf7fb75" -SRC_URI[fluidr3gm-ensemble.sha256sum] = "5d2d3be68780e8e0e191488b3cc81d1fc323aa67f141015be355b2abfe635c67" - -SRC_URI[fluidr3gm-ethnic.md5sum] = "c73cb01cb192f22defb5b744b8b2dd57" -SRC_URI[fluidr3gm-ethnic.sha256sum] = "6105ddc8d85fd5b813250fb8135be3bc3cc8548eeece9542b2815363f9193f7c" - -SRC_URI[fluidr3gm-guitar.md5sum] = "c4d49ff884eb729da01fc159fbf96412" -SRC_URI[fluidr3gm-guitar.sha256sum] = "31f46a5f2aaea7857780460dc4eba10aa698357b4f4f57b14ed0afa749efb2b4" - -SRC_URI[fluidr3gm-organ.md5sum] = "e4fb2e4428183a64548281deb911290e" -SRC_URI[fluidr3gm-organ.sha256sum] = "d991c71083138f4f48995863bd4d77d1a3ca7e8b308511ecd350e4ca90c0f48b" - -SRC_URI[fluidr3gm-percussive.md5sum] = "c8a4afdc45cfefd5409ad39d9d0ebdd0" -SRC_URI[fluidr3gm-percussive.sha256sum] = "c316f3fca1e955f9453414c7f22a940610d6e03c64ab0a52363681f9c30314bf" - -SRC_URI[fluidr3gm-piano.md5sum] = "fcedef3aea615926ff8d2e5e8cdf0004" -SRC_URI[fluidr3gm-piano.sha256sum] = "593c0966d12624e76037f7023f7f5deca4dc965517ee90e945129fbefb094819" - -SRC_URI[fluidr3gm-pipe.md5sum] = "abe06dfb215b0cf6ec1fab953c1ee416" -SRC_URI[fluidr3gm-pipe.sha256sum] = "c259df70894ef7a310e4bf897af9fd08fc5f4e252f9c779039c245b694de9f27" - -SRC_URI[fluidr3gm-reed.md5sum] = "f5ce696f7bcd2cf2ed475c5cd9c7db06" -SRC_URI[fluidr3gm-reed.sha256sum] = "53497f0244ddd238125a6be7e80c7683c55093d1b63906cd53e7f36322e460f9" - -SRC_URI[fluidr3gm-soundeffects.md5sum] = "b8c03ebb67f17a1a58f1e799d8013191" -SRC_URI[fluidr3gm-soundeffects.sha256sum] = "ddfd6b813fd69ce418b43458306823652e659d7e7b18652ff0af8c93147be869" - -SRC_URI[fluidr3gm-strings.md5sum] = "ab7303ba5586300d28a4e8f774356c2c" -SRC_URI[fluidr3gm-strings.sha256sum] = "7a9d004b1045dc4e2dad0e05847f1beeb8cd0813c653ca6f8370dc1185c9ddda" - -SRC_URI[fluidr3gm-syntheffects.md5sum] = "68b558da70ee9d4838156e2c1bc5f3ab" -SRC_URI[fluidr3gm-syntheffects.sha256sum] = "04ca477d361f7b6e01ca00bc1f3c5a414e873c29ead73e0b99929b9a362a9866" - -SRC_URI[fluidr3gm-synthlead.md5sum] = "cddd58f8f09c2bfe38605d909a77e32c" -SRC_URI[fluidr3gm-synthlead.sha256sum] = "e510f95e8266924631cd1ed44eacd4eb3190ff95006381ec0bf023877d2bb12b" - -SRC_URI[fluidr3gm-synthpad.md5sum] = "54ee8656af107dc24fcb0a262815f673" -SRC_URI[fluidr3gm-synthpad.sha256sum] = "b1297b4d8b28f3c4652b842bc19ebfe7ce72658b9423f3b3611e8155bd6997e0" - SRC_URI[jRhodes3.md5sum] = "1cf933decd312535fb8d8aa5772a39cf" SRC_URI[jRhodes3.sha256sum] = "a50462992b19f4df65aa63d237bb0e45a071e63383ae9f2c5a2980d4ec3bcce1" @@ -154,6 +88,11 @@ SRC_URI[choriumreva.sha256sum] = "993a1683a67f30c56c248290e1eb6c13b779331856e9a7 SRC_URI[christiancollins.md5sum] = "5eaa95224f6080864cf6aedc1c9820a6" SRC_URI[christiancollins.sha256sum] = "4203835164766f428c4926c097c9ea58dae431c7fb8f9dbe277b92d80da45ec2" + +SRC_URI[vintage-dreams-waves.md5sum] = "9d6151731c4edb91725bc4f530184f1a" +SRC_URI[vintage-dreams-waves.sha256sum] = "2706ec973acc390b888e0084c7afd4ba75da58f2772c13b1e398a6a66b021f15" + + do_unpack[depends] += "p7zip-native:do_populate_sysroot" S = "${WORKDIR}" @@ -167,6 +106,7 @@ PACKAGES = " \ ${PN}-philscomputerlab-com \ ${PN}-philscomputerlab-com-single \ ${PN}-christiancollins \ + ${PN}-musical-artifacts \ " ALLOW_EMPTY_${PN}-meta = "1" @@ -178,6 +118,7 @@ RRECOMMENDS_${PN}-meta = " \ ${PN}-philscomputerlab-com \ ${PN}-philscomputerlab-com-single \ ${PN}-christiancollins \ + ${PN}-musical-artifacts \ " do_configure() { @@ -188,10 +129,12 @@ do_install() { install ${WORKDIR}/freepats.zenvoid.org/*.sf2 ${D}${datadir}/sf2 install ${WORKDIR}/www.philscomputerlab.com/*.sf2 ${D}${datadir}/sf2 install "${WORKDIR}/GeneralUser GS 1.471/GeneralUser GS v1.471.sf2" ${D}${datadir}/sf2/general-user-gs-v1.471.sf2 - for soundfont in `find ${WORKDIR}/avl-drumkits -name *.sf2`; do + for soundfont in `find ${WORKDIR}/avl-drumkits -name '*.sf2'`; do install $soundfont ${D}${datadir}/sf2 done - for soundfont in `find ${WORKDIR}/linuxaudio.org -name *.sf2`; do + + for soundfont in `find ${WORKDIR}/linuxaudio.org -name '*.sf2'`; do + echo "linuxaudio.org: $soundfont" install $soundfont ${D}${datadir}/sf2 done @@ -242,3 +185,6 @@ FILES_${PN}-philscomputerlab-com-single = " \ " FILES_${PN}-christiancollins = "${datadir}/sf2/general-user-gs-v1.471.sf2" + +FILES_${PN}-musical-artifacts = "${datadir}/sf2/Vintage-Dreams-Waves-V2.sf2" + diff --git a/recipes-misc/recipes-multimedia/soundtouch/soundtouch/0001-Fix-path-to-m4-macro-dir.patch b/recipes-musicians/soundtouch/soundtouch/0001-Fix-path-to-m4-macro-dir.patch similarity index 100% rename from recipes-misc/recipes-multimedia/soundtouch/soundtouch/0001-Fix-path-to-m4-macro-dir.patch rename to recipes-musicians/soundtouch/soundtouch/0001-Fix-path-to-m4-macro-dir.patch diff --git a/recipes-misc/recipes-multimedia/soundtouch/soundtouch_git.bb b/recipes-musicians/soundtouch/soundtouch_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/soundtouch/soundtouch_git.bb rename to recipes-musicians/soundtouch/soundtouch_git.bb diff --git a/recipes-misc/recipes-multimedia/soxr/soxr_0.1.3.bb b/recipes-musicians/soxr/soxr_0.1.3.bb similarity index 78% rename from recipes-misc/recipes-multimedia/soxr/soxr_0.1.3.bb rename to recipes-musicians/soxr/soxr_0.1.3.bb index 0e0c4b0b..bb07867b 100644 --- a/recipes-misc/recipes-multimedia/soxr/soxr_0.1.3.bb +++ b/recipes-musicians/soxr/soxr_0.1.3.bb @@ -11,4 +11,7 @@ SRC_URI[sha256sum] = "b111c15fdc8c029989330ff559184198c161100a59312f5dc19ddeb9b5 S = "${WORKDIR}/${BPN}-${PV}-Source" -EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RelWithDebInfo" +EXTRA_OECMAKE += " \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +" diff --git a/recipes-misc/recipes-multimedia/stk/files/0001-avoid-usr-usr-paths.patch b/recipes-musicians/stk/files/0001-avoid-usr-usr-paths.patch similarity index 100% rename from recipes-misc/recipes-multimedia/stk/files/0001-avoid-usr-usr-paths.patch rename to recipes-musicians/stk/files/0001-avoid-usr-usr-paths.patch diff --git a/recipes-misc/recipes-multimedia/stk/files/0002-configure.ac-fix-shared-library-name.patch b/recipes-musicians/stk/files/0002-configure.ac-fix-shared-library-name.patch similarity index 100% rename from recipes-misc/recipes-multimedia/stk/files/0002-configure.ac-fix-shared-library-name.patch rename to recipes-musicians/stk/files/0002-configure.ac-fix-shared-library-name.patch diff --git a/recipes-misc/recipes-multimedia/stk/stk_4.5.1.bb b/recipes-musicians/stk/stk_4.5.1.bb similarity index 100% rename from recipes-misc/recipes-multimedia/stk/stk_4.5.1.bb rename to recipes-musicians/stk/stk_4.5.1.bb diff --git a/recipes-misc/recipes-multimedia/supercollider/supercollider/0001-server-supernova-utilities-time_tag.hpp-Adding-stati.patch b/recipes-musicians/supercollider/supercollider/0001-server-supernova-utilities-time_tag.hpp-Adding-stati.patch similarity index 100% rename from recipes-misc/recipes-multimedia/supercollider/supercollider/0001-server-supernova-utilities-time_tag.hpp-Adding-stati.patch rename to recipes-musicians/supercollider/supercollider/0001-server-supernova-utilities-time_tag.hpp-Adding-stati.patch diff --git a/recipes-misc/recipes-multimedia/supercollider/supercollider_git.bb b/recipes-musicians/supercollider/supercollider_git.bb similarity index 95% rename from recipes-misc/recipes-multimedia/supercollider/supercollider_git.bb rename to recipes-musicians/supercollider/supercollider_git.bb index 5a0b301c..8d0631f7 100644 --- a/recipes-misc/recipes-multimedia/supercollider/supercollider_git.bb +++ b/recipes-musicians/supercollider/supercollider_git.bb @@ -35,6 +35,7 @@ SIMD_OPTIONS ??= " \ EXTRA_OECMAKE = "\ -DCMAKE_BUILD_TYPE="Release" \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ -DBUILD_TESTING=OFF \ -DENABLE_TESTSUITE=OFF \ -DNATIVE=OFF \ diff --git a/recipes-misc/recipes-multimedia/timidity++/files/0001-do-not-run-check-for-va_copy-this-is-not-allowed-in-.patch b/recipes-musicians/timidity++/files/0001-do-not-run-check-for-va_copy-this-is-not-allowed-in-.patch similarity index 100% rename from recipes-misc/recipes-multimedia/timidity++/files/0001-do-not-run-check-for-va_copy-this-is-not-allowed-in-.patch rename to recipes-musicians/timidity++/files/0001-do-not-run-check-for-va_copy-this-is-not-allowed-in-.patch diff --git a/recipes-misc/recipes-multimedia/timidity++/files/0002-find-cross-calcnewt.patch b/recipes-musicians/timidity++/files/0002-find-cross-calcnewt.patch similarity index 100% rename from recipes-misc/recipes-multimedia/timidity++/files/0002-find-cross-calcnewt.patch rename to recipes-musicians/timidity++/files/0002-find-cross-calcnewt.patch diff --git a/recipes-misc/recipes-multimedia/timidity++/files/0003-timidity-readmidi-zero-division-fix.patch b/recipes-musicians/timidity++/files/0003-timidity-readmidi-zero-division-fix.patch similarity index 100% rename from recipes-misc/recipes-multimedia/timidity++/files/0003-timidity-readmidi-zero-division-fix.patch rename to recipes-musicians/timidity++/files/0003-timidity-readmidi-zero-division-fix.patch diff --git a/recipes-misc/recipes-multimedia/timidity++/files/0004-timidity-resample-frac-overflow-fix.patch b/recipes-musicians/timidity++/files/0004-timidity-resample-frac-overflow-fix.patch similarity index 100% rename from recipes-misc/recipes-multimedia/timidity++/files/0004-timidity-resample-frac-overflow-fix.patch rename to recipes-musicians/timidity++/files/0004-timidity-resample-frac-overflow-fix.patch diff --git a/recipes-misc/recipes-multimedia/timidity++/files/timidity.desktop b/recipes-musicians/timidity++/files/timidity.desktop similarity index 100% rename from recipes-misc/recipes-multimedia/timidity++/files/timidity.desktop rename to recipes-musicians/timidity++/files/timidity.desktop diff --git a/recipes-misc/recipes-multimedia/timidity++/timidity++-native.bb b/recipes-musicians/timidity++/timidity++-native.bb similarity index 100% rename from recipes-misc/recipes-multimedia/timidity++/timidity++-native.bb rename to recipes-musicians/timidity++/timidity++-native.bb diff --git a/recipes-misc/recipes-multimedia/timidity++/timidity++.bb b/recipes-musicians/timidity++/timidity++.bb similarity index 100% rename from recipes-misc/recipes-multimedia/timidity++/timidity++.bb rename to recipes-musicians/timidity++/timidity++.bb diff --git a/recipes-misc/recipes-multimedia/timidity++/timidity++.inc b/recipes-musicians/timidity++/timidity++.inc similarity index 100% rename from recipes-misc/recipes-multimedia/timidity++/timidity++.inc rename to recipes-musicians/timidity++/timidity++.inc diff --git a/recipes-misc/recipes-multimedia/tomahawk/files/0001-use-pkg-config-to-find-taglib.patch b/recipes-musicians/tomahawk/files/0001-use-pkg-config-to-find-taglib.patch similarity index 100% rename from recipes-misc/recipes-multimedia/tomahawk/files/0001-use-pkg-config-to-find-taglib.patch rename to recipes-musicians/tomahawk/files/0001-use-pkg-config-to-find-taglib.patch diff --git a/recipes-misc/recipes-multimedia/tomahawk/tomahawk_git.bb b/recipes-musicians/tomahawk/tomahawk_git.bb similarity index 100% rename from recipes-misc/recipes-multimedia/tomahawk/tomahawk_git.bb rename to recipes-musicians/tomahawk/tomahawk_git.bb diff --git a/recipes-musicians/triceratops/triceratops-lv2/0001-Replace-lv2core-by-lv2.patch b/recipes-musicians/triceratops/triceratops-lv2/0001-Replace-lv2core-by-lv2.patch new file mode 100644 index 00000000..25849faa --- /dev/null +++ b/recipes-musicians/triceratops/triceratops-lv2/0001-Replace-lv2core-by-lv2.patch @@ -0,0 +1,43 @@ +From d6671a285d8c2f5c42f2f55e490a98afab758324 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Fri, 18 Jan 2019 18:05:18 +0100 +Subject: [PATCH] Replace lv2core by lv2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When building lv2 from git, triceratops fails because it cannot find lv2 any +more. + +Reason: lv2core.pc was removed in lv2 [1]. + +Using lv2.pc works perfectly fine - the contents of both files in lv2 version +1.14 are similar from pkg-config point of view. + +[1] https://github.com/drobilla/lv2/commit/4db67120efca2d4c200d2e1ba5cf3d7b97cab97e + +Upstream-Status: submitted [2] + +[2] https://github.com/thunderox/triceratops/pull/4 + +Signed-off-by: Andreas Müller +--- + wscript | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index 8dd3385..3f48ca8 100644 +--- a/wscript ++++ b/wscript +@@ -34,7 +34,7 @@ def configure(conf): + conf.env.append_unique('CXXFLAGS', ['-fPIC','-fpermissive','-finline-functions']) + + if not autowaf.is_child(): +- autowaf.check_pkg(conf, 'lv2core', uselib_store='LV2CORE') ++ autowaf.check_pkg(conf, 'lv2', uselib_store='LV2CORE') + autowaf.check_pkg(conf, 'gtkmm-2.4', uselib_store='GTKMM') + + # Set env['pluginlib_PATTERN'] +-- +2.20.1 + diff --git a/recipes-misc/recipes-multimedia/triceratops/triceratops-lv2_0.3.1.bb b/recipes-musicians/triceratops/triceratops-lv2_0.3.1.bb similarity index 69% rename from recipes-misc/recipes-multimedia/triceratops/triceratops-lv2_0.3.1.bb rename to recipes-musicians/triceratops/triceratops-lv2_0.3.1.bb index 67adc750..fd9e4e70 100644 --- a/recipes-misc/recipes-multimedia/triceratops/triceratops-lv2_0.3.1.bb +++ b/recipes-musicians/triceratops/triceratops-lv2_0.3.1.bb @@ -12,10 +12,17 @@ DEPENDS += " \ inherit waf pkgconfig -SRC_URI = "${SOURCEFORGE_MIRROR}/project/triceratops/${BPN}-v${PV}.tar.gz;subdir=${BPN}-${PV}" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/project/triceratops/${BPN}-v${PV}.tar.gz;subdir=${BPN}-${PV} \ + file://0001-Replace-lv2core-by-lv2.patch \ +" SRC_URI[md5sum] = "cdd3e94b05247061820e17d7c3d900e4" SRC_URI[sha256sum] = "0f678f2bebf5cd1e7aa3de82afa8bcbca64302cafb92d53dbb49143361517033" +EXTRA_OECONF = "\ + --libdir=${libdir} \ +" + FILES_${PN} += " \ ${libdir}/lv2 \ " diff --git a/recipes-misc/recipes-multimedia/vamp-plugin-sdk/files/0001-do-not-perform-test-it-tries-to-run-cross-binaries.patch b/recipes-musicians/vamp-plugin-sdk/files/0001-do-not-perform-test-it-tries-to-run-cross-binaries.patch similarity index 100% rename from recipes-misc/recipes-multimedia/vamp-plugin-sdk/files/0001-do-not-perform-test-it-tries-to-run-cross-binaries.patch rename to recipes-musicians/vamp-plugin-sdk/files/0001-do-not-perform-test-it-tries-to-run-cross-binaries.patch diff --git a/recipes-misc/recipes-multimedia/vamp-plugin-sdk/vamp-plugin-sdk_2.7.1.bb b/recipes-musicians/vamp-plugin-sdk/vamp-plugin-sdk_2.7.1.bb similarity index 80% rename from recipes-misc/recipes-multimedia/vamp-plugin-sdk/vamp-plugin-sdk_2.7.1.bb rename to recipes-musicians/vamp-plugin-sdk/vamp-plugin-sdk_2.7.1.bb index 20e5bbeb..d5569632 100644 --- a/recipes-misc/recipes-multimedia/vamp-plugin-sdk/vamp-plugin-sdk_2.7.1.bb +++ b/recipes-musicians/vamp-plugin-sdk/vamp-plugin-sdk_2.7.1.bb @@ -18,4 +18,8 @@ do_compile() { oe_runmake sdk plugins host rdfgen } +do_install() { + oe_runmake 'DESTDIR=${D}' 'INSTALL_SDK_LIBS=${libdir}' 'INSTALL_PLUGINS=${libdir}/vamp' 'INSTALL_PKGCONFIG=${libdir}/pkgconfig' install +} + FILES_${PN} += "${libdir}/vamp" diff --git a/recipes-musicians/wolf-shaper/wolf-shaper_git.bb b/recipes-musicians/wolf-shaper/wolf-shaper_git.bb new file mode 100644 index 00000000..729ac20e --- /dev/null +++ b/recipes-musicians/wolf-shaper/wolf-shaper_git.bb @@ -0,0 +1,44 @@ +SUMMARY = "Wolf Shaper is a waveshaper plugin with a graph editor" +HOMEPAGE = "https://pdesaulniers.github.io/wolf-shaper/" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://LICENSE;md5=4fe869ee987a340198fb0d54c55c47f1" + +DEPENDS = " \ + jack \ + dssi \ + lv2 \ +" + +inherit pkgconfig qemu-ext pack_audio_plugins + +SRC_URI = "gitsm://github.com/pdesaulniers/wolf-shaper.git" +SRCREV = "d0b46c9ece642488efed3cd255df22516966b334" +S = "${WORKDIR}/git" +PV = "0.1.7" + +export PREFIX="${prefix}" + +do_compile() { + rm -f ${WORKDIR}/lv2_ttl_generator-data + # manipulate scripts to keep lv2_ttl_generator-calls in script for qemu + sed -i 's|"$GEN" "./$FILE"|echo `pwd`/$FILE >> ${WORKDIR}/lv2_ttl_generator-data|g' ${S}/dpf/utils/generate-ttl.sh + + NOOPT=true \ + SKIP_STRIPPING=true \ + BUILD_VST2=true \ + BUILD_LV2=true \ + BUILD_DSSI=true \ + BUILD_JACK=true \ + oe_runmake + + # build ttl-files must be done in quemu + for sofile in `cat ${WORKDIR}/lv2_ttl_generator-data`; do + cd `dirname ${sofile}` + echo "QEMU lv2_ttl_generator for ${sofile}..." + ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${S}/dpf/utils/lv2_ttl_generator')} ${sofile} || echo "ERROR: for QEMU lv2_ttl_generator for ${sofile}!" + done +} + +do_install() { + oe_runmake DESTDIR=${D} PREFIX=${prefix} install +} diff --git a/recipes-misc/recipes-multimedia/x42/avldrums.lv2_git.bb b/recipes-musicians/x42/avldrums.lv2_git.bb similarity index 82% rename from recipes-misc/recipes-multimedia/x42/avldrums.lv2_git.bb rename to recipes-musicians/x42/avldrums.lv2_git.bb index d8177d9d..9cb416f5 100644 --- a/recipes-misc/recipes-multimedia/x42/avldrums.lv2_git.bb +++ b/recipes-musicians/x42/avldrums.lv2_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://x42-plugins.com/x42/x42-avldrums" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -inherit autotools-brokensep pkgconfig +inherit pkgconfig DEPENDS += " \ virtual/libgl \ @@ -20,9 +20,12 @@ PV = "0.3.1" S = "${WORKDIR}/git" EXTRA_OEMAKE += " \ - PREFIX=${prefix} \ STRIP=echo \ OPTIMIZATIONS= \ " +do_install() { + oe_runmake DESTDIR=${D} PREFIX=${prefix} LV2DIR=${libdir}/lv2 install +} + FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-misc/recipes-multimedia/x42/dpl.lv2_git.bb b/recipes-musicians/x42/dpl.lv2_git.bb similarity index 82% rename from recipes-misc/recipes-multimedia/x42/dpl.lv2_git.bb rename to recipes-musicians/x42/dpl.lv2_git.bb index 822b1bd4..d5eba5f9 100644 --- a/recipes-misc/recipes-multimedia/x42/dpl.lv2_git.bb +++ b/recipes-musicians/x42/dpl.lv2_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://x42-plugins.com/x42/x42-limiter" LICENSE = "GPLv3" LIC_FILES_CHKSUM = "file://COPYING;md5=9eef91148a9b14ec7f9df333daebc746" -inherit autotools-brokensep pkgconfig +inherit pkgconfig DEPENDS += " \ libglu \ @@ -19,9 +19,12 @@ PV = "0.2.2+git${SRCPV}" S = "${WORKDIR}/git" EXTRA_OEMAKE += " \ - PREFIX=${prefix} \ STRIP=echo \ OPTIMIZATIONS= \ " +do_install() { + oe_runmake DESTDIR=${D} PREFIX=${prefix} LV2DIR=${libdir}/lv2 install +} + FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-misc/recipes-multimedia/x42/fil4.lv2_git.bb b/recipes-musicians/x42/fil4.lv2_git.bb similarity index 82% rename from recipes-misc/recipes-multimedia/x42/fil4.lv2_git.bb rename to recipes-musicians/x42/fil4.lv2_git.bb index 49e487b1..deac3b1c 100644 --- a/recipes-misc/recipes-multimedia/x42/fil4.lv2_git.bb +++ b/recipes-musicians/x42/fil4.lv2_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://x42-plugins.com/x42/x42-eq" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -inherit autotools-brokensep pkgconfig +inherit pkgconfig DEPENDS += " \ virtual/libgl \ @@ -22,9 +22,12 @@ PV = "0.6.1" S = "${WORKDIR}/git" EXTRA_OEMAKE += " \ - PREFIX=${prefix} \ STRIP=echo \ OPTIMIZATIONS= \ " +do_install() { + oe_runmake DESTDIR=${D} PREFIX=${prefix} LV2DIR=${libdir}/lv2 install +} + FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-support/libltc/libltc_1.3.0.bb b/recipes-musicians/x42/libltc_1.3.0.bb similarity index 100% rename from recipes-support/libltc/libltc_1.3.0.bb rename to recipes-musicians/x42/libltc_1.3.0.bb diff --git a/recipes-misc/recipes-multimedia/x42/meters.lv2_git.bb b/recipes-musicians/x42/meters.lv2_git.bb similarity index 83% rename from recipes-misc/recipes-multimedia/x42/meters.lv2_git.bb rename to recipes-musicians/x42/meters.lv2_git.bb index b3466f55..335bc51b 100644 --- a/recipes-misc/recipes-multimedia/x42/meters.lv2_git.bb +++ b/recipes-musicians/x42/meters.lv2_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://x42.github.io/meters.lv2/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -inherit autotools-brokensep pkgconfig +inherit pkgconfig DEPENDS += " \ virtual/libgl \ @@ -22,9 +22,12 @@ PV = "0.9.8" S = "${WORKDIR}/git" EXTRA_OEMAKE += " \ - PREFIX=${prefix} \ STRIP=echo \ OPTIMIZATIONS= \ " +do_install() { + oe_runmake DESTDIR=${D} PREFIX=${prefix} LV2DIR=${libdir}/lv2 install +} + FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-misc/recipes-multimedia/x42/midifilter.lv2_git.bb b/recipes-musicians/x42/midifilter.lv2_git.bb similarity index 55% rename from recipes-misc/recipes-multimedia/x42/midifilter.lv2_git.bb rename to recipes-musicians/x42/midifilter.lv2_git.bb index 0122c6df..57b42252 100644 --- a/recipes-misc/recipes-multimedia/x42/midifilter.lv2_git.bb +++ b/recipes-musicians/x42/midifilter.lv2_git.bb @@ -3,18 +3,23 @@ HOMEPAGE = "http://x42.github.io/midifilter.lv2/" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4641e94ec96f98fabc56ff9cc48be14b" -inherit autotools-brokensep pkgconfig +inherit pkgconfig DEPENDS += "lv2" -SRC_URI = "git://github.com/x42/midifilter.lv2.git" -SRCREV = "7b9956266616d681fa21b9924d606fa7479e55bd" -PV = "0.5.1" +SRC_URI = " \ + git://github.com/x42/midifilter.lv2.git \ +" +SRCREV = "8bfe1d8e3d37467741cdec9de98e5b6b264bc3f9" +PV = "0.5.2" S = "${WORKDIR}/git" EXTRA_OEMAKE += " \ - PREFIX=${prefix} \ STRIP=echo \ " +do_install() { + oe_runmake DESTDIR=${D} PREFIX=${prefix} LV2DIR=${libdir}/lv2 install +} + FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-musicians/x42/sisco.lv2_git.bb b/recipes-musicians/x42/sisco.lv2_git.bb new file mode 100644 index 00000000..13ddb148 --- /dev/null +++ b/recipes-musicians/x42/sisco.lv2_git.bb @@ -0,0 +1,29 @@ +SUMMARY = "Simple Scope" +HOMEPAGE = "http://x42.github.io/sisco.lv2/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +inherit pkgconfig + +DEPENDS += " \ + virtual/libgl \ + libglu \ + lv2 \ + jack \ +" + +SRC_URI = "gitsm://github.com/x42/sisco.lv2.git" +SRCREV = "09a4731240a6677938f1ee8ca37c90b9efef38ff" +PV = "0.8.0" +S = "${WORKDIR}/git" + +EXTRA_OEMAKE += " \ + STRIP=echo \ + OPTIMIZATIONS= \ +" + +do_install() { + oe_runmake DESTDIR=${D} PREFIX=${prefix} LV2DIR=${libdir}/lv2 install +} + +FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-misc/recipes-multimedia/x42/tuna.lv2_git.bb b/recipes-musicians/x42/tuna.lv2_git.bb similarity index 82% rename from recipes-misc/recipes-multimedia/x42/tuna.lv2_git.bb rename to recipes-musicians/x42/tuna.lv2_git.bb index e4e5af87..c3f4d2cb 100644 --- a/recipes-misc/recipes-multimedia/x42/tuna.lv2_git.bb +++ b/recipes-musicians/x42/tuna.lv2_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://x42-plugins.com/x42/x42-tuner" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -inherit autotools-brokensep pkgconfig +inherit pkgconfig DEPENDS += " \ virtual/libgl \ @@ -22,9 +22,12 @@ PV = "0.4.8" S = "${WORKDIR}/git" EXTRA_OEMAKE += " \ - PREFIX=${prefix} \ STRIP=echo \ OPTIMIZATIONS= \ " +do_install() { + oe_runmake DESTDIR=${D} PREFIX=${prefix} LV2DIR=${libdir}/lv2 install +} + FILES_${PN} += "${libdir}/lv2" diff --git a/recipes-musicians/ykchorus/ykchorus_git.bb b/recipes-musicians/ykchorus/ykchorus_git.bb new file mode 100644 index 00000000..a1782707 --- /dev/null +++ b/recipes-musicians/ykchorus/ykchorus_git.bb @@ -0,0 +1,39 @@ +SUMMARY = "A chorus audio effect plugin based on DSP code by Togu Audio Line (TAL)" +HOMEPAGE = "https://github.com/SpotlightKid/ykchorus" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=02ad2afd072e9ce4a370bedb49e2b075" + +inherit pkgconfig gtk-icon-cache qemu-ext pack_audio_plugins + +DEPENDS += " \ + liblo \ + jack \ + virtual/libgl \ +" + +SRC_URI = "gitsm://github.com/SpotlightKid/ykchorus.git" +SRCREV = "a6b1027e327f5118bbe48ae01e9fa58e14f93479" +PV = "0.2.2+git${SRCPV}" +S = "${WORKDIR}/git" + +do_compile() { + rm -f ${WORKDIR}/lv2_ttl_generator-data + # manipulate scripts to keep lv2_ttl_generator-calls in script for qemu + sed -i 's|"$GEN" "./$FILE"|echo `pwd`/$FILE >> ${WORKDIR}/lv2_ttl_generator-data|g' ${S}/dpf/utils/generate-ttl.sh + + PREFIX=${prefix} \ + NOOPT=true \ + SKIP_STRIPPING=true \ + oe_runmake + + # build ttl-files must be done in quemu + for sofile in `cat ${WORKDIR}/lv2_ttl_generator-data`; do + cd `dirname ${sofile}` + echo "QEMU lv2_ttl_generator for ${sofile}..." + ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${S}/dpf/utils/lv2_ttl_generator')} ${sofile} || echo "ERROR: for QEMU lv2_ttl_generator for ${sofile}!" + done +} + +do_install() { + oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install +} diff --git a/recipes-misc/recipes-multimedia/yoshimi/yoshimi_1.5.9.bb b/recipes-musicians/yoshimi/yoshimi_1.5.10.2.bb similarity index 69% rename from recipes-misc/recipes-multimedia/yoshimi/yoshimi_1.5.9.bb rename to recipes-musicians/yoshimi/yoshimi_1.5.10.2.bb index 8aa82b54..7faa774c 100644 --- a/recipes-misc/recipes-multimedia/yoshimi/yoshimi_1.5.9.bb +++ b/recipes-musicians/yoshimi/yoshimi_1.5.10.2.bb @@ -21,14 +21,14 @@ DEPENDS += " \ libxft \ " -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/1.5/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "5368486f9b1525ac9026e0934bbcb9ac" -SRC_URI[sha256sum] = "20f3b36caf8d3d3ba038a33cb9e75b22fab60bca63c0fc814195046430ef1cdb" +SRC_URI = " \ + ${SOURCEFORGE_MIRROR}/project/${BPN}/1.5/${BPN}-${PV}.tar.bz2 \ +" +SRC_URI[md5sum] = "953662f7552f4f55851554ee76215bfd" +SRC_URI[sha256sum] = "0128bff8926e19344058499756772ba11e6055678cf4b1a3a0480384274e29e7" OECMAKE_SOURCEPATH = "${S}/src" -LDFLAGS += "-lpng16 -ljpeg -lXrender -lXft" - FILES_${PN} += " \ ${datadir}/metainfo \ ${libdir}/lv2 \ diff --git a/recipes-musicians/zam-plugins/zam-plugins/0001-remove-useles-braces-in-macros.patch b/recipes-musicians/zam-plugins/zam-plugins/0001-remove-useles-braces-in-macros.patch new file mode 100644 index 00000000..6b4e7cf1 --- /dev/null +++ b/recipes-musicians/zam-plugins/zam-plugins/0001-remove-useles-braces-in-macros.patch @@ -0,0 +1,57 @@ +From be9c101225336c415dd63647c67206ad3d4d7f66 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sat, 5 Jan 2019 19:44:15 +0100 +Subject: [PATCH] remove useles braces in macros +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +recent complilers don't like them: + +../../dpf/distrho/src/lv2/atom-util.h:334:2: note: in expansion of macro 'LV2_ATOM_OBJECT_FOREACH' + LV2_ATOM_OBJECT_FOREACH(object, prop) { + ^~~~~~~~~~~~~~~~~~~~~~~ +../../dpf/distrho/src/lv2/atom-util.h: In function 'int lv2_atom_object_body_get(uint32_t, const LV2_Atom_Object_Body*, ...)': +../../dpf/distrho/src/lv2/atom-util.h:279:37: warning: unnecessary parentheses in declaration of 'prop' [-Wparentheses] + for (const LV2_Atom_Property_Body* (iter) = lv2_atom_object_begin(body); \ + ^ +../../dpf/distrho/src/lv2/atom-util.h:367:2: note: in expansion of macro 'LV2_ATOM_OBJECT_BODY_FOREACH' + LV2_ATOM_OBJECT_BODY_FOREACH(body, size, prop) { + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ +../../dpf/distrho/src/lv2/atom-util.h: In function 'int lv2_atom_object_get(const LV2_Atom_Object*, ...)': +../../dpf/distrho/src/lv2/atom-util.h:273:37: warning: unnecessary parentheses in declaration of 'prop' [-Wparentheses] + for (const LV2_Atom_Property_Body* (iter) = lv2_atom_object_begin(&(obj)->body); \ + ^ + +Sent/applied @ DPF [1] + +[1] https://github.com/DISTRHO/DPF/pull/98 + +Signed-off-by: Andreas Müller +--- + dpf/distrho/src/lv2/atom-util.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/dpf/distrho/src/lv2/atom-util.h b/dpf/distrho/src/lv2/atom-util.h +index c47c0f6..1353687 100644 +--- a/dpf/distrho/src/lv2/atom-util.h ++++ b/dpf/distrho/src/lv2/atom-util.h +@@ -270,13 +270,13 @@ lv2_atom_object_next(const LV2_Atom_Property_Body* i) + @endcode + */ + #define LV2_ATOM_OBJECT_FOREACH(obj, iter) \ +- for (const LV2_Atom_Property_Body* (iter) = lv2_atom_object_begin(&(obj)->body); \ ++ for (const LV2_Atom_Property_Body* iter = lv2_atom_object_begin(&(obj)->body); \ + !lv2_atom_object_is_end(&(obj)->body, (obj)->atom.size, (iter)); \ + (iter) = lv2_atom_object_next(iter)) + + /** Like LV2_ATOM_OBJECT_FOREACH but for a headerless object body. */ + #define LV2_ATOM_OBJECT_BODY_FOREACH(body, size, iter) \ +- for (const LV2_Atom_Property_Body* (iter) = lv2_atom_object_begin(body); \ ++ for (const LV2_Atom_Property_Body* iter = lv2_atom_object_begin(body); \ + !lv2_atom_object_is_end(body, size, (iter)); \ + (iter) = lv2_atom_object_next(iter)) + +-- +2.20.1 + diff --git a/recipes-musicians/zam-plugins/zam-plugins_git.bb b/recipes-musicians/zam-plugins/zam-plugins_git.bb new file mode 100644 index 00000000..1b740be3 --- /dev/null +++ b/recipes-musicians/zam-plugins/zam-plugins_git.bb @@ -0,0 +1,57 @@ +SUMMARY = "Collection of LADSPA/LV2/VST/JACK audio plugins for high-quality processing" +HOMEPAGE = "http://www.zamaudio.com/?p=976" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS += " \ + virtual/libx11 \ + virtual/libgl \ + liblo \ + jack \ + ladspa-sdk \ + rubberband \ + libsamplerate0 \ + libsndfile1 \ + fftw \ + zita-convolver \ +" + +inherit pkgconfig qemu-ext distro_features_check pack_audio_plugins + +REQUIRED_DISTRO_FEATURE = "x11" + +SRC_URI = " \ + gitsm://github.com/zamaudio/${BPN}.git \ + file://0001-remove-useles-braces-in-macros.patch \ +" +SRCREV = "96ec0c7dbc9c034bc8716309b92fda84bb27cf92" +S = "${WORKDIR}/git" +PV = "3.10+git${SRCPV}" + +do_configure_prepend() { + rm -f ${WORKDIR}/lv2_ttl_generator-data + # manipulate scripts to keep lv2_ttl_generator-calls in script for qemu + sed -i 's|"$GEN" "./$FILE"|echo `pwd`/$FILE >> ${WORKDIR}/lv2_ttl_generator-data|g' ${S}/dpf/utils/generate-ttl.sh +} + + +EXTRA_OEMAKE += " \ + NOOPT=true \ + SKIP_STRIPPING=true \ +" + +do_compile_append() { + # build ttl-files must be done in quemu + for sofile in `cat ${WORKDIR}/lv2_ttl_generator-data`; do + cd `dirname ${sofile}` + echo "QEMU lv2_ttl_generator for ${sofile}..." + ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${S}/dpf/utils/lv2_ttl_generator')} ${sofile} || echo "ERROR: for QEMU lv2_ttl_generator for ${sofile}!" + done +} + +do_install() { + ${MAKE} DESTDIR=${D} PREFIX= LIBDIR=${libdir} BINDIR=${bindir} install +} + +PACKAGES =+ "${PN}-standalone" +FILES_${PN}-standalone = "${bindir}" diff --git a/recipes-misc/recipes-multimedia/zyn/mruby-zest-native.bb b/recipes-musicians/zyn/mruby-zest-native.bb similarity index 100% rename from recipes-misc/recipes-multimedia/zyn/mruby-zest-native.bb rename to recipes-musicians/zyn/mruby-zest-native.bb diff --git a/recipes-misc/recipes-multimedia/zyn/mruby-zest.bb b/recipes-musicians/zyn/mruby-zest.bb similarity index 100% rename from recipes-misc/recipes-multimedia/zyn/mruby-zest.bb rename to recipes-musicians/zyn/mruby-zest.bb diff --git a/recipes-misc/recipes-multimedia/zyn/mruby-zest.inc b/recipes-musicians/zyn/mruby-zest.inc similarity index 84% rename from recipes-misc/recipes-multimedia/zyn/mruby-zest.inc rename to recipes-musicians/zyn/mruby-zest.inc index 0d45867a..bd19c66b 100644 --- a/recipes-misc/recipes-multimedia/zyn/mruby-zest.inc +++ b/recipes-musicians/zyn/mruby-zest.inc @@ -8,8 +8,9 @@ SRC_URI = " \ file://0002-mruby-zest-Align-build-to-our-needs.patch \ file://0003-src-osc-bridge-Align-build-to-our-needs.patch \ " -SRCREV = "b312953ba991b15d1076ba819ca5a44ed4386b28" -PV = "3.02+git${SRCPV}" +SRCREV = "3f112eeb6a0d7b6ce65c1be3f591e02fde965923" +PV = "3.0.4+git${SRCPV}" +PE = "1" S = "${WORKDIR}/git" DEPENDS += " \ diff --git a/recipes-misc/recipes-multimedia/zyn/mruby-zest/0001-mruby-Align-build-to-our-needs.patch b/recipes-musicians/zyn/mruby-zest/0001-mruby-Align-build-to-our-needs.patch similarity index 68% rename from recipes-misc/recipes-multimedia/zyn/mruby-zest/0001-mruby-Align-build-to-our-needs.patch rename to recipes-musicians/zyn/mruby-zest/0001-mruby-Align-build-to-our-needs.patch index 7cccec53..48ab1703 100644 --- a/recipes-misc/recipes-multimedia/zyn/mruby-zest/0001-mruby-Align-build-to-our-needs.patch +++ b/recipes-musicians/zyn/mruby-zest/0001-mruby-Align-build-to-our-needs.patch @@ -1,10 +1,7 @@ From 84ec8305a0e4c67277929a812e6796d9f054cb02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 12 Sep 2018 21:23:52 +0200 +Date: Wed, 13 Mar 2019 22:26:35 +0100 Subject: [PATCH 1/2] mruby: Align build to our needs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit * Add build flags @@ -12,23 +9,15 @@ Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Andreas Müller --- - build_config.rb | 11 +++++++++-- + build_config.rb | 11 ++++++++++- mruby/tasks/toolchains/gcc.rake | 2 +- - 3 files changed, 30 insertions(+), 19 deletions(-) + 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/build_config.rb b/build_config.rb -index f2c053e..5abc53c 100644 +index 664e84a..fda7fd7 100644 --- a/build_config.rb +++ b/build_config.rb -@@ -38,7 +38,6 @@ build_type.new(build_name) do |conf| - enable_debug - - conf.cc.defines = %w(MRUBY_NANOVG_GL2 MRB_ENABLE_DEBUG_HOOK) -- conf.cc.flags << '-O3' - - #No default gems - # Use standard print/puts/p -@@ -102,15 +101,19 @@ build_type.new(build_name) do |conf| +@@ -102,18 +102,22 @@ build_type.new(build_name) do |conf| cc.flags << "-mstackrealign" if windows cc.flags << "-mwindows" if windows cc.flags << "-Wno-declaration-after-statement" @@ -38,28 +27,32 @@ index f2c053e..5abc53c 100644 end conf.linker do |linker| -+ linker.command = ENV['CC'] -+ linker.flags = [ENV['LDFLAGS'] || []] #linker.library_paths << "#{`pwd`.strip}/../deps/nanovg/build/" #linker.library_paths << "#{`pwd`.strip}/../deps/rtosc/build/" ++ linker.command = ENV['CC'] ++ linker.flags = [ENV['LDFLAGS'] || []] linker.library_paths << "#{`pwd`.strip}/../src/osc-bridge/" linker.libraries << 'osc-bridge' -- linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv.a" -+ linker.flags_after_libraries << "-luv" linker.flags_after_libraries << "#{`pwd`.strip}/../deps/pugl/build/libpugl-0.a" linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libnanovg.a" if(!windows) -@@ -124,6 +127,10 @@ build_type.new(build_name) do |conf| - linker.flags_after_libraries << "-lglu32 -lgdi32 -lopengl32" - end - end +- linker.flags_after_libraries << "#{`pwd`.strip}/../deps/libuv.a" ++ linker.flags_after_libraries << "-luv" + if(ENV['OS'] != "Mac") + linker.libraries << 'GL' + linker.libraries << 'X11' +@@ -135,6 +139,11 @@ build_type.new(build_name) do |conf| + conf.gem 'src/mruby-widget-lib' + + #conf.gem 'deps/mruby-profiler' ++ + # Archiver settings + conf.archiver do |archiver| + archiver.command = ENV['AR'] + end + end - #Custom Gems - conf.gem 'src/mruby-qml-spawn' + MRuby::Build.new('host-debug') do |conf| diff --git a/mruby/tasks/toolchains/gcc.rake b/mruby/tasks/toolchains/gcc.rake index f370c0ab..a2ab5ed4 100644 --- a/mruby/tasks/toolchains/gcc.rake @@ -74,5 +67,5 @@ index f370c0ab..a2ab5ed4 100644 linker.libraries = %w(m) linker.library_paths = [] -- -2.14.4 +2.20.1 diff --git a/recipes-misc/recipes-multimedia/zyn/mruby-zest/0002-mruby-zest-Align-build-to-our-needs.patch b/recipes-musicians/zyn/mruby-zest/0002-mruby-zest-Align-build-to-our-needs.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zyn/mruby-zest/0002-mruby-zest-Align-build-to-our-needs.patch rename to recipes-musicians/zyn/mruby-zest/0002-mruby-zest-Align-build-to-our-needs.patch diff --git a/recipes-misc/recipes-multimedia/zyn/mruby-zest/0003-src-osc-bridge-Align-build-to-our-needs.patch b/recipes-musicians/zyn/mruby-zest/0003-src-osc-bridge-Align-build-to-our-needs.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zyn/mruby-zest/0003-src-osc-bridge-Align-build-to-our-needs.patch rename to recipes-musicians/zyn/mruby-zest/0003-src-osc-bridge-Align-build-to-our-needs.patch diff --git a/recipes-misc/recipes-multimedia/zyn/mruby-zest/0004-Native-Do-not-build-X11-dependent-zest-libzest.so.patch b/recipes-musicians/zyn/mruby-zest/0004-Native-Do-not-build-X11-dependent-zest-libzest.so.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zyn/mruby-zest/0004-Native-Do-not-build-X11-dependent-zest-libzest.so.patch rename to recipes-musicians/zyn/mruby-zest/0004-Native-Do-not-build-X11-dependent-zest-libzest.so.patch diff --git a/recipes-misc/recipes-multimedia/zyn/mruby-zest/0005-mruby-Use-native-mrbc.patch b/recipes-musicians/zyn/mruby-zest/0005-mruby-Use-native-mrbc.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zyn/mruby-zest/0005-mruby-Use-native-mrbc.patch rename to recipes-musicians/zyn/mruby-zest/0005-mruby-Use-native-mrbc.patch diff --git a/recipes-misc/recipes-multimedia/zyn/mruby-zest/0006-mruby-regexp-pcre-link-against-libpcre.patch b/recipes-musicians/zyn/mruby-zest/0006-mruby-regexp-pcre-link-against-libpcre.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zyn/mruby-zest/0006-mruby-regexp-pcre-link-against-libpcre.patch rename to recipes-musicians/zyn/mruby-zest/0006-mruby-regexp-pcre-link-against-libpcre.patch diff --git a/recipes-misc/recipes-multimedia/zyn/mruby-zest/0007-Load-schema-from-usr-share-zyn-fusion-schema.patch b/recipes-musicians/zyn/mruby-zest/0007-Load-schema-from-usr-share-zyn-fusion-schema.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zyn/mruby-zest/0007-Load-schema-from-usr-share-zyn-fusion-schema.patch rename to recipes-musicians/zyn/mruby-zest/0007-Load-schema-from-usr-share-zyn-fusion-schema.patch diff --git a/recipes-misc/recipes-multimedia/zyn/mruby-zest/0008-Do-not-require-dummy-MainWindow.qml.patch b/recipes-musicians/zyn/mruby-zest/0008-Do-not-require-dummy-MainWindow.qml.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zyn/mruby-zest/0008-Do-not-require-dummy-MainWindow.qml.patch rename to recipes-musicians/zyn/mruby-zest/0008-Do-not-require-dummy-MainWindow.qml.patch diff --git a/recipes-misc/recipes-multimedia/zyn/zyn-fusion.bb b/recipes-musicians/zyn/zyn-fusion.bb similarity index 86% rename from recipes-misc/recipes-multimedia/zyn/zyn-fusion.bb rename to recipes-musicians/zyn/zyn-fusion.bb index a55914b4..fa8166fe 100644 --- a/recipes-misc/recipes-multimedia/zyn/zyn-fusion.bb +++ b/recipes-musicians/zyn/zyn-fusion.bb @@ -10,7 +10,5 @@ FILES_${PN} += " \ RDEPENDS_${PN} += "mruby-zest" -PROVIDES = "zyn" -RPROVIDES_${PN} = "zyn" RREPLACES_${PN} += "zynaddsubfx" RCONFLICTS_${PN} += "zynaddsubfx" diff --git a/recipes-musicians/zyn/zyn.inc b/recipes-musicians/zyn/zyn.inc new file mode 100644 index 00000000..041be7d3 --- /dev/null +++ b/recipes-musicians/zyn/zyn.inc @@ -0,0 +1,73 @@ +HOMEPAGE = "http://zynaddsubfx.sourceforge.net" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=21fa88a5e50a1c608d22612c1fbe1971" + +inherit cmake qemu-ext pkgconfig gtk-icon-cache distro_features_check pack_audio_plugins + +REQUIRED_DISTRO_FEATURES = "x11" + +DEPENDS += " \ + virtual/libx11 \ + alsa-lib \ + jack \ + portaudio-v19 \ + dssi \ + lv2 \ + liblo \ + zlib \ + libmxml \ + libxpm \ +" + +CXXFLAGS += "-ftree-vectorize -ffast-math -DNDEBUG" + +FILESEXTRAPATHS_prepend := "${THISDIR}/zyn:" + +SRC_URI = " \ + gitsm://github.com/zynaddsubfx/zynaddsubfx.git \ + file://0001-No-target-specific-asm.patch \ + file://0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch \ + file://0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch \ + file://0004-Keep-our-build-flags.patch \ +" +SRCREV = "576f1371b44db44865d57bbd50609e906bd2bfd7" +PV = "3.0.4+git${SRCPV}" +S = "${WORKDIR}/git" + +EXTRA_OECMAKE += "-DPluginLibDir=${baselib}" + +do_configure_prepend() { + # reconfigure? + if [ ! -f ${WORKDIR}/lv2-ttl-generator-data ] ; then + # We cannot run lv2-ttl-generator in cross environment so + # manipulate CMakeLists.txt to keep commands in file + sed -i \ + -e 's|../../lv2-ttl-generator|echo|g' \ + -e 's|echo $> ${WORKDIR}/lv2-ttl-generator-data|g' \ + `find ${S} -name CMakeLists.txt` + else + rm -f ${WORKDIR}/lv2-ttl-generator-data + fi +} + +do_compile_append() { + # build ttl-files must be done in quemu + for sofile in `cat ${WORKDIR}/lv2-ttl-generator-data`; do + cd `dirname ${sofile}` + echo "QEMU lv2-ttl-generator for ${sofile}..." + ${@qemu_run_binary_local(d, '${STAGING_DIR_TARGET}', '${B}/src/Plugin/lv2-ttl-generator')} ${sofile} || echo "ERROR: for QEMU lv2-ttl-generator for ${sofile}!" + done +} + +PACKAGES =+ "${PN}-standalone" +FILES_${PN}-standalone = " \ + ${datadir}/applications \ + ${datadir}/pixmaps \ + ${bindir}/zynaddsubfx \ +" + +RDEPENDS_${PN}-dssi += "${PN}" +RDEPENDS_${PN}-lv2 += "${PN}" +RDEPENDS_${PN}-vst += "${PN}" +RDEPENDS_${PN}-standalone += "${PN}" + diff --git a/recipes-misc/recipes-multimedia/zyn/zyn/0001-No-target-specific-asm.patch b/recipes-musicians/zyn/zyn/0001-No-target-specific-asm.patch similarity index 96% rename from recipes-misc/recipes-multimedia/zyn/zyn/0001-No-target-specific-asm.patch rename to recipes-musicians/zyn/zyn/0001-No-target-specific-asm.patch index ce4cff81..8177add4 100644 --- a/recipes-misc/recipes-multimedia/zyn/zyn/0001-No-target-specific-asm.patch +++ b/recipes-musicians/zyn/zyn/0001-No-target-specific-asm.patch @@ -17,7 +17,7 @@ diff --git a/src/globals.h b/src/globals.h index f3fb1c7..e6a908d 100644 --- a/src/globals.h +++ b/src/globals.h -@@ -248,15 +248,7 @@ enum LegatoMsg { +@@ -252,15 +252,7 @@ enum LegatoMsg { }; //is like i=(int)(floor(f)) diff --git a/recipes-misc/recipes-multimedia/zyn/zyn/0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch b/recipes-musicians/zyn/zyn/0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch similarity index 100% rename from recipes-misc/recipes-multimedia/zyn/zyn/0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch rename to recipes-musicians/zyn/zyn/0002-Controller-Spliter-align-Makefiles-for-cross-compili.patch diff --git a/recipes-misc/recipes-multimedia/zyn/zyn/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch b/recipes-musicians/zyn/zyn/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch similarity index 93% rename from recipes-misc/recipes-multimedia/zyn/zyn/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch rename to recipes-musicians/zyn/zyn/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch index 0a65c753..e103d53d 100644 --- a/recipes-misc/recipes-multimedia/zyn/zyn/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch +++ b/recipes-musicians/zyn/zyn/0003-Nio.cpp-Do-not-use-ps-aux-to-find-jack-busybox-s-ps-.patch @@ -18,9 +18,9 @@ diff --git a/src/Nio/Nio.cpp b/src/Nio/Nio.cpp index 1e26b65..9bbb5bc 100644 --- a/src/Nio/Nio.cpp +++ b/src/Nio/Nio.cpp -@@ -133,21 +133,8 @@ string Nio::getSink() +@@ -136,21 +136,8 @@ string Nio::getSink() #include - void Nio::preferedSampleRate(unsigned &rate) + void Nio::preferredSampleRate(unsigned &rate) { -#if __linux__ - //avoid checking in with jack if it's off diff --git a/recipes-misc/recipes-multimedia/zyn/zyn/0004-Keep-our-build-flags.patch b/recipes-musicians/zyn/zyn/0004-Keep-our-build-flags.patch similarity index 96% rename from recipes-misc/recipes-multimedia/zyn/zyn/0004-Keep-our-build-flags.patch rename to recipes-musicians/zyn/zyn/0004-Keep-our-build-flags.patch index 6fab4fd1..ca130d13 100644 --- a/recipes-misc/recipes-multimedia/zyn/zyn/0004-Keep-our-build-flags.patch +++ b/recipes-musicians/zyn/zyn/0004-Keep-our-build-flags.patch @@ -27,7 +27,7 @@ index 365c129..1fa1b24 100644 set(CMAKE_REQUIRED_FLAGS "") -@@ -255,7 +252,7 @@ if (BuildForDebug) +@@ -328,7 +325,7 @@ if (BuildForDebug) else (BuildForDebug) set (CMAKE_BUILD_TYPE "Release") diff --git a/recipes-misc/recipes-multimedia/zyn/zynaddsubfx.bb b/recipes-musicians/zyn/zynaddsubfx.bb similarity index 93% rename from recipes-misc/recipes-multimedia/zyn/zynaddsubfx.bb rename to recipes-musicians/zyn/zynaddsubfx.bb index c4c43273..2ceb9d61 100644 --- a/recipes-misc/recipes-multimedia/zyn/zynaddsubfx.bb +++ b/recipes-musicians/zyn/zynaddsubfx.bb @@ -18,7 +18,5 @@ do_install_append() { install -m 0755 ${S}/ExternalPrograms/Spliter/spliter ${D}${bindir}/zynaddsubfx-spliter } -PROVIDES = "zyn" -RPROVIDES_${PN} = "zyn" RREPLACES_${PN} += "zyn-fusion" RCONFLICTS_${PN} += "zyn-fusion" diff --git a/recipes-support/catdoc/catdoc_0.95.bb b/recipes-support/catdoc/catdoc_0.95.bb new file mode 100644 index 00000000..2e6461a3 --- /dev/null +++ b/recipes-support/catdoc/catdoc_0.95.bb @@ -0,0 +1,17 @@ +SUMMARY = "Read MS-Word files and outputs text" +HOMEPAGE = "https://www.wagner.pp.ru/~vitus/software/catdoc/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "http://ftp.wagner.pp.ru/pub/catdoc/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "4ece2f43b140fab6a2c3a9d6436d7779" +SRC_URI[sha256sum] = "514a84180352b6bf367c1d2499819dfa82b60d8c45777432fa643a5ed7d80796" + +inherit autotools-brokensep pkgconfig + +EXTRA_OECONF = "--with-install-root=${D}" + +do_install_prepend() { + install -d ${D}/${datadir}/man/man1 + install -d ${D}/${datadir}/${BPN} +} diff --git a/recipes-support/cmst/cmst_2018.01.06.bb b/recipes-support/cmst/cmst_2019.01.13.bb similarity index 74% rename from recipes-support/cmst/cmst_2018.01.06.bb rename to recipes-support/cmst/cmst_2019.01.13.bb index 19e2598d..7e90d735 100644 --- a/recipes-support/cmst/cmst_2018.01.06.bb +++ b/recipes-support/cmst/cmst_2019.01.13.bb @@ -9,7 +9,7 @@ inherit qmake5 gtk-icon-cache DEPENDS += "connman qtbase" SRC_URI = "git://github.com/andrew-bibb/cmst.git" -SRCREV = "cf41767dfbb849f9c05bcdfc7fcb6a37c90b2ad0" +SRCREV = "7778754988c3b68b3cfa757c45ed2e44dbe35dd8" S = "${WORKDIR}/git" # the *.pro file use some paths, e.g. for install which require ${B} = ${S} @@ -21,10 +21,10 @@ EXTRA_QMAKEVARS_PRE += "DISTRO=debian" PACKAGES =+ "${PN}-big-icon" FILES_${PN} += " \ - ${datadir}/dbus-1/system-services/org.cmst.roothelper.service \ - ${datadir}/metainfo/org.cmst.cmst.appdata.xml \ - ${datadir}/cmst/autostart/cmst-autostart.desktop \ - ${datadir}/licenses/cmst/LICENSE \ + ${datadir}/dbus-1/system-services/org.cmst.roothelper.service \ + ${datadir}/metainfo/org.cmst.cmst.appdata.xml \ + ${datadir}/cmst/autostart/cmst-autostart.desktop \ + ${datadir}/licenses/cmst/LICENSE \ " FILES_${PN}-big-icon += "${datadir}/icons/hicolor/???x???/*" diff --git a/recipes-support/freecell-solver/freecell-solver_4.20.0.bb b/recipes-support/freecell-solver/freecell-solver_5.0.0.bb similarity index 68% rename from recipes-support/freecell-solver/freecell-solver_4.20.0.bb rename to recipes-support/freecell-solver/freecell-solver_5.0.0.bb index 660b90e3..f0f93cfe 100644 --- a/recipes-support/freecell-solver/freecell-solver_4.20.0.bb +++ b/recipes-support/freecell-solver/freecell-solver_5.0.0.bb @@ -1,11 +1,11 @@ SUMMARY = "Program that automatically solves layouts of Freecell and similar variants" HOMEPAGE = "hhttp://fc-solve.shlomifish.org/" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=767c2b76f9e7b88434106e0b8823a577" +LIC_FILES_CHKSUM = "file://COPYING.asciidoc;md5=767c2b76f9e7b88434106e0b8823a577" SRC_URI = "http://fc-solve.shlomifish.org/downloads/fc-solve/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "e01a1b6160f104b9402a9196aec35a68" -SRC_URI[sha256sum] = "869c210e7b63b0e0dcfb1c4a2322c41cfa8fbf8db01e7722254a7425a1ab7f81" +SRC_URI[md5sum] = "def258dd81ac99928fa9187ff16a6285" +SRC_URI[sha256sum] = "696717df7e4fab2d5a038b26cc23e2259f7b68a101bc8a4855dffa2841699dfd" inherit cmake perlnative @@ -18,6 +18,7 @@ DEPENDS += " \ EXTRA_OECMAKE = " \ -DFCS_WITH_TEST_SUITE=OFF \ -DBUILD_STATIC_LIBRARY=OFF \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ " # was: 'probably-redundant RPATH /usr/lib' - not exactly a bad breaker. Looked diff --git a/recipes-support/grantlee/grantlee_5.1.0.bb b/recipes-support/grantlee/grantlee_5.1.0.bb index aca59dc0..a305e37d 100644 --- a/recipes-support/grantlee/grantlee_5.1.0.bb +++ b/recipes-support/grantlee/grantlee_5.1.0.bb @@ -14,5 +14,6 @@ inherit cmake_qt5 pkgconfig DEPENDS += "qtscript" -FILES_${PN}-dev += "${libdir}/cmake" -FILES_${PN}-dbg += "${libdir}/grantlee/*/.debug" +EXTRA_OECMAKE += " \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ +" diff --git a/recipes-support/itstool/itstool_2.0.4.bb b/recipes-support/itstool/itstool_2.0.5.bb similarity index 80% rename from recipes-support/itstool/itstool_2.0.4.bb rename to recipes-support/itstool/itstool_2.0.5.bb index e42d33a3..b74d5f60 100644 --- a/recipes-support/itstool/itstool_2.0.4.bb +++ b/recipes-support/itstool/itstool_2.0.5.bb @@ -8,8 +8,8 @@ inherit autotools python3native DEPENDS = "python3-native python3-lxml-native" SRC_URI = "http://files.itstool.org/${BPN}/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "9415ddf6a12012ff688549d2ed767bc5" -SRC_URI[sha256sum] = "97c208b51da33e0b553e830b92655f8deb9132f8fbe9a646771f95c33226eb60" +SRC_URI[md5sum] = "655c6f78fc64faee45adcc45ccc5a57e" +SRC_URI[sha256sum] = "100506f8df62cca6225ec3e631a8237e9c04650c77495af4919ac6a100d4b308" do_install_append() { # fix shebang of main script diff --git a/recipes-support/libdmtx/libdmtx_git.bb b/recipes-support/libdmtx/libdmtx_git.bb index 3f267ccb..1f1f9508 100644 --- a/recipes-support/libdmtx/libdmtx_git.bb +++ b/recipes-support/libdmtx/libdmtx_git.bb @@ -1,10 +1,10 @@ SUMMARY = "libdmtx is a library for reading and writing Data Matrix barcodes" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1c8a135723039c12792b01a2c688251b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b58872aaf3a9d51c1f002b9d7940f4f1" inherit autotools pkgconfig -SRC_URI = "git://git.code.sf.net/p/libdmtx/libdmtx;protocol=git" -SRCREV = "eba6d5193fff75efa2707d0c0a5ded9134d2aa58" -PV = "0.7.4" +SRC_URI = "git://github.com/dmtx/libdmtx.git" +SRCREV = "53f001bbcb09f40747d645997f723fc96a58fec2" +PV = "0.7.5" S = "${WORKDIR}/git" diff --git a/recipes-support/lmdb/lmdb_0.9.21.bb b/recipes-support/lmdb/lmdb_0.9.23.bb similarity index 64% rename from recipes-support/lmdb/lmdb_0.9.21.bb rename to recipes-support/lmdb/lmdb_0.9.23.bb index bfb73b36..9ac1128a 100644 --- a/recipes-support/lmdb/lmdb_0.9.21.bb +++ b/recipes-support/lmdb/lmdb_0.9.23.bb @@ -10,20 +10,12 @@ SRC_URI = " \ SRCREV = "60d500206a108b2c64ca7e36b0113b2cd3711b98" S = "${WORKDIR}/git/libraries/liblmdb" -inherit autotools-brokensep - - do_compile() { oe_runmake "CC=${CC}" } do_install() { - install -d ${D}${bindir} - install -d ${D}${libdir} - install -d ${D}${includedir} - install -d ${D}${mandir} - sed -i 's:\$(prefix)/man:${mandir}:' Makefile - oe_runmake DESTDIR=${D} prefix=${prefix} libprefix=${libdir} manprefix=${mandir} install + oe_runmake DESTDIR=${D} prefix=${prefix} libdir=${libdir} mandir=${mandir} install chown -R root:root ${D}${bindir} chown -R root:root ${D}${libdir} } diff --git a/recipes-support/mlt/mlt_6.10.0.bb b/recipes-support/mlt/mlt_6.12.0.bb similarity index 87% rename from recipes-support/mlt/mlt_6.10.0.bb rename to recipes-support/mlt/mlt_6.12.0.bb index 47ee6565..17dc90a0 100644 --- a/recipes-support/mlt/mlt_6.10.0.bb +++ b/recipes-support/mlt/mlt_6.12.0.bb @@ -7,10 +7,8 @@ LIC_FILES_CHKSUM = " \ file://GPLv3;md5=d32239bcb673463ab874e80d47fae504 \ " -SRC_URI = " \ - git://github.com/mltframework/mlt.git \ -" -SRCREV = "41710728faa7ea8be6483dd97afdf2ce6ff38e76" +SRC_URI = "git://github.com/mltframework/mlt.git" +SRCREV = "f608b96d2ae236bfec532d1b354d722b25475f95" S = "${WORKDIR}/git" inherit autotools-brokensep pkgconfig diff --git a/recipes-support/muparser/muparser_2.2.5.bb b/recipes-support/muparser/muparser_2.2.6.bb similarity index 86% rename from recipes-support/muparser/muparser_2.2.5.bb rename to recipes-support/muparser/muparser_2.2.6.bb index cb15b0e4..c8ac100e 100644 --- a/recipes-support/muparser/muparser_2.2.5.bb +++ b/recipes-support/muparser/muparser_2.2.6.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://License.txt;md5=630a76659803db4be41fa4ce5be5ca16" SRC_URI = "git://github.com/beltoforion/muparser.git" -SRCREV = "33dcf471d40f15cb86d9307328dc8f9e875a5202" +SRCREV = "b7511e19027296af06265bac5db7ed7a36037737" S = "${WORKDIR}/git" inherit cmake pkgconfig diff --git a/recipes-support/nodeeditor/nodeeditor_git.bb b/recipes-support/nodeeditor/nodeeditor_git.bb new file mode 100644 index 00000000..4572b275 --- /dev/null +++ b/recipes-support/nodeeditor/nodeeditor_git.bb @@ -0,0 +1,26 @@ +SUMMARY = "Qt Node Editor. Dataflow programming framework" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3dd210d444241389c4e5dff1f84e7c10" + +SRC_URI = "git://github.com/paceholder/nodeeditor.git" +SRCREV = "5ad2aaf21f8d241c9e03d9a291709824ae3f75ed" +PV = "2.1.2" +S = "${WORKDIR}/git" + +inherit cmake_qt5 + +EXTRA_OECMAKE += " \ + -DBUILD_EXAMPLES=ON \ + -DCMAKE_SKIP_BUILD_RPATH=ON \ +" + +do_install_append() { + install -d ${D}${bindir} + install -m 755 ${B}/bin/* ${D}${bindir} +} + +FILES_SOLIBSDEV = "" +FILES_${PN} += "${libdir}/libnodes.so" + +PACKAGES =+ "${PN}-examples" +FILES_${PN}-examples = "${bindir}" diff --git a/recipes-support/packagegroups/meta-qt5-extra-music-world.bb b/recipes-support/packagegroups/meta-qt5-extra-music-world.bb index e6179edd..6382396d 100644 --- a/recipes-support/packagegroups/meta-qt5-extra-music-world.bb +++ b/recipes-support/packagegroups/meta-qt5-extra-music-world.bb @@ -15,7 +15,7 @@ RDEPENDS_${PN} = " \ # overlook a package. RDEPENDS_${PN} += " \ - amsynth \ + amsynth-standalone amsynth-lv2 amsynth-vst \ ardour5 \ aubio \ audio-tweaks \ @@ -29,14 +29,20 @@ RDEPENDS_${PN} += " \ lpd8editor \ \ \ - distrho-ports distrho-ports-presets \ - distrho-ports-extra \ - dpf-plugins \ + distrho-ports-lv2 distrho-ports-presets distrho-ports-vst \ + distrho-ports-extra-lv2 distrho-ports-extra-vst \ + dpf-plugins-ladspa dpf-plugins-lv2 dpf-plugins-vst \ lv2-ttl-generator \ \ \ + drmr \ + \ + \ ganv \ + ingen-lv2 ingen-standalone \ + jalv \ lilv \ + lv2 \ mda-lv2 \ patchage \ serd \ @@ -52,7 +58,8 @@ RDEPENDS_${PN} += " \ ftgl \ gmidimonitor \ guitarix \ - helm \ + gxplugins.lv2 \ + helm-standalone helm-lv2 helm-vst \ hydrogen hydrogen-drumkits \ infamousplugins \ \ @@ -70,7 +77,6 @@ RDEPENDS_${PN} += " \ libxmp \ lmms \ lrdf \ - lv2 \ mixxx \ muse \ nekobee \ @@ -124,7 +130,7 @@ RDEPENDS_${PN} += " \ timidity++ \ triceratops-lv2 \ vamp-plugin-sdk \ - wolf-shaper \ + wolf-shaper-dssi wolf-shaper-lv2 wolf-shaper-vst \ \ \ avldrums.lv2 \ @@ -132,14 +138,19 @@ RDEPENDS_${PN} += " \ fil4.lv2 \ meters.lv2 \ midifilter.lv2 \ + sisco.lv2 \ tuna.lv2 \ \ \ + ykchorus ykchorus-dssi ykchorus-lv2 ykchorus-vst \ yoshimi \ - zyn \ + zam-plugins-standalone zam-plugins-ladspa zam-plugins-lv2 zam-plugins-vst \ + ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "zyn-fusion-dssi zyn-fusion-lv2 zyn-fusion-vst zyn-fusion-standalone", "zynaddsubfx-dssi zynaddsubfx-lv2 zynaddsubfx-vst zynaddsubfx-standalone",d)} \ " # non working +# lsp-plugins-standalone lsp-plugins-ladspa lsp-plugins-lv2 lsp-plugins-vst + # tomahawk # empty diff --git a/recipes-support/packagegroups/meta-qt5-extra-world.bb b/recipes-support/packagegroups/meta-qt5-extra-world.bb index e7fb8772..df631e70 100644 --- a/recipes-support/packagegroups/meta-qt5-extra-world.bb +++ b/recipes-support/packagegroups/meta-qt5-extra-world.bb @@ -7,10 +7,7 @@ inherit packagegroup RDEPENDS_${PN} = " \ antimony \ \ - gottet \ - hexalate \ - peg-e \ - simsu \ + gottcode-world \ \ compton \ qpdfview \ diff --git a/recipes-support/sass/libsass_git.bb b/recipes-support/sass/libsass_git.bb new file mode 100644 index 00000000..4c229cdb --- /dev/null +++ b/recipes-support/sass/libsass_git.bb @@ -0,0 +1,13 @@ +SUMMARY = "C/C++ port of the Sass CSS precompiler" +HOMEPAGE = "http://sass-lang.com/libsass" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d" + +inherit autotools + +SRC_URI = "git://github.com/sass/libsass.git;branch=3.5-stable" +SRCREV = "39e30874b9a5dd6a802c20e8b0470ba44eeba929" +S = "${WORKDIR}/git" +PV = "3.5.5" + +BBCLASSEXTEND = "native" diff --git a/recipes-support/sass/sassc_git.bb b/recipes-support/sass/sassc_git.bb new file mode 100644 index 00000000..044c0c7f --- /dev/null +++ b/recipes-support/sass/sassc_git.bb @@ -0,0 +1,14 @@ +SUMMARY = "libsass command line driver " +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744" + +DEPENDS = "libsass" + +inherit autotools pkgconfig + +SRC_URI = "git://github.com/sass/sassc.git" +SRCREV = "aa6d5c635ea8faf44d542a23aaf85d27e5777d48" +S = "${WORKDIR}/git" +PV = "3.5.0" + +BBCLASSEXTEND = "native" diff --git a/recipes-support/telepathy/telepathy-qt_0.9.7.bb b/recipes-support/telepathy/telepathy-qt_0.9.7.bb index 00277dd2..746de8ee 100644 --- a/recipes-support/telepathy/telepathy-qt_0.9.7.bb +++ b/recipes-support/telepathy/telepathy-qt_0.9.7.bb @@ -18,4 +18,5 @@ EXTRA_OECMAKE += " \ -DDESIRED_QT_VERSION=5 \ -DENABLE_TESTS=FALSE \ -DENABLE_FARSTREAM=FALSE \ + -DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')} \ " diff --git a/recipes-support/translate-toolkit/translate-toolkit_1.13.0.bb b/recipes-support/translate-toolkit/translate-toolkit_git.bb similarity index 64% rename from recipes-support/translate-toolkit/translate-toolkit_1.13.0.bb rename to recipes-support/translate-toolkit/translate-toolkit_git.bb index ec7dc852..6e8a3c82 100644 --- a/recipes-support/translate-toolkit/translate-toolkit_1.13.0.bb +++ b/recipes-support/translate-toolkit/translate-toolkit_git.bb @@ -5,19 +5,18 @@ HOMEPAGE = "http://toolkit.translatehouse.org/" inherit setuptools -SRC_URI = " \ - https://github.com/translate/translate/releases/download/${PV}/translate-toolkit-${PV}.tar.bz2 \ -" -SRC_URI[md5sum] = "f9997a0deb3f1767bb20665a47cd2708" -SRC_URI[sha256sum] = "dcbbf49058e4196a06e988d9dc1e762321ab0d057c4be035b84e3c11353fc2f8" +SRC_URI = "git://github.com/translate/translate.git" +SRCREV = "44fadd143869f3b03bb93a401891fe539543b2b2" +S = "${WORKDIR}/git" +PV = "2.3.1" do_install_append() { # move files to correct location - # 1. /usr/share/lib -> ${libdir} - if [ -d ${D}${datadir}/lib ] ; then + # 1. /usr/share/lib(64) -> ${libdir} + if [ -d ${D}${datadir}/${baselib} ] ; then mkdir -p ${D}/${libdir} - cp -r ${D}${datadir}/lib/* ${D}/${libdir} - rm -rf ${D}${datadir}/lib + cp -r ${D}${datadir}/${baselib}/* ${D}/${libdir} + rm -rf ${D}${datadir}/${baselib} fi # if empty datadir -> delete diff --git a/recipes-support/umockdev/umockdev_git.bb b/recipes-support/umockdev/umockdev_git.bb index 41b0d06b..595b42bb 100644 --- a/recipes-support/umockdev/umockdev_git.bb +++ b/recipes-support/umockdev/umockdev_git.bb @@ -7,11 +7,11 @@ SRCREV = "a9a34ac0e71f6eae4432261ad3fd647dbee070cb" PV = "0.12.1" S = "${WORKDIR}/git" -inherit autotools pkgconfig gobject-introspection gtk-doc vala +inherit autotools pkgconfig vala gobject-introspection gtk-doc DEPENDS += "glib-2.0 udev libgudev" -EXTRA_OECONF = "--disable-gtk-doc --enable-introspection" +EXTRA_OECONF += "--disable-gtk-doc" # Although we disable doc we need ${S}/docs/gtk-doc.make GTKDOC_DOCDIR = "${S}/docs" diff --git a/recipes-support/xapian/xapian-core_1.4.0.bb b/recipes-support/xapian/xapian-core_1.4.9.bb similarity index 75% rename from recipes-support/xapian/xapian-core_1.4.0.bb rename to recipes-support/xapian/xapian-core_1.4.9.bb index 4affb7f9..1db117cd 100644 --- a/recipes-support/xapian/xapian-core_1.4.0.bb +++ b/recipes-support/xapian/xapian-core_1.4.9.bb @@ -4,8 +4,8 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=4325afd396febcb659c36b49533135d4" SRC_URI = "http://oligarchy.co.uk/xapian/${PV}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "5308261e78337604bd8f845dd6b4aafc" -SRC_URI[sha256sum] = "10584f57112aa5e9c0e8a89e251aecbf7c582097638bfee79c1fe39a8b6a6477" +SRC_URI[md5sum] = "e0361d7994287edf1248d320758e9f84" +SRC_URI[sha256sum] = "cde9c39d014f04c09b59d9c21551db9794c10617dc69ab4c9826352a533df5cc" inherit autotools cmake_lib