From 045e5e1e67bb2740d687e21e03e4e5571c751236 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 00:04:42 +0430 Subject: [PATCH 01/17] New package: drumstick --- srcpkgs/drumstick-devel | 1 + srcpkgs/drumstick/template | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 120000 srcpkgs/drumstick-devel create mode 100644 srcpkgs/drumstick/template diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel new file mode 120000 index 00000000000..e953fd56e31 --- /dev/null +++ b/srcpkgs/drumstick-devel @@ -0,0 +1 @@ +drumstick \ No newline at end of file diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template new file mode 100644 index 00000000000..86ae19b6471 --- /dev/null +++ b/srcpkgs/drumstick/template @@ -0,0 +1,31 @@ +# Template file for 'drumstick' +pkgname=drumstick +version=1.1.2 +revision=1 +build_style=cmake +configure_args="-DLIB_SUFFIX=" +hostmakedepends="pkg-config doxygen libxslt docbook-xsl" +makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel" +short_desc="a set of MIDI libraries using C++/Qt5 idioms and style" +maintainer="Mohammad Amin Sameti " +license="GPL-3.0-or-later" +homepage="http://${pkgname}.sourceforge.net" +distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" +checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e + +post_install() { + for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do + vdoc $doc + done + + vlicense COPYING +} + +drumstick-devel_package() { + short_desc+=" - development" + depends="${makedepends} ${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/include + vmove usr/lib + } +} From f15790fcc34ba85aa33ad2aeec488ba080993478 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 00:18:32 +0430 Subject: [PATCH 02/17] Keep some libs for elf itself --- srcpkgs/drumstick/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template index 86ae19b6471..5b8659e5fc0 100644 --- a/srcpkgs/drumstick/template +++ b/srcpkgs/drumstick/template @@ -26,6 +26,7 @@ drumstick-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include - vmove usr/lib + vmove usr/lib/pkgconfig + vmove usr/lib/drumstick } } From 5131927b3c2e246adfa82ddedb6d292adedc43fb Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 11:23:19 +0430 Subject: [PATCH 03/17] Fix license --- srcpkgs/drumstick/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template index 5b8659e5fc0..7f426ce4108 100644 --- a/srcpkgs/drumstick/template +++ b/srcpkgs/drumstick/template @@ -8,7 +8,7 @@ hostmakedepends="pkg-config doxygen libxslt docbook-xsl" makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel" short_desc="a set of MIDI libraries using C++/Qt5 idioms and style" maintainer="Mohammad Amin Sameti " -license="GPL-3.0-or-later" +license="GPL-2.0-or-later" homepage="http://${pkgname}.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e From e2d780b8a4e093a61436e5fc1fa53e785758cee3 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 11:24:34 +0430 Subject: [PATCH 04/17] Hardcode ${pkgname} --- srcpkgs/drumstick/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template index 7f426ce4108..f7d99e2d2b1 100644 --- a/srcpkgs/drumstick/template +++ b/srcpkgs/drumstick/template @@ -9,8 +9,8 @@ makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel" short_desc="a set of MIDI libraries using C++/Qt5 idioms and style" maintainer="Mohammad Amin Sameti " license="GPL-2.0-or-later" -homepage="http://${pkgname}.sourceforge.net" -distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}.tar.bz2" +homepage="http://drumstick.sourceforge.net" +distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2" checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e post_install() { From 9e732eda96d3a95e555c1f8c29392cc06dd4bce1 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 11:25:42 +0430 Subject: [PATCH 05/17] Do not `vdoc` COPYING and INSTALL --- srcpkgs/drumstick/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template index f7d99e2d2b1..965200781e3 100644 --- a/srcpkgs/drumstick/template +++ b/srcpkgs/drumstick/template @@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2" checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e post_install() { - for doc in COPYING TODO INSTALL NEWS ChangeLog README AUTHORS; do + for doc in TODO NEWS ChangeLog README AUTHORS; do vdoc $doc done From 1e55c3e5efbe950a22a443b489129114c89e67c7 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 11:26:27 +0430 Subject: [PATCH 06/17] Lint short_desc --- srcpkgs/drumstick/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template index 965200781e3..1bf7b020807 100644 --- a/srcpkgs/drumstick/template +++ b/srcpkgs/drumstick/template @@ -6,7 +6,7 @@ build_style=cmake configure_args="-DLIB_SUFFIX=" hostmakedepends="pkg-config doxygen libxslt docbook-xsl" makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel" -short_desc="a set of MIDI libraries using C++/Qt5 idioms and style" +short_desc="Set of MIDI libraries using C++/Qt5 idioms and style" maintainer="Mohammad Amin Sameti " license="GPL-2.0-or-later" homepage="http://drumstick.sourceforge.net" From e0277cea2bc297b41e17ff8fee5c5e9cfde5e86c Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 11:36:45 +0430 Subject: [PATCH 07/17] Move libraries to its own package --- srcpkgs/drumstick | 1 + srcpkgs/drumstick-devel | 1 - srcpkgs/libdrumstick-devel | 1 + srcpkgs/{drumstick => libdrumstick}/template | 16 +++++++++++++--- 4 files changed, 15 insertions(+), 4 deletions(-) create mode 120000 srcpkgs/drumstick delete mode 120000 srcpkgs/drumstick-devel create mode 120000 srcpkgs/libdrumstick-devel rename srcpkgs/{drumstick => libdrumstick}/template (75%) diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick new file mode 120000 index 00000000000..6e9d58d1e45 --- /dev/null +++ b/srcpkgs/drumstick @@ -0,0 +1 @@ +libdrumstick \ No newline at end of file diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel deleted file mode 120000 index e953fd56e31..00000000000 --- a/srcpkgs/drumstick-devel +++ /dev/null @@ -1 +0,0 @@ -drumstick \ No newline at end of file diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel new file mode 120000 index 00000000000..6e9d58d1e45 --- /dev/null +++ b/srcpkgs/libdrumstick-devel @@ -0,0 +1 @@ +libdrumstick \ No newline at end of file diff --git a/srcpkgs/drumstick/template b/srcpkgs/libdrumstick/template similarity index 75% rename from srcpkgs/drumstick/template rename to srcpkgs/libdrumstick/template index 1bf7b020807..57c187cabb2 100644 --- a/srcpkgs/drumstick/template +++ b/srcpkgs/libdrumstick/template @@ -1,5 +1,5 @@ # Template file for 'drumstick' -pkgname=drumstick +pkgname=libdrumstick version=1.1.2 revision=1 build_style=cmake @@ -21,12 +21,22 @@ post_install() { vlicense COPYING } -drumstick-devel_package() { +libdrumstick-devel_package() { short_desc+=" - development" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove usr/lib/drumstick + } +} + +drumstick_package() { + short_desc+=" - applications" + depends="${sourcepkg}>=${version}_${revision}" + pkg_install() { + vmove usr/bin + vmove usr/share/applications + vmove usr/share/icons + vmove usr/share/man } } From cd04ba09383502aacb9d3882226f75e7d748a5e8 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 18:03:50 +0430 Subject: [PATCH 08/17] Fix short_desc for libdrumstick-devel --- srcpkgs/libdrumstick/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template index 57c187cabb2..83f67a7dd3d 100644 --- a/srcpkgs/libdrumstick/template +++ b/srcpkgs/libdrumstick/template @@ -1,4 +1,4 @@ -# Template file for 'drumstick' +# Template file for 'libdrumstick' pkgname=libdrumstick version=1.1.2 revision=1 @@ -22,7 +22,7 @@ post_install() { } libdrumstick-devel_package() { - short_desc+=" - development" + short_desc+=" - development libraries" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" pkg_install() { vmove usr/include From 47e0470a1c655ee093f1edb477491327a16e7b26 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 18:26:44 +0430 Subject: [PATCH 09/17] Fix wrksrc mismatch --- srcpkgs/libdrumstick/template | 1 + 1 file changed, 1 insertion(+) diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template index 83f67a7dd3d..58c7b119151 100644 --- a/srcpkgs/libdrumstick/template +++ b/srcpkgs/libdrumstick/template @@ -3,6 +3,7 @@ pkgname=libdrumstick version=1.1.2 revision=1 build_style=cmake +wrksrc="drumstick-${version}" configure_args="-DLIB_SUFFIX=" hostmakedepends="pkg-config doxygen libxslt docbook-xsl" makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel" From 99c4eed69eed69e1217c6ccb82363d0adb444c5a Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 19:18:37 +0430 Subject: [PATCH 10/17] Point to libdrumstick for doc and licenses --- srcpkgs/libdrumstick/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template index 58c7b119151..2d985c157c0 100644 --- a/srcpkgs/libdrumstick/template +++ b/srcpkgs/libdrumstick/template @@ -35,8 +35,12 @@ drumstick_package() { short_desc+=" - applications" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { + ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick + ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick + vmove usr/bin vmove usr/share/applications + vmove usr/share/mime vmove usr/share/icons vmove usr/share/man } From e31fa1cd136eae6edd1e08625eda67baa8a7e572 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 21:03:53 +0430 Subject: [PATCH 11/17] Fix lint issue --- srcpkgs/libdrumstick/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template index 2d985c157c0..18deba22bb5 100644 --- a/srcpkgs/libdrumstick/template +++ b/srcpkgs/libdrumstick/template @@ -2,8 +2,8 @@ pkgname=libdrumstick version=1.1.2 revision=1 -build_style=cmake wrksrc="drumstick-${version}" +build_style=cmake configure_args="-DLIB_SUFFIX=" hostmakedepends="pkg-config doxygen libxslt docbook-xsl" makedepends="qt5-svg-devel alsa-lib-devel pulseaudio-devel" From 7c877cd08b4805b800d228f9c2f07d2020562aa1 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 21:06:16 +0430 Subject: [PATCH 12/17] Make sure section directory exists before symlinking --- srcpkgs/libdrumstick/template | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template index 18deba22bb5..999695c2cbc 100644 --- a/srcpkgs/libdrumstick/template +++ b/srcpkgs/libdrumstick/template @@ -35,8 +35,10 @@ drumstick_package() { short_desc+=" - applications" depends="${sourcepkg}>=${version}_${revision}" pkg_install() { - ln -s libdrumstick ${PKGDESTDIR}/usr/share/doc/drumstick - ln -s libdrumstick ${PKGDESTDIR}/usr/share/licenses/drumstick + for section in doc licenses; do + mkdir -p ${PKGDESTDIR}/usr/share/${section} + ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick + done vmove usr/bin vmove usr/share/applications From b54c2f0230d5db236d66788bb5293cbc5a27c4fd Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 21:46:35 +0430 Subject: [PATCH 13/17] Add SONAMEs to common/shlibs --- common/shlibs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/shlibs b/common/shlibs index d344f65c5a6..15f98659929 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3502,3 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1 libqb.so.0 libqb-1.0.5_1 libusbguard.so.0 usbguard-0.7.5_1 libknet.so.1 libknet1-1.11_1 +libdrumstick-file.so.1 libdrumstick-1.1.2_1 +libdrumstick-alsa.so.1 libdrumstick-1.1.2_1 +libdrumstick-rt.so.1 libdrumstick-1.1.2_1 From 132994ead01e73ce3f845ccbdb1a2ecd0c672b2c Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Sun, 1 Sep 2019 21:54:15 +0430 Subject: [PATCH 14/17] Remove autodepped dep --- srcpkgs/libdrumstick/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/libdrumstick/template index 999695c2cbc..e33eb83c45b 100644 --- a/srcpkgs/libdrumstick/template +++ b/srcpkgs/libdrumstick/template @@ -33,7 +33,6 @@ libdrumstick-devel_package() { drumstick_package() { short_desc+=" - applications" - depends="${sourcepkg}>=${version}_${revision}" pkg_install() { for section in doc licenses; do mkdir -p ${PKGDESTDIR}/usr/share/${section} From 9a38ffbb35aecdd9bfc394c6c4cb2f41d7de0fd5 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Mon, 2 Sep 2019 09:55:58 +0430 Subject: [PATCH 15/17] Do not split package into three --- common/shlibs | 6 ++--- srcpkgs/drumstick | 1 - srcpkgs/drumstick-devel | 1 + srcpkgs/{libdrumstick => drumstick}/template | 23 +++----------------- srcpkgs/libdrumstick-devel | 1 - 5 files changed, 7 insertions(+), 25 deletions(-) delete mode 120000 srcpkgs/drumstick create mode 120000 srcpkgs/drumstick-devel rename srcpkgs/{libdrumstick => drumstick}/template (63%) delete mode 120000 srcpkgs/libdrumstick-devel diff --git a/common/shlibs b/common/shlibs index 15f98659929..0ba42c6b85b 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3502,6 +3502,6 @@ liblog4c.so.3 log4c-1.2.4_1 libqb.so.0 libqb-1.0.5_1 libusbguard.so.0 usbguard-0.7.5_1 libknet.so.1 libknet1-1.11_1 -libdrumstick-file.so.1 libdrumstick-1.1.2_1 -libdrumstick-alsa.so.1 libdrumstick-1.1.2_1 -libdrumstick-rt.so.1 libdrumstick-1.1.2_1 +libdrumstick-file.so.1 drumstick-1.1.2_1 +libdrumstick-alsa.so.1 drumstick-1.1.2_1 +libdrumstick-rt.so.1 drumstick-1.1.2_1 diff --git a/srcpkgs/drumstick b/srcpkgs/drumstick deleted file mode 120000 index 6e9d58d1e45..00000000000 --- a/srcpkgs/drumstick +++ /dev/null @@ -1 +0,0 @@ -libdrumstick \ No newline at end of file diff --git a/srcpkgs/drumstick-devel b/srcpkgs/drumstick-devel new file mode 120000 index 00000000000..e953fd56e31 --- /dev/null +++ b/srcpkgs/drumstick-devel @@ -0,0 +1 @@ +drumstick \ No newline at end of file diff --git a/srcpkgs/libdrumstick/template b/srcpkgs/drumstick/template similarity index 63% rename from srcpkgs/libdrumstick/template rename to srcpkgs/drumstick/template index e33eb83c45b..7584a16b8a5 100644 --- a/srcpkgs/libdrumstick/template +++ b/srcpkgs/drumstick/template @@ -1,8 +1,7 @@ -# Template file for 'libdrumstick' -pkgname=libdrumstick +# Template file for 'drumstick' +pkgname=drumstick version=1.1.2 revision=1 -wrksrc="drumstick-${version}" build_style=cmake configure_args="-DLIB_SUFFIX=" hostmakedepends="pkg-config doxygen libxslt docbook-xsl" @@ -22,7 +21,7 @@ post_install() { vlicense COPYING } -libdrumstick-devel_package() { +drumstick-devel_package() { short_desc+=" - development libraries" depends="${makedepends} ${sourcepkg}>=${version}_${revision}" pkg_install() { @@ -30,19 +29,3 @@ libdrumstick-devel_package() { vmove usr/lib/pkgconfig } } - -drumstick_package() { - short_desc+=" - applications" - pkg_install() { - for section in doc licenses; do - mkdir -p ${PKGDESTDIR}/usr/share/${section} - ln -s libdrumstick ${PKGDESTDIR}/usr/share/${section}/drumstick - done - - vmove usr/bin - vmove usr/share/applications - vmove usr/share/mime - vmove usr/share/icons - vmove usr/share/man - } -} diff --git a/srcpkgs/libdrumstick-devel b/srcpkgs/libdrumstick-devel deleted file mode 120000 index 6e9d58d1e45..00000000000 --- a/srcpkgs/libdrumstick-devel +++ /dev/null @@ -1 +0,0 @@ -libdrumstick \ No newline at end of file From 32f374197e50ede2e413f823125b285a1dc08d03 Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Mon, 2 Sep 2019 10:32:22 +0430 Subject: [PATCH 16/17] Fix for ARM targets --- srcpkgs/drumstick/template | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template index 7584a16b8a5..7cd35b37968 100644 --- a/srcpkgs/drumstick/template +++ b/srcpkgs/drumstick/template @@ -13,6 +13,10 @@ homepage="http://drumstick.sourceforge.net" distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2" checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e +case "$XBPS_TARGET_MACHINE" in + arm*|aarch*) hostmakedepends+=" qt5-qmake" +esac + post_install() { for doc in TODO NEWS ChangeLog README AUTHORS; do vdoc $doc From dbffd623afacd7dc422fd22cb2777bd6cacac36b Mon Sep 17 00:00:00 2001 From: Mohammad Amin Sameti Date: Mon, 2 Sep 2019 10:53:17 +0430 Subject: [PATCH 17/17] Fix #2 for ARM --- srcpkgs/drumstick/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/drumstick/template b/srcpkgs/drumstick/template index 7cd35b37968..c8aa2f7f009 100644 --- a/srcpkgs/drumstick/template +++ b/srcpkgs/drumstick/template @@ -14,7 +14,7 @@ distfiles="${SOURCEFORGE_SITE}/drumstick/drumstick-${version}.tar.bz2" checksum=7791b439aab9a5c24a53cbf5ce9ab1dcaf40a33a9d8828ca1731e823b1c7924e case "$XBPS_TARGET_MACHINE" in - arm*|aarch*) hostmakedepends+=" qt5-qmake" + arm*|aarch*) hostmakedepends+=" qt5-qmake qt5-host-tools" esac post_install() {