Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 44

gmerlin.changes Changed

@@ -1,106 +1,10 @@
 -------------------------------------------------------------------
-Wed May 18 01:02:50 UTC 2011 - brunciter@localhost.lan
+Tue Jun 19 22:46:08 UTC 2012 - reddwarf@opensuse.org
 
-- Compile fix
+- Update to 1.2.0
 
 -------------------------------------------------------------------
-Fri Mar 10 00:00:00 UTC 2011 - detlef@links2linux.de
+Wed Sep 29 22:54:18 UTC 2010 - reddwarf@opensuse.org
 
-- update to 1.0.0
-
--------------------------------------------------------------------
-Sat Feb 27 00:00:00 UTC 2010 - toni@links2linux.de
-
-- update to 0.4.3
-
--------------------------------------------------------------------
-Thu Feb 25 00:00:00 UTC 2010 - toni@links2linux.de
-
-- update to 0.4.2
-
--------------------------------------------------------------------
-Mon Oct 19 00:00:00 UTC 2009 - toni@links2linux.de
-
-- added subpackages gavl and jack
-- renamed libgmerlin-gtk0 to libgmerlin_gtk0
-
--------------------------------------------------------------------
-Tue Sep 22 00:00:00 UTC 2009 - Manfred.Tremmel@iiv.de
-
-- update to 0.4.1
-
--------------------------------------------------------------------
-Wed Dec 17 00:00:00 UTC 2008 - toni@links2linux.de
-
-- update to 0.4.0
-
--------------------------------------------------------------------
-Tue Jul 22 00:00:00 UTC 2008 - toni@links2linux.de
-
-- update to 0.3.8
-
--------------------------------------------------------------------
-Wed Jan  9 00:00:00 UTC 2008 - toni@links2linux.de
-
-- update to 0.3.7
-- added pulseaudio subpackage for pulseaudio plugin
-- using fdupes for openSUSE-10.3
-- changed package layout according Shared Library Packaging Policy
-
--------------------------------------------------------------------
-Fri May 11 00:00:00 UTC 2007 - toni@links2linux.de
-
-- update to 0.3.6
-- added subpackages: audiofilters, videofilters, kbd
-- disabled subpackage gmerlin-lqt (libquicktime)
-
--------------------------------------------------------------------
-Fri Dec 29 00:00:00 UTC 2006 - toni@links2linux.de
-
-- build SuSE-10.2
-- enabled subpackage gmerlin-lqt (libquicktime)
-
--------------------------------------------------------------------
-Sat Dec  9 00:00:00 UTC 2006 - toni@links2linux.de
-
-- update to 0.3.5
-- removed */plugins/*.la
-
--------------------------------------------------------------------
-Fri Sep 22 00:00:00 UTC 2006 - toni@links2linux.de
-
-- corrections in spec
-
--------------------------------------------------------------------
-Tue Sep 19 00:00:00 UTC 2006 - toni@links2linux.de
-
-- build for packman
-- gmerlin-lqt is hardcoded deactivated, because of the packmanrobot.py script!
-
--------------------------------------------------------------------
-Sun Aug  6 00:00:00 UTC 2006 - oc2pus@arcor.de - 0.3.4-0.oc2pus.2
-
-- fixed gmerlin-alsa
-
--------------------------------------------------------------------
-Wed Jul 12 00:00:00 UTC 2006 - oc2pus@arcor.de - 0.3.4-0.oc2pus.1
-
-- update to 0.3.4
-- added gmerlin-mikmod, gmerlin-subtext, gmerlin-postprocess, gmerlin-OSD
-
--------------------------------------------------------------------
-Wed Apr 12 00:00:00 UTC 2006 - oc2pus@arcor.de - 0.3.3-0.oc2pus.2
-
-- corrected directory rights
-
--------------------------------------------------------------------
-Sat Feb  4 00:00:00 UTC 2006 - oc2pus@arcor.de - 0.3.3-0.oc2pus.1
-
-- update to 0.3.3
-- disabled gmerlin-lqt
-
--------------------------------------------------------------------
-Fri Nov 18 00:00:00 UTC 2005 - oc2pus@arcor.de - 0.3.2-0.oc2pus.1
-
-- initial version 0.3.2
+- Initial package

gmerlin.spec Changed

@@ -1,768 +1,319 @@
-BuildRequires:	-post-build-checks
-
-# Copyright (c) 2005-2010 oc2pus
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
-#
-# Please submit bugfixes or comments to toni@links2linux.de
-
-# norootforbuild
-
-%define _prefix			/usr
-%define _gavl_version	1.1.2
-%define _SOnr			0
-
-Summary:		Base library for gmerlin applications
-Name:			gmerlin
-Version:		1.0.0
-Release:		1
-License:		GPL
-Group:			Development/Libraries/C and C++
-Source0:		%{name}-%{version}.tar.gz
-Source90:		%{name}-rpmlintrc
-Patch:			%{name}-configure.ac.diff
-Patch0:         gmerlin.compile.patch
-%if %suse_version > 1140
-Patch1:         ld_build_fix.patch
-%endif
-# PATCH-FIX-OPENSUSE gmerlin-1.0.0-icon_link.patch reddwarf@opensuse.org -- Fix icon symlinks
-Patch2:		gmerlin-1.0.0-icon_link.patch
-URL:			http://gmerlin.sourceforge.net/
-PreReq:			%install_info_prereq
-BuildRequires:	alsa-devel >= 1.0.0
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	doxygen
-BuildRequires:	esound-devel >= 0.2.19
-BuildRequires:	fdupes
-BuildRequires:	freetype2-devel
-BuildRequires:	gcc-c++
-BuildRequires:	gtk2-devel >= 2.8
-BuildRequires:	libcddb-devel >= 1.2
-BuildRequires:	libcdio-devel >= 0.75
-BuildRequires:	libgavl-devel >= %{_gavl_version}
-BuildRequires:	libjpeg-devel >= 6b
-BuildRequires:	libmusicbrainz-devel >= 2.0.2
-BuildRequires:	libpng-devel >= 1.2.2
-BuildRequires:	libsndfile-devel
-BuildRequires:	libpulse-devel
-BuildRequires:	libquicktime-devel >= 1.0
-BuildRequires:	libtheora-devel
-BuildRequires:	libtiff-devel >= 3.5.0
-BuildRequires:	libv4l-devel
-BuildRequires:	libvisual-devel >= 0.4.0
-BuildRequires:	libxml2-devel >= 2.4.0
-BuildRequires:	mjpegtools-devel
-BuildRequires:  libjack-devel
-BuildRequires:	update-desktop-files
-%if %suse_version > 1140
-BuildRequires:  Mesa-devel
-%endif
-BuildRoot:		%{_tmppath}/%{name}-%{version}-build
-
-%description
-Base library for gmerlin applications.
-
-#
-# gmerlin shared libs
-#
-%package -n libgmerlin%{_SOnr}
-Summary:	Shared libraries for gmerlin
-Group:		System/Libraries
-
-%description -n libgmerlin%{_SOnr}
-Shared libraries for package gmerlin.
-
-#
-# libgmerlin-devel
-#
-%package -n libgmerlin-devel
-Summary:	Header files for compiling gmerlin applications and plugins
-Group:		Development/Libraries/C and C++
-Requires:	freetype2-devel
-Requires:	gtk2-devel >= 2.8
-Requires:	libcddb-devel >= 1.2
-#Requires:	libcdio-devel >= 0.75
-Requires:	libgavl-devel >= %{_gavl_version}
-Requires:	libgmerlin%{_SOnr} = %{version}
-Requires:	libjpeg-devel >= 6b
-Requires:	libmusicbrainz-devel >= 2.0.2
-Requires:	libpng-devel >= 1.2.2
-Requires:	libsndfile-devel
-Requires:	libpulse-devel
-Requires:	libquicktime-devel >= 1.0
-Requires:	libtheora-devel
-Requires:	libtiff-devel >= 3.5.0
-Requires:	libv4l-devel
-Requires:	libvisual-devel >= 0.4.0
-Requires:	libxml2-devel >= 2.4.0
-Provides:	gmerlin-devel = 0.3.6
-Obsoletes:	gmerlin-devel < 0.3.6
-
-%description -n libgmerlin-devel
-Header files for compiling gmerlin applications and plugins.
-
-#
-# gmerlin-gtk
-#
-%package -n libgmerlin_gtk%{_SOnr}
-Summary:	Gtk support library for gmerlin
-Group:	    System/Libraries
-Requires:	gtk2 >= 2.8
-Requires:	libgmerlin%{_SOnr} = %{version}
-Provides:	gmerlin-gtk = 0.3.6
-Obsoletes:	gmerlin-gtk < 0.3.6
-Provides:	libgmerlin-gtk0 = 0.4.1
-Obsoletes:	libgmerlin-gtk0 < 0.4.1
-
-%description -n libgmerlin_gtk%{_SOnr}
-Gtk support library for package gmerlin.
-
-#
-# gmerlin-gtk-devel
-#
-%package -n libgmerlin-gtk-devel
-Summary:	Header files for compiling gmerlin gtk applications
-Group:	    Development/Libraries/C and C++
-Requires:	gtk2-devel >= 2.8
-Requires:	libgmerlin-devel = %{version}
-Requires:	libgmerlin_gtk%{_SOnr} = %{version}
-Provides:	gmerlin-gtk-devel = 0.3.6
-Obsoletes:	gmerlin-gtk-devel < 0.3.6
-
-%description -n libgmerlin-gtk-devel
-Header files for compiling gmerlin gtk applications.
-
-#
-# Libquicktime
-#
-%package lqt
-Summary:	Libquicktime plugins for gmerlin
-Group:		Productivity/Multimedia/Other
-Provides:	%{name}-input-plugin
-
-%description lqt
-Libquicktime plugins for gmerlin (see http://libquicktime.sf.net)
-
-#
-# Alsa
-#
-%package alsa
-Summary:	Alsa plugins for gmerlin
-Group:		Productivity/Multimedia/Sound/Utilities
-Requires:	alsa >= 1.0.0
-Provides:	%{name}-soundcard-plugin
-
-%description alsa
-Alsa plugins for gmerlin (see http://alsa-project.org)
-
-
-#
-# Pulseaudio
 #
-%package pulseaudio
-Summary:	Pulseaudio plugins for gmerlin
-Group:		Productivity/Multimedia/Sound/Utilities
-Provides:	%{name}-soundcard-plugin
-
-%description pulseaudio
-Pulseaudio plugins for package gmerlin.
-
-#
-# Jpeg
-#
-%package jpeg
-Summary:	Jpeg plugins for gmerlin
-Group:		Productivity/Graphics/Other
-Provides:	%{name}-image-reader-plugin
-Provides:	%{name}-image-writer-plugin
-
-%description jpeg
-Jpeg plugins for package gmerlin.
-
-#
-# PNG
-#
-%package png
-Summary:	PNG plugins for gmerlin
-Group:		Productivity/Graphics/Other
-Provides:	%{name}-image-reader-plugin
-Provides:	%{name}-image-writer-plugin
-
-%description png
-PNG plugins for package gmerlin.
-
-#
-# TIFF
-#
-%package tiff
-Summary:	Tiff plugins for gmerlin

gmerlin-1.0.0-desktop_files.patch Added

@@ -0,0 +1,64 @@
+Index: apps/plugincfg/gmerlin-plugincfg.desktop
+===================================================================
+--- apps/plugincfg/gmerlin-plugincfg.desktop.orig
++++ apps/plugincfg/gmerlin-plugincfg.desktop
+@@ -6,4 +6,4 @@ Comment[de]=Gmerlin Plugins konfiguriere
+ Exec=gmerlin_plugincfg
+ Icon=gmerlin-plugincfg
+ Type=Application
+-Categories=Audio
++Categories=Utility;Settings;
+Index: apps/recorder/gmerlin-recorder.desktop
+===================================================================
+--- apps/recorder/gmerlin-recorder.desktop.orig
++++ apps/recorder/gmerlin-recorder.desktop
+@@ -1,11 +1,9 @@
+ [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;
+-
++Categories=AudioVideo;Recorder;
+Index: apps/transcoder/gmerlin-transcoder.desktop
+===================================================================
+--- apps/transcoder/gmerlin-transcoder.desktop.orig
++++ apps/transcoder/gmerlin-transcoder.desktop
+@@ -1,11 +1,9 @@
+ [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;
+-
++Categories=AudioVideo;AudioVideoEditing;
+Index: apps/visualizer/gmerlin-visualizer.desktop
+===================================================================
+--- apps/visualizer/gmerlin-visualizer.desktop.orig
++++ apps/visualizer/gmerlin-visualizer.desktop
+@@ -1,11 +1,9 @@
+ [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;
+-
++Categories=AudioVideo;Player;

gmerlin-1.0.0-icon_link.patch Changed

gmerlin-1.2.0-cdio.patch Added

@@ -0,0 +1,91 @@
+Index: plugins/cdaudio/cdtext.c
+===================================================================
+--- plugins/cdaudio/cdtext.c.orig
++++ plugins/cdaudio/cdtext.c
+@@ -34,7 +34,7 @@
+ #include "cdaudio.h"
+ 
+ #define GET_FIELD(dst, key) \
+-  field = cdtext_get_const(key, cdtext);
++  field = cdtext_get_const(cdtext, key, i+1);
+ 
+ #define GET_FIELD_DEFAULT(dst,key)                                      \
+   field = cdtext_get_const(key, cdtext);                                \
+@@ -64,30 +64,26 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+ 
+   /* Get information for the whole disc */
+   
+-  cdtext = cdio_get_cdtext (cdio, 0);
++  cdtext = cdio_get_cdtext (cdio);
+ 
+   if(!cdtext)
+     return 0;
+   
+-  artist  = cdtext_get_const(CDTEXT_PERFORMER, cdtext);
+-  author  = cdtext_get_const(CDTEXT_COMPOSER, cdtext); /* Composer overwrites songwriter */
++  artist  = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, 0);
++  author  = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, 0); /* Composer overwrites songwriter */
+ 
+   if(!author)
+-    author  = cdtext_get_const(CDTEXT_SONGWRITER, cdtext);
++    author  = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, 0);
+   
+-  album  = cdtext_get_const(CDTEXT_TITLE, cdtext);
+-  genre  = cdtext_get_const(CDTEXT_GENRE, cdtext);
+-  comment  = cdtext_get_const(CDTEXT_MESSAGE, cdtext);
++  album  = cdtext_get_const(cdtext, CDTEXT_FIELD_TITLE, 0);
++  genre  = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, 0);
++  comment  = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, 0);
+   
+   for(i = 0; i < idx->num_tracks; i++)
+     {
+     if(idx->tracks[i].is_audio)
+       {
+-      cdtext = cdio_get_cdtext (cdio, i+1);
+-      if(!cdtext)
+-        return 0;
+-      
+-      GET_FIELD(title, CDTEXT_TITLE);
++      GET_FIELD(title, CDTEXT_FIELD_TITLE);
+       
+       if(!title)
+         return 0;
+@@ -95,7 +91,7 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+       gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                         GAVL_META_TITLE, title);
+ 
+-      if((field = cdtext_get_const(CDTEXT_PERFORMER, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_PERFORMER, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_ARTIST, field);
+       else
+@@ -103,10 +99,10 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+                           GAVL_META_ARTIST, artist);
+ 
+ 
+-      if((field = cdtext_get_const(CDTEXT_COMPOSER, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_COMPOSER, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_AUTHOR, field);
+-      else if((field = cdtext_get_const(CDTEXT_SONGWRITER, cdtext)))
++      else if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_SONGWRITER, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_AUTHOR, field);
+       else if(author)
+@@ -114,14 +110,14 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+                           GAVL_META_AUTHOR, author);
+ 
+ 
+-      if((field = cdtext_get_const(CDTEXT_GENRE, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_GENRE, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_GENRE, field);
+       else
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_GENRE, genre);
+ 
+-      if((field = cdtext_get_const(CDTEXT_MESSAGE, cdtext)))
++      if((field = cdtext_get_const(cdtext, CDTEXT_FIELD_MESSAGE, i+1)))
+         gavl_metadata_set(&info[idx->tracks[i].index].metadata,
+                           GAVL_META_COMMENT, field);
+       else

gmerlin-1.2.0-underlinking.patch Added

@@ -0,0 +1,363 @@
+Index: lib/Makefile.am
+===================================================================
+--- lib/Makefile.am.orig
++++ lib/Makefile.am
+@@ -49,7 +49,7 @@ libgmerlin_la_LIBADD = $(x11_libadd) @FO
+ bin_PROGRAMS = gmerlin_visualizer_slave
+ 
+ gmerlin_visualizer_slave_SOURCES = visualize_slave.c
+-gmerlin_visualizer_slave_LDADD = libgmerlin.la
++gmerlin_visualizer_slave_LDADD = libgmerlin.la -ldl -lpthread
+ 
+ lib_LTLIBRARIES = libgmerlin.la
+ libgmerlin_la_SOURCES = \
+Index: lib/Makefile.in
+===================================================================
+--- lib/Makefile.in.orig
++++ lib/Makefile.in
+@@ -427,7 +427,7 @@ $(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
+ gmerlin_visualizer_slave_SOURCES = visualize_slave.c
+-gmerlin_visualizer_slave_LDADD = libgmerlin.la
++gmerlin_visualizer_slave_LDADD = libgmerlin.la -ldl -lpthread
+ lib_LTLIBRARIES = libgmerlin.la
+ libgmerlin_la_SOURCES = \
+ $(lv_sources) \
+Index: tests/Makefile.am
+===================================================================
+--- tests/Makefile.am.orig
++++ tests/Makefile.am
+@@ -130,7 +130,7 @@ chapter_SOURCES = chapter.c
+ chapter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ 
+ vumeter_SOURCES = vumeter.c
+-vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
+ 
+ 
+ v4ltest_SOURCES = v4ltest.c
+@@ -143,7 +143,7 @@ visualization_SOURCES = visualization.c
+ visualization_LDADD = ../lib/libgmerlin.la
+ 
+ scrolltext_SOURCES = scrolltext.c
+-scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
+ 
+ question_SOURCES = question.c
+ question_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+@@ -155,7 +155,7 @@ message_SOURCES = message.c
+ message_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ 
+ playtree_SOURCES = playtree.c
+-playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
+ 
+ server_SOURCES = server.c
+ server_LDADD = ../lib/libgmerlin.la
+Index: tests/Makefile.in
+===================================================================
+--- tests/Makefile.in.orig
++++ tests/Makefile.in
+@@ -504,7 +504,7 @@ cfgtest_LDADD = ../lib/libgmerlin.la ../
+ chapter_SOURCES = chapter.c
+ chapter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ vumeter_SOURCES = vumeter.c
+-vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++vumeter_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
+ v4ltest_SOURCES = v4ltest.c
+ v4ltest_LDADD = ../lib/libgmerlin.la
+ v4ldump_SOURCES = v4ldump.c
+@@ -512,7 +512,7 @@ v4ldump_LDADD = ../lib/libgmerlin.la
+ visualization_SOURCES = visualization.c
+ visualization_LDADD = ../lib/libgmerlin.la
+ scrolltext_SOURCES = scrolltext.c
+-scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++scrolltext_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
+ question_SOURCES = question.c
+ question_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ auth_SOURCES = auth.c
+@@ -520,7 +520,7 @@ auth_LDADD = ../lib/libgmerlin.la ../lib
+ message_SOURCES = message.c
+ message_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
+ playtree_SOURCES = playtree.c
+-playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la
++playtree_LDADD = ../lib/libgmerlin.la ../lib/gtk/libgmerlin_gtk.la @GTK_LIBS@
+ server_SOURCES = server.c
+ server_LDADD = ../lib/libgmerlin.la
+ client_SOURCES = client.c
+Index: apps/player/Makefile.am
+===================================================================
+--- apps/player/Makefile.am.orig
++++ apps/player/Makefile.am
+@@ -38,7 +38,7 @@ gmerlin.h \
+ player_remote.h \
+ playerwindow.h
+ 
+-gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@
++gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@ @GTK_LIBS@
+ gmerlin_remote_LDADD = $(top_builddir)/lib/libgmerlin.la
+ 
+ EXTRA_DIST = gmerlin_launcher gmerlin-player.desktop
+Index: apps/player/Makefile.in
+===================================================================
+--- apps/player/Makefile.in.orig
++++ apps/player/Makefile.in
+@@ -361,7 +361,7 @@ gmerlin.h \
+ player_remote.h \
+ playerwindow.h
+ 
+-gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@
++gmerlin_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @XML2_LIBS@ @GTK_LIBS@
+ gmerlin_remote_LDADD = $(top_builddir)/lib/libgmerlin.la
+ EXTRA_DIST = gmerlin_launcher gmerlin-player.desktop
+ all: all-am
+Index: apps/plugincfg/Makefile.am
+===================================================================
+--- apps/plugincfg/Makefile.am.orig
++++ apps/plugincfg/Makefile.am
+@@ -18,6 +18,6 @@ Desktop_DATA = gmerlin-plugincfg.desktop
+ gmerlin_plugincfg_SOURCES = gmerlin_plugincfg.c
+ gmerlin_plugincfg_LDADD = \
+ $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
+-$(top_builddir)/lib/libgmerlin.la
++$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
+ 
+ EXTRA_DIST = gmerlin-plugincfg.desktop
+Index: apps/plugincfg/Makefile.in
+===================================================================
+--- apps/plugincfg/Makefile.in.orig
++++ apps/plugincfg/Makefile.in
+@@ -328,7 +328,7 @@ Desktop_DATA = gmerlin-plugincfg.desktop
+ gmerlin_plugincfg_SOURCES = gmerlin_plugincfg.c
+ gmerlin_plugincfg_LDADD = \
+ $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
+-$(top_builddir)/lib/libgmerlin.la
++$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
+ 
+ EXTRA_DIST = gmerlin-plugincfg.desktop
+ all: all-am
+Index: apps/alsamixer/Makefile.am
+===================================================================
+--- apps/alsamixer/Makefile.am.orig
++++ apps/alsamixer/Makefile.am
+@@ -18,7 +18,7 @@ Desktop_DATA = gmerlin-alsamixer.desktop
+ bin_PROGRAMS = gmerlin_alsamixer
+ 
+ gmerlin_alsamixer_SOURCES = card.c main.c mixer.c g_control.c g_card.c g_mixer.c
+-gmerlin_alsamixer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @ALSA_LIBS@ -lpthread
++gmerlin_alsamixer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @ALSA_LIBS@ -lpthread @GTK_LIBS@
+ 
+ noinst_HEADERS = alsamixer.h gui.h
+ 
+Index: apps/alsamixer/Makefile.in
+===================================================================
+--- apps/alsamixer/Makefile.in.orig
++++ apps/alsamixer/Makefile.in
+@@ -331,7 +331,7 @@ AM_CFLAGS = \
+ Desktopdir = $(datadir)/applications
+ Desktop_DATA = gmerlin-alsamixer.desktop
+ gmerlin_alsamixer_SOURCES = card.c main.c mixer.c g_control.c g_card.c g_mixer.c
+-gmerlin_alsamixer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @ALSA_LIBS@ -lpthread
++gmerlin_alsamixer_LDADD = $(top_builddir)/lib/libgmerlin.la $(top_builddir)/lib/gtk/libgmerlin_gtk.la @ALSA_LIBS@ -lpthread @GTK_LIBS@
+ noinst_HEADERS = alsamixer.h gui.h
+ EXTRA_DIST = gmerlin-alsamixer.desktop
+ all: all-am
+Index: apps/recorder/Makefile.am
+===================================================================
+--- apps/recorder/Makefile.am.orig
++++ apps/recorder/Makefile.am
+@@ -20,7 +20,7 @@ gmerlin_recorder_SOURCES = gmerlin_recor
+ 
+ gmerlin_recorder_LDADD = \
+ $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
+-$(top_builddir)/lib/libgmerlin.la
++$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
+ 
+ noinst_HEADERS = recorder_window.h
+ 
+Index: apps/recorder/Makefile.in
+===================================================================
+--- apps/recorder/Makefile.in.orig
++++ apps/recorder/Makefile.in
+@@ -332,7 +332,7 @@ Desktop_DATA = gmerlin-recorder.desktop
+ gmerlin_recorder_SOURCES = gmerlin_recorder.c recorder_window.c
+ gmerlin_recorder_LDADD = \
+ $(top_builddir)/lib/gtk/libgmerlin_gtk.la \
+-$(top_builddir)/lib/libgmerlin.la
++$(top_builddir)/lib/libgmerlin.la @GTK_LIBS@
+ 
+ noinst_HEADERS = recorder_window.h
+ EXTRA_DIST = gmerlin-recorder.desktop
+Index: apps/transcoder/Makefile.am
+===================================================================
+--- apps/transcoder/Makefile.am.orig
++++ apps/transcoder/Makefile.am
+@@ -28,7 +28,7 @@ gmerlin_transcoder_remote_SOURCES = gmer
+ 
+ gmerlin_transcoder_LDADD = \
+ $(top_builddir)/lib/gtk/libgmerlin_gtk.la \

gmerlin-configure.ac.diff Deleted

gmerlin.compile.patch Deleted

ld_build_fix.patch Deleted

@@ -1,284 +0,0 @@
-diff -urB gmerlin-1.0.0/apps/player/Makefile.in new/apps/player/Makefile.in
---- gmerlin-1.0.0/apps/player/Makefile.in	2011-01-08 01:50:09.000000000 +0100
-+++ new/apps/player/Makefile.in	2011-10-19 14:40:18.371750731 +0200
-@@ -439,10 +439,10 @@
- 	rm -f $$list
- gmerlin$(EXEEXT): $(gmerlin_OBJECTS) $(gmerlin_DEPENDENCIES) 
- 	@rm -f gmerlin$(EXEEXT)
--	$(LINK) $(gmerlin_OBJECTS) $(gmerlin_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_OBJECTS) $(gmerlin_LDADD) $(LIBS) -lxml2 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lgdk_pixbuf-2.0
- gmerlin_remote$(EXEEXT): $(gmerlin_remote_OBJECTS) $(gmerlin_remote_DEPENDENCIES) 
- 	@rm -f gmerlin_remote$(EXEEXT)
--	$(LINK) $(gmerlin_remote_OBJECTS) $(gmerlin_remote_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_remote_OBJECTS) $(gmerlin_remote_LDADD) $(LIBS) -lxml2 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lgdk_pixbuf-2.0
- install-binSCRIPTS: $(bin_SCRIPTS)
- 	@$(NORMAL_INSTALL)
- 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-diff -urB gmerlin-1.0.0/apps/plugincfg/Makefile.in new/apps/plugincfg/Makefile.in
---- gmerlin-1.0.0/apps/plugincfg/Makefile.in	2011-01-08 01:50:09.000000000 +0100
-+++ new/apps/plugincfg/Makefile.in	2011-10-19 15:13:31.668847201 +0200
-@@ -406,7 +406,7 @@
- 	rm -f $$list
- gmerlin_plugincfg$(EXEEXT): $(gmerlin_plugincfg_OBJECTS) $(gmerlin_plugincfg_DEPENDENCIES) 
- 	@rm -f gmerlin_plugincfg$(EXEEXT)
--	$(LINK) $(gmerlin_plugincfg_OBJECTS) $(gmerlin_plugincfg_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_plugincfg_OBJECTS) $(gmerlin_plugincfg_LDADD) $(LIBS) -lxml2 -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lgdk_pixbuf-2.0
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-diff -urB gmerlin-1.0.0/lib/Makefile.am new/lib/Makefile.am
---- gmerlin-1.0.0/lib/Makefile.am	2010-09-30 15:59:04.000000000 +0200
-+++ new/lib/Makefile.am	2011-10-19 14:39:55.748749636 +0200
-@@ -44,7 +44,7 @@
- 
- 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
-+libgmerlin_la_LIBADD = $(x11_libadd) @FONTCONFIG_LIBS@ @FREETYPE_LIBS@ @XML2_LIBS@ @ICONV_LIBS@ @LIBINTL@ $(lv_libs) -ldl -lpthread -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- 
- bin_PROGRAMS = gmerlin_visualizer_slave
- 
-diff -urB gmerlin-1.0.0/lib/Makefile.in new/lib/Makefile.in
---- gmerlin-1.0.0/lib/Makefile.in	2011-01-08 01:50:10.000000000 +0100
-+++ new/lib/Makefile.in	2011-10-19 14:39:55.749749637 +0200
-@@ -614,7 +614,7 @@
- 	rm -f $$list
- gmerlin_visualizer_slave$(EXEEXT): $(gmerlin_visualizer_slave_OBJECTS) $(gmerlin_visualizer_slave_DEPENDENCIES) 
- 	@rm -f gmerlin_visualizer_slave$(EXEEXT)
--	$(LINK) $(gmerlin_visualizer_slave_OBJECTS) $(gmerlin_visualizer_slave_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_visualizer_slave_OBJECTS) $(gmerlin_visualizer_slave_LDADD) $(LIBS) -lpthread -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-diff -urB gmerlin-1.0.0/tests/Makefile.in new/tests/Makefile.in
---- gmerlin-1.0.0/tests/Makefile.in	2011-01-08 01:50:12.000000000 +0100
-+++ new/tests/Makefile.in	2011-10-19 14:39:55.750749638 +0200
-@@ -590,94 +590,94 @@
- 	rm -f $$list
- audioplayer1$(EXEEXT): $(audioplayer1_OBJECTS) $(audioplayer1_DEPENDENCIES) 
- 	@rm -f audioplayer1$(EXEEXT)
--	$(LINK) $(audioplayer1_OBJECTS) $(audioplayer1_LDADD) $(LIBS)
-+	$(LINK) $(audioplayer1_OBJECTS) $(audioplayer1_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- auth$(EXEEXT): $(auth_OBJECTS) $(auth_DEPENDENCIES) 
- 	@rm -f auth$(EXEEXT)
--	$(LINK) $(auth_OBJECTS) $(auth_LDADD) $(LIBS)
-+	$(LINK) $(auth_OBJECTS) $(auth_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- cfgtest$(EXEEXT): $(cfgtest_OBJECTS) $(cfgtest_DEPENDENCIES) 
- 	@rm -f cfgtest$(EXEEXT)
--	$(LINK) $(cfgtest_OBJECTS) $(cfgtest_LDADD) $(LIBS)
-+	$(LINK) $(cfgtest_OBJECTS) $(cfgtest_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- chapter$(EXEEXT): $(chapter_OBJECTS) $(chapter_DEPENDENCIES) 
- 	@rm -f chapter$(EXEEXT)
--	$(LINK) $(chapter_OBJECTS) $(chapter_LDADD) $(LIBS)
-+	$(LINK) $(chapter_OBJECTS) $(chapter_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- client$(EXEEXT): $(client_OBJECTS) $(client_DEPENDENCIES) 
- 	@rm -f client$(EXEEXT)
--	$(LINK) $(client_OBJECTS) $(client_LDADD) $(LIBS)
-+	$(LINK) $(client_OBJECTS) $(client_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- dump_plugins$(EXEEXT): $(dump_plugins_OBJECTS) $(dump_plugins_DEPENDENCIES) 
- 	@rm -f dump_plugins$(EXEEXT)
--	$(LINK) $(dump_plugins_OBJECTS) $(dump_plugins_LDADD) $(LIBS)
-+	$(LINK) $(dump_plugins_OBJECTS) $(dump_plugins_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- extractchannel$(EXEEXT): $(extractchannel_OBJECTS) $(extractchannel_DEPENDENCIES) 
- 	@rm -f extractchannel$(EXEEXT)
--	$(LINK) $(extractchannel_OBJECTS) $(extractchannel_LDADD) $(LIBS)
-+	$(LINK) $(extractchannel_OBJECTS) $(extractchannel_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- fvtest$(EXEEXT): $(fvtest_OBJECTS) $(fvtest_DEPENDENCIES) 
- 	@rm -f fvtest$(EXEEXT)
--	$(LINK) $(fvtest_OBJECTS) $(fvtest_LDADD) $(LIBS)
-+	$(LINK) $(fvtest_OBJECTS) $(fvtest_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- gmerlin_imgconvert$(EXEEXT): $(gmerlin_imgconvert_OBJECTS) $(gmerlin_imgconvert_DEPENDENCIES) 
- 	@rm -f gmerlin_imgconvert$(EXEEXT)
--	$(LINK) $(gmerlin_imgconvert_OBJECTS) $(gmerlin_imgconvert_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_imgconvert_OBJECTS) $(gmerlin_imgconvert_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- gmerlin_imgdiff$(EXEEXT): $(gmerlin_imgdiff_OBJECTS) $(gmerlin_imgdiff_DEPENDENCIES) 
- 	@rm -f gmerlin_imgdiff$(EXEEXT)
--	$(LINK) $(gmerlin_imgdiff_OBJECTS) $(gmerlin_imgdiff_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_imgdiff_OBJECTS) $(gmerlin_imgdiff_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- gmerlin_psnr$(EXEEXT): $(gmerlin_psnr_OBJECTS) $(gmerlin_psnr_DEPENDENCIES) 
- 	@rm -f gmerlin_psnr$(EXEEXT)
--	$(LINK) $(gmerlin_psnr_OBJECTS) $(gmerlin_psnr_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_psnr_OBJECTS) $(gmerlin_psnr_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- gmerlin_ssim$(EXEEXT): $(gmerlin_ssim_OBJECTS) $(gmerlin_ssim_DEPENDENCIES) 
- 	@rm -f gmerlin_ssim$(EXEEXT)
--	$(LINK) $(gmerlin_ssim_OBJECTS) $(gmerlin_ssim_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_ssim_OBJECTS) $(gmerlin_ssim_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- gmerlin_vanalyze$(EXEEXT): $(gmerlin_vanalyze_OBJECTS) $(gmerlin_vanalyze_DEPENDENCIES) 
- 	@rm -f gmerlin_vanalyze$(EXEEXT)
--	$(LINK) $(gmerlin_vanalyze_OBJECTS) $(gmerlin_vanalyze_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_vanalyze_OBJECTS) $(gmerlin_vanalyze_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- gmerlin_visualize$(EXEEXT): $(gmerlin_visualize_OBJECTS) $(gmerlin_visualize_DEPENDENCIES) 
- 	@rm -f gmerlin_visualize$(EXEEXT)
--	$(LINK) $(gmerlin_visualize_OBJECTS) $(gmerlin_visualize_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_visualize_OBJECTS) $(gmerlin_visualize_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- gmerlin_vpsnr$(EXEEXT): $(gmerlin_vpsnr_OBJECTS) $(gmerlin_vpsnr_DEPENDENCIES) 
- 	@rm -f gmerlin_vpsnr$(EXEEXT)
--	$(LINK) $(gmerlin_vpsnr_OBJECTS) $(gmerlin_vpsnr_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_vpsnr_OBJECTS) $(gmerlin_vpsnr_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- insertchannel$(EXEEXT): $(insertchannel_OBJECTS) $(insertchannel_DEPENDENCIES) 
- 	@rm -f insertchannel$(EXEEXT)
--	$(LINK) $(insertchannel_OBJECTS) $(insertchannel_LDADD) $(LIBS)
-+	$(LINK) $(insertchannel_OBJECTS) $(insertchannel_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- ladspa$(EXEEXT): $(ladspa_OBJECTS) $(ladspa_DEPENDENCIES) 
- 	@rm -f ladspa$(EXEEXT)
--	$(LINK) $(ladspa_OBJECTS) $(ladspa_LDADD) $(LIBS)
-+	$(LINK) $(ladspa_OBJECTS) $(ladspa_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- message$(EXEEXT): $(message_OBJECTS) $(message_DEPENDENCIES) 
- 	@rm -f message$(EXEEXT)
--	$(LINK) $(message_OBJECTS) $(message_LDADD) $(LIBS)
-+	$(LINK) $(message_OBJECTS) $(message_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- msgtest$(EXEEXT): $(msgtest_OBJECTS) $(msgtest_DEPENDENCIES) 
- 	@rm -f msgtest$(EXEEXT)
--	$(LINK) $(msgtest_OBJECTS) $(msgtest_LDADD) $(LIBS)
-+	$(LINK) $(msgtest_OBJECTS) $(msgtest_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- playtree$(EXEEXT): $(playtree_OBJECTS) $(playtree_DEPENDENCIES) 
- 	@rm -f playtree$(EXEEXT)
--	$(LINK) $(playtree_OBJECTS) $(playtree_LDADD) $(LIBS)
-+	$(LINK) $(playtree_OBJECTS) $(playtree_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lxml2
- question$(EXEEXT): $(question_OBJECTS) $(question_DEPENDENCIES) 
- 	@rm -f question$(EXEEXT)
--	$(LINK) $(question_OBJECTS) $(question_LDADD) $(LIBS)
-+	$(LINK) $(question_OBJECTS) $(question_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- scrolltext$(EXEEXT): $(scrolltext_OBJECTS) $(scrolltext_DEPENDENCIES) 
- 	@rm -f scrolltext$(EXEEXT)
--	$(LINK) $(scrolltext_OBJECTS) $(scrolltext_LDADD) $(LIBS)
-+	$(LINK) $(scrolltext_OBJECTS) $(scrolltext_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- server$(EXEEXT): $(server_OBJECTS) $(server_DEPENDENCIES) 
- 	@rm -f server$(EXEEXT)
--	$(LINK) $(server_OBJECTS) $(server_LDADD) $(LIBS)
-+	$(LINK) $(server_OBJECTS) $(server_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- textrenderer$(EXEEXT): $(textrenderer_OBJECTS) $(textrenderer_DEPENDENCIES) 
- 	@rm -f textrenderer$(EXEEXT)
--	$(LINK) $(textrenderer_OBJECTS) $(textrenderer_LDADD) $(LIBS)
-+	$(LINK) $(textrenderer_OBJECTS) $(textrenderer_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- thumbnail$(EXEEXT): $(thumbnail_OBJECTS) $(thumbnail_DEPENDENCIES) 
- 	@rm -f thumbnail$(EXEEXT)
--	$(LINK) $(thumbnail_OBJECTS) $(thumbnail_LDADD) $(LIBS)
-+	$(LINK) $(thumbnail_OBJECTS) $(thumbnail_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- v4ldump$(EXEEXT): $(v4ldump_OBJECTS) $(v4ldump_DEPENDENCIES) 
- 	@rm -f v4ldump$(EXEEXT)
--	$(LINK) $(v4ldump_OBJECTS) $(v4ldump_LDADD) $(LIBS)
-+	$(LINK) $(v4ldump_OBJECTS) $(v4ldump_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- v4ltest$(EXEEXT): $(v4ltest_OBJECTS) $(v4ltest_DEPENDENCIES) 
- 	@rm -f v4ltest$(EXEEXT)
--	$(LINK) $(v4ltest_OBJECTS) $(v4ltest_LDADD) $(LIBS)
-+	$(LINK) $(v4ltest_OBJECTS) $(v4ltest_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- videoplayer1$(EXEEXT): $(videoplayer1_OBJECTS) $(videoplayer1_DEPENDENCIES) 
- 	@rm -f videoplayer1$(EXEEXT)
--	$(LINK) $(videoplayer1_OBJECTS) $(videoplayer1_LDADD) $(LIBS)
-+	$(LINK) $(videoplayer1_OBJECTS) $(videoplayer1_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- visualization$(EXEEXT): $(visualization_OBJECTS) $(visualization_DEPENDENCIES) 
- 	@rm -f visualization$(EXEEXT)
--	$(LINK) $(visualization_OBJECTS) $(visualization_LDADD) $(LIBS)
-+	$(LINK) $(visualization_OBJECTS) $(visualization_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- vumeter$(EXEEXT): $(vumeter_OBJECTS) $(vumeter_DEPENDENCIES) 
- 	@rm -f vumeter$(EXEEXT)
--	$(LINK) $(vumeter_OBJECTS) $(vumeter_LDADD) $(LIBS)
-+	$(LINK) $(vumeter_OBJECTS) $(vumeter_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-diff -urB gmerlin-1.0.0/apps/alsamixer/Makefile.in new/apps/alsamixer/Makefile.in
---- gmerlin-1.0.0/apps/alsamixer/Makefile.in	2011-01-08 01:50:09.000000000 +0100
-+++ new/apps/alsamixer/Makefile.in	2011-10-19 15:59:49.142981624 +0200
-@@ -409,7 +409,7 @@
- 	rm -f $$list
- gmerlin_alsamixer$(EXEEXT): $(gmerlin_alsamixer_OBJECTS) $(gmerlin_alsamixer_DEPENDENCIES) 
- 	@rm -f gmerlin_alsamixer$(EXEEXT)
--	$(LINK) $(gmerlin_alsamixer_OBJECTS) $(gmerlin_alsamixer_LDADD) $(LIBS)
-+	$(LINK) $(gmerlin_alsamixer_OBJECTS) $(gmerlin_alsamixer_LDADD) $(LIBS) -lgtk-x11-2.0 -lgdk-x11-2.0 -lstdc++ -lX11 -ldl -lgobject-2.0 -lglib-2.0 -lxml2
- 
- mostlyclean-compile:
- 	-rm -f *.$(OBJEXT)
-diff -urB gmerlin-1.0.0/apps/camelot/Makefile.in new/apps/camelot/Makefile.in
---- gmerlin-1.0.0/apps/camelot/Makefile.in	2011-01-08 01:50:09.000000000 +0100
-+++ new/apps/camelot/Makefile.in	2011-10-19 16:00:03.614982324 +0200
-@@ -414,7 +414,7 @@
- 	rm -f $$list
- camelot$(EXEEXT): $(camelot_OBJECTS) $(camelot_DEPENDENCIES) 
- 	@rm -f camelot$(EXEEXT)

gmerlin-1.0.0.tar.gz -> gmerlin-1.2.0.tar.gz Changed

gmerlin-rpmlintrc Deleted