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 47

gmerlin.changes Changed

@@ -1,4 +1,20 @@
 -------------------------------------------------------------------
+Wed Feb 25 08:15:40 UTC 2015 - avvissu@yandex.ru
+
+- Update to svn4256
+- Remove all patches (fixed in upstream):
+ * gmerlin-1.0.0-desktop_files.patch
+ * gmerlin-1.2.0-texinfo-5.0.patch
+ * gmerlin-1.2.0-underlinking.patch
+- Fix build error (gmerlin-4256-write_frame_jack.patch) 
+- Update to gmerlin-1.2.0-cdio.patch
+- Add BuildRequires: pkgconfig(alsa) pkgconfig(sqlite3) pkgconfig(uuid)
+- Add package gmerlin instead of gmerlin-plugins
+- Add Requires: gmerlin for all packages gmerlin-*
+- Add packages plugincfg and gavf-tools
+- Set default permission for FHS directories
+
+-------------------------------------------------------------------
 Sat Feb 21 16:29:47 UTC 2015 - avvissu@yandex.ru
 
 - Fix build on openSUSE 13.2 (gmerlin-1.2.0-texinfo-5.0.patch)
@@ -9,7 +25,7 @@
   * remove Requires: %{name} = %{version} from libgmerlin
 - Fix file-contains-date-and-time: add HTML_TIMESTAMP = NO  
 - Add %suse_update_desktop_file and %icon_theme_cache*
-- Add packages for plugins and docs 
+- Add packages for plugins and docs  
 
 -------------------------------------------------------------------
 Fri Mar 28 21:40:10 UTC 2014 - seife+obs@b1-systems.com

gmerlin.spec Changed

@@ -17,22 +17,24 @@
 
 
 %define soname 0
+%define rev     4256
+
 Name:           gmerlin
-Version:        1.2.0
+Version:        1.2.0rsvn%{rev}
 Release:        0
 Summary:        Multimedia architecture for Linux
 License:        GPL-2.0+
 Group:          System/Libraries
 Url:            http://gmerlin.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/project/gmerlin/gmerlin/%{version}/gmerlin-%{version}.tar.gz
+#svn checkout svn://svn.code.sf.net/p/gmerlin/code/trunk/gmerlin/
+Source0:        gmerlin-%{rev}.tar.gz
 # PATCH-FIX-OPENSUSE gmerlin-1.0.0-icon_link.patch reddwarf@opensuse.org -- Fix icon symlinks
 Patch0:         gmerlin-1.0.0-icon_link.patch
-# PATCH-FIX-UPSTREAM gmerlin-1.0.0-desktop_files.patch gmerlin-general_ML_2011-01-09 10:25 reddwarf@opensuse.org -- Update desktop files to current standard
-Patch1:         gmerlin-1.0.0-desktop_files.patch
+# PATCH-FIX-UPSTREAM write_frame_jack.patch avvissu@yandex.ru --  Remove cruft from the audio output API
+Patch1:         gmerlin-4256-write_frame_jack.patch
 Patch2:         gmerlin-1.2.0-cdio.patch
-Patch3:         gmerlin-1.2.0-underlinking.patch
-# PATCH-FIX-UPSTREAM texinfo-5.0.patch avvissu@yandex.ru -- Fix build with texinfo >= 5.0
-Patch4:         gmerlin-1.2.0-texinfo-5.0.patch
+BuildRequires:  autoconf
+BuildRequires:  automake
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  hicolor-icon-theme
@@ -40,6 +42,7 @@
 BuildRequires:  libmusicbrainz-devel
 BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
+BuildRequires:  libtool
 BuildRequires:  pkg-config
 BuildRequires:  texinfo
 BuildRequires:  update-desktop-files
@@ -65,27 +68,20 @@
 BuildRequires:  pkgconfig(libv4lconvert)
 BuildRequires:  pkgconfig(libvisual-0.4)
 BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(uuid)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xfixes)
 BuildRequires:  pkgconfig(xinerama)
 BuildRequires:  pkgconfig(xtst)
 BuildRequires:  pkgconfig(xv)
-Requires:       %{name}-plugins = %{version}
 Requires(post): info
 Requires(postun): info
 
 %description
 Multimedia architecture consisting of libraries and applications.
 
-%package        plugins
-Summary:        Gmerlin plugins
-Group:          Productivity/Multimedia/Other
-Requires:       lib%{name}%{soname} = %{version}
-
-%description plugins
-Plugins for gmerlin applications.
-
-%package -n libgmerlin%{soname}
+%package -n 	libgmerlin%{soname}
 Summary:        Base library for gmerlin applications
 Group:          System/Libraries
 
@@ -93,7 +89,7 @@
 This package contain the library needed to run a programs compiled
 using libgmerlin.
 
-%package -n libgmerlin-devel
+%package -n 	libgmerlin-devel
 Summary:        Development files for gmerlin
 Group:          Development/Libraries/C and C++
 Requires:       libgmerlin%{soname} = %{version}
@@ -101,7 +97,7 @@
 %description -n libgmerlin-devel
 Header files for compiling gmerlin applications and plugins.
 
-%package -n libgmerlin_gtk%{soname}
+%package -n 	libgmerlin_gtk%{soname}
 Summary:        Gtk support library for gmerlin
 Group:          System/Libraries
 
@@ -109,7 +105,7 @@
 This package contain the library needed to run a programs compiled
 using libgmerlin_gtk.
 
-%package -n libgmerlin_gtk-devel
+%package -n 	libgmerlin_gtk-devel
 Summary:        Development files for gmerlin gtk
 Group:          Development/Libraries/C and C++
 Requires:       libgmerlin_gtk%{soname} = %{version}
@@ -117,64 +113,98 @@
 %description -n libgmerlin_gtk-devel
 Header files for compiling gmerlin gtk applications.
 
-%package player
+%package 		player
 Summary:        Multiformat media player
 Group:          Productivity/Multimedia/Video/Players
+Requires:       %{name} = %{version}
 
-%description player
+%description 	player
 Multiformat media player for package gmerlin.
 
-%package recorder
+%package 		plugincfg
+Summary:        Gmerlin Plugin configurator
+Group:          Productivity/Multimedia/Other
+Requires:       %{name} = %{version}
+
+%description 	plugincfg
+This program to write a command line application, which uses gmerlin plugins.
+It lets you configure all plugin options and save them at a location, where
+other applications can find them.
+
+%package 		recorder
 Summary:        Multiformat recorder
 Group:          Productivity/Multimedia/Video/Editors and Convertors
+Requires:       %{name} = %{version}
 
-%description recorder
+%description 	recorder
 Is a small application, which records audio and video from hardware devices.
 
-%package alsamixer
+%package 		alsamixer
 Summary:        Alsa mixer
 Group:          Productivity/Multimedia/Sound/Mixers
+Requires:       %{name} = %{version}
 
-%description alsamixer
+%description 	alsamixer
 This lets you configure your soundcard even if it has more than 100 controls.
 Multiple cards are supported as well.
 
-%package transcoder
+%package        gavf-tools
+Summary:        Tools for gavf multimedia format
+Group:          Productivity/Multimedia/Other
+Requires:       %{name} = %{version}
+
+%description    gavf-tools
+This package contains command line programs for work with gavf.
+gavf: A multimedia container format for gmerlin
+
+%package 		transcoder
 Summary:        Audio/Video transcoder
 Group:          Productivity/Multimedia/Video/Editors and Convertors
+Requires:       %{name} = %{version}
 
 %description transcoder
 Lets you configure the options for each track.
 
-%package visualizer
+%package 		visualizer
 Summary:        Visualization app
 Group:          Productivity/Multimedia/Other
+Requires:       %{name} = %{version}
 
-%description visualizer
+%description 	visualizer
 This program runs visualization plugins with audio coming from the soundcard.
 
-%package utils
+%package 		utils
 Summary:        Utilities for gmerlin
 Group:          Productivity/Multimedia/Other
-
-%description utils
-Utilities for package gmerlin.
-
-%package kbd
+Requires:       %{name} = %{version}
+
+%description 	utils
+This package contains command line programs:
+	* gmerlin_imgconvert - Image converter
+    * gmerlin_{imgdiff,vpsnr,ssim} - compare two images
+    * gmerlin_player - Commandline Multimedia player
+    * gmerlin-record - record audio and video from hardware devices
+	* gmerlin_vanalyze - compare two videos
+    * gmerlin-video-thumbnailer - Video thumbnailer
+    * etc
+
+%package 		kbd
 Summary:        Keyboard daemon for gmerlin
 Group:          Productivity/Multimedia/Other
+Requires:       %{name} = %{version}
 
-%description kbd
+%description 	kbd
 Keyboard daemon for package gmerlin.

gmerlin-1.0.0-desktop_files.patch Deleted

@@ -1,64 +0,0 @@
-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

@@ -1,38 +1,10 @@
-Index: icons/Makefile.am
-===================================================================
---- icons/Makefile.am.orig
-+++ icons/Makefile.am
-@@ -109,14 +109,14 @@ dist_pkgdata_DATA = $(icons)
+diff -U 3 -H -d -r -N -- gmerlin.orig/icons/Makefile.am gmerlin/icons/Makefile.am
+--- gmerlin.orig/icons/Makefile.am	2015-02-23 02:44:26.644798539 +0300
++++ gmerlin/icons/Makefile.am	2015-02-23 10:24:13.689595307 +0300
+@@ -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
-Index: icons/Makefile.in
-===================================================================
---- icons/Makefile.in.orig
-+++ icons/Makefile.in
-@@ -631,14 +631,14 @@ uninstall-am: uninstall-dist_pkgdataDATA
- 
- install-data-hook:
- 	test -z $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps || $(mkdir_p) $(DESTDIR)$(prefix)/share/icons/hicolor/48x48/apps
+ 	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

gmerlin-1.2.0-cdio.patch Changed

@@ -1,8 +1,7 @@
-Index: plugins/cdaudio/cdtext.c
-===================================================================
---- plugins/cdaudio/cdtext.c.orig
-+++ plugins/cdaudio/cdtext.c
-@@ -34,7 +34,7 @@
+diff -U 3 -H -d -r -N -- gmerlin.orig/plugins/cdaudio/cdtext.c gmerlin/plugins/cdaudio/cdtext.c
+--- gmerlin.orig/plugins/cdaudio/cdtext.c	2015-02-23 01:41:32.975585479 +0300
++++ gmerlin/plugins/cdaudio/cdtext.c	2015-02-25 02:21:21.859139216 +0300
+@@ -44,7 +44,7 @@
  #include "cdaudio.h"
  
  #define GET_FIELD(dst, key) \
@@ -11,7 +10,7 @@
  
  #define GET_FIELD_DEFAULT(dst,key)                                      \
    field = cdtext_get_const(key, cdtext);                                \
-@@ -64,30 +64,26 @@ int bg_cdaudio_get_metadata_cdtext(CdIo_
+@@ -74,30 +74,27 @@
  
    /* Get information for the whole disc */
    
@@ -44,13 +43,13 @@
 -      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_
+@@ -105,7 +102,7 @@
        gavl_metadata_set(&info[idx->tracks[i].index].metadata,
                          GAVL_META_TITLE, title);
  
@@ -59,7 +58,7 @@
          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_
+@@ -113,10 +110,10 @@
                            GAVL_META_ARTIST, artist);
  
  
@@ -72,7 +71,7 @@
          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_
+@@ -124,14 +121,14 @@
                            GAVL_META_AUTHOR, author);

gmerlin-1.2.0-texinfo-5.0.patch Deleted

gmerlin-1.2.0-underlinking.patch Deleted

@@ -1,363 +0,0 @@
-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-4256-write_frame_jack.patch Added

@@ -0,0 +1,30 @@
+diff -U 3 -H -d -r -N -- gmerlin.orig/plugins/jack/oa_jack.c gmerlin/plugins/jack/oa_jack.c
+--- gmerlin.orig/plugins/jack/oa_jack.c	2015-02-23 02:44:23.000000000 +0300
++++ gmerlin/plugins/jack/oa_jack.c	2015-02-23 09:31:25.789886541 +0300
+@@ -178,12 +178,11 @@
+   return GAVL_SINK_OK;
+   }
+ 
+-static void
+-write_frame_jack(void * p, gavl_audio_frame_t * f)
+-  {
+-  jack_t * priv = p;
+-  gavl_audio_sink_put_frame(priv->sink, f);
+-  }
++//static void write_frame_jack(void * p, gavl_audio_frame_t * f)
++//  {
++//  jack_t * priv = p;
++//  gavl_audio_sink_put_frame(priv->sink, f);
++//  }
+ 
+ static int open_jack(void * data, gavl_audio_format_t * format)
+   {
+@@ -295,7 +294,7 @@
+     .open =          open_jack,
+     .get_sink =      get_sink_jack,
+     .start =         bg_jack_start,
+-    .write_audio =   write_frame_jack,
++//    .write_audio =   write_frame_jack,
+     .stop =          bg_jack_stop,
+     .close =         close_jack,
+     .get_delay =     get_delay_jack,

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