|
|
@@ -1,27 +1,34 @@
|
|
|
%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
|
|
|
-%define OCT_SITE_D %{_datadir}/octave/site/m
|
|
|
|
|
|
-Summary: A library to handle various audio file formats.
|
|
|
-Summary(ja): さまざまなフォーマットの音声ファイルを扱うライブラリ
|
|
|
-Name: libsndfile
|
|
|
-Version: 1.0.25
|
|
|
-Release: 1%{?_dist_release}
|
|
|
-Source: http://www.mega-nerd.com/libsndfile/%{name}-%{version}.tar.gz
|
|
|
-License: LGPL
|
|
|
-Group: System Environment/Libraries
|
|
|
-URL: http://www.mega-nerd.com/libsndfile/
|
|
|
+Summary: A library to handle various audio file formats.
|
|
|
+Summary(ja): さまざまなフォーマットの音声ファイルを扱うライブラリ
|
|
|
+Name: libsndfile
|
|
|
+Version: 1.0.25
|
|
|
+Release: 2%{?_dist_release}
|
|
|
+
|
|
|
+License: LGPLv2+ and GPLv2+ and BSD
|
|
|
+Group: System Environment/Libraries
|
|
|
+URL: http://www.mega-nerd.com/libsndfile/
|
|
|
+
|
|
|
+Source0: http://www.mega-nerd.com/libsndfile/%{name}-%{version}.tar.gz
|
|
|
+Patch0: %{name}-1.0.25-system-gsm.patch
|
|
|
+Patch1: libsndfile-1.0.25-zerodivfix.patch
|
|
|
|
|
|
# security fix
|
|
|
-# Patch100: libsndfile-1.0.16_CVE-2007-4974.patch
|
|
|
-# Patch110: libsndfile-1.0.20_fix-dev-by-zero.patch
|
|
|
-Patch100: libsndfile-1.0.21_CVE-2011-2696.patch
|
|
|
+Patch100: libsndfile-1.0.21_CVE-2011-2696.patch
|
|
|
+Patch101: libsndfile-1.0.25-cve2014_9496.patch
|
|
|
|
|
|
-Requires: alsa-lib
|
|
|
-BuildRequires: alsa-lib-devel
|
|
|
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
+BuildRequires: alsa-lib-devel
|
|
|
+BuildRequires: flac-devel
|
|
|
+BuildRequires: libogg-devel
|
|
|
+BuildRequires: libvorbis-devel
|
|
|
+BuildRequires: pkgconfig
|
|
|
+BuildRequires: sqlite3-devel
|
|
|
+BuildRequires: gsm-devel
|
|
|
|
|
|
-Vendor: Project Vine
|
|
|
-Distribution: Vine Linux
|
|
|
+Vendor: Project Vine
|
|
|
+Distribution: Vine Linux
|
|
|
|
|
|
%description
|
|
|
libsndfile is a C library for reading and writing sound files such as
|
|
|
@@ -29,24 +36,17 @@ AIFF, AU and WAV files through one standard interface. It can currently
|
|
|
read/write 8, 16, 24 and 32-bit PCM files as well as 32-bit floating
|
|
|
point WAV files and a number of compressed formats.
|
|
|
|
|
|
-%description -l ja
|
|
|
-libsndfile is a C library for reading and writing sound files such as
|
|
|
-AIFF, AU and WAV files through one standard interface. It can currently
|
|
|
-read/write 8, 16, 24 and 32-bit PCM files as well as 32-bit floating
|
|
|
-point WAV files and a number of compressed formats.
|
|
|
-
|
|
|
|
|
|
%package devel
|
|
|
Summary: Libraries, includes, etc to develop libsndfile applications
|
|
|
+Summary(ja): libsndfile アプリケーションを開発するためのファイル集
|
|
|
Group: Development/Libraries
|
|
|
Requires: %{name} = %{version}-%{release}
|
|
|
+Requires: pkgconfig
|
|
|
|
|
|
%description devel
|
|
|
Libraries, include files, etc you can use to develop libsndfile applications.
|
|
|
|
|
|
-%description devel -l ja
|
|
|
-Libraries, include files, etc you can use to develop libsndfile applications.
|
|
|
-
|
|
|
|
|
|
# compat32
|
|
|
%package -n compat32-%{name}
|
|
|
@@ -60,49 +60,79 @@ AIFF, AU and WAV files through one standard interface. It can currently
|
|
|
read/write 8, 16, 24 and 32-bit PCM files as well as 32-bit floating
|
|
|
point WAV files and a number of compressed formats.
|
|
|
|
|
|
-%description -n compat32-%{name} -l ja
|
|
|
-libsndfile is a C library for reading and writing sound files such as
|
|
|
-AIFF, AU and WAV files through one standard interface. It can currently
|
|
|
-read/write 8, 16, 24 and 32-bit PCM files as well as 32-bit floating
|
|
|
-point WAV files and a number of compressed formats.
|
|
|
-
|
|
|
|
|
|
%package -n compat32-%{name}-devel
|
|
|
Summary: Libraries, includes, etc to develop libsndfile applications
|
|
|
+Summary(ja): libsndfile アプリケーションを開発するためのファイル集
|
|
|
Group: Development/Libraries
|
|
|
Requires: compat32-%{name} = %{version}-%{release}
|
|
|
+Requires: compat32-pkgconfig
|
|
|
Requires: %{name}-devel = %{version}-%{release}
|
|
|
|
|
|
%description -n compat32-%{name}-devel
|
|
|
Libraries, include files, etc you can use to develop libsndfile applications.
|
|
|
|
|
|
-%description -n compat32-%{name}-devel -l ja
|
|
|
-Libraries, include files, etc you can use to develop libsndfile applications.
|
|
|
-
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
+%patch0 -p1
|
|
|
+%patch1 -p1 -b .zerodivfix
|
|
|
|
|
|
# security fix
|
|
|
-# %patch100 -p1 -b .CVE-2007-4974
|
|
|
-# %patch110 -p0 -b .dev-by-zero
|
|
|
%patch100 -p1 -b .CVE-2011-2696
|
|
|
+%patch101 -p1 -b .cve2014_9496
|
|
|
+
|
|
|
+rm -r src/GSM610 ; autoreconf -I M4 -fiv # for system-gsm patch
|
|
|
|
|
|
%build
|
|
|
-%configure --disable-sqlite --disable-external-libs --disable-octave
|
|
|
-%__make %{?_smp_mflags}
|
|
|
+%configure \
|
|
|
+ --disable-dependency-tracking \
|
|
|
+ --enable-sqlite \
|
|
|
+ --enable-alsa \
|
|
|
+ --enable-largefile \
|
|
|
+ --disable-static
|
|
|
+
|
|
|
+# Get rid of rpath
|
|
|
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
|
|
|
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
|
|
|
+
|
|
|
+make %{?_smp_mflags}
|
|
|
|
|
|
%install
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
-# htmldir=$RPM_BUILD_ROOT\$\(htmldocdir\) libsndfile1-dev
|
|
|
-%makeinstall \
|
|
|
- htmldir=$RPM_BUILD_ROOT%{_datadir}/doc/libsndfile1-dev
|
|
|
+make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
|
|
|
rm -rf html
|
|
|
cp -pr $RPM_BUILD_ROOT%{_datadir}/doc/libsndfile1-dev html
|
|
|
rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/libsndfile1-dev
|
|
|
|
|
|
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.{a,la}
|
|
|
+rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
|
|
|
+
|
|
|
+
|
|
|
+# fix multilib issues
|
|
|
+%if %{__isa_bits} == 64
|
|
|
+%define wordsize 64
|
|
|
+%else
|
|
|
+%define wordsize 32
|
|
|
+%endif
|
|
|
+
|
|
|
+mv $RPM_BUILD_ROOT%{_includedir}/sndfile.h \
|
|
|
+ $RPM_BUILD_ROOT%{_includedir}/sndfile-%{wordsize}.h
|
|
|
+
|
|
|
+cat > $RPM_BUILD_ROOT%{_includedir}/sndfile.h <<EOF
|
|
|
+#include <bits/wordsize.h>
|
|
|
+
|
|
|
+#if __WORDSIZE == 32
|
|
|
+# include "sndfile-32.h"
|
|
|
+#elif __WORDSIZE == 64
|
|
|
+# include "sndfile-64.h"
|
|
|
+#else
|
|
|
+# error "unexpected value for __WORDSIZE macro"
|
|
|
+#endif
|
|
|
+EOF
|
|
|
+
|
|
|
+%check
|
|
|
+LD_LIBRARY_PATH=$PWD/src/.libs make check
|
|
|
|
|
|
%clean
|
|
|
rm -rf $RPM_BUILD_ROOT
|
|
|
@@ -111,23 +141,27 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%postun -p /sbin/ldconfig
|
|
|
|
|
|
+# compat32
|
|
|
+%if %{build_compat32}
|
|
|
%post -n compat32-%{name} -p /sbin/ldconfig
|
|
|
|
|
|
%postun -n compat32-%{name} -p /sbin/ldconfig
|
|
|
-
|
|
|
+%endif
|
|
|
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README html
|
|
|
+%doc AUTHORS COPYING ChangeLog NEWS README
|
|
|
%{_libdir}/libsndfile.so.*
|
|
|
%{_bindir}/*
|
|
|
%{_mandir}/man1/*
|
|
|
-# %{_datadir}/octave/site/m/*
|
|
|
|
|
|
%files devel
|
|
|
%defattr(-,root,root)
|
|
|
+%doc html/*
|
|
|
%{_libdir}/libsndfile.so
|
|
|
-%{_includedir}/*
|
|
|
+%{_includedir}/sndfile.h
|
|
|
+%{_includedir}/sndfile.hh
|
|
|
+%{_includedir}/sndfile-%{wordsize}.h
|
|
|
%{_libdir}/pkgconfig/sndfile.pc
|
|
|
|
|
|
# compat32
|
|
|
@@ -138,12 +172,23 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
|
|
|
%files -n compat32-%{name}-devel
|
|
|
%defattr(-,root,root)
|
|
|
+%{_includedir}/sndfile-%{wordsize}.h
|
|
|
%{_libdir}/libsndfile.so
|
|
|
%{_libdir}/pkgconfig/sndfile.pc
|
|
|
%endif
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Feb 18 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 1.0.25-2
|
|
|
+- added Patch0, 1 and 101 from Fedora
|
|
|
+ * Tue Jan 13 2015 Michal Hlavinka <mhlavink@redhat.com> - 1.0.25-14
|
|
|
+ - fix CVE-2014-9496: 2 buffer overruns in sd2_parse_rsrc_fork (#1178840)
|
|
|
+ - division by zero leading to denial of service in psf_fwrite (#1177254)
|
|
|
+ * Sat Nov 12 2011 Ville Skyttä <ville.skytta@iki.fi> - 1.0.25-2
|
|
|
+ - Patch to use system libgsm instead of a bundled copy.
|
|
|
+- added BR: flac-devel, libogg-devel, libvorbis-devel, pkgconfig,
|
|
|
+ sqlite3-devel and gsm-devel
|
|
|
+
|
|
|
* Mon Apr 29 2013 Toshiharu Kudoh <toshi.kd2@gmail.com> - 1.0.25-1
|
|
|
- new upstream release
|
|
|
|
inagaki