diff options
author | lukem <lukem> | 2001-11-27 04:12:51 +0000 |
---|---|---|
committer | lukem <lukem> | 2001-11-27 04:12:51 +0000 |
commit | a3310b0296dc0f00a5c45a7bc319b857e613eeeb (patch) | |
tree | 3a9fce81faa3a3055a364c69477f91ed08a9458c /audio/gqmpeg | |
parent | a47214a967233532dc49e1c8382e063e80a7dc65 (diff) | |
download | pkgsrc-a3310b0296dc0f00a5c45a7bc319b857e613eeeb.tar.gz |
remove patches obsoleted by rev 0.10.0 (hi hubert! :)
Diffstat (limited to 'audio/gqmpeg')
-rw-r--r-- | audio/gqmpeg/patches/patch-ac | 71 | ||||
-rw-r--r-- | audio/gqmpeg/patches/patch-ad | 13 | ||||
-rw-r--r-- | audio/gqmpeg/patches/patch-ae | 12 | ||||
-rw-r--r-- | audio/gqmpeg/patches/patch-af | 67 |
4 files changed, 0 insertions, 163 deletions
diff --git a/audio/gqmpeg/patches/patch-ac b/audio/gqmpeg/patches/patch-ac deleted file mode 100644 index e667494bd45..00000000000 --- a/audio/gqmpeg/patches/patch-ac +++ /dev/null @@ -1,71 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2001/08/24 08:27:43 lukem Exp $ - ---- src/io_ogg123.c.orig Fri Feb 16 13:53:18 2001 -+++ src/io_ogg123.c Fri Aug 24 17:28:58 2001 -@@ -35,6 +35,7 @@ gint ogg123_enabled = FALSE; - - gint ogg123_device = 0; - gchar *ogg123_device_options = NULL; -+gchar *ogg123_extra_options = NULL; - - /* internal stuff */ - static SongData *ogg123_current_sd = NULL; -@@ -52,10 +53,15 @@ static int ogg123_pipe[2]; - - static const gchar *ogg123_output_devices[] = - { -+#ifdef __NetBSD__ -+ "sun", -+#endif - "oss", - "esd", - "irix", -+#ifndef __NetBSD__ - "solaris", -+#endif - "wav", - NULL - }; -@@ -332,11 +338,13 @@ static void ogg123_input_read_cb(gpointe - *----------------------------------------------------------------------------- - */ - -+#define OGG123_MAX_COMMANDS 32 -+ - static gint ogg123_child_run(SongData *sd, gint position) - { - pid_t frk_pid; -- char cmd_arguments[16][512]; -- char *cmd_ptr[16]; -+ char cmd_arguments[OGG123_MAX_COMMANDS][512]; -+ char *cmd_ptr[OGG123_MAX_COMMANDS]; - int cmd_cnt = 0; - gchar *exec_bin = OGG123_BINARY; - -@@ -370,6 +378,26 @@ static gint ogg123_child_run(SongData *s - sprintf(cmd_arguments[cmd_cnt], "--device-option=%s", ogg123_device_options); - cmd_ptr[cmd_cnt] = cmd_arguments[cmd_cnt]; - cmd_cnt++; -+ } -+ -+ if (ogg123_extra_options && -+ strlen(ogg123_extra_options) > 0 && -+ cmd_cnt + 2 < OGG123_MAX_COMMANDS) -+ { -+ gchar **vector; -+ gint i; -+ -+ vector = g_strsplit(ogg123_extra_options, " ", OGG123_MAX_COMMANDS - 2 - cmd_cnt); -+ i = 0; -+ -+ while(vector && vector[i] != NULL) -+ { -+ strcpy(cmd_arguments[cmd_cnt], vector[i]); -+ cmd_ptr[cmd_cnt] = cmd_arguments[cmd_cnt]; -+ cmd_cnt++; -+ i++; -+ } -+ g_strfreev(vector); - } - - strcpy(cmd_arguments[cmd_cnt], sd->path); diff --git a/audio/gqmpeg/patches/patch-ad b/audio/gqmpeg/patches/patch-ad deleted file mode 100644 index 9003f2eeaaf..00000000000 --- a/audio/gqmpeg/patches/patch-ad +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2001/06/16 19:59:16 jlam Exp $ - ---- src/Makefile.in.orig Wed Feb 28 02:08:08 2001 -+++ src/Makefile.in Fri Jun 15 15:01:24 2001 -@@ -100,7 +100,7 @@ - SUBDIRS = default_skin - DIST_SUBDIRS = default_skin - --INCLUDES = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir) -DLOCALEDIR=\""$(localedir)"\" -I$(includedir) $(GTK_CFLAGS) $(GDK_PIXBUF_CFLAGS) -+INCLUDES = -I$(srcdir) -I$(builddir) -I$(top_srcdir) -I$(top_builddir) -DLOCALEDIR=\""$(localedir)"\" $(GTK_CFLAGS) $(GDK_PIXBUF_CFLAGS) - - - module_SLIK = ui2_button.c ui2_button.h ui2_button_edit.c ui2_button_edit.h ui2_default.c ui2_default.h ui2_dial.c ui2_dial.h ui2_dial_edit.c ui2_dial_edit.h ui2_display.c ui2_display.h ui2_editor.c ui2_editor.h ui2_includes.h ui2_init.c ui2_init.h ui2_item.c ui2_item.h ui2_item_edit.c ui2_item_edit.h ui2_list.c ui2_list.h ui2_list_edit.c ui2_list_edit.h ui2_main.c ui2_main.h ui2_number.c ui2_number.h ui2_number_edit.c ui2_number_edit.h ui2_parse.c ui2_parse.h ui2_skin.c ui2_skin.h ui2_slider.c ui2_slider.h ui2_slider_edit.c ui2_slider_edit.h ui2_text.c ui2_text.h ui2_text_edit.c ui2_text_edit.h ui2_typedefs.h ui2_util.c ui2_util.h ui2_widget.c ui2_widget.h ui_clist_edit.c ui_clist_edit.h ui_fileops.c ui_fileops.h ui_menu.c ui_menu.h ui_pathsel.c ui_pathsel.h ui_pixbuf_ops.c ui_pixbuf_ops.h ui_pixbuf_save.c ui_pixbuf_save.h ui_tabcomp.c ui_tabcomp.h ui_utildlg.c ui_utildlg.h diff --git a/audio/gqmpeg/patches/patch-ae b/audio/gqmpeg/patches/patch-ae deleted file mode 100644 index e4e83a1a856..00000000000 --- a/audio/gqmpeg/patches/patch-ae +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2001/08/24 08:27:43 lukem Exp $ - ---- src/io_ogg123.h.orig Fri Feb 16 13:52:44 2001 -+++ src/io_ogg123.h Fri Aug 24 17:28:40 2001 -@@ -18,6 +18,7 @@ extern gint ogg123_enabled; - - extern gint ogg123_device; - extern gchar *ogg123_device_options; -+extern gchar *ogg123_extra_options; - - - /* diff --git a/audio/gqmpeg/patches/patch-af b/audio/gqmpeg/patches/patch-af deleted file mode 100644 index c6a9514c65a..00000000000 --- a/audio/gqmpeg/patches/patch-af +++ /dev/null @@ -1,67 +0,0 @@ ---- src/io_ogg123_cfg.c.orig Fri Feb 16 13:53:38 2001 -+++ src/io_ogg123_cfg.c Fri Aug 24 17:56:24 2001 -@@ -17,6 +17,7 @@ - - static GtkWidget *ogg123_vbox = NULL; - static GtkWidget *ogg123_device_options_entry = NULL; -+static GtkWidget *ogg123_extra_options_entry = NULL; - - gint c_ogg123_device; - -@@ -33,6 +34,8 @@ void ogg123_config_load(FILE *f, const g - "ogg123_device", value, ogg123_device); - ogg123_device_options = read_char_option(f, option, - "ogg123_device_options", value, ogg123_device_options); -+ ogg123_extra_options = read_char_option(f, option, -+ "ogg123_extra_options", value_all, ogg123_extra_options); - } - - void ogg123_config_save(FILE *f) -@@ -41,6 +44,7 @@ void ogg123_config_save(FILE *f) - - write_int_option(f, "ogg123_device", ogg123_device); - write_char_option(f, "ogg123_device_options", ogg123_device_options); -+ write_char_option(f, "ogg123_extra_options", ogg123_extra_options); - } - - /* -@@ -61,6 +65,11 @@ void ogg123_config_apply(void) - if (buf && strlen(buf) > 0) ogg123_device_options = g_strdup(buf); - - ogg123_device = c_ogg123_device; -+ -+ g_free(ogg123_extra_options); -+ ogg123_extra_options = NULL; -+ buf = gtk_entry_get_text(GTK_ENTRY(ogg123_extra_options_entry)); -+ if (buf && strlen(buf) > 0) ogg123_extra_options = g_strdup(buf); - } - - void ogg123_config_close(void) -@@ -154,6 +163,27 @@ GtkWidget *ogg123_config_init(void) - if (ogg123_device_options) gtk_entry_set_text(GTK_ENTRY(ogg123_device_options_entry), ogg123_device_options); - gtk_box_pack_start(GTK_BOX(hbox), ogg123_device_options_entry, TRUE, TRUE, 0); - gtk_widget_show(ogg123_device_options_entry); -+ -+ hbox = gtk_hbox_new (FALSE, 5); -+ gtk_container_border_width (GTK_CONTAINER(hbox), 5); -+ gtk_box_pack_start(GTK_BOX(ogg123_vbox), hbox, FALSE, FALSE, 0); -+ gtk_widget_show(hbox); -+ -+ label = gtk_label_new(_("User options:")); -+ gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); -+ gtk_widget_show(label); -+ -+ ogg123_extra_options_entry = gtk_entry_new_with_max_length(255); -+ if (ogg123_extra_options) -+ { -+ gtk_entry_set_text(GTK_ENTRY(ogg123_extra_options_entry), ogg123_extra_options); -+ } -+ gtk_box_pack_start(GTK_BOX(hbox), ogg123_extra_options_entry, FALSE, FALSE, 0); -+ gtk_widget_show(ogg123_extra_options_entry); -+ -+ label = gtk_label_new(_("ogg123 options do not take effect until the next song.")); -+ gtk_box_pack_start(GTK_BOX(ogg123_vbox), label, FALSE, FALSE, 0); -+ gtk_widget_show (label); - - if (!ogg123_enabled) gtk_widget_set_sensitive(ogg123_vbox, FALSE); - return ogg123_vbox; |