On 06/20/2012 06:14 PM, Cristian Morales Vega wrote: > Some of them are needed only when compiling with > -Wl,--no-allow-shlib-undefined and others are a requirement if using > the latest version of GNU ld. In any case, adding them adds > correctness.
for sake of completeness, attached are the patches that we apply on debian. i guess these include most underlinking problems. fgmasdr IOhannes PS: note that some of those might be highly debian-specific (e.g. GMERLIN_0002)
Description: Fix build failure on Ubuntu armel. Bug-Ubuntu: https://launchpad.net/bugs/704027 Author: Alessio Treglia <[email protected]> --- src/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- gavl.orig/src/Makefile.am +++ gavl/src/Makefile.am @@ -30,7 +30,7 @@ benchmark_LDADD = ../gavl/libgavl.la @RT volume_test_SOURCES = volume_test.c -volume_test_LDADD = ../gavl/libgavl.la +volume_test_LDADD = -lm ../gavl/libgavl.la dump_frame_table_SOURCES = dump_frame_table.c dump_frame_table_LDADD = ../gavl/libgavl.la
Description: Update desktop files as per Freedesktop.org's spec. Remove 'Encoding' keys since they are deprecated. Consistently remove '.png' suffix in 'Icon' key Origin: Debian --- apps/recorder/gmerlin-recorder.desktop | 1 - apps/transcoder/gmerlin-transcoder.desktop | 1 - apps/visualizer/gmerlin-visualizer.desktop | 1 - 3 files changed, 3 deletions(-) --- gmerlin.orig/apps/transcoder/gmerlin-transcoder.desktop +++ gmerlin/apps/transcoder/gmerlin-transcoder.desktop @@ -1,11 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 Name=Gmerlin transcoder Name[de]=Gmerlin transcoder Comment=Gmerlin multimedia transcoder Comment[de]=Gmerlin multimedia transcoder Exec=gmerlin_transcoder -Icon=gmerlin-transcoder.png +Icon=gmerlin-transcoder Type=Application Categories=Application;AudioVideo; --- gmerlin.orig/apps/visualizer/gmerlin-visualizer.desktop +++ gmerlin/apps/visualizer/gmerlin-visualizer.desktop @@ -1,11 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 Name=Gmerlin visualizer Name[de]=Gmerlin visualisierer Comment=Run visualization plugins Comment[de]=Visualisierungs Plugins laufen lassen Exec=gmerlin_visualizer -Icon=gmerlin-visualizer.png +Icon=gmerlin-visualizer Type=Application Categories=Application;AudioVideo; --- gmerlin.orig/apps/recorder/gmerlin-recorder.desktop +++ gmerlin/apps/recorder/gmerlin-recorder.desktop @@ -1,11 +1,10 @@ [Desktop Entry] -Encoding=UTF-8 Name=Gmerlin recorder Name[de]=Gmerlin recorder Comment=Audio/video recorder Comment[de]=Audio/video recorder Exec=gmerlin_recorder -Icon=gmerlin-recorder.png +Icon=gmerlin-recorder Type=Application Categories=Application;AudioVideo;
Description: Improve the manpages provide by upstream. Origin: Debian --- apps/cmdlineplayer/gmerlin_play.1 | 48 +++++++++++++------------- apps/player/gmerlin.1 | 10 ++--- apps/player/gmerlin_remote.1 | 50 ++++++++++++++-------------- apps/transcoder/gmerlin_transcoder.1 | 12 +++--- apps/transcoder/gmerlin_transcoder_remote.1 | 20 +++++------ 5 files changed, 70 insertions(+), 70 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" .SH NAME -gmerlin_transcoder +gmerlin_transcoder \- GTK multimedia transcoder .SH SYNOPSIS .B gmerlin_transcoder .I [options] @@ -10,7 +10,7 @@ .SH OPTIONS -.B -p +.B \-p .I <file> .RS 2 @@ -20,25 +20,25 @@ .SH GENERIC OPTIONS The following generic options are available for all gmerlin applications -.B -help +.B \-help .RS 2 Print this help message and exit .RE -.B -help-man +.B \-help\-man .RS 2 Print this help message as a manual page and exit .RE -.B -help-texi +.B \-help\-texi .RS 2 Print this help message in texinfo format and exit .RE -.B -version +.B \-version .RS 2 Print version info and exit --- 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" .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 @@ .SH GLOBAL OPTIONS -.B -host +.B \-host .I <hostname> .RS 2 Host to connect to, default is localhost .RE -.B -port +.B \-port .I <port> .RS 2 Port to connect to .RE -.B -launch +.B \-launch .RS 2 Launch new transcoder if necessary @@ -33,14 +33,14 @@ .SH COMMANDS -.B -addalbum +.B \-addalbum .I <album_file> .RS 2 Add album to track list .RE -.B -add +.B \-add .I <location> .RS 2 @@ -50,25 +50,25 @@ .SH GENERIC OPTIONS The following generic options are available for all gmerlin applications -.B -help +.B \-help .RS 2 Print this help message and exit .RE -.B -help-man +.B \-help\-man .RS 2 Print this help message as a manual page and exit .RE -.B -help-texi +.B \-help\-texi .RS 2 Print this help message in texinfo format and exit .RE -.B -version +.B \-version .RS 2 Print version info and exit --- gmerlin.orig/apps/player/gmerlin.1 +++ gmerlin/apps/player/gmerlin.1 @@ -1,6 +1,6 @@ .TH GMERLIN 1 "January 2011" Gmerlin "User Manuals" .SH NAME -gmerlin +gmerlin \- Gmerlin GUI Player .SH SYNOPSIS .B gmerlin .I [options] @@ -12,25 +12,25 @@ .SH GENERIC OPTIONS The following generic options are available for all gmerlin applications -.B -help +.B \-help .RS 2 Print this help message and exit .RE -.B -help-man +.B \-help\-man .RS 2 Print this help message as a manual page and exit .RE -.B -help-texi +.B \-help\-texi .RS 2 Print this help message in texinfo format and exit .RE -.B -version +.B \-version .RS 2 Print version info and exit --- 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" .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 @@ .SH GLOBAL OPTIONS -.B -host +.B \-host .I <hostname> .RS 2 Host to connect to, default is localhost .RE -.B -port +.B \-port .I <port> .RS 2 Port to connect to .RE -.B -launch +.B \-launch .RS 2 Launch new player if necessary @@ -33,64 +33,64 @@ .SH COMMANDS -.B -play +.B \-play .RS 2 Play current track .RE -.B -next +.B \-next .RS 2 Switch to next track .RE -.B -prev +.B \-prev .RS 2 Switch to previous track .RE -.B -stop +.B \-stop .RS 2 Stop playback .RE -.B -pause +.B \-pause .RS 2 Pause playback .RE -.B -mute +.B \-mute .RS 2 Toggle mute .RE -.B -add +.B \-add .I <gml> .RS 2 Add <gml> to the incoming album .RE -.B -addplay +.B \-addplay .I <gml> .RS 2 Add <gml> to the incoming album and play it .RE -.B -open +.B \-open .I <device> .RS 2 Open album for <device>. Device must be a GML (e.g. dvd:///dev/hdd). .RE -.B -openplay +.B \-openplay .I <device> .RS 2 @@ -98,57 +98,57 @@ dvd:///dev/hdd). .RE -.B -volume +.B \-volume .I <volume> .RS 2 Set player volume. <volume> is in dB, 0.0 is max .RE -.B -volume-rel +.B \-volume\-rel .I <diff> .RS 2 -In- or decrease player volume. <diff> is in dB +In\- or decrease player volume. <diff> is in dB .RE -.B -seek-rel +.B \-seek\-rel .I <diff> .RS 2 Seek relative. <diff> is in seconds. .RE -.B -chapter -.I [num|+|-] +.B \-chapter +.I [num|+|\-] .RS 2 -Go to the specified chapter. Use '+' and '-' to go to the next or previous +Go to the specified chapter. Use '+' and '\-' to go to the next or previous chapter respectively .RE .SH GENERIC OPTIONS The following generic options are available for all gmerlin applications -.B -help +.B \-help .RS 2 Print this help message and exit .RE -.B -help-man +.B \-help\-man .RS 2 Print this help message as a manual page and exit .RE -.B -help-texi +.B \-help\-texi .RS 2 Print this help message in texinfo format and exit .RE -.B -version +.B \-version .RS 2 Print version info and exit --- 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" .SH NAME -gmerlin_player +gmerlin_player \- Commandline Multimedia player .SH SYNOPSIS .B gmerlin_player .I [options] @@ -11,7 +11,7 @@ .SH OPTIONS -.B -oa +.B \-oa .I <audio_output_options> .RS 2 @@ -140,7 +140,7 @@ .RE .RE -.B -ov +.B \-ov .I <video_output_options> .RS 2 @@ -222,7 +222,7 @@ .P .RE -.B -i +.B \-i .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 @@ .P .RS 2 -.BR trackname_template "=<string> (Default: %p - %t)" +.BR trackname_template "=<string> (Default: %p \- %t)" .P Trackname template .P @@ -421,16 +421,16 @@ %a: Album %g: Genre %t: Track name -%<d>n: Track number (d = number of digits, 1-9) +%<d>n: Track number (d = number of digits, 1\-9) %y: Year %c: Comment .P .BR use_cdtext "=[1|0] (default: 1)" .P -Use CD-Text +Use CD\-Text .P -Try to get CD metadata from CD-Text +Try to get CD metadata from CD\-Text .P .BR use_local "=[1|0] (default: 1)" @@ -547,7 +547,7 @@ .P Disable extra paranoia .P -Disables intra-read data verification; only overlap checking atread +Disables intra\-read data verification; only overlap checking atread boundaries is performed. It can wedge if errors occur in the attempted overlap area. Not recommended. @@ -884,7 +884,7 @@ .RE .RE -.B -aud +.B \-aud .I <audio_options> .RS 2 @@ -994,7 +994,7 @@ .P .RE -.B -vid +.B \-vid .I <video_options> .RS 2 @@ -1056,7 +1056,7 @@ .P .RE -.B -inopt +.B \-inopt .I <input_options> .RS 2 @@ -1071,7 +1071,7 @@ realtime filter tweaking work. .P -.BR sync_offset "=<number> (-1000..1000, default: 0)" +.BR sync_offset "=<number> (\-1000..1000, default: 0)" .P Sync offset [ms] .P @@ -1081,7 +1081,7 @@ .P .RE -.B -osd +.B \-osd .I <osd_options> .RS 2 @@ -1166,27 +1166,27 @@ .P .RE -.B -nt +.B \-nt .RS 2 Disable time display .RE -.B -vol +.B \-vol .I <volume> .RS 2 Set volume in dB (max: 0.0) .RE -.B -v +.B \-v .I level .RS 2 Set verbosity level (0..4) .RE -.B -tracks +.B \-tracks .I <track_spec> .RS 2 @@ -1196,25 +1196,25 @@ .SH GENERIC OPTIONS The following generic options are available for all gmerlin applications -.B -help +.B \-help .RS 2 Print this help message and exit .RE -.B -help-man +.B \-help\-man .RS 2 Print this help message as a manual page and exit .RE -.B -help-texi +.B \-help\-texi .RS 2 Print this help message in texinfo format and exit .RE -.B -version +.B \-version .RS 2 Print version info and exit
Description: provide policy-compliant version of bg_sem.h Since the upstream version includes BSD-4-clause'd licensed code, it cannot be distributed with debian; since the file is really only needed if no posix semaphores are available, we just use these Author: IOhannes m zmölnig --- /dev/null +++ gmerlin/include/gmerlin/bg_sem.h @@ -0,0 +1 @@ +#include <semaphore.h>
Author: Cristian Morales Vega <[email protected]> Description: remove double call to (deprecated) png_set_gray_1_2_4_to_8() --- gmerlin.orig/plugins/png/ir_png.c +++ gmerlin/plugins/png/ir_png.c @@ -133,7 +133,6 @@ png_set_expand_gray_1_2_4_to_8(png->png_ptr); #endif - png_set_gray_1_2_4_to_8(png->png_ptr); if (png_get_valid(png->png_ptr, png->info_ptr, PNG_INFO_tRNS)) { png_set_tRNS_to_alpha(png->png_ptr);
Author: IOhannes m zmölnig
Description: prevent segfaults if no plugins can be found
--- gmerlin.orig/lib/pluginregistry.c
+++ gmerlin/lib/pluginregistry.c
@@ -174,6 +174,9 @@
bg_plugin_info_t ** arr;
int num_plugins = 0;
int keep_going;
+
+ if(NULL==list)
+ return NULL;
/* Count plugins */
@@ -216,7 +219,8 @@
for(i = 0; i < num_plugins-1; i++)
arr[i]->next = arr[i+1];
- arr[num_plugins-1]->next = (bg_plugin_info_t*)0;
+ if(num_plugins>0)
+ arr[num_plugins-1]->next = (bg_plugin_info_t*)0;
list = arr[0];
/* Free array */
free(arr);
@@ -957,16 +961,18 @@
if(ret->singlepic_encoder)
ret->entries = append_to_list(ret->entries, ret->singlepic_encoder);
- /* Sort */
-
- ret->entries = sort_by_priority(ret->entries);
+ if(ret->entries)
+ {
+ /* Sort */
+ ret->entries = sort_by_priority(ret->entries);
- if(!opt->dont_save)
- bg_plugin_registry_save(ret->entries);
-
- /* Remove duplicate external plugins */
- ret->entries = remove_duplicate(ret->entries);
+ if(!opt->dont_save)
+ bg_plugin_registry_save(ret->entries);
+ /* Remove duplicate external plugins */
+ ret->entries = remove_duplicate(ret->entries);
+ }
+
/* Kick out unsupported plugins */
tmp_info = ret->entries;
Author: Cristian Morales Vega <[email protected]> Description: fixed accidentally omitted type-specification in function declaraion --- gmerlin.orig/lib/visualize_slave.c +++ gmerlin/lib/visualize_slave.c @@ -782,7 +782,7 @@ return write(STDOUT_FILENO, data, len); } -static int write_message(msg) +static int write_message(bg_msg_t * msg) { int result; // fprintf(stderr, "Write message slave...\n");
Author: Cristian Morales Vega <[email protected]> Description: link libgmerlin against libxml and libm as these are needed and obviously forgotten by upstream --- gmerlin.orig/configure.ac +++ gmerlin/configure.ac @@ -139,6 +139,8 @@ dnl Required +LT_LIB_M + XML2_REQUIRED="2.4.0" PKG_CHECK_MODULES(XML2, libxml-2.0 >= $XML2_REQUIRED, , AC_MSG_ERROR("libxml2 not found")) AC_SUBST(XML2_REQUIRED) --- gmerlin.orig/lib/gtk/Makefile.am +++ gmerlin/lib/gtk/Makefile.am @@ -64,5 +64,5 @@ urlselect.c \ vumeter.c -libgmerlin_gtk_la_LIBADD = @GTK_LIBS@ $(top_builddir)/lib/libgmerlin.la +libgmerlin_gtk_la_LIBADD = @GTK_LIBS@ $(top_builddir)/lib/libgmerlin.la @XML2_LIBS@ @LIBM@ Binary files gmerlin.orig/.git/index and gmerlin/.git/index differ
Author: IOhannes m zmölnig
Description: move gmerlin_visualizer_slave into /usr/lib/gmerlin/bin
as "this program is not to be started from the cmdline" but rather directly from
libgmerlin (which of course has to be aware of the changed position)
--- gmerlin.orig/lib/Makefile.am
+++ gmerlin/lib/Makefile.am
@@ -1,4 +1,5 @@
plugindir=$(pkglibdir)/plugins
+pkgbindir=$(pkglibdir)/bin
INCLUDES = -I$(top_srcdir)/include
if HAVE_X11
@@ -40,13 +41,14 @@
-DPLUGIN_DIR=\"$(plugindir)\" \
-DDOC_DIR=\"$(docdir)\" \
-DDATA_DIR=\"$(pkgdatadir)\" \
+-DPKGBIN_DIR=\"$(pkgbindir)\" \
$(lv_cflags)
libgmerlin_la_LDFLAGS = -version-info @LTVERSION_CURRENT@:@LTVERSION_REVISION@:@LTVERSION_AGE@ -export-symbols-regex ^bg_
libgmerlin_la_LIBADD = $(x11_libadd) @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XML2_LIBS@ @ICONV_LIBS@ @LIBINTL@ $(lv_libs) -ldl -lpthread
-bin_PROGRAMS = gmerlin_visualizer_slave
+pkgbin_PROGRAMS = gmerlin_visualizer_slave
gmerlin_visualizer_slave_SOURCES = visualize_slave.c
gmerlin_visualizer_slave_LDADD = libgmerlin.la
--- gmerlin.orig/lib/visualize.c
+++ gmerlin/lib/visualize.c
@@ -40,7 +40,6 @@
#include <gmerlin/log.h>
#define LOG_DOMAIN "visualizer"
-
/*
* gmerlin_visualize_slave
* -w "window_id"
@@ -48,6 +47,12 @@
* -o "output_module"
*/
+#ifdef PKGBIN_DIR
+# define PKGBIN_PATH PKGBIN_DIR"/"
+#else
+# define PKGBIN_PATH ""
+#endif
+
struct bg_visualizer_s
{
bg_msg_t * msg;
@@ -228,13 +233,13 @@
if(v->vis_info->flags & BG_PLUGIN_VISUALIZE_FRAME)
{
- command = bg_sprintf("gmerlin_visualizer_slave -w %s -o %s -p ",
+ command = bg_sprintf(PKGBIN_PATH "gmerlin_visualizer_slave -w %s -o %s -p ",
v->display_string,
v->ov_info->module_filename);
}
else
{
- command = bg_sprintf("gmerlin_visualizer_slave -w %s -p ",
+ command = bg_sprintf(PKGBIN_PATH "gmerlin_visualizer_slave -w %s -p ",
v->display_string);
}
#ifdef HAVE_LV
Author: IOhannes m zmölnig
Description: fix various spelling errors reported by lintian
--- gmerlin.orig/apps/kbd/kbd_config.c
+++ gmerlin/apps/kbd/kbd_config.c
@@ -616,7 +616,7 @@
ret->kbd_button = gtk_check_button_new_with_label(TR("Daemon running"));
bg_gtk_tooltips_set_tip(ret->kbd_button,
- TRS("Switch deamon on and off. If you want to start the daemon with each start of X, add \"gmerlin_kbd\" to your startup programs"),
+ TRS("Switch daemon on and off. If you want to start the daemon with each start of X, add \"gmerlin_kbd\" to your startup programs"),
PACKAGE);
ret->add_button =
--- gmerlin.orig/doc/gmerlin_play.texi
+++ gmerlin/doc/gmerlin_play.texi
@@ -188,7 +188,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.
@*@*
@item @b{ftp_anonymous}=[1|0] (default: 1)@*@*
--- gmerlin.orig/lib/lcdproc.c
+++ gmerlin/lib/lcdproc.c
@@ -208,7 +208,7 @@
if(!bg_host_address_set(addr, l->hostname_cfg, l->port_cfg, SOCK_STREAM))
{
- bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Could not resolve adress for: %s",
+ bg_log(BG_LOG_ERROR, LOG_DOMAIN, "Could not resolve address for: %s",
l->hostname_cfg);
goto fail;
}
--- gmerlin.orig/plugins/videofilters/fv_tctweak.c
+++ gmerlin/plugins/videofilters/fv_tctweak.c
@@ -303,7 +303,7 @@
}
else
{
- fprintf(stderr, "Non continous timecode: ");
+ fprintf(stderr, "Non continuous timecode: ");
gavl_timecode_dump(&vp->format.timecode_format, tc);
fprintf(stderr, " != ");
gavl_timecode_dump(&vp->format.timecode_format, frame->timecode);
--- gmerlin.orig/po/de.po
+++ gmerlin/po/de.po
@@ -5214,7 +5214,7 @@
#: apps/kbd/kbd_config.c:619
msgid ""
-"Switch deamon on and off. If you want to start the daemon with each start of "
+"Switch daemon on and off. If you want to start the daemon with each start of "
"X, add \"gmerlin_kbd\" to your startup programs"
msgstr ""
"Schalte den Dämon ein und aus. Wenn Du den Dämon bei jedem Start von X "
@@ -6435,7 +6435,7 @@
#: lib/lcdproc.c:211
#, c-format
-msgid "Could not resolve adress for: %s"
+msgid "Could not resolve address for: %s"
msgstr "Konnte Adresse nicht auflösen für %s"
#: lib/lcdproc.c:218
--- gmerlin.orig/po/gmerlin.pot
+++ gmerlin/po/gmerlin.pot
@@ -4932,7 +4932,7 @@
#: apps/kbd/kbd_config.c:619
msgid ""
-"Switch deamon on and off. If you want to start the daemon with each start of "
+"Switch daemon on and off. If you want to start the daemon with each start of "
"X, add \"gmerlin_kbd\" to your startup programs"
msgstr ""
@@ -6066,7 +6066,7 @@
#: lib/lcdproc.c:211
#, c-format
-msgid "Could not resolve adress for: %s"
+msgid "Could not resolve address for: %s"
msgstr ""
#: lib/lcdproc.c:218
Fix dvdread detection.
--- a/m4/check_funcs.m4
+++ b/m4/check_funcs.m4
@@ -945,11 +945,7 @@
#include <stdio.h>
main()
{
-#if DVDREAD_VERSION < 905
- return -1;
-#else
return 0;
-#endif
}
],
[
Description: fix build-system due to removed upstream sources From: IOhannes m zmölnig --- gmerlin-avdecoder.orig/configure.ac +++ gmerlin-avdecoder/configure.ac @@ -570,13 +570,6 @@ include/Makefile \ include/bgav_version.h \ lib/Makefile \ -lib/libw32dll/Makefile \ -lib/libw32dll/dmo/Makefile \ -lib/libw32dll/qtx/Makefile \ -lib/libw32dll/qtx/qtxsdk/Makefile \ -lib/libw32dll/wine/Makefile \ -lib/libw32dll/DirectShow/Makefile \ -lib/GSM610/Makefile \ m4/Makefile \ plugins/Makefile \ tests/Makefile ]) --- gmerlin-avdecoder.orig/lib/Makefile.am +++ gmerlin-avdecoder/lib/Makefile.am @@ -234,19 +234,9 @@ speex_sources = endif -if HAVE_W32DLL -win32_subdirs = libw32dll -win32_libs = \ -$(top_builddir)/lib/libw32dll/DirectShow/libds_filter.la \ -$(top_builddir)/lib/libw32dll/dmo/libdmo_filter.la \ -$(top_builddir)/lib/libw32dll/wine/libwine.la \ --lpthread -win32_sources = video_win32.c audio_qtwin32.c audio_win32.c win32codec.c -else win32_subdirs = win32_libs = win32_sources = -endif if HAVE_REALDLL real_sources = audio_real.c video_real.c @@ -289,7 +279,7 @@ gsm_sources = gsm_subdirs = gsm_libs = -endif +endif SUBDIRS = $(win32_subdirs) $(gsm_subdirs) @@ -493,8 +483,6 @@ mxf.c \ nanosoft.c \ options.c \ -os.c \ -os_inet_aton.c \ packetbuffer.c \ packetpool.c \ packettimer.c \
From: IOhannes m zmölnig
Description: use system's libgsm (+headers), since the version that ships with
upstream is removed (for policy reasons) and the two are supposed to be
compatible
--- gmerlin-avdecoder.orig/configure.ac
+++ gmerlin-avdecoder/configure.ac
@@ -504,6 +504,18 @@
[disable libgsm]),
have_libgsm="false", have_libgsm="true")
+AC_SUBST(GSM_LIBS)
+if test "x$have_libgsm" = "xtrue"; then
+ have_sysgsm="false"
+ AC_CHECK_HEADER(gsm/gsm.h,
+ [AC_CHECK_LIB(gsm, gsm_create, have_sysgsm="true")]
+ )
+ if test "x$have_sysgsm" = "xtrue"; then
+ GSM_LIBS="-lgsm"
+ AC_DEFINE([HAVE_GSM_GSM_H], [1], [define if you have 'gsm/gsm.h'])
+ fi
+fi
+
if test "x$have_libgsm" = "xtrue"; then
AC_DEFINE([HAVE_LIBGSM])
fi
--- gmerlin-avdecoder.orig/lib/audio_gsm.c
+++ gmerlin-avdecoder/lib/audio_gsm.c
@@ -23,7 +23,11 @@
#include <avdec_private.h>
#include <codecs.h>
-#include "GSM610/gsm.h"
+#ifdef HAVE_GSM_GSM_H
+# include "gsm/gsm.h"
+#else
+# include "GSM610/gsm.h"
+#endif
/* Audio decoder for the internal libgsm */
--- gmerlin-avdecoder.orig/lib/Makefile.am
+++ gmerlin-avdecoder/lib/Makefile.am
@@ -273,8 +273,8 @@
if HAVE_LIBGSM
gsm_sources = audio_gsm.c
-gsm_subdirs = GSM610
-gsm_libs = $(top_builddir)/lib/GSM610/libgsm.la
+gsm_subdirs =
+gsm_libs = @GSM_LIBS@
else
gsm_sources =
gsm_subdirs =
Description: fix various typos that made lintian complain
Author: IOhannes m zmölnig
--- gmerlin-avdecoder.orig/lib/demux_nsv.c
+++ gmerlin-avdecoder/lib/demux_nsv.c
@@ -516,7 +516,7 @@
else
{
bgav_log(ctx->opt, BGAV_LOG_WARNING, LOG_DOMAIN,
- "Seeking with verison 2 TOC not support due to lack of sample files.\nContact the authors to solve this");
+ "Seeking with version 2 TOC not support due to lack of sample files.\nContact the authors to solve this");
}
}
--- gmerlin-avdecoder.orig/lib/in_rtsp.c
+++ gmerlin-avdecoder/lib/in_rtsp.c
@@ -578,7 +578,7 @@
freeaddrinfo(addr);
- bgav_log(s->opt, BGAV_LOG_INFO, LOG_DOMAIN, "Server adress: %s\n", ip);
+ bgav_log(s->opt, BGAV_LOG_INFO, LOG_DOMAIN, "Server address: %s\n", ip);
free(ip);
}
else
--- gmerlin-avdecoder.orig/lib/sdp.c
+++ gmerlin-avdecoder/lib/sdp.c
@@ -813,7 +813,7 @@
void bgav_sdp_dump(bgav_sdp_t * s)
{
int i;
- bgav_dprintf( "Protcol Version: %d\n", s->protocol_version); /* v= */
+ bgav_dprintf( "Protocol Version: %d\n", s->protocol_version); /* v= */
bgav_dprintf( "Origin:\n");
--- gmerlin-avdecoder.orig/po/de.po
+++ gmerlin-avdecoder/po/de.po
@@ -165,7 +165,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 the next even "
+"accessible through the firewall. Odd values are rounded to the next even "
"value."
msgstr ""
@@ -1561,7 +1561,7 @@
#: lib/demux_nsv.c:519
msgid ""
-"Seeking with verison 2 TOC not support due to lack of sample files.\n"
+"Seeking with version 2 TOC not support due to lack of sample files.\n"
"Contact the authors to solve this"
msgstr ""
"Suchen mit Version 2 TOC ist nicht unterstützt wegen fehlender "
@@ -2062,7 +2062,7 @@
#: lib/in_rtsp.c:581
#, c-format
-msgid "Server adress: %s\n"
+msgid "Server address: %s\n"
msgstr ""
#: lib/in_rtsp.c:593
--- gmerlin-avdecoder.orig/po/gmerlin-avdecoder.pot
+++ gmerlin-avdecoder/po/gmerlin-avdecoder.pot
@@ -164,7 +164,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 the next even "
+"accessible through the firewall. Odd values are rounded to the next even "
"value."
msgstr ""
@@ -1510,7 +1510,7 @@
#: lib/demux_nsv.c:519
msgid ""
-"Seeking with verison 2 TOC not support due to lack of sample files.\n"
+"Seeking with version 2 TOC not support due to lack of sample files.\n"
"Contact the authors to solve this"
msgstr ""
@@ -2001,7 +2001,7 @@
#: lib/in_rtsp.c:581
#, c-format
-msgid "Server adress: %s\n"
+msgid "Server address: %s\n"
msgstr ""
#: lib/in_rtsp.c:593
--- gmerlin-avdecoder.orig/plugins/i_avdec.c
+++ gmerlin-avdecoder/plugins/i_avdec.c
@@ -260,7 +260,7 @@
.val_min = { .val_i = 0 },
.val_max = { .val_i = 65530 },
.val_default = { .val_i = 0 },
- .help_string = TRS("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 the next even value."),
+ .help_string = TRS("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 accessible through the firewall. Odd values are rounded to the next even value."),
},
{
.name = "ftp_options",
Binary files gmerlin-avdecoder.orig/.git/index and gmerlin-avdecoder/.git/index differ
Author: IOhannes m zmölnig Description: fix spelling mistakes --- gmerlin-encoders.orig/plugins/ffmpeg/params.h +++ gmerlin-encoders/plugins/ffmpeg/params.h @@ -211,7 +211,7 @@ 1: Strictly conform to all the things in the spec no matter what \ consequences\n\ 0: Default\n\ --1: Allow inofficial extensions\n\ +-1: Allow unofficial extensions\n\ -2: Allow non standarized experimental things") \ } --- gmerlin-encoders.orig/po/de.po +++ gmerlin-encoders/po/de.po @@ -1221,7 +1221,7 @@ "1: Strictly conform to all the things in the spec no matter what " "consequences\n" "0: Default\n" -"-1: Allow inofficial extensions\n" +"-1: Allow unofficial extensions\n" "-2: Allow non standarized experimental things" msgstr "" "2: Strenges Befolgen einer älteren, strengeren Version der Spezifikation " --- gmerlin-encoders.orig/po/gmerlin-encoders.pot +++ gmerlin-encoders/po/gmerlin-encoders.pot @@ -1123,7 +1123,7 @@ "1: Strictly conform to all the things in the spec no matter what " "consequences\n" "0: Default\n" -"-1: Allow inofficial extensions\n" +"-1: Allow unofficial extensions\n" "-2: Allow non standarized experimental things" msgstr ""
signature.asc
Description: OpenPGP digital signature
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________ Gmerlin-general mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/gmerlin-general
