[SCM] gmerlin/master: put internal binaries into /usr/lib/gmerlin

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4d5d2bb6c644302a5aa335d609767cee7eb87a2b
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Wed Jan 12 16:00:36 2011 +0100

    put internal binaries into /usr/lib/gmerlin

diff --git a/debian/gmerlin.install b/debian/gmerlin.install
index a28d019..975bef8 100644
--- a/debian/gmerlin.install
+++ b/debian/gmerlin.install
@@ -2,3 +2,4 @@ debian/tmp/usr/bin
 debian/tmp/usr/share/man/man1
 debian/tmp/usr/share/applications
 debian/tmp/usr/lib/gmerlin/plugins/*.so
+debian/tmp/usr/lib/gmerlin/bin
diff --git a/debian/patches/gmerlin_visualizer_slave.patch b/debian/patches/gmerlin_visualizer_slave.patch
new file mode 100644
index 0000000..a26a108
--- /dev/null
+++ b/debian/patches/gmerlin_visualizer_slave.patch
@@ -0,0 +1,67 @@
+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
diff --git a/debian/patches/series b/debian/patches/series
index 9f54233..7d68feb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,5 @@ replace_bg_sem_h.patch
 png_set_gray.patch
 function_param_type.patch
 underlinking.patch
+gmerlin_visualizer_slave.patch
 fix_typos.patch

-- 
gmerlin packaging