[SCM] gmerlin/master: Refresh patches.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Mon Jun 11 11:12:13 UTC 2012
The following commit has been merged in the master branch:
commit 0db9c5058492e9a6561081aa278a42407563c4dd
Author: Alessio Treglia <alessio at debian.org>
Date: Mon Jun 11 13:04:54 2012 +0200
Refresh patches.
diff --git a/debian/patches/fix_manpages.patch b/debian/patches/fix_manpages.patch
index 6e69b90..2938440 100644
--- a/debian/patches/fix_manpages.patch
+++ b/debian/patches/fix_manpages.patch
@@ -2,24 +2,25 @@ Description: Improve the manpages provide by upstream.
also make sure that generated manpages provide proper whois section
Origin: Debian
---
- apps/cmdlineplayer/gmerlin_play.1 | 48 +++++++++++++-------------
+ apps/cmdlineplayer/gmerlin_play.1 | 50 ++++++++++++-------------
apps/player/gmerlin.1 | 10 ++---
- apps/player/gmerlin_remote.1 | 50 ++++++++++++++--------------
+ apps/player/gmerlin_remote.1 | 56 ++++++++++++++--------------
apps/transcoder/gmerlin_transcoder.1 | 12 +++---
- apps/transcoder/gmerlin_transcoder_remote.1 | 20 +++++------
- 5 files changed, 70 insertions(+), 70 deletions(-)
+ apps/transcoder/gmerlin_transcoder_remote.1 | 20 +++++-----
+ lib/cmdline.c | 2 -
+ 6 files changed, 75 insertions(+), 75 deletions(-)
--- gmerlin.orig/apps/transcoder/gmerlin_transcoder.1
+++ gmerlin/apps/transcoder/gmerlin_transcoder.1
@@ -1,6 +1,6 @@
- .TH GMERLIN_TRANSCODER 1 "January 2011" Gmerlin "User Manuals"
+ .TH GMERLIN_TRANSCODER 1 "March 2012" Gmerlin "User Manuals"
.SH NAME
-gmerlin_transcoder
+gmerlin_transcoder \- GTK multimedia transcoder
.SH SYNOPSIS
.B gmerlin_transcoder
.I [options]
-@@ -10,7 +10,7 @@
+@@ -10,7 +10,7 @@ GTK multimedia transcoder
.SH OPTIONS
@@ -28,7 +29,7 @@ Origin: Debian
.I <file>
.RS 2
-@@ -20,25 +20,25 @@
+@@ -20,25 +20,25 @@ Load a profile from the given file
.SH GENERIC OPTIONS
The following generic options are available for all gmerlin applications
@@ -61,14 +62,14 @@ Origin: Debian
--- gmerlin.orig/apps/transcoder/gmerlin_transcoder_remote.1
+++ gmerlin/apps/transcoder/gmerlin_transcoder_remote.1
@@ -1,6 +1,6 @@
- .TH GMERLIN_TRANSCODER_REMOTE 1 "January 2011" Gmerlin "User Manuals"
+ .TH GMERLIN_TRANSCODER_REMOTE 1 "March 2012" Gmerlin "User Manuals"
.SH NAME
-gmerlin_transcoder_remote
+gmerlin_transcoder_remote \- Remote control command for the Gmerlin GUI transcoder
.SH SYNOPSIS
.B gmerlin_transcoder_remote
.I [options]
-@@ -11,21 +11,21 @@
+@@ -11,21 +11,21 @@ Remote control command for the Gmerlin G
.SH GLOBAL OPTIONS
@@ -93,7 +94,7 @@ Origin: Debian
.RS 2
Launch new transcoder if necessary
-@@ -33,14 +33,14 @@
+@@ -33,14 +33,14 @@ Launch new transcoder if necessary
.SH COMMANDS
@@ -110,7 +111,7 @@ Origin: Debian
.I <location>
.RS 2
-@@ -50,25 +50,25 @@
+@@ -50,25 +50,25 @@ Add <location> to the track list
.SH GENERIC OPTIONS
The following generic options are available for all gmerlin applications
@@ -143,14 +144,14 @@ Origin: Debian
--- gmerlin.orig/apps/player/gmerlin.1
+++ gmerlin/apps/player/gmerlin.1
@@ -1,6 +1,6 @@
- .TH GMERLIN 1 "January 2011" Gmerlin "User Manuals"
+ .TH GMERLIN 1 "March 2012" Gmerlin "User Manuals"
.SH NAME
-gmerlin
+gmerlin \- Gmerlin GUI Player
.SH SYNOPSIS
.B gmerlin
.I [options]
-@@ -12,25 +12,25 @@
+@@ -12,25 +12,25 @@ Gmerlin GUI Player
.SH GENERIC OPTIONS
The following generic options are available for all gmerlin applications
@@ -183,14 +184,14 @@ Origin: Debian
--- gmerlin.orig/apps/player/gmerlin_remote.1
+++ gmerlin/apps/player/gmerlin_remote.1
@@ -1,6 +1,6 @@
- .TH GMERLIN_REMOTE 1 "January 2011" Gmerlin "User Manuals"
+ .TH GMERLIN_REMOTE 1 "March 2012" Gmerlin "User Manuals"
.SH NAME
-gmerlin_remote
+gmerlin_remote \- Remote control command for the Gmerlin GUI Player
.SH SYNOPSIS
.B gmerlin_remote
.I [options]
-@@ -11,21 +11,21 @@
+@@ -11,21 +11,21 @@ Remote control command for the Gmerlin G
.SH GLOBAL OPTIONS
@@ -215,7 +216,7 @@ Origin: Debian
.RS 2
Launch new player if necessary
-@@ -33,64 +33,64 @@
+@@ -33,64 +33,64 @@ Launch new player if necessary
.SH COMMANDS
@@ -290,7 +291,7 @@ Origin: Debian
.I <device>
.RS 2
-@@ -98,57 +98,57 @@
+@@ -98,48 +98,48 @@ Open album for <device> and play first t
dvd:///dev/hdd).
.RE
@@ -330,6 +331,26 @@ Origin: Debian
chapter respectively
.RE
+-.B -get-name
++.B \-get\-name
+
+ .RS 2
+ Print name of the current track
+ .RE
+
+-.B -get-metadata
++.B \-get\-metadata
+
+ .RS 2
+ Print metadata of the current track
+ .RE
+
+-.B -get-time
++.B \-get\-time
+
+ .RS 2
+ Print time of the current track
+@@ -148,25 +148,25 @@ Print time of the current track
.SH GENERIC OPTIONS
The following generic options are available for all gmerlin applications
@@ -362,14 +383,14 @@ Origin: Debian
--- gmerlin.orig/apps/cmdlineplayer/gmerlin_play.1
+++ gmerlin/apps/cmdlineplayer/gmerlin_play.1
@@ -1,6 +1,6 @@
- .TH GMERLIN_PLAYER 1 "January 2011" Gmerlin "User Manuals"
+ .TH GMERLIN_PLAYER 1 "March 2012" Gmerlin "User Manuals"
.SH NAME
-gmerlin_player
+gmerlin_player \- Commandline Multimedia player
.SH SYNOPSIS
.B gmerlin_player
.I [options]
-@@ -11,7 +11,7 @@
+@@ -11,7 +11,7 @@ Commandline Multimedia player
.SH OPTIONS
@@ -378,7 +399,7 @@ Origin: Debian
.I <audio_output_options>
.RS 2
-@@ -140,7 +140,7 @@
+@@ -128,7 +128,7 @@ Host (empty: local)
.RE
.RE
@@ -387,7 +408,7 @@ Origin: Debian
.I <video_output_options>
.RS 2
-@@ -222,7 +222,7 @@
+@@ -230,7 +230,7 @@ Window ID
.P
.RE
@@ -396,34 +417,7 @@ Origin: Debian
.I <input_plugin>
.RS 2
-@@ -262,7 +262,7 @@
- Shrink factor
- .P
- This enables downscaling of images while decoding. Currently only
--supported for JPEG-2000.
-+supported for JPEG\-2000.
-
- .P
- .BR vdpau "=[1|0] (default: 1)"
-@@ -335,7 +335,7 @@
- Port base for RTP over UDP. Values of 1024 or smaller enable random
- ports (recommended for RTSP aware firewalls). Values larger than 1024
- define the base port. 2 consecutive ports are used for each A/V stream,
--these must be accessable through the firewall. Odd values are rounded to
-+these must be accessible through the firewall. Odd values are rounded to
- the next even value.
-
- .P
-@@ -371,7 +371,7 @@
- .P
- This sets the default encoding for text subtitles,when the original
- encoding is unknown. It must be a character set namerecognized by iconv.
--Type 'iconv -l' at the commandline for a list of supported encodings.
-+Type 'iconv \-l' at the commandline for a list of supported encodings.
-
- .P
- .BR sample_accuracy "=<string>"
-@@ -412,7 +412,7 @@
+@@ -249,7 +249,7 @@ input plugin
.P
.RS 2
@@ -432,7 +426,7 @@ Origin: Debian
.P
Trackname template
.P
-@@ -421,16 +421,16 @@
+@@ -258,16 +258,16 @@ Template for track name generation from
%a: Album
%g: Genre
%t: Track name
@@ -452,7 +446,7 @@ Origin: Debian
.P
.BR use_local "=[1|0] (default: 1)"
-@@ -547,7 +547,7 @@
+@@ -384,7 +384,7 @@ Disable all data verification and correc
.P
Disable extra paranoia
.P
@@ -461,7 +455,34 @@ Origin: Debian
boundaries is performed. It can wedge if errors occur in the attempted
overlap area. Not recommended.
-@@ -884,7 +884,7 @@
+@@ -415,7 +415,7 @@ postprocessing, 1 means maximum postproc
+ Shrink factor
+ .P
+ This enables downscaling of images while decoding. Currently only
+-supported for JPEG-2000.
++supported for JPEG\-2000.
+
+ .P
+ .BR vdpau "=[1|0] (default: 1)"
+@@ -488,7 +488,7 @@ Port base for RTP
+ Port base for RTP over UDP. Values of 1024 or smaller enable random
+ ports (recommended for RTSP aware firewalls). Values larger than 1024
+ define the base port. 2 consecutive ports are used for each A/V stream,
+-these must be accessable through the firewall. Odd values are rounded to
++these must be accessible through the firewall. Odd values are rounded to
+ the next even value.
+
+ .P
+@@ -524,7 +524,7 @@ Default subtitle encoding
+ .P
+ This sets the default encoding for text subtitles,when the original
+ encoding is unknown. It must be a character set namerecognized by iconv.
+-Type 'iconv -l' at the commandline for a list of supported encodings.
++Type 'iconv \-l' at the commandline for a list of supported encodings.
+
+ .P
+ .BR sample_accuracy "=<string>"
+@@ -891,7 +891,7 @@ Use interpolate mixing
.RE
.RE
@@ -470,7 +491,7 @@ Origin: Debian
.I <audio_options>
.RS 2
-@@ -994,7 +994,7 @@
+@@ -1001,7 +1001,7 @@ Mix mode when downmixing Stereo to Mono.
.P
.RE
@@ -479,7 +500,7 @@ Origin: Debian
.I <video_options>
.RS 2
-@@ -1056,7 +1056,7 @@
+@@ -1063,7 +1063,7 @@ restart
.P
.RE
@@ -488,7 +509,7 @@ Origin: Debian
.I <input_options>
.RS 2
-@@ -1071,7 +1071,7 @@
+@@ -1078,7 +1078,7 @@ When showing still images, gmerlin repea
realtime filter tweaking work.
.P
@@ -497,7 +518,7 @@ Origin: Debian
.P
Sync offset [ms]
.P
-@@ -1081,7 +1081,7 @@
+@@ -1088,7 +1088,7 @@ and video. Use positive values if the vi
.P
.RE
@@ -506,7 +527,7 @@ Origin: Debian
.I <osd_options>
.RS 2
-@@ -1166,27 +1166,27 @@
+@@ -1173,27 +1173,27 @@ Duration (milliseconds)
.P
.RE
@@ -538,7 +559,7 @@ Origin: Debian
.I <track_spec>
.RS 2
-@@ -1196,25 +1196,25 @@
+@@ -1203,25 +1203,25 @@ Set verbosity level (0..4)
.SH GENERIC OPTIONS
The following generic options are available for all gmerlin applications
@@ -570,7 +591,7 @@ Origin: Debian
Print version info and exit
--- gmerlin.orig/lib/cmdline.c
+++ gmerlin/lib/cmdline.c
-@@ -383,7 +383,7 @@
+@@ -383,7 +383,7 @@ void bg_cmdline_print_help(char * argv0,
free(string_uc);
--
gmerlin packaging
More information about the pkg-multimedia-commits
mailing list