- Add audio/marlin at version 0.7 with new USE_GSTREAMER macro.

Approved by:	pav


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3582 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 63 insertions, 0 deletions

diff --git a/audio/marlin/files/patch-marlin-marlin-channel.h b/audio/marlin/files/patch-marlin-marlin-channel.h
new file mode 100644
index 000000000..a099f3cd3
--- /dev/null
+++ b/audio/marlin/files/patch-marlin-marlin-channel.h
@@ -0,0 +1,10 @@
+--- marlin/marlin-channel.h.orig	Sat Oct 11 01:02:22 2003
++++ marlin/marlin-channel.h	Sun Nov 16 23:53:22 2003
+@@ -22,6 +22,7 @@
+ #ifndef __MARLIN_CHANNEL_H__
+ #define __MARLIN_CHANNEL_H__
+ 
++#include <sys/types.h>
+ #include <glib.h>
+ 
+ #include <marlin/marlin-types.h>
diff --git a/audio/marlin/files/patch-marlin-marlin-sample-view.c b/audio/marlin/files/patch-marlin-marlin-sample-view.c
new file mode 100644
index 000000000..4dabdf046
--- /dev/null
+++ b/audio/marlin/files/patch-marlin-marlin-sample-view.c
@@ -0,0 +1,12 @@
+--- marlin/marlin-sample-view.c.orig	Sun Aug  8 00:41:40 2004
++++ marlin/marlin-sample-view.c	Wed Aug 11 20:01:45 2004
+@@ -157,6 +157,9 @@
+ 			 guint64 new_position,
+ 			 gboolean extend_selection);
+ 
++void marlin_sample_view_vzoom_in (MarlinSampleView *view);
++void marlin_sample_view_vzoom_out (MarlinSampleView *view);
++
+ /* Stuff to register the coverage enum */
+ #define MARLIN_TYPE_COVERAGE (coverage_get_type ())
+ static GType
diff --git a/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c b/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c
new file mode 100644
index 000000000..3d8ff6e7f
--- /dev/null
+++ b/audio/marlin/files/patch-src-libegg-egg-toolbar-editor.c
@@ -0,0 +1,18 @@
+--- src/libegg/egg-toolbar-editor.c.orig	Sat Jul  3 16:37:44 2004
++++ src/libegg/egg-toolbar-editor.c	Sat Jul  3 16:38:00 2004
+@@ -102,12 +102,12 @@
+ static gint
+ compare_actions (gconstpointer a, gconstpointer b)
+ {
+-  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
+-  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+-
+   GValue value_a = { 0, }, value_b = { 0, };
+   const char *short_label_a, *short_label_b;
+   int ret;
++
++  g_return_val_if_fail (GTK_IS_ACTION (a), 0);
++  g_return_val_if_fail (GTK_IS_ACTION (b), 0);
+ 
+   g_value_init (&value_a, G_TYPE_STRING);
+   g_object_get_property (G_OBJECT (a), "short_label", &value_a);
diff --git a/audio/marlin/files/patch-src_marlin-cdda-record.c b/audio/marlin/files/patch-src_marlin-cdda-record.c
new file mode 100644
index 000000000..2420b3909
--- /dev/null
+++ b/audio/marlin/files/patch-src_marlin-cdda-record.c
@@ -0,0 +1,11 @@
+--- src/marlin-cdda-record.c.orig	Mon Nov 17 12:45:49 2003
++++ src/marlin-cdda-record.c	Mon Nov 17 12:46:17 2003
+@@ -506,7 +506,7 @@
+ 		if (res) {
+ 			if (i > 0) {
+ 				char *start_str, *finish_str, *length_str;
+-				gint64 length = time - time_count;;
++				gint64 length = time - time_count;
+ 				char *full;
+ 				
+ 				cdda->track_starts[i] = time;
diff --git a/audio/marlin/files/patch-src_marlin-window-menu.c b/audio/marlin/files/patch-src_marlin-window-menu.c
new file mode 100644
index 000000000..47139a1d8
--- /dev/null
+++ b/audio/marlin/files/patch-src_marlin-window-menu.c
@@ -0,0 +1,12 @@
+--- src/marlin-window-menu.c.orig	Thu Aug  5 12:47:19 2004
++++ src/marlin-window-menu.c	Wed Aug 11 22:06:41 2004
+@@ -634,8 +634,8 @@
+ 	GtkWidget *editor, *dialog;
+ 	EphyToolbarsModel *model;
+ 	Toolbar *toolbar;
+-	GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));;
+ 	char *xml;
++	GtkUIManager *ui_manager = marlin_window_get_menu_merge (MARLIN_WINDOW (data));;
+ 
+ 	toolbar = marlin_window_get_toolbar (MARLIN_WINDOW (data));
+ 	model = marlin_get_toolbars_model ();