- initial

Changed files:
    gmerlin-icons.patch -> 1.1
    gmerlin-info.patch -> 1.1
    gmerlin-link.patch -> 1.1

diff --git a/gmerlin-icons.patch b/gmerlin-icons.patch
new file mode 100644 (file)
index 0000000..7b01027
--- /dev/null
+++ b/gmerlin-icons.patch
@@ -0,0 +1,25 @@
+--- gmerlin-1.0.0/icons/Makefile.am.orig       2010-11-09 20:06:32.000000000 +0100
++++ gmerlin-1.0.0/icons/Makefile.am    2011-07-25 18:30:44.349550758 +0200
+@@ -109,14 +109,14 @@
+ 
+ install-data-hook:
+       test -z $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps || $(mkdir_p) $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps
+-      ln -sf $(DESTDIR)$(pkgdatadir)/mixer_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-alsamixer.png
+-      ln -sf $(DESTDIR)$(pkgdatadir)/player_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-player.png
+-      ln -sf $(DESTDIR)$(pkgdatadir)/transcoder_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-transcoder.png
+-      ln -sf $(DESTDIR)$(pkgdatadir)/camelot_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-camelot.png
+-      ln -sf $(DESTDIR)$(pkgdatadir)/kbd_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-kbd.png
+-      ln -sf $(DESTDIR)$(pkgdatadir)/plugincfg_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-plugincfg.png
+-      ln -sf $(DESTDIR)$(pkgdatadir)/recorder_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-recorder.png
+-      ln -sf $(DESTDIR)$(pkgdatadir)/visualizer_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-visualizer.png
++      ln -sf $(pkgdatadir)/mixer_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-alsamixer.png
++      ln -sf $(pkgdatadir)/player_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-player.png
++      ln -sf $(pkgdatadir)/transcoder_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-transcoder.png
++      ln -sf $(pkgdatadir)/camelot_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-camelot.png
++      ln -sf $(pkgdatadir)/kbd_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-kbd.png
++      ln -sf $(pkgdatadir)/plugincfg_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-plugincfg.png
++      ln -sf $(pkgdatadir)/recorder_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-recorder.png
++      ln -sf $(pkgdatadir)/visualizer_icon.png $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-visualizer.png
+ 
+ uninstall-local:
+       -rm -rf $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps/gmerlin-alsamixer.png

diff --git a/gmerlin-info.patch b/gmerlin-info.patch
new file mode 100644 (file)
index 0000000..ca9d214
--- /dev/null
+++ b/gmerlin-info.patch
@@ -0,0 +1,14 @@
+--- gmerlin-1.0.0/doc/gmerlin.texi.orig        2010-09-30 11:06:22.000000000 +0200
++++ gmerlin-1.0.0/doc/gmerlin.texi     2011-07-25 20:44:05.929818678 +0200
+@@ -3,9 +3,9 @@
+ @setfilename gmerlin.info
+ @include version.texi
+ @settitle Gmerlin @value{VERSION}
+-@dircategory Gmerlin
++@dircategory Miscellaneous:
+ @direntry
+-* Gmerlin: (gmerlin).           Gmerlin multimedia applications
++* Gmerlin: (gmerlin).                 Gmerlin multimedia applications
+ @end direntry
+ 
+ 

diff --git a/gmerlin-link.patch b/gmerlin-link.patch
new file mode 100644 (file)
index 0000000..5ae90fe
--- /dev/null
+++ b/gmerlin-link.patch
@@ -0,0 +1,22 @@
+--- gmerlin-1.0.0/lib/Makefile.am.orig 2010-09-30 15:59:04.000000000 +0200
++++ gmerlin-1.0.0/lib/Makefile.am      2011-07-23 10:33:40.372806341 +0200
+@@ -49,7 +49,7 @@
+ bin_PROGRAMS = gmerlin_visualizer_slave
+ 
+ gmerlin_visualizer_slave_SOURCES = visualize_slave.c
+-gmerlin_visualizer_slave_LDADD = libgmerlin.la
++gmerlin_visualizer_slave_LDADD = libgmerlin.la -lpthread -ldl
+ 
+ lib_LTLIBRARIES = libgmerlin.la
+ libgmerlin_la_SOURCES = \
+--- gmerlin-1.0.0/configure.ac.orig    2011-01-05 20:45:01.000000000 +0100
++++ gmerlin-1.0.0/configure.ac 2011-07-23 10:40:14.012819521 +0200
+@@ -154,7 +154,7 @@
+ PKG_CHECK_MODULES(FREETYPE, freetype2 >= $FREETYPE_REQUIRED, , AC_MSG_ERROR("freetype2 not found"))
+ 
+ ICONV_LIBS=
+-AC_CHECK_LIB(iconv, libiconv_close, ICONV_LIBS="-liconv")
++AC_CHECK_FUNC([iconv_close], , [AC_CHECK_LIB(iconv, libiconv_close, ICONV_LIBS="-liconv")])
+ AC_SUBST(ICONV_LIBS)
+ 
+ dnl