Jan Engelhardt 2012-03-11 12:36:01 +00:00 committed by Git OBS Bridge
parent 26c4a83377
commit 6b5b9b218e
10 changed files with 289 additions and 123 deletions

1
baselibs.conf Normal file
View File

@ -0,0 +1 @@
libspandsp2

0
ready
View File

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6f645fab8ed5bfe08f33a8e8efd7aa3dcbdc60d762ccabf53a46bb5ab4805fb7
size 2169502

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:53c3402d46823969303d4323b4c83be8bdb40fca4076dd285a20e5beea373e55
size 2750386

49
spandsp-autoconf.diff Normal file
View File

@ -0,0 +1,49 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-07-17 16:15:32.890081276 +0200
Upstream: tbd
build: resolve libtool warnings
libtoolize: Consider adding "AC_CONFIG_MACRO_DIR([m4])" to configure.ac and
libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree.
libtoolize: Consider adding "-I m4" to ACLOCAL_AMFLAGS in Makefile.am.
The extra file in m4 is for making sure the directory exists.
---
Makefile.am | 2 ++
configure.ac | 1 +
m4/.gitignore | 2 ++
3 files changed, 5 insertions(+)
Index: spandsp-0.0.6/Makefile.am
===================================================================
--- spandsp-0.0.6.orig/Makefile.am
+++ spandsp-0.0.6/Makefile.am
@@ -16,6 +16,8 @@
## License along with this program; if not, write to the Free Software
## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ACLOCAL_AMFLAGS = -I m4
+
AM_CFLAGS = $(COMP_VENDOR_CFLAGS)
AM_LDFLAGS = $(COMP_VENDOR_LDFLAGS)
Index: spandsp-0.0.6/configure.ac
===================================================================
--- spandsp-0.0.6.orig/configure.ac
+++ spandsp-0.0.6/configure.ac
@@ -44,6 +44,7 @@ AC_SUBST(SPANDSP_LT_AGE)
AC_CONFIG_SRCDIR([src/tone_generate.c])
AC_CONFIG_AUX_DIR(config)
+AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([src/config.h:config-h.in])
AM_INIT_AUTOMAKE($PACKAGE, $VERSION)
Index: spandsp-0.0.6/m4/.gitignore
===================================================================
--- /dev/null
+++ spandsp-0.0.6/m4/.gitignore
@@ -0,0 +1,2 @@
+/libtool.m4
+/lt*.m4

104
spandsp-lrint.diff Normal file
View File

@ -0,0 +1,104 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-07-17 16:15:32.890081276 +0200
Upstream: tbd
build: fix lrint detection
The configure test puts -lm into the wrong place.
configure:16102: gcc -o conftest -lm conftest.c >&5
/tmp/ccZ8dPRc.o: In function `main':
conftest.c:(.text+0xd): undefined reference to `lrint'
conftest.c:(.text+0x1f): undefined reference to `lrint'
collect2: ld returned 1 exit status
"-lm" is a library, not a CFLAG.
---
config/ax_c99_features.m4 | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
Index: spandsp-0.0.6/config/ax_c99_features.m4
===================================================================
--- spandsp-0.0.6.orig/config/ax_c99_features.m4
+++ spandsp-0.0.6/config/ax_c99_features.m4
@@ -47,8 +47,8 @@ AC_DEFUN([AX_C99_FUNC_LRINT],
[AC_CACHE_CHECK(for lrint,
ac_cv_c99_lrint,
[
-lrint_save_CFLAGS=$CFLAGS
-CFLAGS="-lm"
+lrint_save_LIBS="$LIBS"
+LIBS="-lm"
AC_TRY_LINK([
#define _ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1
@@ -58,7 +58,7 @@ AC_TRY_LINK([
#include <math.h>
], if (!lrint(3.14159)) lrint(2.7183);, ac_cv_c99_lrint=yes, ac_cv_c99_lrint=no)
-CFLAGS=$lrint_save_CFLAGS
+LIBS="$lrint_save_LIBS"
])
@@ -84,8 +84,8 @@ AC_DEFUN([AX_C99_FUNC_LRINTF],
[AC_CACHE_CHECK(for lrintf,
ac_cv_c99_lrintf,
[
-lrintf_save_CFLAGS=$CFLAGS
-CFLAGS="-lm"
+lrintf_save_LIBS="$LIBS"
+LIBS="-lm"
AC_TRY_LINK([
#define _ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1
@@ -95,7 +95,7 @@ AC_TRY_LINK([
#include <math.h>
], if (!lrintf(3.14159)) lrintf(2.7183);, ac_cv_c99_lrintf=yes, ac_cv_c99_lrintf=no)
-CFLAGS=$lrintf_save_CFLAGS
+libs="$lrintf_save_LIBS"
])
@@ -121,8 +121,8 @@ AC_DEFUN([AX_C99_FUNC_LLRINT],
[AC_CACHE_CHECK(for llrint,
ac_cv_c99_llrint,
[
-llrint_save_CFLAGS=$CFLAGS
-CFLAGS="-lm"
+llrint_save_LIBS="$LIBS"
+LIBS="-lm"
AC_TRY_LINK([
#define ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1
@@ -132,7 +132,7 @@ AC_TRY_LINK([
#include <math.h>
], long long int x ; x = llrint(3.14159) ;, ac_cv_c99_llrint=yes, ac_cv_c99_llrint=no)
-CFLAGS=$llrint_save_CFLAGS
+LIBS="$llrint_save_LIBS"
])
@@ -159,8 +159,8 @@ AC_DEFUN([AX_C99_FUNC_LLRINTF],
[AC_CACHE_CHECK(for llrintf,
ac_cv_c99_llrintf,
[
-llrintf_save_CFLAGS=$CFLAGS
-CFLAGS="-lm"
+llrintf_save_LIBS="$LIBS"
+LIBS="-lm"
AC_TRY_LINK([
#define _ISOC9X_SOURCE 1
#define _ISOC99_SOURCE 1
@@ -170,7 +170,7 @@ AC_TRY_LINK([
#include <math.h>
], long long int x ; x = llrintf(3.14159) ;, ac_cv_c99_llrintf=yes, ac_cv_c99_llrintf=no)
-CFLAGS=$llrintf_save_CFLAGS
+LIBS="$llrintf_save_LIBS"
])

24
spandsp-path.diff Normal file
View File

@ -0,0 +1,24 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: long ago, 2011-07-17 16:15:32.890081276 +0200 or earlier
Upstream: tbd
libdir is used in shell context, where $() is wrong.
*headshake* Just use ${}, which is valid in both sh _and_ make.
---
configure.ac | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: spandsp-0.0.6/configure.ac
===================================================================
--- spandsp-0.0.6.orig/configure.ac
+++ spandsp-0.0.6/configure.ac
@@ -253,7 +253,7 @@ then
case "${host}" in
x86_64-*)
# X86_64 Linux machines may have both 64 bit and 32 bit libraries. We need to choose the right set
- AX_CHECK_REAL_FILE([${prefix}/lib64], libdir='$(exec_prefix)/lib64')
+ AX_CHECK_REAL_FILE([${prefix}/lib64], libdir='${exec_prefix}/lib64')
AX_CHECK_REAL_FILE([/usr/X11R6/lib64], [TESTLIBS="$TESTLIBS -L/usr/X11R6/lib64"], AC_CHECK_FILE([/usr/X11R6/lib], [TESTLIBS="$TESTLIBS -L/usr/X11R6/lib"]))
# The very oldest AMD 64 bit chips support SSE2, SSE and MMX
enable_sse2="yes"

23
spandsp-pkgconfig1.diff Normal file
View File

@ -0,0 +1,23 @@
From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-07-17 16:15:32.890081276 +0200
Upstream: tbd
Libraries required only for static linking should go into
Libs.private, not Libs.
---
spandsp.pc.in | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
Index: spandsp-0.0.6/spandsp.pc.in
===================================================================
--- spandsp-0.0.6.orig/spandsp.pc.in
+++ spandsp-0.0.6/spandsp.pc.in
@@ -7,5 +7,6 @@ Name: spandsp
Description: A DSP library for telephony.
Requires:
Version: @VERSION@
-Libs: -L${libdir} -lspandsp -ltiff -lm
+Libs: -L${libdir} -lspandsp
+Libs.private: -ltiff -lm
Cflags: -I${includedir}

View File

@ -1,3 +1,38 @@
-------------------------------------------------------------------
Sat Nov 19 16:02:00 UTC 2011 - coolo@suse.com
- add libtool as buildrequire to avoid implicit dependency
-------------------------------------------------------------------
Thu Oct 27 15:16:40 UTC 2011 - kkeil@linux-pingi.de
- Upstream did change the license to LGPL 2.1 in 2008
-------------------------------------------------------------------
Sat Oct 8 16:23:09 UTC 2011 - jengelh@medozas.de
- updated to new upstream release 0.0.6pre18
* no changelog was provided by upstream
- put documentation into its own subpackage
- enable SSE2 on x86_64, since it's part of the x86_64 ABI anyway
- add patches to resolve autoconf warnings (spandsp-autoconf.diff),
failure to properly find lrint (spandsp-lrint.diff), a typo
(spandsp-path.diff), and faulty dependencies
(spandsp-pkgconfig1.diff)
- Separate build and test dependencies
- Enable parallel build
-------------------------------------------------------------------
Sat Mar 13 20:33:19 UTC 2010 - chris@computersalat.de
- added baselibs.conf
- cleanup spec
o sort TAGS
o fix build warnig
build without RPM_OPT_FLAGS
o macro usage
o removed data from changelog
-------------------------------------------------------------------
Wed Sep 24 12:22:20 CEST 2008 - ro@suse.de

View File

@ -1,7 +1,7 @@
#
# spec file for package spandsp (Version 0.0.5pre4)
# spec file for package spandsp
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -15,20 +15,32 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
Name: spandsp
BuildRequires: audiofile-devel docbook-xsl-stylesheets doxygen gcc-c++ libtiff-devel libxslt
Url: http://www.soft-switch.org/
%define lname libspandsp2
Summary: A DSP library for Telephony and SoftFAX
Version: 0.0.5pre4
Release: 3
License: GPL v2 only
Version: 0.0.6pre18
Release: 0
License: LGPL-2.1
Group: System/Libraries
Url: http://soft-switch.org/
Source0: %{name}-%{version}.tar.bz2
Source1: baselibs.conf
Patch1: spandsp-autoconf.diff
Patch2: spandsp-pkgconfig1.diff
Patch3: spandsp-path.diff
Patch4: spandsp-lrint.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define debug_package_requires libspandsp1 = %{version}-%{release}
BuildRequires: docbook-xsl-stylesheets doxygen
BuildRequires: libtiff-devel libxslt
BuildRequires: libtool pkgconfig
%define tests 0
%if 0%{?tests}
BuildRequires: fftw3-devel fltk-devel gcc-c++
BuildRequires: libpcap-devel pkgconfig(audiofile) pkgconfig(sndfile)
BuildRequires: pkgconfig(libxml-2.0) pkgconfig(xproto)
%endif
%description
SpanDSP is a library of DSP functions for telephony, in the 8000 sample
@ -37,48 +49,39 @@ contains low level functions, such as basic filters. It also contains
higher level functions, such as cadenced supervisory tone detection,
and a complete software FAX machine.
Authors:
--------
Steve Underwood <steveu@coppice.org>
%package devel
License: GPL v2 only
Summary: Development files for the SpanDSP library
Group: Development/Libraries/C and C++
Requires: libspandsp1 = %version libtiff-devel glibc-devel
Requires: %lname = %{version} libtiff-devel glibc-devel
%description devel
This package contains files that are needed for developing or compiling
software that uses the spandsp library.
Authors:
--------
Steve Underwood <steveu@coppice.org>
%package -n libspandsp1
License: GPL v2 only
%package -n %lname
Summary: A DSP library for Telephony and SoftFAX
Group: System/Libraries
%description -n libspandsp1
%description -n %lname
SpanDSP is a library of DSP functions for telephony, in the 8000 sample
per second world of E1s, T1s, and higher order PCM channels. It
contains low level functions, such as basic filters. It also contains
higher level functions, such as cadenced supervisory tone detection,
and a complete software FAX machine.
%package doc
Summary: Documentation for the libspandsp API
Group: Documentation/HTML
%if 0%{?suse_version} >= 1130
BuildArch: noarch
%endif
Authors:
--------
Steve Underwood <steveu@coppice.org>
%description doc
This package contains documentation for the libspandsp API.
%prep
%setup -q -n spandsp-0.0.5
%setup -qn %name-0.0.6
%patch -P 1 -P 2 -P 3 -P 4 -p1
%build
autoreconf -fiv
@ -87,114 +90,41 @@ autoreconf -fiv
--enable-mmx \
%endif
%ifarch x86_64
--enable-sse \
--enable-sse --enable-sse2 \
%endif
--disable-static \
--enable-doc \
--with-pic
make
make %{?_smp_mflags}
%check
make check
%if 0%{?tests}
make check %{?_smp_mflags}
%endif
%install
%makeinstall
mkdir -p %buildroot/%_docdir/%name
cp -a COPYING INSTALL AUTHORS NEWS README DueDiligence \
ChangeLog doc/api/html %buildroot/%_docdir/%name
find %buildroot -name '*.la' | xargs rm
find "%buildroot" -name "*.la" -delete
%post -n libspandsp1 -p /sbin/ldconfig
%post -n %lname -p /sbin/ldconfig
%postun -n libspandsp1 -p /sbin/ldconfig
%clean
rm -rf %buildroot
%postun -n %lname -p /sbin/ldconfig
%files devel
%defattr(-,root,root,-)
%doc %_docdir/%name
%_includedir/*
%_libdir/libs*.so
%_libdir/lib%name.so
%_libdir/pkgconfig/*.pc
%files -n libspandsp1
%files -n %lname
%defattr(-,root,root,-)
%_libdir/lib*.so.*
%_libdir/lib%name.so.2*
%files doc
%defattr(-,root,root)
%doc %_docdir/%name
%changelog
* Wed Sep 24 2008 ro@suse.de
- fix debug package requires again
* Wed Sep 17 2008 mrueckert@suse.de
- fix requires of the debug package
* Thu Sep 11 2008 max@suse.de
- New version: 0.0.5pre4
- Packages renamed to comply with the package naming conventions.
- Added libxslt and docbook-xsl-stylesheets to build the
T.34 documentation.
* Sat May 03 2008 crrodriguez@suse.de
- fix Error: shlib-with-non-pic-code /usr/lib/libspandsp.so.0.0.2 in PPC
_ some files not built with RPM_OPT_FLAGS
* Mon Feb 25 2008 crrodriguez@suse.de
- fix library-without-ldconfig* errors
- fix -devel package dependencies
* Wed Jan 23 2008 max@suse.de
- New version: 0.0.4pre16
- It is said to be more stable for faxing (#347599).
- Added API documentation to the devel subpackage.
- Enabled MMX for i586 and i686.
- Removed the static library.
* Thu Aug 02 2007 max@suse.de
- Update to final 0.0.3 version (obsoletes our previous patches)
- Split off a devel package
* Tue Mar 13 2007 pgajdos@suse.cz
- fixed 'warning: array subscript is above array bounds' (#239958)
- array-subscript.patch
* Fri Oct 20 2006 max@suse.de
- New version: 0.0.3pre24
- Improved fax handling.
* Mon Mar 20 2006 max@suse.de
- New version: 0.0.2pre25
- fixed an error in T.4 processing, causing a sideways shift with some
sending FAX machines (e.g. some Canons).
- fixed an error in the generation of single tones.
* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
* Mon Jan 23 2006 max@suse.de
- New version: 0.0.2pre23
* Fri Dec 16 2005 max@suse.de
- New version: 0.0.2pre21
* Mon May 23 2005 max@suse.de
- New version: 0.0.2pre18
* Wed May 04 2005 max@suse.de
- New version: 0.0.2pre17
* Fri Apr 22 2005 max@suse.de
- New version: 0.0.2pre15
- Fixed building with gcc4 and reduced warnings.
* Thu Apr 14 2005 sbrabec@suse.cz
- Added audiofile-devel to neededforbuild.
* Mon Feb 28 2005 max@suse.de
- New version: 0.0.2pre10
* Mon Feb 28 2005 max@suse.de
- New version: 0.0.2pre9
* Thu Jan 13 2005 max@suse.de
- New version: 0.0.2pre8
* Wed Jan 12 2005 max@suse.de
- New version: 0.0.2pre7
* Mon Nov 29 2004 max@suse.de
- New version: 0.0.2pre6
* Thu Nov 18 2004 ro@suse.de
- fixed file list
* Fri Nov 05 2004 max@suse.de
- New version: 0.0.2pre4
* Tue Jul 06 2004 max@suse.de
- autoreconf needs --install to get the names of shared libs right.
* Mon Jul 05 2004 max@suse.de
- Don't use x86-speciffic assembler code.
* Wed Jun 23 2004 max@suse.de
- New package: spandsp (0.0.1k)
- SpanDSP is a library of DSP functions for telephony, in the
8000 sample per second world of E1s, T1s, and higher order
PCM channels. It contains low level functions, such as basic
filters. It also contains higher level functions, such as
cadenced supervisory tone detection, and a complete software
FAX machine.