r1173 - in /unstable/djbfft/debian: changelog control libdjbfft-dev.install libdjbfft0.76-dev.install libdjbfft0.76-dev.links libdjbfft0.76.install patches/03_libdjbfft.patch patches/03_shared-libdjbfft.patch patches/series rules

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Wed Apr 30 12:52:22 UTC 2008 

Author: fabian-guest
Date: Wed Apr 30 12:52:21 2008
New Revision: 1173

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1173
Log:
Decided to stay with the static library and build a PIC enabled version.

Added:
    unstable/djbfft/debian/libdjbfft-dev.install
      - copied, changed from r1160, unstable/djbfft/debian/libdjbfft0.76-dev.install
    unstable/djbfft/debian/patches/03_libdjbfft.patch
Removed:
    unstable/djbfft/debian/libdjbfft0.76-dev.install
    unstable/djbfft/debian/libdjbfft0.76-dev.links
    unstable/djbfft/debian/libdjbfft0.76.install
    unstable/djbfft/debian/patches/03_shared-libdjbfft.patch
Modified:
    unstable/djbfft/debian/changelog
    unstable/djbfft/debian/control
    unstable/djbfft/debian/patches/series
    unstable/djbfft/debian/rules

Modified: unstable/djbfft/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/djbfft/debian/changelog?rev=1173&op=diff
==============================================================================
--- unstable/djbfft/debian/changelog (original)
+++ unstable/djbfft/debian/changelog Wed Apr 30 12:52:21 2008
@@ -1,7 +1,5 @@
 djbfft (0.76-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #477806).
-  * Applied a (slightly modified) patch from Gentoo to build the shared
-    library.
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Fri, 25 Apr 2008 00:00:00 +0100
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Wed, 30 Apr 2008 00:00:00 +0100

Modified: unstable/djbfft/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/djbfft/debian/control?rev=1173&op=diff
==============================================================================
--- unstable/djbfft/debian/control (original)
+++ unstable/djbfft/debian/control Wed Apr 30 12:52:21 2008
@@ -9,8 +9,8 @@
 Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/djbfft/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/djbfft/
 
-Package: libdjbfft0.76
-Section: libs
+Package: libdjbfft-dev
+Section: libdevel
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: extremely fast library for floating-point convolution
@@ -20,17 +20,4 @@
  at twice the speed, and fast multiplication of complex arrays. Single
  precision and double precision are equally supported.
  .
- This package contains the shared library.
-
-Package: libdjbfft0.76-dev
-Section: libdevel
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libdjbfft0.76 (= ${binary:Version})
-Description: extremely fast library for floating-point convolution (development)
- djbfft is an extremely fast library for floating-point convolution. The
- current version holds most of the speed records for double-precision FFTs on
- general-purpose computers. djbfft provides power-of-2 complex FFTs, real FFTs
- at twice the speed, and fast multiplication of complex arrays. Single
- precision and double precision are equally supported.
- .
  This package contains the development files.

Copied: unstable/djbfft/debian/libdjbfft-dev.install (from r1160, unstable/djbfft/debian/libdjbfft0.76-dev.install)
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/djbfft/debian/libdjbfft-dev.install?rev=1173&op=diff
==============================================================================
--- unstable/djbfft/debian/libdjbfft0.76-dev.install (original)
+++ unstable/djbfft/debian/libdjbfft-dev.install Wed Apr 30 12:52:21 2008
@@ -7,4 +7,4 @@
 fftr4.h	/usr/include
 fftr8.h	/usr/include
 fftfreq.h	/usr/include
-libdjbfft.a	/usr/lib
+libdjbfft*.a	/usr/lib

Added: unstable/djbfft/debian/patches/03_libdjbfft.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/djbfft/debian/patches/03_libdjbfft.patch?rev=1173&op=file
==============================================================================
--- unstable/djbfft/debian/patches/03_libdjbfft.patch (added)
+++ unstable/djbfft/debian/patches/03_libdjbfft.patch Wed Apr 30 12:52:21 2008
@@ -1,0 +1,80 @@
+--- djbfft.orig/Makefile
++++ djbfft/Makefile
+@@ -569,8 +569,8 @@
+ 	./compile 8v5.c
+ 
+ accuracy: \
+-load accuracy.o djbfft.a math.lib
+-	./load accuracy djbfft.a  `cat math.lib`
++load accuracy.o libdjbfft.a math.lib
++	./load accuracy libdjbfft.a  `cat math.lib`
+ 
+ accuracy.o: \
+ compile accuracy.c fftc4.h complex4.h real4.h fftc8.h complex8.h \
+@@ -578,8 +578,8 @@
+ 	./compile accuracy.c
+ 
+ accuracy2: \
+-load accuracy2.o djbfft.a math.lib
+-	./load accuracy2 djbfft.a  `cat math.lib`
++load accuracy2.o libdjbfft.a math.lib
++	./load accuracy2 libdjbfft.a  `cat math.lib`
+ 
+ accuracy2.o: \
+ compile accuracy2.c fftc4.h complex4.h real4.h fftc8.h complex8.h \
+@@ -649,7 +649,7 @@
+ 	) > compilebase
+ 	chmod 755 compilebase
+ 
+-djbfft.a: \
++libdjbfft.a: \
+ makelib 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o 8u0.o 8mc.o 8c0.o 8c1.o \
+ 8c2.o 8c3.o 8c4.o 8c5.o 8d0.o 8d1.o 8d2.o 8d3.o 8d4.o 8d5.o 8v5.o \
+ 8v4.o 8v3.o 8v2.o 8v1.o 8v0.o 8mr.o 8r0.o 8r1.o 8r2.o 8r3.o 8r4.o \
+@@ -657,7 +657,7 @@
+ 4c1.o 4c2.o 4c3.o 4c4.o 4c5.o 4d0.o 4d1.o 4d2.o 4d3.o 4d4.o 4d5.o \
+ 4v5.o 4v4.o 4v3.o 4v2.o 4v1.o 4v0.o 4mr.o 4r0.o 4r1.o 4r2.o 4r3.o \
+ 4r4.o 4r5.o 4sr.o fftfreq.o
+-	./makelib djbfft.a 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o \
++	./makelib libdjbfft.a 8sc.o 8u5.o 8u4.o 8u3.o 8u2.o 8u1.o \
+ 	8u0.o 8mc.o 8c0.o 8c1.o 8c2.o 8c3.o 8c4.o 8c5.o 8d0.o 8d1.o \
+ 	8d2.o 8d3.o 8d4.o 8d5.o 8v5.o 8v4.o 8v3.o 8v2.o 8v1.o 8v0.o \
+ 	8mr.o 8r0.o 8r1.o 8r2.o 8r3.o 8r4.o 8r5.o 8sr.o 4sc.o 4u5.o \
+@@ -758,15 +758,15 @@
+ 	./compile open_trunc.c
+ 
+ prog: \
+-djbfft.a accuracy accuracy2 speed speed.out
++libdjbfft.a accuracy accuracy2 speed speed.out
+ 
+ setup: \
+ it install
+ 	./install
+ 
+ speed: \
+-load speed.o djbfft.a math.lib
+-	./load speed djbfft.a  `cat math.lib`
++load speed.o libdjbfft.a math.lib
++	./load speed libdjbfft.a  `cat math.lib`
+ 
+ speed.o: \
+ compile speed.c fftr4.h real4.h fftr8.h real8.h fftc4.h complex4.h \
+--- djbfft.orig/hier.c
++++ djbfft/hier.c
+@@ -2,12 +2,12 @@
+ 
+ void hier()
+ {
+-  h(auto_home,-1,-1,02755);
++  h(auto_home,-1,-1,0755);
+ 
+-  d(auto_home,"lib",-1,-1,02755);
+-  c(auto_home,"lib","djbfft.a",-1,-1,0644);
++  d(auto_home,"lib",-1,-1,0755);
++  c(auto_home,"lib","libdjbfft.a",-1,-1,0644);
+ 
+-  d(auto_home,"include",-1,-1,02755);
++  d(auto_home,"include",-1,-1,0755);
+   c(auto_home,"include","real4.h",-1,-1,0644);
+   c(auto_home,"include","real8.h",-1,-1,0644);
+   c(auto_home,"include","complex4.h",-1,-1,0644);

Modified: unstable/djbfft/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/djbfft/debian/patches/series?rev=1173&op=diff
==============================================================================
--- unstable/djbfft/debian/patches/series (original)
+++ unstable/djbfft/debian/patches/series Wed Apr 30 12:52:21 2008
@@ -1,3 +1,3 @@
 01_conf.patch
 02_gcc-3.patch
-03_shared-libdjbfft.patch
+03_libdjbfft.patch

Modified: unstable/djbfft/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/djbfft/debian/rules?rev=1173&op=diff
==============================================================================
--- unstable/djbfft/debian/rules (original)
+++ unstable/djbfft/debian/rules Wed Apr 30 12:52:21 2008
@@ -3,16 +3,15 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-build/libdjbfft0.76:: libdjbfft.so.0.76
-libdjbfft.so.0.76:
-	rm -f *.so.* $(shell cat TARGETS)
-	make LIBDJBFFT="libdjbfft.so.0.76" LIBPERMS="0755" LIBSONAME="libdjbfft.so.0.76" \
-		CFLAGS="$(CFLAGS) -fPIC -DPIC" LDFLAGS="$(LDFLAGS)"
+build/libdjbfft-dev:: libdjbfft.a
+libdjbfft.a:
+	# Build and backup the PIC library
+	make CFLAGS="$(CFLAGS) -fPIC -DPIC" LDFLAGS="$(LDFLAGS)"
+	mv -f libdjbfft.a libdjbfft_pic.a
+	rm -f $(shell cat TARGETS)
 
-build/libdjbfft0.76-dev:: libdjbfft.a
-libdjbfft.a:
-	rm -f *.a $(shell cat TARGETS)
-	make LIBDJBFFT="libdjbfft.a" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+	# Build the normal static library
+	make CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 clean::
-	rm -f *.a *.so.* $(shell cat TARGETS)
+	rm -f *.a $(shell cat TARGETS)

More information about the pkg-multimedia-commits mailing list