[prboom+] 04/05: Condense Debian-specific changes to the default configuration into a single patch.

[Fabian Greffrath]

This is an automated email from the git hooks/post-receive script.

fabian-guest pushed a commit to branch master
in repository prboom+.

commit 51ce46e9dafd9cd52a61a4a593b72297d10a9a2b
Author: Fabian Greffrath <fabian+debian at greffrath.com>
Date:   Thu Apr 30 15:16:05 2015 +0200

    Condense Debian-specific changes to the default configuration into a single patch.
---
 debian/patches/cap_soundcommand.patch | 14 --------------
 debian/patches/config-debian.patch    | 30 ++++++++++++++++++++++++++++++
 debian/patches/series                 |  4 +---
 debian/patches/snd_midiplayer.patch   | 15 ---------------
 debian/patches/snd_soundfont.patch    | 14 --------------
 5 files changed, 31 insertions(+), 46 deletions(-)

diff --git a/debian/patches/cap_soundcommand.patch b/debian/patches/cap_soundcommand.patch
deleted file mode 100644
index a56db2b..0000000
--- a/debian/patches/cap_soundcommand.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Description: The Ogg Vorbis encoder in vorbis-tools is called "oggenc".
-
---- a/src/m_misc.c
-+++ b/src/m_misc.c
-@@ -978,7 +978,7 @@ default_t defaults[] =
- 
-   // NSM
-   {"Video capture encoding settings",{NULL},{0},UL,UL,def_none,ss_none},
--  {"cap_soundcommand",{NULL, &cap_soundcommand},{0,"oggenc2 -r -R %s -q 5 - -o output.ogg"},UL,UL,def_str,ss_none},
-+  {"cap_soundcommand",{NULL, &cap_soundcommand},{0,"oggenc -r -R %s -q 5 - -o output.ogg"},UL,UL,def_str,ss_none},
-   {"cap_videocommand",{NULL, &cap_videocommand},{0,"x264 -o output.mp4 --crf 22 --muxer mp4 --demuxer raw --input-csp rgb --input-depth 8 --input-res %wx%h --fps 35 -"},UL,UL,def_str,ss_none},
-   {"cap_muxcommand",{NULL, &cap_muxcommand},{0,"mkvmerge -o %f output.mp4 output.ogg"},UL,UL,def_str,ss_none},
-   {"cap_tempfile1",{NULL, &cap_tempfile1},{0,"output.ogg"},UL,UL,def_str,ss_none},
diff --git a/debian/patches/config-debian.patch b/debian/patches/config-debian.patch
new file mode 100644
index 0000000..0cc6481
--- /dev/null
+++ b/debian/patches/config-debian.patch
@@ -0,0 +1,30 @@
+Author: Fabian Greffrath <fabian+debian at greffrath.com>
+Description: Debian-specific changes to the default configuration
+ * Change default MIDI player to the OPL2 emulator,
+   so "freepats" can be demoted to a suggestion.
+ * Fix the sound font file name for musescore-soundfont-gm.
+ * The Ogg Vorbis encoder in vorbis-tools is called "oggenc".
+
+--- a/src/m_misc.c
++++ b/src/m_misc.c
+@@ -380,9 +380,9 @@ default_t defaults[] =
+ #ifdef _WIN32
+   {"snd_midiplayer",{NULL, &snd_midiplayer},{0,"fluidsynth"},UL,UL,def_str,ss_none},
+ #else
+-  {"snd_midiplayer",{NULL, &snd_midiplayer},{0,"sdl"},UL,UL,def_str,ss_none},
++  {"snd_midiplayer",{NULL, &snd_midiplayer},{0,"opl2"},UL,UL,def_str,ss_none},
+ #endif
+-  {"snd_soundfont",{NULL, &snd_soundfont},{0,"TimGM6mb.sf2"},UL,UL,def_str,ss_none}, // soundfont name for synths that support it
++  {"snd_soundfont",{NULL, &snd_soundfont},{0,"/usr/share/sounds/sf2/TimGM6mb.sf2"},UL,UL,def_str,ss_none}, // soundfont name for synths that support it
+   {"snd_mididev",{NULL, &snd_mididev},{0,""},UL,UL,def_str,ss_none}, // midi device to use for portmidiplayer
+ 
+ #ifdef _WIN32
+@@ -983,7 +983,7 @@ default_t defaults[] =
+ 
+   // NSM
+   {"Video capture encoding settings",{NULL},{0},UL,UL,def_none,ss_none},
+-  {"cap_soundcommand",{NULL, &cap_soundcommand},{0,"oggenc2 -r -R %s -q 5 - -o output.ogg"},UL,UL,def_str,ss_none},
++  {"cap_soundcommand",{NULL, &cap_soundcommand},{0,"oggenc -r -R %s -q 5 - -o output.ogg"},UL,UL,def_str,ss_none},
+   {"cap_videocommand",{NULL, &cap_videocommand},{0,"x264 -o output.mp4 --crf 22 --muxer mp4 --demuxer raw --input-csp rgb --input-depth 8 --input-res %wx%h --fps 35 -"},UL,UL,def_str,ss_none},
+   {"cap_muxcommand",{NULL, &cap_muxcommand},{0,"mkvmerge -o %f output.mp4 output.ogg"},UL,UL,def_str,ss_none},
+   {"cap_tempfile1",{NULL, &cap_tempfile1},{0,"output.ogg"},UL,UL,def_str,ss_none},
diff --git a/debian/patches/series b/debian/patches/series
index 5c86af4..53a1fb1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,3 @@
-snd_midiplayer.patch
-snd_soundfont.patch
-cap_soundcommand.patch
+config-debian.patch
 remove_google_adsense.patch
 reproducible-build.patch
diff --git a/debian/patches/snd_midiplayer.patch b/debian/patches/snd_midiplayer.patch
deleted file mode 100644
index 667243f..0000000
--- a/debian/patches/snd_midiplayer.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Description: Change default MIDI player to the OPL2 emulator,
- so "freepats" can be demoted to a suggestion.
-
---- a/src/m_misc.c
-+++ b/src/m_misc.c
-@@ -380,7 +380,7 @@ default_t defaults[] =
- #ifdef _WIN32
-   {"snd_midiplayer",{NULL, &snd_midiplayer},{0,"fluidsynth"},UL,UL,def_str,ss_none},
- #else
--  {"snd_midiplayer",{NULL, &snd_midiplayer},{0,"sdl"},UL,UL,def_str,ss_none},
-+  {"snd_midiplayer",{NULL, &snd_midiplayer},{0,"opl2"},UL,UL,def_str,ss_none},
- #endif
-   {"snd_soundfont",{NULL, &snd_soundfont},{0,"TimGM6mb.sf2"},UL,UL,def_str,ss_none}, // soundfont name for synths that support it
-   {"snd_mididev",{NULL, &snd_mididev},{0,""},UL,UL,def_str,ss_none}, // midi device to use for portmidiplayer
diff --git a/debian/patches/snd_soundfont.patch b/debian/patches/snd_soundfont.patch
deleted file mode 100644
index ef1938f..0000000
--- a/debian/patches/snd_soundfont.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Description: Fix the sound font file name for musescore-soundfont-gm.
-
---- a/src/m_misc.c
-+++ b/src/m_misc.c
-@@ -382,7 +382,7 @@ default_t defaults[] =
- #else
-   {"snd_midiplayer",{NULL, &snd_midiplayer},{0,"opl2"},UL,UL,def_str,ss_none},
- #endif
--  {"snd_soundfont",{NULL, &snd_soundfont},{0,"TimGM6mb.sf2"},UL,UL,def_str,ss_none}, // soundfont name for synths that support it
-+  {"snd_soundfont",{NULL, &snd_soundfont},{0,"/usr/share/sounds/sf2/TimGM6mb.sf2"},UL,UL,def_str,ss_none}, // soundfont name for synths that support it
-   {"snd_mididev",{NULL, &snd_mididev},{0,""},UL,UL,def_str,ss_none}, // midi device to use for portmidiplayer
- 
- #ifdef _WIN32

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/prboom+.git