[soundtracker] soundtracker-0.6.8-11 w/ gdk-pixbuf-less channel mute
Hans Ulrich Niedermann
ndim at fedoraproject.org
Sat Feb 12 19:29:08 UTC 2011
commit 0286e66cdd5b016402e4d0bfc5f50d470472cc81
Author: Hans Ulrich Niedermann <hun at n-dimensional.de>
Date: Sat Feb 12 20:24:38 2011 +0100
soundtracker-0.6.8-11 w/ gdk-pixbuf-less channel mute
* Sat Feb 12 2011 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.6.8-11
- Add soundtracker-0.6.8-channel-mute-w-o-gdk-pixbuf.patch
...tracker-0.6.8-channel-mute-w-o-gdk-pixbuf.patch | 231 ++++++++++++++++++++
soundtracker.spec | 9 +-
2 files changed, 238 insertions(+), 2 deletions(-)
---
diff --git a/soundtracker-0.6.8-channel-mute-w-o-gdk-pixbuf.patch b/soundtracker-0.6.8-channel-mute-w-o-gdk-pixbuf.patch
new file mode 100644
index 0000000..4933cea
--- /dev/null
+++ b/soundtracker-0.6.8-channel-mute-w-o-gdk-pixbuf.patch
@@ -0,0 +1,231 @@
+diff -rup soundtracker-0.6.8/app/Makefile.am soundtracker-0.6.8-no-gdk-pixbuf/app/Makefile.am
+--- soundtracker-0.6.8/app/Makefile.am 2006-02-25 13:30:54.000000000 +0100
++++ soundtracker-0.6.8-no-gdk-pixbuf/app/Makefile.am 2011-02-12 19:54:21.775747321 +0100
+@@ -42,9 +42,7 @@ soundtracker_SOURCES = \
+ xm-player.c xm-player.h \
+ tracer.c tracer.h
+
+-if !NO_GDK_PIXBUF
+- soundtracker_SOURCES += scalablepic.c scalablepic.h
+-endif
++soundtracker_SOURCES += scalablepic.c scalablepic.h
+
+ if DRIVER_ALSA_050
+ soundtracker_SOURCES += midi-050.c midi-utils-050.c midi-settings-050.c \
+diff -rup soundtracker-0.6.8/app/Makefile.in soundtracker-0.6.8-no-gdk-pixbuf/app/Makefile.in
+--- soundtracker-0.6.8/app/Makefile.in 2006-02-25 13:32:35.030737059 +0100
++++ soundtracker-0.6.8-no-gdk-pixbuf/app/Makefile.in 2011-02-12 20:10:01.341939139 +0100
+@@ -36,7 +36,7 @@ NORMAL_UNINSTALL = :
+ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ host_triplet = @host@
+- at NO_GDK_PIXBUF_FALSE@am__append_1 = scalablepic.c scalablepic.h
++am__append_1 = scalablepic.c scalablepic.h
+ @DRIVER_ALSA_050_TRUE at am__append_2 = midi-050.c midi-utils-050.c midi-settings-050.c \
+ @DRIVER_ALSA_050_TRUE@ midi.h midi-settings.h midi-utils.h
+
+@@ -266,7 +266,7 @@ am__soundtracker_SOURCES_DIST = audio.c
+ midi-050.c midi-utils-050.c midi-settings-050.c midi.h \
+ midi-settings.h midi-utils.h midi-09x.c midi-utils-09x.c \
+ midi-settings-09x.c
+- at NO_GDK_PIXBUF_FALSE@am__objects_1 = scalablepic.$(OBJEXT)
++am__objects_1 = scalablepic.$(OBJEXT)
+ @DRIVER_ALSA_050_TRUE at am__objects_2 = midi-050.$(OBJEXT) \
+ @DRIVER_ALSA_050_TRUE@ midi-utils-050.$(OBJEXT) \
+ @DRIVER_ALSA_050_TRUE@ midi-settings-050.$(OBJEXT)
+diff -rup soundtracker-0.6.8/app/scalablepic.c soundtracker-0.6.8-no-gdk-pixbuf/app/scalablepic.c
+--- soundtracker-0.6.8/app/scalablepic.c 2003-03-02 14:54:05.000000000 +0100
++++ soundtracker-0.6.8-no-gdk-pixbuf/app/scalablepic.c 2011-02-12 19:54:21.776747325 +0100
+@@ -54,20 +54,22 @@ guint scalable_pic_get_type (void)
+ return (scalable_pic_type);
+ }
+
+-GtkWidget *scalable_pic_new (GdkPixbuf *pic)
++GtkWidget *scalable_pic_new (void)
+ {
+ ScalablePic *sp;
+
+ GtkWidget *widget = GTK_WIDGET (gtk_type_new (scalable_pic_get_type ()));
+ sp = SCALABLE_PIC (widget);
+
++#ifndef NO_GDK_PIXBUF
+ sp->pic = pic;
+ if(pic != NULL) {
+ sp->maxwidth = 1.414 * (gfloat)(sp->pic_width = gdk_pixbuf_get_width(sp->pic));
+ sp->maxheight = 1.414 * (gfloat)(sp->pic_height = gdk_pixbuf_get_height(sp->pic));
+ sp->copy = NULL;
+ }
+-
++#endif
++
+ return (widget);
+ }
+
+@@ -137,7 +139,9 @@ static void scalable_pic_destroy (GtkObj
+ g_return_if_fail (IS_SCALABLE_PIC (object));
+
+ sp = SCALABLE_PIC (object);
++#ifndef NO_GDK_PIXBUF
+ if (sp->copy != NULL) gdk_pixbuf_unref (sp->copy);
++#endif
+
+ klass = gtk_type_class (gtk_widget_get_type ());
+ if (GTK_OBJECT_CLASS (klass)->destroy)
+@@ -146,7 +150,9 @@ static void scalable_pic_destroy (GtkObj
+
+ static void scalable_pic_draw (GtkWidget *widget, GdkRectangle *area)
+ {
+- gboolean need_resize = FALSE;
++#ifndef NO_GDK_PIXBUF
++ gboolean need_resize = FALSE;
++#endif
+
+ ScalablePic *sp;
+
+@@ -155,6 +161,17 @@ static void scalable_pic_draw (GtkWidget
+
+ sp = SCALABLE_PIC (widget);
+
++#ifdef NO_GDK_PIXBUF
++ const gint w = widget->allocation.width;
++ const gint h = widget->allocation.height;
++ gdk_window_clear_area (widget->window,
++ 0, 0, w, h);
++ GdkGC *gc = widget->style->fg_gc[widget->state];
++ gdk_draw_line (widget->window, gc,
++ 0, 0, w, h);
++ gdk_draw_line (widget->window, gc,
++ 0, h, w, 0);
++#else
+ if(sp->pic == NULL)
+ return;
+
+@@ -189,6 +206,7 @@ static void scalable_pic_draw (GtkWidget
+ gdk_pixbuf_render_to_drawable (sp->copy, widget->window,
+ widget->style->black_gc, area->x, area->y, area->x, area->y,
+ area->width, area->height, GDK_RGB_DITHER_NORMAL, 0, 0);
++#endif
+ }
+
+ static void scalable_pic_size_request (GtkWidget *widget,
+diff -rup soundtracker-0.6.8/app/scalablepic.h soundtracker-0.6.8-no-gdk-pixbuf/app/scalablepic.h
+--- soundtracker-0.6.8/app/scalablepic.h 2003-03-02 14:54:11.000000000 +0100
++++ soundtracker-0.6.8-no-gdk-pixbuf/app/scalablepic.h 2011-02-12 19:54:21.777747329 +0100
+@@ -24,9 +24,13 @@
+ #ifndef __SCALABLE_PIC_H
+ #define __SCALABLE_PIC_H
+
++#include <config.h>
++
+ #include <gtk/gtk.h>
+ #include <gtk/gtkwidget.h>
++#ifndef NO_GDK_PIXBUF
+ #include <gdk-pixbuf/gdk-pixbuf.h>
++#endif
+
+ #ifdef __cplusplus
+ extern "C" {
+@@ -41,7 +45,9 @@ extern "C" {
+
+ typedef struct _ScalablePic {
+ GtkWidget widget;
++#ifndef NO_GDK_PIXBUF
+ GdkPixbuf *pic, *copy;
++#endif
+ gint maxwidth, maxheight, former_width, former_height, pic_width, pic_height;
+ } ScalablePic;
+
+@@ -49,8 +55,14 @@ typedef struct _ScalablePicClass {
+ GtkWidgetClass parent_class;
+ } ScalablePicClass;
+
+-/* create a widget containing GdkPixbuf image */
++/* create a widget containing a scalable "x" drawn white on black,
++ * either with gdk-pixbuf or without
++ */
++#ifndef NO_GDK_PIXBUF
+ GtkWidget *scalable_pic_new (GdkPixbuf *pic);
++#else
++GtkWidget *scalable_pic_new (void);
++#endif
+ guint scalable_pic_get_type (void);
+
+ #ifdef __cplusplus
+diff -rup soundtracker-0.6.8/app/scope-group.c soundtracker-0.6.8-no-gdk-pixbuf/app/scope-group.c
+--- soundtracker-0.6.8/app/scope-group.c 2003-05-17 13:16:36.000000000 +0200
++++ soundtracker-0.6.8-no-gdk-pixbuf/app/scope-group.c 2011-02-12 19:54:21.778747333 +0100
+@@ -33,8 +33,8 @@
+
+ #ifndef NO_GDK_PIXBUF
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+-#include "scalablepic.h"
+ #endif
++#include "scalablepic.h"
+
+ #include "scope-group.h"
+ #include "sample-display.h"
+@@ -58,14 +58,12 @@ button_toggled (GtkWidget *widget,
+ s = SCOPE_GROUP(w->parent); /* button<-table<-scope_group */
+ s->on_mask = (s->on_mask & (~(1 << n))) | (on ? 1 << n : 0);/* set mask */
+
+-#ifndef NO_GDK_PIXBUF
+ if (s->scopes_on) {
+ gtk_widget_hide (on ? s->mutedpic[n] : GTK_WIDGET(s->scopes[n]));
+ gtk_widget_show (on ? GTK_WIDGET(s->scopes[n]) : s->mutedpic[n]);
+ } else {
+ (on ? gtk_widget_hide : gtk_widget_show)(GTK_WIDGET(s->mutedpic[n]));
+ }
+-#endif
+ }
+ }
+
+@@ -92,10 +90,8 @@ scope_group_set_num_channels (ScopeGroup
+ // Reset all buttons (enable all channels)
+ for(i = 0; i < 32; i++) {
+ gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(s->scopebuttons[i]), 1);
+-#ifndef NO_GDK_PIXBUF
+ gtk_widget_hide (s->mutedpic[i]);
+ if (s->scopes_on) gtk_widget_show (GTK_WIDGET(s->scopes[i]));
+-#endif
+ }
+
+ s->numchan = num_channels;
+@@ -111,12 +107,8 @@ scope_group_enable_scopes (ScopeGroup *s
+ s->scopes_on = enable;
+
+ for(i = 0; i < 32; i++) {
+-#ifdef NO_GDK_PIXBUF
+- (enable ? gtk_widget_show : gtk_widget_hide)(GTK_WIDGET(s->scopes[i]));
+-#else
+ if (GTK_TOGGLE_BUTTON(s->scopebuttons[i])->active)
+ (enable ? gtk_widget_show : gtk_widget_hide)(GTK_WIDGET(s->scopes[i]));
+-#endif
+ }
+ }
+
+@@ -298,9 +290,11 @@ scope_group_new (void)
+
+ #ifndef NO_GDK_PIXBUF
+ thing = scalable_pic_new (mutedpic);
++#else
++ thing = scalable_pic_new ();
++#endif
+ gtk_box_pack_start(GTK_BOX(box), thing, TRUE, TRUE, 0);
+ s->mutedpic[i] = thing;
+-#endif
+
+
+ thing = sample_display_new(FALSE);
+diff -rup soundtracker-0.6.8/app/scope-group.h soundtracker-0.6.8-no-gdk-pixbuf/app/scope-group.h
+--- soundtracker-0.6.8/app/scope-group.h 2003-03-02 15:18:42.000000000 +0100
++++ soundtracker-0.6.8-no-gdk-pixbuf/app/scope-group.h 2011-02-12 19:54:21.778747333 +0100
+@@ -44,9 +44,7 @@ struct _ScopeGroup
+ GtkWidget *table;
+ SampleDisplay *scopes[32];
+ GtkWidget *scopebuttons[32];
+-#ifndef NO_GDK_PIXBUF
+ GtkWidget *mutedpic[32];
+-#endif
+ int numchan;
+ int scopes_on;
+ int update_freq;
diff --git a/soundtracker.spec b/soundtracker.spec
index 8cda60e..8f78832 100644
--- a/soundtracker.spec
+++ b/soundtracker.spec
@@ -1,6 +1,6 @@
Name: soundtracker
Version: 0.6.8
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Sound module composer/player
@@ -10,6 +10,7 @@ URL: http://www.soundtracker.org/
Source0: http://www.soundtracker.org/dl/v0.6/soundtracker-%{version}.tar.gz
Source1: soundtracker.desktop
Patch0: soundtracker-0.6.8-no-setuid.patch
+Patch1: soundtracker-0.6.8-channel-mute-w-o-gdk-pixbuf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk+-devel
@@ -24,7 +25,8 @@ format. The user interface makes use of GTK+.
%prep
%setup -q
-%patch0 -p1
+%patch0 -p1 -b .no-setuid
+%patch1 -p1 -b .mute-wo-pixbuf
%build
# System has Gnome 2 (or Gnome 3 even): No need for Gnome1 support.
@@ -54,6 +56,9 @@ rm -rf %{buildroot}
%{_datadir}/soundtracker/
%changelog
+* Sat Feb 12 2011 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.6.8-11
+- Add soundtracker-0.6.8-channel-mute-w-o-gdk-pixbuf.patch
+
* Sat Feb 12 2011 Hans Ulrich Niedermann <hun at n-dimensional.de> - 0.6.8-10
- Update spec file comments
- Stop using gdk-pixbuf
More information about the scm-commits
mailing list