Accepting request 288103 from home:pluskalm:branches:multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/288103
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/speex?expand=0&rev=17

speex-1.0.5-warning-fix.diff

@@ -1,19 +0,0 @@
---- src/speexenc.c
-+++ src/speexenc.c
-@@ -460,7 +460,7 @@
-    }
- 
-    {
--      fread(first_bytes, 1, 12, fin);
-+      if (fread(first_bytes, 1, 12, fin) == 12) {
-       if (strncmp(first_bytes,"RIFF",4)==0 && strncmp(first_bytes,"RIFF",4)==0)
-       {
-          if (read_wav_header(fin, &rate, &chan, &fmt, &size)==-1)
-@@ -468,6 +468,7 @@
-          wave_input=1;
-          lsb=1; /* CHECK: exists big-endian .wav ?? */
-       }
-+      }
-    }
- 
-    if (modeID==-1 && !rate)

speex-1.2rc1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6
-size 1061882

speex-1.2rc2.tar.gz

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

speex-no-build-date.patch

@@ -23,4 +23,3 @@ Index: src/speexenc.c
 +   printf ("speexenc (Speex encoder) version %s\n", speex_version);
     printf ("Copyright (C) 2002-2006 Jean-Marc Valin\n");
  }
- 

speex.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Feb 23 14:57:20 UTC 2015 - mpluskal@suse.com
+
+- Split package to two separate packages
+  * speexdsp contains libraries
+  * speex contains tools
+- Update to 1.2rc2
+  * This release splits the speex codec library and the speex DSP 
+    library into separate source trees. Both projects received 
+    build-system improvements, bugfixes, and cleanup. The speex 
+    codec's VBR tuning was improved, while the speexdsp resampler 
+    got some NEON optimizations.
+- Remove obsolete patch
+  * speex-1.0.5-warning-fix.diff
+
 -------------------------------------------------------------------
 Fri Apr  5 11:21:38 UTC 2013 - idonmez@suse.com
 

speex.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package speex
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,26 +16,21 @@
 #
 
 
+%define package_version 1.2rc2
 Name:           speex
+Version:        1.1.999_%{package_version}
+Release:        0
 Summary:        An Open Source, Patent Free Speech Codec
 License:        BSD-3-Clause
 Group:          System/Libraries
-%define package_version 1.2rc1
-Version:        1.1.999_%{package_version}
-Release:        0
 Url:            http://www.speex.org/
-Source:         http://downloads.xiph.org/releases/speex/%{name}-%{package_version}.tar.gz
+Source0:        http://downloads.xiph.org/releases/speex/%{name}-%{package_version}.tar.gz
-Source2:        baselibs.conf
+Source1:        baselibs.conf
-Patch1:         speex-1.0.5-warning-fix.diff
+Patch0:         speex-no-build-date.patch
-Patch2:         speex-no-build-date.patch
+BuildRequires:  pkg-config
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(speexdsp)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libogg-devel
-BuildRequires:  libtool
-BuildRequires:  pkgconfig
-# bug437293
-%ifarch ppc64
-Obsoletes:      speex-64bit
-%endif
 
 %description
 Speex is a patent free audio codec designed especially for voice
@@ -55,31 +50,12 @@ Speex is a patent free audio codec designed especially for voice
 narrowband and wideband quality. This project aims to be complementary
 to the Vorbis codec.
 
-%package -n libspeexdsp1
-Summary:        An Open Source, Patent Free Speech Codec Library
-Group:          System/Libraries
-
-%description -n libspeexdsp1
-Speex is a patent free audio codec designed especially for voice
-(unlike Vorbis which targets general audio) signals and providing good
-narrowband and wideband quality. This project aims to be complementary
-to the Vorbis codec.
-
-
 %package devel
 Summary:        Development package for SpeeX
 Group:          Development/Libraries/C and C++
-Provides:       libspeex-devel = %{version}-%release
-Obsoletes:      libspeex-devel < %{version}-%release
-Requires:       glibc-devel
-Requires:       libogg-devel
 Requires:       libspeex1 = %{version}
-Requires:       libspeexdsp1 = %{version}
+Provides:       libspeex-devel = %{version}-%{release}
-# bug437293
+Obsoletes:      libspeex-devel < %{version}-%{release}
-%ifarch ppc64
-Obsoletes:      speex-devel-64bit
-%endif
-#
 
 %description devel
 This package contains the files needed to compile programs that use the
@@ -87,41 +63,30 @@ SpeeX library.
 
 %prep
 %setup -q -n %{name}-%{package_version}
-%patch1
+%patch0 
-%patch2
 
 %build
-%if 0%{?suse_version} >= 1100
-autoreconf -fi
-%endif
 %configure \
-    --disable-static \
+	--enable-binaries \
-    --with-ogg-libraries=%{_libdir}
+	--disable-static 
-%{__make} %{?jobs:-j%{jobs}}
+
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
 # remove duped documents
-%{__rm} -rf %{buildroot}%{_datadir}/doc/speex*
+rm -rf %{buildroot}%{_datadir}/doc/speex*
 # remove unneeded *.la files
-%{__rm} -f %{buildroot}%{_libdir}/*.la
+find %{buildroot} -type f -name "*.la" -delete -print
-%{__rm} -f %{buildroot}%{_libdir}/*.a
+rm -f %{buildroot}%{_libdir}/*.a
 
 %post -n libspeex1 -p /sbin/ldconfig
 
 %postun -n libspeex1 -p /sbin/ldconfig
 
-%post -n libspeexdsp1 -p /sbin/ldconfig
-
-%postun -n libspeexdsp1 -p /sbin/ldconfig
-
-%clean
-%{__rm} -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
-%doc doc/*.pdf
 %{_bindir}/speex*
 %{_mandir}/man?/*
 
@@ -129,10 +94,6 @@ autoreconf -fi
 %defattr(-,root,root)
 %{_libdir}/libspeex.so.*
 
-%files -n libspeexdsp1
-%defattr(-,root,root)
-%{_libdir}/libspeexdsp.so.*
-
 %files devel
 %defattr(-,root,root)
 %doc doc/manual.pdf