Accepting request 293154 from home:posophe:branches:network:telephony
update OBS-URL: https://build.opensuse.org/request/show/293154 OBS-URL: https://build.opensuse.org/package/show/network:telephony/spandsp?expand=0&rev=27
This commit is contained in:
parent
d82a6583e4
commit
88ef567958
3
spandsp-0.0.6.tar.gz
Normal file
3
spandsp-0.0.6.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cc053ac67e8ac4bb992f258fd94f275a7872df959f6a87763965feabfdcc9465
|
||||
size 3309837
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f2487e5dbb131c44f5ac4514a061d3f4acf496a06e85f97b2397d9ba585bc0bf
|
||||
size 2388024
|
@ -32,13 +32,13 @@ 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)
|
||||
@@ -45,6 +45,7 @@
|
||||
|
||||
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)
|
||||
AM_INIT_AUTOMAKE([1.9.5])
|
||||
|
||||
Index: spandsp-0.0.6/m4/.gitignore
|
||||
===================================================================
|
||||
|
@ -1,104 +0,0 @@
|
||||
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"
|
||||
|
||||
])
|
||||
|
@ -1,24 +0,0 @@
|
||||
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"
|
@ -1,23 +0,0 @@
|
||||
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}
|
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 25 17:33:40 UTC 2015 - p.drouand@gmail.com
|
||||
|
||||
- Update to version 0.0.6 (finale)
|
||||
* Unupdated changelog
|
||||
- Remove obsolete patches
|
||||
* spandsp-pkgconfig1.diff
|
||||
* spandsp-path.diff
|
||||
* spandsp-lrint.diff
|
||||
- Update spandsp-autoconf.diff
|
||||
- Use download Url as source
|
||||
- Remove xz require
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jan 25 04:27:45 UTC 2013 - jengelh@inai.de
|
||||
|
||||
|
22
spandsp.spec
22
spandsp.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package spandsp
|
||||
#
|
||||
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2015 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
|
||||
@ -21,17 +21,13 @@ Name: spandsp
|
||||
Summary: A DSP library for Telephony and SoftFAX
|
||||
License: LGPL-2.1 and GPL-2.0
|
||||
Group: Development/Libraries/C and C++
|
||||
Version: 0.0.6pre21
|
||||
Version: 0.0.6
|
||||
Release: 0
|
||||
Url: http://soft-switch.org/
|
||||
|
||||
#DL-URL: http://soft-switch.org/downloads/spandsp/
|
||||
Source0: %name-%version.tar.xz
|
||||
Source0: http://soft-switch.org/downloads/spandsp/%name-%version.tar.gz
|
||||
Source1: baselibs.conf
|
||||
Patch1: spandsp-autoconf.diff
|
||||
Patch2: spandsp-pkgconfig1.diff
|
||||
Patch3: spandsp-path.diff
|
||||
Patch4: spandsp-lrint.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: doxygen
|
||||
@ -39,7 +35,6 @@ BuildRequires: libtiff-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: libxslt
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: xz
|
||||
%define tests 0
|
||||
%if 0%{?tests}
|
||||
BuildRequires: fftw3-devel
|
||||
@ -96,7 +91,7 @@ This package contains documentation for the libspandsp API.
|
||||
|
||||
%prep
|
||||
%setup -qn %name-0.0.6
|
||||
%patch -P 1 -P 2 -P 3 -P 4 -p1
|
||||
%patch1 -p1
|
||||
|
||||
%build
|
||||
autoreconf -fiv
|
||||
@ -118,12 +113,11 @@ make check %{?_smp_mflags}
|
||||
%endif
|
||||
|
||||
%install
|
||||
b="%buildroot";
|
||||
make install DESTDIR="$b";
|
||||
mkdir -p "$b/%_docdir/%name";
|
||||
make install DESTDIR="%buildroot";
|
||||
mkdir -p "%buildroot%_docdir/%name";
|
||||
cp -a COPYING AUTHORS NEWS README DueDiligence \
|
||||
ChangeLog doc/api/html "$b/%_docdir/%name";
|
||||
find "$b" -name "*.la" -delete
|
||||
ChangeLog doc/api/html "%buildroot%_docdir/%name";
|
||||
find %{buildroot} -name "*.la" -delete
|
||||
|
||||
%post -n %lname -p /sbin/ldconfig
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user