Add 'BeatBuddy Kit'

Signed-off-by: Christopher Arndt <chris@chrisarndt.de>

4 files changed, 125 insertions, 109 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8032c4037e57..eb4c12f28e82 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = hydrogen-drumkits-flac
 	pkgdesc = Hydrogen drum kits (FLAC format)
-	pkgver = 20180818
+	pkgver = 20220929
 	pkgrel = 1
-	url = http://hydrogen-music.org/downloads/
+	url = https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/
 	changelog = ChangeLog
 	arch = any
 	license = GPL2
@@ -14,6 +14,7 @@ pkgbase = hydrogen-drumkits-flac
 	conflicts = hydrogen-drumkits
 	source = convert-samples.py
 	source = https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/3355606kit.h2drumkit
+	source = https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/BeatBuddy_Kit.h2drumkit
 	source = https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/BJA_Pacific.h2drumkit
 	source = https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/Boss_DR-110.h2drumkit
 	source = https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/circAfrique%20v4.h2drumkit
@@ -42,35 +43,36 @@ pkgbase = hydrogen-drumkits-flac
 	source = https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/TR808909.h2drumkit
 	source = https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/VariBreaks.h2drumkit
 	source = https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries/YamahaVintageKit.h2drumkit
-	md5sums = 7508aac4c4f75352c96f97509b13997a
-	md5sums = 5dad41a4f0fb5a9fda0af98b9f553060
-	md5sums = cde7a74a06edde3b5f85435c29909891
-	md5sums = f528892879ee04621055c4a3f12166c1
-	md5sums = e9d8604d2089abc764e54d1f209900b7
-	md5sums = 86dbdb8d2f9b12690e92211d36c6fe7d
-	md5sums = c08d5093fc28a30a7542f0c89493e807
-	md5sums = cb11827e185ab5a6906967901495884b
-	md5sums = 0465025dcf6659657b773874d168c27b
-	md5sums = 8750fcbe186e49a89bc18a9237ee6604
-	md5sums = df1bd778148cc25d8f63a8cc7aa91fcb
-	md5sums = 0e96f5971d5db887a186d5739c12ab77
-	md5sums = c6cd87bf54e0a760c5f4fecbff979100
-	md5sums = 0e381ae9e4e04a5eab1ce5e5dbc3dcd4
-	md5sums = f953edf3f4227d786df59b544370e379
-	md5sums = 7f52d6ac56a31f5b618657d40d4eb86e
-	md5sums = 217f38ebf2849b20ff3a5dca1994be08
-	md5sums = f445c60d4625a6bfe6bb9dbac1ac0aa7
-	md5sums = 8bc8365a17b28ccc41213a0f2f82d869
-	md5sums = 4c895d59c3bc5f3322d14789de345be2
-	md5sums = 2da5b8ee87bce3e67464c61ba0b722dd
-	md5sums = 79ca7360784ec72959aa07c3c584d76c
-	md5sums = f0b243f7bbc0c4c04977b2efa96a07b4
-	md5sums = 33f02627ac1489e4ab52c5f078c538b9
-	md5sums = 635274624e0a739c51b70f72a58cfcec
-	md5sums = f91912fc88361dd8954c11f2e602aa25
-	md5sums = 3969810a3a9a8844ccc216802b7288ad
-	md5sums = 1db9cce82fbdaebac1ab4608be5853ea
-	md5sums = a9c305829cd23c28ffd1647cb5c0bdfd
-	md5sums = 8f63997dd789179fa009f84cc515fb3e
+	sha256sums = 9b5421520553429b80108ad0d4e613bc83ee27b39437d7dc55bae63148004373
+	sha256sums = 96b1d325fd52e97d7b99ca9191cb376e430ecea1f83d12281f314e30f20fa121
+	sha256sums = abc823a4e1ec52da4dae41a6c6712d9b04866c16b13b353bf756427f780c3b94
+	sha256sums = a485753a2a60a1ce30e782784c0f26a84bbbee6bdb324b40c04a1f09f3668305
+	sha256sums = 5debdfb050f639478725af134d315649f242142f84691ce1409cd9f56f6943be
+	sha256sums = f09ff7e46310409b8ec7f180193cda6bb69e2a67d5e7f78f8c1c1954bb9a3a2c
+	sha256sums = 3e95845d821129b119dea47fd56eadbb17da74b3a95a2154cac31a037b8a6f66
+	sha256sums = 6be9d2dba736bfcbc85e31ecf744c74b6620143e4fdc198309c4786951077391
+	sha256sums = 30d30e6c9aeb25597454034cee58495b410a8f95b3d689c9a0c4e2915af7871f
+	sha256sums = 7ae4f8e7bf52b84637100b6f781e94752ad738626cff912c7704522ea692fbe7
+	sha256sums = 14ed0cd45097471e3f9775958f40441c1c2886d5594e0111e2b0b7e63b5da00f
+	sha256sums = 7229f52268483119c3a8b1e62dc85f801e37b6c34834e8c603d8aaec0445c5f9
+	sha256sums = daccb09332bf6aac09b83f9605a084120a9decff1447d02cc68d16b00f101546
+	sha256sums = 37b9f1d6d8fdf2a65aef5fcde5ac305c89983e1e23ce5b8194922640cce9146d
+	sha256sums = f0cd2e52f0dbc8d6a001f203ee47cd691d8d028d30501ce332a52659aa62a07a
+	sha256sums = cfde7e4c7a25f0d72d0674b4d849471b9d309e28372709b509e743aad8c30d5c
+	sha256sums = d194d2d47cd33d09842ecb6db74783aaa89368e69a964868c7fd2feb3e1b7613
+	sha256sums = e2c586017bc4952976b8af5447435e7fa5109308861b5f5be3213d86346bd972
+	sha256sums = ad88e46d6e07a046cb5443e5bea4cc7645be992fc85e24853372cf5562c5ee24
+	sha256sums = f41377b32b154c809984e11ebaf0b7cfd9bac2ecc26b78c8de7c9bbd243f9310
+	sha256sums = c43d5b25938e95bcce4a204892e668b289f419b993e006bdf3f28c9c374b10c9
+	sha256sums = c81cebee6a4d0df70fee7456c13bbdfe2c50b39b62888cb03c0768f885eb74dd
+	sha256sums = 5927572af24f9a2737f94c7c8e816e22d6b28f00e19d575495c1a97351a79096
+	sha256sums = cffa12c5a176d9c9532bafacba773c0a0f7e2fe71ea5a14dae402d2de0726ccb
+	sha256sums = adcc4a3023708fab46108acfc99dfc04e2b2b62bb21aa87ed8a027ccbb46b576
+	sha256sums = 4e9400c2bb7d06f0271bcbf2e052235fe8500095d6e6dfcd8fcb0593571f110b
+	sha256sums = 83e072ef8e8783d861ce500a8082161392e49853a54335823e1cd7f7874c8504
+	sha256sums = 4fb52d1bbdda886db4b742c6de33d7475ef5088076c18533bd705c588f69a87b
+	sha256sums = 4637f0c39b488074943030d6cb0274f3e35d1da221eb6d078c15ea118f4e496d
+	sha256sums = ed7bfa21abc05712ea89860b7e680808d14d567d49377fbc65914a9dd518e14d
+	sha256sums = 17005f5c79d92af3caef52ea313b1ac5bc49f1eefa4462b22980dec2b031bf27
 
 pkgname = hydrogen-drumkits-flac
diff --git a/ChangeLog b/ChangeLog
index 0cb9fca82d94..9fa4530c2b8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2021-11-12 Christopher Arndt <chris@chrisarndt.de>
+2022-10-28 Christopher Arndt <aur@chrisarndt.de>
+
+	* 20220929-1:
+	add "BeatBuddy Kit" drumkit
+	update project URL
+	use SHA256 checksums
+
+2021-11-12 Christopher Arndt <aur@chrisarndt.de>
 
 	* 20180818-1:
 	add "The Black Pearl 1.0" drumkit
@@ -6,7 +13,7 @@
 	add "Lightning1024" drumkit
 	fix project and download URLs
 
-2018-03-15 Christopher Arndt <chris@chrisarndt.de>
+2018-03-15 Christopher Arndt <aur@chrisarndt.de>
 
 	* 20180312-1:
 	package forked from 'hydrogen-drumkits'
diff --git a/PKGBUILD b/PKGBUILD
index 40de027d4edc..6cd81cbd170e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,22 +2,24 @@
 # Contributor: Daniele Paolella <danielepaolella@email.it>
 # Contributor: Artem Borisovskiy
 
-pkgname="hydrogen-drumkits-flac"
-pkgver=20180818
+_pkgname=hydrogen-drumkits
+pkgname=$_pkgname-flac
+pkgver=20220929
 pkgrel=1
-pkgdesc="Hydrogen drum kits (FLAC format)"
+pkgdesc='Hydrogen drum kits (FLAC format)'
 arch=(any)
-url="http://hydrogen-music.org/downloads/"
-license=('GPL2')
-depends=('hydrogen')
-makedepends=('flac' 'python' 'sox')
-provides=('hydrogen-drumkits')
-conflicts=('hydrogen-drumkits')
+url='https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/'
+license=(GPL2)
+depends=(hydrogen)
+makedepends=(flac python sox)
+provides=($_pkgname)
+conflicts=($_pkgname)
 changelog=ChangeLog
 _sourcebase="https://sourceforge.net/projects/hydrogen/files/Sound%20Libraries/Main%20sound%20libraries"
 source=(
   'convert-samples.py'
   "$_sourcebase/3355606kit.h2drumkit"
+  "$_sourcebase/BeatBuddy_Kit.h2drumkit"
   "$_sourcebase/BJA_Pacific.h2drumkit"
   "$_sourcebase/Boss_DR-110.h2drumkit"
   "$_sourcebase/circAfrique%20v4.h2drumkit"
@@ -47,67 +49,69 @@ source=(
   "$_sourcebase/VariBreaks.h2drumkit"
   "$_sourcebase/YamahaVintageKit.h2drumkit"
 )
-md5sums=('7508aac4c4f75352c96f97509b13997a'
-         '5dad41a4f0fb5a9fda0af98b9f553060'
-         'cde7a74a06edde3b5f85435c29909891'
-         'f528892879ee04621055c4a3f12166c1'
-         'e9d8604d2089abc764e54d1f209900b7'
-         '86dbdb8d2f9b12690e92211d36c6fe7d'
-         'c08d5093fc28a30a7542f0c89493e807'
-         'cb11827e185ab5a6906967901495884b'
-         '0465025dcf6659657b773874d168c27b'
-         '8750fcbe186e49a89bc18a9237ee6604'
-         'df1bd778148cc25d8f63a8cc7aa91fcb'
-         '0e96f5971d5db887a186d5739c12ab77'
-         'c6cd87bf54e0a760c5f4fecbff979100'
-         '0e381ae9e4e04a5eab1ce5e5dbc3dcd4'
-         'f953edf3f4227d786df59b544370e379'
-         '7f52d6ac56a31f5b618657d40d4eb86e'
-         '217f38ebf2849b20ff3a5dca1994be08'
-         'f445c60d4625a6bfe6bb9dbac1ac0aa7'
-         '8bc8365a17b28ccc41213a0f2f82d869'
-         '4c895d59c3bc5f3322d14789de345be2'
-         '2da5b8ee87bce3e67464c61ba0b722dd'
-         '79ca7360784ec72959aa07c3c584d76c'
-         'f0b243f7bbc0c4c04977b2efa96a07b4'
-         '33f02627ac1489e4ab52c5f078c538b9'
-         '635274624e0a739c51b70f72a58cfcec'
-         'f91912fc88361dd8954c11f2e602aa25'
-         '3969810a3a9a8844ccc216802b7288ad'
-         '1db9cce82fbdaebac1ab4608be5853ea'
-         'a9c305829cd23c28ffd1647cb5c0bdfd'
-         '8f63997dd789179fa009f84cc515fb3e')
+sha256sums=('9b5421520553429b80108ad0d4e613bc83ee27b39437d7dc55bae63148004373'
+            '96b1d325fd52e97d7b99ca9191cb376e430ecea1f83d12281f314e30f20fa121'
+            'abc823a4e1ec52da4dae41a6c6712d9b04866c16b13b353bf756427f780c3b94'
+            'a485753a2a60a1ce30e782784c0f26a84bbbee6bdb324b40c04a1f09f3668305'
+            '5debdfb050f639478725af134d315649f242142f84691ce1409cd9f56f6943be'
+            'f09ff7e46310409b8ec7f180193cda6bb69e2a67d5e7f78f8c1c1954bb9a3a2c'
+            '3e95845d821129b119dea47fd56eadbb17da74b3a95a2154cac31a037b8a6f66'
+            '6be9d2dba736bfcbc85e31ecf744c74b6620143e4fdc198309c4786951077391'
+            '30d30e6c9aeb25597454034cee58495b410a8f95b3d689c9a0c4e2915af7871f'
+            '7ae4f8e7bf52b84637100b6f781e94752ad738626cff912c7704522ea692fbe7'
+            '14ed0cd45097471e3f9775958f40441c1c2886d5594e0111e2b0b7e63b5da00f'
+            '7229f52268483119c3a8b1e62dc85f801e37b6c34834e8c603d8aaec0445c5f9'
+            'daccb09332bf6aac09b83f9605a084120a9decff1447d02cc68d16b00f101546'
+            '37b9f1d6d8fdf2a65aef5fcde5ac305c89983e1e23ce5b8194922640cce9146d'
+            'f0cd2e52f0dbc8d6a001f203ee47cd691d8d028d30501ce332a52659aa62a07a'
+            'cfde7e4c7a25f0d72d0674b4d849471b9d309e28372709b509e743aad8c30d5c'
+            'd194d2d47cd33d09842ecb6db74783aaa89368e69a964868c7fd2feb3e1b7613'
+            'e2c586017bc4952976b8af5447435e7fa5109308861b5f5be3213d86346bd972'
+            'ad88e46d6e07a046cb5443e5bea4cc7645be992fc85e24853372cf5562c5ee24'
+            'f41377b32b154c809984e11ebaf0b7cfd9bac2ecc26b78c8de7c9bbd243f9310'
+            'c43d5b25938e95bcce4a204892e668b289f419b993e006bdf3f28c9c374b10c9'
+            'c81cebee6a4d0df70fee7456c13bbdfe2c50b39b62888cb03c0768f885eb74dd'
+            '5927572af24f9a2737f94c7c8e816e22d6b28f00e19d575495c1a97351a79096'
+            'cffa12c5a176d9c9532bafacba773c0a0f7e2fe71ea5a14dae402d2de0726ccb'
+            'adcc4a3023708fab46108acfc99dfc04e2b2b62bb21aa87ed8a027ccbb46b576'
+            '4e9400c2bb7d06f0271bcbf2e052235fe8500095d6e6dfcd8fcb0593571f110b'
+            '83e072ef8e8783d861ce500a8082161392e49853a54335823e1cd7f7874c8504'
+            '4fb52d1bbdda886db4b742c6de33d7475ef5088076c18533bd705c588f69a87b'
+            '4637f0c39b488074943030d6cb0274f3e35d1da221eb6d078c15ea118f4e496d'
+            'ed7bfa21abc05712ea89860b7e680808d14d567d49377fbc65914a9dd518e14d'
+            '17005f5c79d92af3caef52ea313b1ac5bc49f1eefa4462b22980dec2b031bf27')
 _drumkitsdir="/usr/share/hydrogen/data/drumkits"
 _drumkits=(
-    '3355606kit'
-    'BJA_Pacific'
-    'Boss_DR-110'
-    'circAfrique v4'
-    'Classic-626'
-    'Classic-808'
-    'ColomboAcousticDrumkit'
-    'DeathMetal'
-    'EasternHop-1'
-    'ElectricEmpireKit'
-    'ErnysPercussion'
-    'ForzeeStereo'
-    'Gimme A Hand 1.0'
-    'HardElectro1'
-    'HipHop-1'
-    'HipHop-2'
-    'K-27_Trash_Kit'
-    'Lightning1024'
-    'Millo-Drums_v.1'
-    'Millo_MultiLayered2'
-    'Millo_MultiLayered3'
-    'SF3007-2011-Set-03'
-    'Synthie-1'
-    'TD-7kit'
-    'Techno-1'
-    'The Black Pearl 1.0'
-    'TR808909'
-    'VariBreaks'
-    'YamahaVintageKit'
+  '3355606kit'
+  'BeatBuddy Kit'
+  'BJA_Pacific'
+  'Boss_DR-110'
+  'circAfrique v4'
+  'Classic-626'
+  'Classic-808'
+  'ColomboAcousticDrumkit'
+  'DeathMetal'
+  'EasternHop-1'
+  'ElectricEmpireKit'
+  'ErnysPercussion'
+  'ForzeeStereo'
+  'Gimme A Hand 1.0'
+  'HardElectro1'
+  'HipHop-1'
+  'HipHop-2'
+  'K-27_Trash_Kit'
+  'Lightning1024'
+  'Millo-Drums_v.1'
+  'Millo_MultiLayered2'
+  'Millo_MultiLayered3'
+  'SF3007-2011-Set-03'
+  'Synthie-1'
+  'TD-7kit'
+  'Techno-1'
+  'The Black Pearl 1.0'
+  'TR808909'
+  'VariBreaks'
+  'YamahaVintageKit'
 )
 
 build() {
@@ -117,15 +121,15 @@ build() {
 }
 
 package() {
-  install -d -m 755 "${pkgdir}${_drumkitsdir}"
+  install -d -m 755 "$pkgdir"$_drumkitsdir
 
   for drumkit in "${_drumkits[@]}"; do
-    cp -rp "${srcdir}/${drumkit}" "${pkgdir}${_drumkitsdir}"
+    cp -rp "$srcdir/$drumkit" "$pkgdir"$_drumkitsdir
   done
 
   plain "Removing superfluous files..."
-  find "${pkgdir}${_drumkitsdir}" -name LICENCE -delete
-  find "${pkgdir}${_drumkitsdir}" -name "._*" -delete
-  find "${pkgdir}${_drumkitsdir}" -type d -exec chmod 755 {} \;
-  find "${pkgdir}${_drumkitsdir}" -type f -exec chmod 644 {} \;
+  find "$pkgdir"$_drumkitsdir -name LICENCE -delete
+  find "$pkgdir"$_drumkitsdir -name "._*" -delete
+  find "$pkgdir"$_drumkitsdir -type d -exec chmod 755 {} \;
+  find "$pkgdir"$_drumkitsdir -type f -exec chmod 644 {} \;
 }
diff --git a/convert-samples.py b/convert-samples.py
index ac45a1320e60..eff40827664c 100755
--- a/convert-samples.py
+++ b/convert-samples.py
@@ -57,4 +57,7 @@ for drumkit in sys.argv[1:]:
                 with open(drumkit_xml, 'w') as fp:
                     fp.write(xml.replace(fn, flac))
 
-                os.unlink(orig)
+        try:
+            os.unlink(orig)
+        except:
+            print("Warning: could not remove '%s'.", file=sys.stderr)