From 45b5583bc3dd77304f7dcfcd07aae8a8de9b8b04 Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Sat, 30 Jan 2010 08:44:09 +0000 Subject: [PATCH] - Update to 0.05-8 --- .cvsignore | 2 +- guitarix-midiout.patch | 77 ------------------------------------------ guitarix.spec | 11 +++--- sources | 2 +- 4 files changed, 7 insertions(+), 85 deletions(-) delete mode 100644 guitarix-midiout.patch diff --git a/.cvsignore b/.cvsignore index 9f906c9..178cb6e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -guitarix-0.05.5-1.tar.bz2 +guitarix-0.05.8-1.tar.bz2 diff --git a/guitarix-midiout.patch b/guitarix-midiout.patch deleted file mode 100644 index e0810ad..0000000 --- a/guitarix-midiout.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- trunk/src/gx_engine.cpp 2009/12/13 09:24:02 433 -+++ trunk/src/gx_engine.cpp 2009/12/16 19:36:03 434 -@@ -533,11 +533,11 @@ - /* --- adding rest of engine class by file inclusion for readability --- */ - - /* MIDI engine */ --#ifdef USE_RINGBUFFER --#include "gx_engine_midi_ringbuf.cpp" --#else -+//#ifdef USE_RINGBUFFER -+//#include "gx_engine_midi_ringbuf.cpp" -+//#else - #include "gx_engine_midi.cpp" --#endif -+//#endif - - /* audio engine */ - #include "gx_engine_audio.cpp" ---- trunk/src/gx_engine_midi.cpp 2009/12/13 09:24:02 433 -+++ trunk/src/gx_engine_midi.cpp 2009/12/16 19:36:03 434 -@@ -411,8 +411,8 @@ - if(Beat_is < rms)Beat_is += 2; - //Beat_is = rms; - send+=step; -- if (fcheckbox10 == 1.0) send1+=step; -- if (fcheckbox11 == 1.0) send2+=step; -+ if (fcheckbox10 ) send1+=step; -+ if (fcheckbox11 ) send2+=step; - } - // else weg +=step; - } ---- trunk/src/gx_gui_helpers.cpp 2009/12/13 09:24:02 433 -+++ trunk/src/gx_gui_helpers.cpp 2009/12/16 19:36:03 434 -@@ -1525,6 +1525,33 @@ - return FALSE; - } - -+ gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data) -+ { -+ if (int(float(gx_current_skin)==1)) -+ { -+ GdkColor colorGreen; -+ gdk_color_parse("#000000", &colorGreen); -+ gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen); -+ gdk_color_parse("#111111", &colorGreen); -+ gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen); -+ gdk_color_parse("#222222", &colorGreen); -+ gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen); -+ gdk_color_parse("#333333", &colorGreen); -+ gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen); -+ } -+ else{ -+ GdkColor colorGreen; -+ gdk_color_parse("#a6a9aa", &colorGreen); -+ gtk_widget_modify_fg (wi, GTK_STATE_NORMAL, &colorGreen); -+ gdk_color_parse("#ffffff", &colorGreen); -+ gtk_widget_modify_fg (wi, GTK_STATE_PRELIGHT, &colorGreen); -+ gdk_color_parse("#ffffff", &colorGreen); -+ gtk_widget_modify_fg (wi, GTK_STATE_ACTIVE, &colorGreen); -+ gdk_color_parse("#a6a9aa", &colorGreen); -+ gtk_widget_modify_fg (wi, GTK_STATE_SELECTED, &colorGreen); -+ } -+ return FALSE; -+ } - - gboolean box7_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data) - { ---- trunk/src/headers/gx_gui_helpers.h 2009/12/13 09:24:02 433 -+++ trunk/src/headers/gx_gui_helpers.h 2009/12/16 19:36:03 434 -@@ -44,6 +44,7 @@ - gboolean box2_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data); - gboolean box1_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data); - gboolean box_expose (GtkWidget *wi, GdkEventExpose *ev, gpointer user_data); -+ gboolean label_expose(GtkWidget *wi, GdkEventExpose *ev, gpointer user_data); - - /* guitarix skin related functions */ - unsigned int gx_fetch_available_skins(); diff --git a/guitarix.spec b/guitarix.spec index c1977f3..fd55906 100644 --- a/guitarix.spec +++ b/guitarix.spec @@ -1,14 +1,11 @@ Name: guitarix -Version: 0.05.5 +Version: 0.05.8 Release: 1%{?dist} Summary: Mono amplifier to JACK Group: Applications/Multimedia License: GPLv2+ URL: http://guitarix.sourceforge.net/ -Source0: http://downloads.sourceforge.net/project/%{name}/%{name}/%{name}-%{version}-1/%{name}-%{version}-1.tar.bz2 -# From upstream trunk: -# http://guitarix.svn.sourceforge.net/viewvc/guitarix?view=rev&revision=434 -Patch0: %{name}-midiout.patch +Source0: http://sourceforge.net/projects/%{name}/files/%{name}/%{name}-%{version}-1.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: boost-devel @@ -41,7 +38,6 @@ all channels. %prep %setup -q -n %{name}-%{version}-1 -%patch0 -p1 -b .midiout %build ./waf -vvv configure --prefix=%{_prefix} --cxxflags="%{optflags}" --ladspadir=%{_libdir}/ladspa @@ -72,6 +68,9 @@ rm -rf %{buildroot} %{_datadir}/applications/%{name}.desktop %changelog +* Sat Jan 30 2010 Orcan Ogetbil - 0.05.8-1 +- Update to 0.05-8 + * Thu Dec 24 2009 Orcan Ogetbil - 0.05.5-1 - Update to 0.05.5 - Add Requires: qjackctl. RHBZ #549566 diff --git a/sources b/sources index 888fcee..4a0b2c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4ffdd87871823562282a16975090d7e2 guitarix-0.05.5-1.tar.bz2 +7c5fc30b2ea8837d859f8b1e89d0611b guitarix-0.05.8-1.tar.bz2