From f322910b3a6d7fbf0651f6644867d726b5e444f2 Mon Sep 17 00:00:00 2001
From: Marko Lindqvist <cazfi74@gmail.com>
Date: Wed, 22 May 2024 00:51:40 +0300
Subject: [PATCH 41/41] stdsounds: Add w_generic sound effect

Sound is Public Domain (CC0) sample by Trex0n
https://opengameart.org/content/happy-and-sad-tuba-fanfare

See RM #658

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 data/stdsounds.soundspec        |   5 +++--
 data/stdsounds/Makefile.am      |   1 +
 data/stdsounds/fanfarehappy.ogg | Bin 0 -> 37060 bytes
 meson.build                     |   3 ++-
 4 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 data/stdsounds/fanfarehappy.ogg

diff --git a/data/stdsounds.soundspec b/data/stdsounds.soundspec
index 4f293e2b1d..bcaabb1bc2 100644
--- a/data/stdsounds.soundspec
+++ b/data/stdsounds.soundspec
@@ -8,7 +8,8 @@ artists = "\
  OpenQuartz - Ali Jackson (alister667@hotmail.com) [ali]\
  OpenQuartz - Frank Condello (pox@planetquake.com) [pox]\
  Warzone - Eidos Entertainment (GPL release) [warzone]\
- Eskapada - eskapada@o2.pl (Public Domain) [jt]"
+ Eskapada - eskapada@o2.pl (Public Domain) [jt]\
+ Trex0n - https://opengameart.org/users/trex0n [trex0n]"
 
 ; For a list of tags used see README.sound, buildings.ruleset and
 ; units.ruleset.
@@ -163,7 +164,7 @@ m_transport = "stdsounds/inh2o.ogg" ; [pox]
 m_trireme = "stdsounds/inh2o.ogg" ; [pox]
 ;m_warriors = ""
 
-;w_generic = ""
+w_generic = "stdsounds/fanfarehappy.ogg" ; [trex0n]
 ;w_apollo_program = ""
 ;w_asmiths_trading_co = ""
 ;w_colossus = ""
diff --git a/data/stdsounds/Makefile.am b/data/stdsounds/Makefile.am
index fd27591a66..77512b587f 100644
--- a/data/stdsounds/Makefile.am
+++ b/data/stdsounds/Makefile.am
@@ -4,6 +4,7 @@
 pkgdatadir = $(datadir)/$(PACKAGE)/stdsounds
 
 pkgdata_DATA =          \
+	fanfarehappy.ogg \
 	foot3.ogg	\
 	illegal.ogg	\
 	inh2o.ogg	\
diff --git a/data/stdsounds/fanfarehappy.ogg b/data/stdsounds/fanfarehappy.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..9f4931279875438d6692e978242c04cae0f8195d
GIT binary patch
diff --git a/meson.build b/meson.build
index 7a5e75f82e..61c758d161 100644
--- a/meson.build
+++ b/meson.build
@@ -2873,7 +2873,8 @@ install_data('data/amplio2/activities.png',
 install_data('data/stdmusic/CullamBruce-Lockhart--Dawning_Fanfare.ogg',
              install_dir : join_paths(get_option('datadir'), 'freeciv/stdmusic'))
 
-install_data('data/stdsounds/foot3.ogg',
+install_data('data/stdsounds/fanfarehappy.ogg',
+             'data/stdsounds/foot3.ogg',
              'data/stdsounds/illegal.ogg',
              'data/stdsounds/inh2o.ogg',
              'data/stdsounds/LrgCan.ogg',
-- 
2.43.0

