rpms/lv2-swh-plugins/F-10 .cvsignore, 1.2, 1.3 lv2-swh-plugins.spec, 1.1, 1.2 sources, 1.2, 1.3 swh-lv2-resolve-symbols.patch, 1.1, 1.2

Thu Nov 19 02:43:20 UTC 2009

Author: oget

Update of /cvs/pkgs/rpms/lv2-swh-plugins/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3034

Modified Files:
	.cvsignore lv2-swh-plugins.spec sources 
	swh-lv2-resolve-symbols.patch 
Log Message:
* Wed Nov 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-4.20091118git
- Update to latest git, which was only a few bugfix commits away from latest release
- Drop upstreamed patches
- More thorough clean-up of the source tree before building



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-swh-plugins/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3

--- .cvsignore	27 Apr 2009 18:06:53 -0000	1.2
+++ .cvsignore	19 Nov 2009 02:43:20 -0000	1.3
@@ -1 +1 @@
-swh-lv2-1.0.15.tar.gz
+swh-lv2-75f9f84.tar.gz


Index: lv2-swh-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-swh-plugins/F-10/lv2-swh-plugins.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- lv2-swh-plugins.spec	27 Apr 2009 18:06:53 -0000	1.1
+++ lv2-swh-plugins.spec	19 Nov 2009 02:43:20 -0000	1.2
@@ -1,22 +1,29 @@
 %global pkgname swh-lv2
+%global gitver 75f9f84
 
 Name:		lv2-swh-plugins
 Version:	1.0.15
-Release:	2%{?dist}
+Release:	4.20091118git%{?dist}
 Summary:	LV2 ports of LADSPA swh plugins
 Group:		Applications/Multimedia
 License:	GPLv2+
 URL:		http://lv2plug.in/
-Source0:	http://plugin.org.uk/lv2/%{pkgname}-%{version}.tar.gz
-# The following two patches are sent to the author via email (there is no bugtracker)
+# Get sources from upstream git
+# wget http://github.com/swh/lv2/tarball/master
+Source0:	%{pkgname}-%{gitver}.tar.gz
+#Source0:	http://plugin.org.uk/lv2/%{pkgname}-%{version}.tar.gz
+# The following two patches are sent to the author on github:
 # This patch fixes unresolved symbols errors
-Patch0:		swh-lv2-resolve-symbols.patch
+# http://github.com/swh/lv2/issues#issue/1/comment/77008
+Patch0:		%{pkgname}-resolve-symbols.patch
 # This is for preserving timestamps of the installed files and to correct
 # the permissions of .ttl files
-Patch1:		swh-lv2-time-and-perm.patch
+# http://github.com/swh/lv2/issues#issue/3
+Patch1:		%{pkgname}-time-and-perm.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	fftw-devel
+BuildRequires:	libxslt
 BuildRequires:	lv2core-devel
 Requires:	lv2core
 
@@ -27,7 +34,7 @@ things should work as well or not as the
 
 
 %prep
-%setup -q -n %{pkgname}-%{version}
+%setup -q -n %{pkgname}-%{gitver}
 %patch0 -p1 -b .symbols
 %patch1 -p1 -b .timeandperm
 
@@ -35,6 +42,7 @@ things should work as well or not as the
 rm -f include/lv2.h
 
 %build
+make real-clean
 make %{?_smp_mflags} \
 	CFLAGS="-I%{_includedir} $RPM_OPT_FLAGS" \
 	LDFLAGS="$RPM_OPT_FLAGS"
@@ -56,6 +64,14 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Nov 18 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-4.20091118git
+- Update to latest git, which was only a few bugfix commits away from latest release
+- Drop upstreamed patches
+- More thorough clean-up of the source tree before building
+
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Apr 23 2009 Orcan Ogetbil <oget[DOT]fedora[AT]gmail[DOT]com> - 1.0.15-2
 - Fix unresolved symbols
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-swh-plugins/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Apr 2009 18:06:53 -0000	1.2
+++ sources	19 Nov 2009 02:43:20 -0000	1.3
@@ -1 +1 @@
-c78f42c36d7bf2fb5b17f795ef9636d1  swh-lv2-1.0.15.tar.gz
+0a10cb2deb2149fc27505772b7f48750  swh-lv2-75f9f84.tar.gz

swh-lv2-resolve-symbols.patch:
 Makefile |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Index: swh-lv2-resolve-symbols.patch
===================================================================
RCS file: /cvs/pkgs/rpms/lv2-swh-plugins/F-10/swh-lv2-resolve-symbols.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- swh-lv2-resolve-symbols.patch	27 Apr 2009 18:06:53 -0000	1.1
+++ swh-lv2-resolve-symbols.patch	19 Nov 2009 02:43:20 -0000	1.2
@@ -1,55 +1,29 @@
-diff -rupN swh-lv2-1.0.15.old/extra.mk swh-lv2-1.0.15/extra.mk
---- swh-lv2-1.0.15.old/extra.mk	2008-01-09 16:02:08.000000000 -0500
-+++ swh-lv2-1.0.15/extra.mk	2009-04-23 14:14:10.000000000 -0400
-@@ -1,6 +1,6 @@
+--- swh-lv2-75f9f84.old/Makefile	2009-11-18 02:11:12.000000000 -0500
++++ swh-lv2-75f9f84/Makefile	2009-11-18 02:28:36.000000000 -0500
+@@ -3,8 +3,6 @@ INSTALL_DIR = $(PREFIX)/lib/lv2
+ 
+ VERSION = 1.0.15
+ 
+-include extra.mk
+-
+ PLUGINS = alias-swh.lv2 allpass-swh.lv2 am_pitchshift-swh.lv2 amp-swh.lv2 \
+ analogue_osc-swh.lv2 bandpass_a_iir-swh.lv2 bandpass_iir-swh.lv2 \
+ bode_shifter-swh.lv2 bode_shifter_cv-swh.lv2 butterworth-swh.lv2 \
+@@ -33,7 +31,6 @@ zm1-swh.lv2
+ 
+ FFT_PLUGINS = mbeq-swh.lv2 pitch_scale-swh.lv2
+ 
 -analogue_osc_LDFLAGS = util/blo.o
--fm_osc_LDFLAGS = util/blo.o
--hermes_filter_LDFLAGS = util/blo.o
-+analogue_osc_LDFLAGS = util/blo.o -lrt
-+fm_osc_LDFLAGS = util/blo.o -lrt
-+hermes_filter_LDFLAGS = util/blo.o -lrt
- 
- bandpass_iir_LDFLAGS = util/iir.o
- bandpass_a_iir_LDFLAGS = util/iir.o
-@@ -21,3 +21,6 @@ se4_LDFLAGS = util/db.o util/rms.o
  
- mbeq_CFLAGS = `pkg-config fftw3f --cflags`
- mbeq_LDFLAGS = `pkg-config fftw3f --libs`
-+
-+pitch_scale_CFLAGS = `pkg-config fftw3f --cflags`
-+pitch_scale_LDFLAGS = util/pitchscale.o `pkg-config fftw3f --libs`
-diff -rupN swh-lv2-1.0.15.old/Makefile swh-lv2-1.0.15/Makefile
---- swh-lv2-1.0.15.old/Makefile	2008-01-09 16:02:08.000000000 -0500
-+++ swh-lv2-1.0.15/Makefile	2009-04-23 14:17:41.000000000 -0400
-@@ -44,8 +44,8 @@ PLUGIN_LDFLAGS = -arch i386 -arch ppc -d
- BUILD_PLUGINS = $(PLUGINS)
- else
- EXT = so
--PLUGIN_CFLAGS = -Wall -I. -Iinclude -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fPIC -DPIC $(CFLAGS)
--PLUGIN_LDFLAGS = -shared $(LDFLAGS)
-+PLUGIN_CFLAGS = -Wall -I. -Iinclude -O3 -fomit-frame-pointer -fstrength-reduce -funroll-loops -fPIC -DPIC -DFFTW3 $(CFLAGS)
-+PLUGIN_LDFLAGS = -shared -lm $(LDFLAGS)
- BUILD_PLUGINS = $(PLUGINS) $(FFT_PLUGINS)
+ DARWIN := $(shell uname | grep Darwin)
+ OS := $(shell uname -s)
+@@ -53,6 +50,9 @@ BUILD_PLUGINS = $(PLUGINS) $(FFT_PLUGINS
+ RT = -lrt
  endif
  
-@@ -56,7 +56,7 @@ all: util gverb $(OBJECTS)
- gverb: gverb/gverb.c gverb/gverbdsp.c gverb/gverb.o gverb/gverbdsp.o
- 	(cd gverb && make -w CFLAGS="$(PLUGIN_CFLAGS)" LDFLAGS="$(PLUGIN_LDFLAGS)")
- 
--util: util/blo.o util/iir.o util/db.o util/rms.o
-+util: util/blo.o util/iir.o util/db.o util/rms.o util/pitchscale.o
- 
- %.c: OBJ = $(shell echo $@ | sed 's/\.c$$/- at OS@.$(EXT)/')
- %.c: %.xml
-diff -rupN swh-lv2-1.0.15.old/util/pitchscale.c swh-lv2-1.0.15/util/pitchscale.c
---- swh-lv2-1.0.15.old/util/pitchscale.c	2008-01-09 16:02:07.000000000 -0500
-+++ swh-lv2-1.0.15/util/pitchscale.c	2009-04-23 14:08:52.000000000 -0400
-@@ -36,7 +36,7 @@
- *****************************************************************************/
- 
- #include <string.h>
--#include "../config.h"
-+//#include "../config.h"
- #include <math.h>
++# Load plugin specific flags:
++include extra.mk
++
+ OBJECTS = $(shell echo $(BUILD_PLUGINS) | sed 's/\([^ ]*\.lv2\)/plugins\/\1\/plugin.$(EXT)/g')
  
- #include "pitchscale.h"
+ all: util gverb $(OBJECTS)


