diff --git a/libsamplerate-ac.diff b/libsamplerate-ac.diff index 56cf9dc..5f2105a 100644 --- a/libsamplerate-ac.diff +++ b/libsamplerate-ac.diff @@ -1,5 +1,3 @@ -Index: acinclude.m4 -=================================================================== --- acinclude.m4.orig +++ acinclude.m4 @@ -135,7 +135,6 @@ if test $ac_cv_c_byte_order = unknown ; @@ -18,3 +16,53 @@ Index: acinclude.m4 )# AC_C_FIND_ENDIAN +--- configure.ac.orig ++++ configure.ac +@@ -4,7 +4,8 @@ dnl Require autoconf version >= 2.57) + AC_PREREQ(2.57) + + AC_INIT([libsamplerate],[0.1.7],[erikd@mega-nerd.com]) +- ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + # Put config stuff in Cfg. + AC_CONFIG_AUX_DIR(Cfg) + +@@ -16,10 +17,6 @@ AC_CONFIG_MACRO_DIR([M4]) + AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION) + AC_CONFIG_HEADER(src/config.h) + +- +-dnl Add parameters for aclocal +-AC_SUBST(ACLOCAL_AMFLAGS, "-I M4") +- + AC_LANG([C]) + + #------------------------------------------------------------------------------------ +@@ -40,7 +37,7 @@ AC_LANG([C]) + + SHARED_VERSION_INFO="1:7:1" + +-AC_PROG_CC ++AC_PROG_CC_STDC + AM_PROG_CC_C_O + + # Do not check for F77. +@@ -122,7 +119,7 @@ AC_CHECK_SIGNAL(SIGALRM) + + AC_C99_FUNC_LRINT + AC_C99_FUNC_LRINTF +-# AC_C99_FUNC_LLRINT Don't need this (yet?). ++AC_C99_FUNC_LLRINT + + case "x$ac_cv_c99_lrint$ac_cv_c99_lrintf" in + xyesyes) +--- Makefile.am.orig ++++ Makefile.am +@@ -1,5 +1,6 @@ + ## Process this file with automake to produce Makefile.in + ++ACLOCAL_AMFLAGS = -I M4 + DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror + + SUBDIRS = src doc examples tests diff --git a/libsamplerate.changes b/libsamplerate.changes index 638c07f..5b85202 100644 --- a/libsamplerate.changes +++ b/libsamplerate.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Dec 8 16:23:18 UTC 2010 - cristian.rodriguez@opensuse.org + +- Import debian fixes, this fix: +* The test suite so we can run make check +* src_simple() causes a crash with certain inputs + ------------------------------------------------------------------- Sun Jun 6 16:54:13 UTC 2010 - cristian.rodriguez@opensuse.org diff --git a/libsamplerate.spec b/libsamplerate.spec index 894d3c2..66154b5 100644 --- a/libsamplerate.spec +++ b/libsamplerate.spec @@ -19,7 +19,7 @@ Name: libsamplerate -BuildRequires: pkgconfig +BuildRequires: pkgconfig fftw3-devel quilt libsndfile-devel Summary: A Sample Rate Converter Library Version: 0.1.7 Release: 1 @@ -27,7 +27,8 @@ License: GPLv2+ Group: System/Libraries Source: %{name}-%{version}.tar.bz2 Source2: baselibs.conf -Patch: %{name}-ac.diff +Patch0: %{name}-ac.diff +Patch1: libsamplerate_0.1.7-3.diff.gz Url: http://www.mega-nerd.com/SRC/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -80,12 +81,18 @@ Authors: %prep %setup -q -%patch +%patch0 +%patch1 -p1 +QUILT_PATCHES=debian/patches quilt push -a %build autoreconf --force --install %configure --with-pic --disable-static make %{?jobs:-j %jobs} +%check +pushd tests +make check +popd %install make DESTDIR="$RPM_BUILD_ROOT" install diff --git a/libsamplerate_0.1.7-3.diff.gz b/libsamplerate_0.1.7-3.diff.gz new file mode 100644 index 0000000..91a0aed --- /dev/null +++ b/libsamplerate_0.1.7-3.diff.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9cc16187e56b683628af41c2f94d687a78e9decb9975b3968fbbaf2249c388c4 +size 7534