rpms/lv2-EQ10Q-plugins/F-13 import.log, NONE, 1.1 lv2-EQ10Q-plugins-CXXFLAGS.patch, NONE, 1.1 lv2-EQ10Q-plugins-datadir.patch, NONE, 1.1 lv2-EQ10Q-plugins-foaf.patch, NONE, 1.1 lv2-EQ10Q-plugins.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

David Cornette davidcornette at fedoraproject.org
Fri Jul 16 05:23:33 UTC 2010


Author: davidcornette

Update of /cvs/pkgs/rpms/lv2-EQ10Q-plugins/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv15994/F-13

Modified Files:
	.cvsignore sources 
Added Files:
	import.log lv2-EQ10Q-plugins-CXXFLAGS.patch 
	lv2-EQ10Q-plugins-datadir.patch lv2-EQ10Q-plugins-foaf.patch 
	lv2-EQ10Q-plugins.spec 
Log Message:
* Fri Jul 16 2010 David Cornette <rpm at davidcornette.com> 1.0-6
- Initial commit




--- NEW FILE import.log ---
lv2-EQ10Q-plugins-1_0-6_fc13:F-13:lv2-EQ10Q-plugins-1.0-6.fc13.src.rpm:1279257707

lv2-EQ10Q-plugins-CXXFLAGS.patch:
 Makefile |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE lv2-EQ10Q-plugins-CXXFLAGS.patch ---
diff -rupN EQ10Q/Makefile EQ10Q.dlc/Makefile
--- EQ10Q/Makefile	2009-12-16 07:52:24.000000000 -0500
+++ EQ10Q.dlc/Makefile	2010-04-13 01:39:58.336334851 -0400
@@ -1,5 +1,7 @@
 BUNDLE = paramEQ-Rafols.lv2
 INSTALL_DIR = /usr/local/lib/lv2
+CXXFLAGS = -O3
+
 
 
 $(BUNDLE): manifest.ttl parameq.ttl paramEQ.so parameq_gui.so  logo_top_top.png logo_top.png logo_center.png logo_bottom.png logo_bottom_bottom.png EQ-10Q_bakc.png combopix
@@ -9,10 +11,10 @@ $(BUNDLE): manifest.ttl parameq.ttl para
 	cp -R combopix $(BUNDLE)
 
 paramEQ.so: plugin.cpp
-	g++ -O3 -shared -fPIC -DPIC plugin.cpp `pkg-config --cflags --libs lv2-plugin` -o paramEQ.so
+	g++ $(CXXFLAGS) -shared -fPIC -DPIC plugin.cpp `pkg-config --cflags --libs lv2-plugin` -o paramEQ.so
 
 parameq_gui.so: main_window.cpp band_ctl.cpp ctlbutton.cpp bodeplot.cpp vuwidget.cpp templatewidget.cpp pixmapcombo.cpp
-	g++ -O3 -shared -fPIC -DPIC  bodeplot.cpp templatewidget.cpp vuwidget.cpp pixmapcombo.cpp ctlbutton.cpp  band_ctl.cpp main_window.cpp `pkg-config --cflags --libs lv2-gui plotmm`  -o parameq_gui.so
+	g++ $(CXXFLAGS) -shared -fPIC -DPIC  bodeplot.cpp templatewidget.cpp vuwidget.cpp pixmapcombo.cpp ctlbutton.cpp  band_ctl.cpp main_window.cpp `pkg-config --cflags --libs lv2-gui plotmm`  -o parameq_gui.so
 
 
 install: $(BUNDLE)

lv2-EQ10Q-plugins-datadir.patch:
 Makefile        |   10 ++++++++--
 main_window.cpp |   17 +++++++++++------
 pixmapcombo.h   |   36 ++++++++++++++++++++----------------
 3 files changed, 39 insertions(+), 24 deletions(-)

--- NEW FILE lv2-EQ10Q-plugins-datadir.patch ---
diff -rupN EQ10Q/main_window.cpp EQ10Q.dlc/main_window.cpp
--- EQ10Q/main_window.cpp	2010-01-10 13:30:24.000000000 -0500
+++ EQ10Q.dlc/main_window.cpp	2010-04-14 02:37:10.956920405 -0400
@@ -19,6 +19,11 @@
  ***************************************************************************/
 
 #include "main_window.hh"
+
+#ifndef DATADIR
+#define DATADIR "/usr/local/lib/lv2/paramEQ-Rafols.lv2"
+#endif
+
  //punter a objecte principal;
 
 void gloabal_set_gain_freq(main_window *main_ptr, int b_ix, float g, float f){
@@ -40,11 +45,11 @@ main_window::main_window(const std::stri
   B_Button("B"),
   in_vu(1),
   out_vu(1),
-  image_logo_top_top("/usr/local/lib/lv2/paramEQ-Rafols.lv2/logo_top_top.png"),
-  image_logo_top("/usr/local/lib/lv2/paramEQ-Rafols.lv2/logo_top.png"),
-  image_logo_center("/usr/local/lib/lv2/paramEQ-Rafols.lv2/logo_center.png"),
-  image_logo_bottom("/usr/local/lib/lv2/paramEQ-Rafols.lv2/logo_bottom.png"),
-  image_logo_bottom_bottom("/usr/local/lib/lv2/paramEQ-Rafols.lv2/logo_bottom_bottom.png")
+  image_logo_top_top(DATADIR "/logo_top_top.png"),
+  image_logo_top(DATADIR "/logo_top.png"),
+  image_logo_center(DATADIR "/logo_center.png"),
+  image_logo_bottom(DATADIR "/logo_bottom.png"),
+  image_logo_bottom_bottom(DATADIR "/logo_bottom_bottom.png")
 
   {
 
@@ -412,7 +417,7 @@ bool main_window::on_window_popup(GdkEve
     flag_pop_resize = false;
     Gtk::Window *this_win = &((Gtk::Window&)(*this->get_toplevel()));
     this_win->set_resizable(false);
-    this_win->modify_bg_pixmap(Gtk::STATE_NORMAL , "/usr/local/lib/lv2/paramEQ-Rafols.lv2/EQ-10Q_bakc.png");
+    this_win->modify_bg_pixmap(Gtk::STATE_NORMAL , DATADIR "/EQ-10Q_bakc.png");
   }
 
   //Passu dels spins
diff -rupN EQ10Q/Makefile EQ10Q.dlc/Makefile
--- EQ10Q/Makefile	2010-04-13 02:07:14.853214729 -0400
+++ EQ10Q.dlc/Makefile	2010-04-14 03:07:16.029214665 -0400
@@ -2,6 +2,12 @@ BUNDLE = paramEQ-Rafols.lv2
 INSTALL_DIR = /usr/local/lib/lv2
 CXXFLAGS = -O3
 
+ifdef DATADIR
+    DATADIR_FLAGS = -DDATADIR="\"$(DATADIR)\""
+else
+    DATADIR_FLAGS =
+endif
+
 
 
 $(BUNDLE): manifest.ttl parameq.ttl paramEQ.so parameq_gui.so  logo_top_top.png logo_top.png logo_center.png logo_bottom.png logo_bottom_bottom.png EQ-10Q_bakc.png combopix
@@ -11,10 +17,10 @@ $(BUNDLE): manifest.ttl parameq.ttl para
 	cp -R combopix $(BUNDLE)
 
 paramEQ.so: plugin.cpp
-	g++ $(CXXFLAGS) -shared -fPIC -DPIC plugin.cpp `pkg-config --cflags --libs lv2-plugin` -o paramEQ.so
+	g++ $(CXXFLAGS) $(DATADIR_FLAGS) -shared -fPIC -DPIC plugin.cpp `pkg-config --cflags --libs lv2-plugin` -o paramEQ.so
 
 parameq_gui.so: main_window.cpp band_ctl.cpp ctlbutton.cpp bodeplot.cpp vuwidget.cpp templatewidget.cpp pixmapcombo.cpp
-	g++ $(CXXFLAGS) -shared -fPIC -DPIC  bodeplot.cpp templatewidget.cpp vuwidget.cpp pixmapcombo.cpp ctlbutton.cpp  band_ctl.cpp main_window.cpp `pkg-config --cflags --libs lv2-gui plotmm`  -o parameq_gui.so
+	g++ $(CXXFLAGS) $(DATADIR_FLAGS) -shared -fPIC -DPIC  bodeplot.cpp templatewidget.cpp vuwidget.cpp pixmapcombo.cpp ctlbutton.cpp  band_ctl.cpp main_window.cpp `pkg-config --cflags --libs lv2-gui plotmm`  -o parameq_gui.so
 
 
 install: $(BUNDLE)
diff -rupN EQ10Q/pixmapcombo.h EQ10Q.dlc/pixmapcombo.h
--- EQ10Q/pixmapcombo.h	2010-01-10 13:30:23.000000000 -0500
+++ EQ10Q.dlc/pixmapcombo.h	2010-04-14 02:36:41.581916238 -0400
@@ -28,23 +28,27 @@
 #include <gtkmm/image.h>
 #include <gtkmm/stock.h>
 
-#define RUTA_OFF "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/off.png"
+#ifndef DATADIR
+#define DATADIR "/usr/local/lib/lv2/paramEQ-Rafols.lv2"
+#endif
+
+#define RUTA_OFF DATADIR "/combopix/off.png"
+
+#define RUTA_LPF1 DATADIR "/combopix/lpf1.png"
+#define RUTA_LPF2 DATADIR "/combopix/lpf2.png"
+#define RUTA_LPF3 DATADIR "/combopix/lpf3.png"
+#define RUTA_LPF4 DATADIR "/combopix/lpf4.png"
+
+#define RUTA_HPF1 DATADIR "/combopix/hpf1.png"
+#define RUTA_HPF2 DATADIR "/combopix/hpf2.png"
+#define RUTA_HPF3 DATADIR "/combopix/hpf3.png"
+#define RUTA_HPF4 DATADIR "/combopix/hpf4.png"
 
-#define RUTA_LPF1 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf1.png"
-#define RUTA_LPF2 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf2.png"
-#define RUTA_LPF3 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf3.png"
-#define RUTA_LPF4 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/lpf4.png"
-
-#define RUTA_HPF1 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf1.png"
-#define RUTA_HPF2 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf2.png"
-#define RUTA_HPF3 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf3.png"
-#define RUTA_HPF4 "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/hpf4.png"
+#define RUTA_LOSHELF DATADIR "/combopix/loshelf.png"
+#define RUTA_HISHELF DATADIR "/combopix/hishelf.png"
 
-#define RUTA_LOSHELF "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/loshelf.png"
-#define RUTA_HISHELF "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/hishelf.png"
-
-#define RUTA_PEAK "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/peak.png"
-#define RUTA_NOTCH "/usr/local/lib/lv2/paramEQ-Rafols.lv2/combopix/notch.png"
+#define RUTA_PEAK DATADIR "/combopix/peak.png"
+#define RUTA_NOTCH DATADIR "/combopix/notch.png"
 
 class PixMapCombo : public Gtk::ComboBox{
   public:
@@ -68,4 +72,4 @@ class PixMapCombo : public Gtk::ComboBox
     
 };
 
-#endif
\ No newline at end of file
+#endif

lv2-EQ10Q-plugins-foaf.patch:
 parameq.ttl |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE lv2-EQ10Q-plugins-foaf.patch ---
diff -rupN EQ10Q/parameq.ttl EQ10Q.dlc/parameq.ttl
--- EQ10Q/parameq.ttl	2010-01-10 13:24:11.000000000 -0500
+++ EQ10Q.dlc/parameq.ttl	2010-04-14 00:33:45.730089696 -0400
@@ -1,5 +1,6 @@
 @prefix lv2:  <http://lv2plug.in/ns/lv2core#>.
 @prefix doap: <http://usefulinc.com/ns/doap#>.
+ at prefix foaf: <http://xmlns.com/foaf/0.1/> .
 @prefix guiext: <http://lv2plug.in/ns/extensions/ui#>.
 
 <http://sapistaplugin.com/eq/param/peaking/gui>
@@ -478,4 +479,4 @@ lv2:port [
     lv2:index 46;
     lv2:symbol "out_vu_ctl";
     lv2:name "Out VU CTL";
-  ].
\ No newline at end of file
+  ].


--- NEW FILE lv2-EQ10Q-plugins.spec ---
Name:           lv2-EQ10Q-plugins
Version:        1.0
Release:        6%{?dist}
Summary:        LV2 Plugin: Parametric audio equalizer with 12 different filter types

Group:          Applications/Multimedia
# The vuwidget class is under GPLv3+.  The rest is under GPLv2+.  The GPLv3+ is
# only only included in the parameq_gui.so library.  The other library,
# paramEQ.so, contains only GPLv2+ code.
License:        GPLv2+ and GPLv3+
URL:            http://eq10q.sourceforge.net/
Source0:        http://downloads.sourceforge.net/project/eq10q/EQ10Q-LV2Plugin-source-%{version}.tar.gz
# This patch modifies the make file to allow for the overriding of optimization
# flags.
# This patch was submitted to upstream's patch tracker. See
# http://sourceforge.net/tracker/?func=detail&aid=2988919&group_id=298133&atid=1257899
Patch0:         %{name}-CXXFLAGS.patch
# This patch fixes an issue with the parameq.ttl file.  This file fails to
# properly define the foaf prefix.  This bug actually can cause a hang in
# lv2rack if the user has this plugin installed.
# Submitted upstream.  See
# http://sourceforge.net/tracker/?func=detail&aid=2988911&group_id=298133&atid=1257899
Patch1:         %{name}-foaf.patch
# This patch lets the builder specify a directory for the gui's image files.
# Submitted upstream at
# http://sourceforge.net/tracker/?func=detail&aid=2988924&group_id=298133&atid=1257899
Patch2:         %{name}-datadir.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

%global datadir %{_datadir}/%{name}

BuildRequires:  pkgconfig
BuildRequires:  gtkmm24-devel
BuildRequires:  plotmm-devel
BuildRequires:  lv2-c++-tools-static
BuildRequires:  pstreams-devel
BuildRequires:  lv2core-devel
Requires:  lv2core

%description
EQ10Q is an audio plug-in using the LV2 standard implementing a powerful and
flexible parametric equalizer.
The goal is to create an equalizer plug-in that includes parametric equalization
with different filter types like peaking, HPF, LPF, Shelving and Notch with IIR
algorithms and a nice GUI displaying the equalization curve.
At the moment we have implemented second order biquadratic filters (Peaking,
Low Shelving, High Shelving and Notch), and configurable order (1, 2, 3, 4) HPF
and LPF filters. All with IIR algorithms.

%prep
%setup -q -n EQ10Q
%patch0 -p1
%patch1 -p1
%patch2 -p1

# Get rid of warnings about spurious exec permissions in debuginfo package
chmod -x templatewidget.cpp templatewidget.h


%build
make %{?_smp_mflags} CXXFLAGS="%{optflags}" DATADIR=%{datadir}


%install
rm -rf %{buildroot}
make install INSTALL_DIR="%{buildroot}%{_libdir}/lv2"
mkdir -p %{buildroot}%{datadir}
mv %{buildroot}%{_libdir}/lv2/paramEQ-Rafols.lv2/*.png %{buildroot}%{_libdir}/lv2/paramEQ-Rafols.lv2/combopix %{buildroot}%{datadir}


%clean
rm -rf %{buildroot}


%files
%defattr(-,root,root,-)
%doc README
%{_libdir}/lv2/*
%{datadir}



%changelog
* Thu Jul 08 2010 David Cornette <rpm at davidcornette.com> 1.0-6
- Fixed some spelling errors and added comments about the patches

* Sun May 23 2010 David Cornette <rpm at davidcornette.com> 1.0-5
- Changed BuildRequires: to lv2-c++-tools-static instead of -devel
- Fixed executable permissions on two source files in debuginfo package

* Wed Apr 14 2010 David Cornette <rpm at davidcornette.com> 1.0-4
- Patch ttl file to define foaf
- Patch plugin gui to look for image files in /usr/share

* Mon Apr 12 2010 David Cornette <rpm at davidcornette.com> 1.0-3
- Using version macro in Source0:
- fixed license
- Patched Makefile to be able to override CXXFLAGS with optflags

* Sun Apr 11 2010 David Cornette <rpm at davidcornette.com> 1.0-2
- Adding BuildRequires:  lv2core-devel

* Fri Apr 9 2010 David Cornette <rpm at davidcornette.com> 1.0-1
- Initial build



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-EQ10Q-plugins/F-13/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	12 Jul 2010 17:30:55 -0000	1.1
+++ .cvsignore	16 Jul 2010 05:23:33 -0000	1.2
@@ -0,0 +1 @@
+EQ10Q-LV2Plugin-source-1.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-EQ10Q-plugins/F-13/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	12 Jul 2010 17:30:55 -0000	1.1
+++ sources	16 Jul 2010 05:23:33 -0000	1.2
@@ -0,0 +1 @@
+6680197c8c97d65ae194ab5218dc24b5  EQ10Q-LV2Plugin-source-1.0.tar.gz



More information about the scm-commits mailing list