diff --git a/README.md b/README.md index 8c122dd0c..fca8ef1a5 100644 --- a/README.md +++ b/README.md @@ -328,7 +328,7 @@ UTF-8 with C++ in a Portable Way * License: custom (see `doc/licenses/utf8-cpp-custom.txt`) * URL: http://utfcpp.sourceforge.net/ -## 5.9. Oxygen icons +## 5.9. Oxygen icons and sound files Most of the icons included in this package originate from the Oxygen Project. These include all files in the `share/icons` sub-directory @@ -340,5 +340,8 @@ in the source code in the `icons/scalable` sub-directory. You can obtain the source code from the [MKVToolNix website](https://mkvtoolnix.download/). +All of the sound files in the `share/sounds` sub-directory originate +from the Oxygen project. + * License: GNU Lesser General Public License v3 (see `doc/licenses/LGPL-3.0.txt`) * URL: https://techbase.kde.org/Projects/Oxygen diff --git a/Rakefile b/Rakefile index a282545ad..a4753df5f 100644 --- a/Rakefile +++ b/Rakefile @@ -740,6 +740,13 @@ namespace :install do install_dir dest_dir install_data "#{dest_dir}/", FileList[ "#{dir}/*" ].to_a.select { |file| wanted_apps[ file.gsub(/.*\//, '') ] } end + + if c?(:USE_QT) + sounds_dir ="#{c(:pkgdatadir)}/sounds" + + install_dir sounds_dir + install_data sounds_dir, FileList["#{$top_srcdir}/share/sounds/*"] + end end man_page_name_mapper = lambda do |name| diff --git a/debian-upstream/mkvtoolnix-gui.install b/debian-upstream/mkvtoolnix-gui.install index 136d1b211..45c99600c 100644 --- a/debian-upstream/mkvtoolnix-gui.install +++ b/debian-upstream/mkvtoolnix-gui.install @@ -4,3 +4,4 @@ usr/share/applications/*.desktop usr/share/icons/hicolor/*/apps/mkvtoolnix-gui.png usr/share/man/*/man1/mkvtoolnix-gui.1 usr/share/man/man1/mkvtoolnix-gui.1 +usr/share/mkvtoolnix/sounds/*.ogg diff --git a/mkvtoolnix.spec b/mkvtoolnix.spec index f32afe925..4c7a10ac5 100644 --- a/mkvtoolnix.spec +++ b/mkvtoolnix.spec @@ -124,6 +124,7 @@ strip ${RPM_BUILD_ROOT}/usr/bin/* %{_datadir}/man/pl %{_datadir}/man/uk %{_datadir}/man/zh_CN +%{_datadir}/mkvtoolnix %changelog -n mkvtoolnix * Sat Mar 25 2017 Moritz Bunkus 10.0.0-1 diff --git a/share/sounds/finished-1.ogg b/share/sounds/finished-1.ogg new file mode 100644 index 000000000..627be467b Binary files /dev/null and b/share/sounds/finished-1.ogg differ diff --git a/share/sounds/finished-2.ogg b/share/sounds/finished-2.ogg new file mode 100644 index 000000000..bcd66ddae Binary files /dev/null and b/share/sounds/finished-2.ogg differ diff --git a/share/sounds/finished-3.ogg b/share/sounds/finished-3.ogg new file mode 100644 index 000000000..c29f0aebf Binary files /dev/null and b/share/sounds/finished-3.ogg differ diff --git a/tools/macos/build.sh b/tools/macos/build.sh index aa175c3f9..b0b0d950e 100755 --- a/tools/macos/build.sh +++ b/tools/macos/build.sh @@ -255,6 +255,9 @@ function build_dmg { strip ${dmgcnt}/MacOS/mkv{merge,info,info-gui,extract,propedit,toolnix-gui} + mv ${dmgmac}/mkvtoolnix/sounds ${dmgmac}/sounds + rmdir ${dmgmac}/mkvtoolnix + cp README.md $dmgbase/README.txt cp COPYING $dmgbase/COPYING.txt cp NEWS.md $dmgbase/NEWS.txt diff --git a/tools/windows/populate_installer_dir.sh b/tools/windows/populate_installer_dir.sh index ab0ba4615..fafe86273 100755 --- a/tools/windows/populate_installer_dir.sh +++ b/tools/windows/populate_installer_dir.sh @@ -51,7 +51,7 @@ function create_directories { cd ${tgt_dir} rm -rf * - mkdir -p examples data doc/licenses locale/libqt + mkdir -p examples data/sounds doc/licenses locale/libqt print -- " done" } @@ -68,6 +68,7 @@ function copy_files { cp share/icons/windows/mkvtoolnix-gui.ico ${tgt_dir}/installer/ cp ${mxe_usr_dir}/share/misc/magic.mgc ${tgt_dir}/data/ + cp share/sounds/* ${tgt_dir}/data/sounds/ touch ${tgt_dir}/data/portable-app cp README.md ${tgt_dir}/doc/README.txt