- Removed spurious #endif in the libsndfile.h wrapper. Thx to Edward

Sheldrake for finding it. Fixes #468508.
- Fix build for autoconf-2.63
This commit is contained in:
Andreas Thienemann 2008-10-25 13:54:28 +00:00
parent 9111a019d9
commit eefc3802c7
2 changed files with 32 additions and 1 deletions

View File

@ -0,0 +1,27 @@
diff -up libsndfile-1.0.17/acinclude.m4.orig libsndfile-1.0.17/acinclude.m4
--- libsndfile-1.0.17/acinclude.m4.orig 2008-10-25 15:36:13.000000000 +0200
+++ libsndfile-1.0.17/acinclude.m4 2008-10-25 15:36:18.000000000 +0200
@@ -266,11 +266,6 @@ else
ac_cv_c_big_endian=0
ac_cv_c_little_endian=0
- AC_MSG_WARN([[*****************************************************************]])
- AC_MSG_WARN([[*** Not able to determine endian-ness of target processor. ]])
- AC_MSG_WARN([[*** The constants CPU_IS_BIG_ENDIAN and CPU_IS_LITTLE_ENDIAN in ]])
- AC_MSG_WARN([[*** src/config.h may need to be hand editied. ]])
- AC_MSG_WARN([[*****************************************************************]])
fi
)# AC_C_FIND_ENDIAN
diff -up libsndfile-1.0.17/configure.ac.orig libsndfile-1.0.17/configure.ac
--- libsndfile-1.0.17/configure.ac.orig 2008-10-25 15:35:36.000000000 +0200
+++ libsndfile-1.0.17/configure.ac 2008-10-25 15:35:57.000000000 +0200
@@ -31,6 +31,8 @@ AC_LANG([C])
SHARED_VERSION_INFO="1:17:0"
AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_CXX
AM_PROG_LIBTOOL
AC_CHECK_PROG(autogen, autogen, yes, no)

View File

@ -8,9 +8,11 @@ URL: http://www.mega-nerd.com/libsndfile/
Source0: http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz Source0: http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
Patch0: libsndfile-1.0.17+flac-1.1.3.patch Patch0: libsndfile-1.0.17+flac-1.1.3.patch
Patch1: libsndfile-1.0.17-flac-buffer-overflow.patch Patch1: libsndfile-1.0.17-flac-buffer-overflow.patch
Patch2: libsndfile-1.0.17-autotools.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel, pkgconfig, flac-devel, sqlite-devel, libogg-devel BuildRequires: alsa-lib-devel, pkgconfig, flac-devel, sqlite-devel, libogg-devel
BuildRequires: libtool, autoconf, automake
Provides: %{name}-octave = %{version}-%{release} Provides: %{name}-octave = %{version}-%{release}
@ -38,7 +40,8 @@ This package contains files needed to develop with libsndfile.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
autoreconf
%build %build
%configure \ %configure \
@ -119,6 +122,7 @@ rm -rf $RPM_BUILD_ROOT
* Thu Oct 25 2008 Andreas Thienemann <andreas@bawue.net> - 1.0.17-6 * Thu Oct 25 2008 Andreas Thienemann <andreas@bawue.net> - 1.0.17-6
- Removed spurious #endif in the libsndfile.h wrapper. Thx to Edward - Removed spurious #endif in the libsndfile.h wrapper. Thx to Edward
Sheldrake for finding it. Fixes #468508. Sheldrake for finding it. Fixes #468508.
- Fix build for autoconf-2.63
* Thu Oct 23 2008 Andreas Thienemann <andreas@bawue.net> - 1.0.17-5 * Thu Oct 23 2008 Andreas Thienemann <andreas@bawue.net> - 1.0.17-5
- Fixed multilib conflict. #342401 - Fixed multilib conflict. #342401