Accepting request 55126 from multimedia:libs

Accepted submit request 55126 from user plater

OBS-URL: https://build.opensuse.org/request/show/55126
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvorbis?expand=0&rev=22
This commit is contained in:
Marcus Rückert 2010-12-08 13:18:28 +00:00 committed by Git OBS Bridge
commit 4dfbdf5f58
10 changed files with 257 additions and 129 deletions

14
_service Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" ?>
<services>
<service name="download_url">
<param name="protocol">http</param>
<param name="host">downloads.xiph.org</param>
<param name="path">/releases/vorbis/libvorbis-1.3.2.tar.bz2</param>
</service>
<service name="verify_file">
<param name="file">_service:download_url:libvorbis-1.3.2.tar.bz2</param>
<param name="verifier">sha256</param>
<param name="checksum">9f04b60ba89edbe860dc0a5902171e4ac35cff8ba19252aa23ed029994823395</param>
</service>
<service name="set_version"/>
</services>

View File

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

View File

@ -0,0 +1,148 @@
#
# spec file for package libvorbis (Version 1.3.2)
#
# Copyright (c) 2010 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
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
%define _SO_nr 0
Name: libvorbis
Version: 1.3.2
Release: 0
License: BSD3c(or similar)
Summary: The Vorbis General Audio Compression Codec
Url: http://www.vorbis.com/
Group: System/Libraries
# bug437293 (SLES10 -> SLES11 upgrade path)
%ifarch ppc64
Obsoletes: libvorbis-64bit
%endif
#
Source: %{name}-%{version}.tar.bz2
Source2: baselibs.conf
Patch1: libvorbis-lib64.dif
Patch2: libvorbis-m4.dif
# URL http://www.geocities.jp/aoyoume/aotuv/
# Patch5: libvorbis-%{version}-aotuv-b5.7.diff
# PATCH-FIX-UPSTREAM libvorbis-pkgconfig.patch https://trac.xiph.org/ticket/1759 reddwarf@opensuse.org -- Use Requires/Libs.private to avoid overlinking
Patch10: libvorbis-pkgconfig.patch
BuildRequires: libogg-devel
BuildRequires: pkgconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and
general-purpose compressed audio format for audio and music at fixed
and variable bit rates from 16 to 128 kbps/channel.
The native bitstream format of Vorbis is libogg (Ogg). Alternatively,
libmatroska (matroska) can also be used.
%package -n libvorbis%{_SO_nr}
Summary: The Vorbis General Audio Compression Codec
Group: System/Libraries
# bug437293 (SLES10 -> SLES11 upgrade path)
%ifarch ppc64
Obsoletes: libvorbis-64bit
%endif
#
# libvorbis was last used in openSUSE 11.3
Provides: %{name} = %{version}
Obsoletes: %{name} <= 1.2.3
%description -n libvorbis%{_SO_nr}
Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and
general-purpose compressed audio format for audio and music at fixed
and variable bit rates from 16 to 128 kbps/channel.
The native bitstream format of Vorbis is libogg (Ogg). Alternatively,
libmatroska (matroska) can also be used.
%package devel
License: BSD3c(or similar)
Summary: Include Files and Libraries mandatory for Ogg Vorbis Development
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: glibc-devel,
Requires: libogg-devel
# bug437293 (SLES10 -> SLES11 upgrade path)
%ifarch ppc64
Obsoletes: libvorbis-devel-64bit
%endif
#
%description devel
This package contains all necessary include files and libraries needed
to compile and develop applications that use libvorbis.
%package doc
License: BSD3c(or similar)
Summary: Documentation of Ogg/Vorbis library
Group: Documentation/Other
%if 0%{?suse_version} >= 1120
BuildArch: noarch
%endif
%description doc
This package contains documents for Ogg/Vorbis library, including the
API reference.
%prep
%setup -q
%patch2
# %patch5 -p1
%patch10
if [ "%{_lib}" == "lib64" ]; then
%patch1
fi
%build
%configure --disable-static
make %{?_smp_mflags}
%install
%makeinstall
mkdir -p %{buildroot}%{_docdir}/%{name}
mv %{buildroot}%{_datadir}/doc/libvorbis-* %{buildroot}%{_docdir}/%{name}
install -c -m 0644 doc/Vorbis_I_spec.* %{buildroot}%{_docdir}/%{name}
# remove unneeded files
rm -f %{buildroot}%{_libdir}/*.la
%check
%__make check
%post -n libvorbis%{_SO_nr} -p /sbin/ldconfig
%postun -n libvorbis%{_SO_nr} -p /sbin/ldconfig
%clean
[ %{buildroot} != "/" ] && rm -rf %{buildroot}
%files -n libvorbis%{_SO_nr}
%defattr(0644,root,root,0755)
%doc COPYING AUTHORS README *.txt
%{_libdir}/lib*.so.*
%files devel
%defattr(-,root,root)
%{_datadir}/aclocal/*.m4
%{_includedir}/vorbis
%{_libdir}/lib*.so
%{_libdir}/pkgconfig/*.pc
%files doc
%defattr(-,root,root)
%doc %{_docdir}/%{name}
%changelog

View File

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

View File

@ -1,26 +0,0 @@
---
Makefile.am | 2 ++
doc/Makefile.am | 1 -
2 files changed, 2 insertions(+), 1 deletion(-)
--- Makefile.am.orig
+++ Makefile.am
@@ -2,6 +2,8 @@
AUTOMAKE_OPTIONS = 1.6 foreign dist-zip dist-bzip2
+ACLOCAL_AMFLAGS = -I m4
+
SUBDIRS = m4 include vq lib examples test doc
m4datadir = $(datadir)/aclocal
--- doc/Makefile.am.orig
+++ doc/Makefile.am
@@ -44,7 +44,6 @@
hufftree-under.png \
residue-pack.png \
residue2.png \
- white-xifish.png \
window1.png \
window2.png
SPEC_PDF = xifish.pdf

View File

@ -1,17 +0,0 @@
---
doc/vorbisenc/index.html | 2 ++
1 file changed, 2 insertions(+)
--- doc/vorbisenc/index.html.orig
+++ doc/vorbisenc/index.html
@@ -20,8 +20,10 @@
<p>
<a href="overview.html">libvorbisenc api overview</a><br>
<a href="reference.html">libvorbisenc api reference</a><br>
+<!--
<a href="changes.html">libvorbisenc api changes from 1.0 and 1.0.1</a><br>
<a href="examples.html">libvorbisenc encode setup examples</a><br>
+ -->
<br><br>
<hr noshade>

View File

@ -1,15 +0,0 @@
---
lib/backends.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/lib/backends.h
+++ b/lib/backends.h
@@ -111,7 +111,7 @@
int partitions; /* possible codebooks for a partition */
int groupbook; /* huffbook for partitioning */
int secondstages[64]; /* expanded out to pointers in lookup */
- int booklist[256]; /* list of second stage books */
+ int booklist[512]; /* list of second stage books */
const float classmetric1[64];
const float classmetric2[64];

View File

@ -1,14 +0,0 @@
---
lib/codebook.c | 1 +
1 file changed, 1 insertion(+)
--- a/lib/codebook.c
+++ b/lib/codebook.c
@@ -198,6 +198,7 @@
for(i=0;i<s->entries;){
long num=oggpack_read(opb,_ilog(s->entries-i));
if(num==-1)goto _eofout;
+ if(length>32)goto _errout;
for(j=0;j<num && i<s->entries;j++,i++)
s->lengthlist[i]=length;
length++;

View File

@ -1,3 +1,50 @@
-------------------------------------------------------------------
Wed Dec 8 04:23:34 UTC 2010 - reddwarf@opensuse.org
- updated to version 1.3.2
* vorbis: additional proofing against invalid/malicious
streams in floor, residue, and bos/eos packet trimming
code (see SVN for details).
* vorbis: Added programming documentation tree for the
low-level calls
* vorbisfile: Correct handling of serial numbers array
element [0] on non-seekable streams
* vorbisenc: Back out an [old] AoTuV HF weighting that was
first enabled in 1.3.0; there are a few samples where I
really don't like the effect it causes.
* vorbis: return correct timestamp for granule positions
with high bit set.
* vorbisfile: the [undocumented] half-rate decode api made no
attempt to keep the pcm offset tracking consistent in seeks.
Fix and add a testing mode to seeking_example.c to torture
test seeking in halfrate mode. Also remove requirement that
halfrate mode only work with seekable files.
* vorbisfile: Fix a chaining bug in raw_seeks where seeking
out of the current link would fail due to not
reinitializing the decode machinery.
* vorbisfile: improve seeking strategy. Reduces the
necessary number of seek callbacks in an open or seek
operation by well over 2/3.
- updated to version 1.3.1
* tweak + minor arithmetic fix in floor1 fit
* revert noise norm to conservative 1.2.3 behavior pending
more listening testing
- updated to versio 1.3.0
* Optimized surround support for 5.1 encoding at 44.1/48kHz
* Added encoder control call to disable channel coupling
* Correct an overflow bug in very low-bitrate encoding on 32 bit
machines that caused inflated bitrates
* Numerous API hardening, leak and build fixes
* Correct bug in 22kHz compand setup that could cause a crash
* Correct bug in 16kHz codebooks that could cause unstable pure
tones at high bitrates
- run spec-cleaner
- removed libvorbis-automake-fix.diff, libvorbis-doc-fixes.diff,
libvorbis-r16326-CVE-2009-3379.diff and
libvorbis-r16597-CVE-2009-3379.diff (upstream fixed)
- follow library packaging policy
- run make check
------------------------------------------------------------------- -------------------------------------------------------------------
Wed May 26 15:03:32 CEST 2010 - tiwai@suse.de Wed May 26 15:03:32 CEST 2010 - tiwai@suse.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package libvorbis (Version 1.2.3) # spec file for package libvorbis (Version 1.3.2)
# #
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -15,18 +15,16 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
# norootforbuild %define _SO_nr 0
Name: libvorbis Name: libvorbis
BuildRequires: libogg-devel pkgconfig Version: to_be_filled_by_service
Summary: The Vorbis General Audio Compression Codec Release: 0
Version: 1.2.3
Release: 3
Group: System/Libraries
License: BSD3c(or similar) License: BSD3c(or similar)
Summary: The Vorbis General Audio Compression Codec
Url: http://www.vorbis.com/ Url: http://www.vorbis.com/
# bug437293 Group: System/Libraries
# bug437293 (SLES10 -> SLES11 upgrade path)
%ifarch ppc64 %ifarch ppc64
Obsoletes: libvorbis-64bit Obsoletes: libvorbis-64bit
%endif %endif
@ -35,14 +33,12 @@ Source: %{name}-%{version}.tar.bz2
Source2: baselibs.conf Source2: baselibs.conf
Patch1: libvorbis-lib64.dif Patch1: libvorbis-lib64.dif
Patch2: libvorbis-m4.dif Patch2: libvorbis-m4.dif
Patch3: libvorbis-automake-fix.diff
# URL http://www.geocities.jp/aoyoume/aotuv/ # URL http://www.geocities.jp/aoyoume/aotuv/
# Patch5: libvorbis-%{version}-aotuv-b5.7.diff # Patch5: libvorbis-%{version}-aotuv-b5.7.diff
Patch9: libvorbis-doc-fixes.diff # PATCH-FIX-UPSTREAM libvorbis-pkgconfig.patch https://trac.xiph.org/ticket/1759 reddwarf@opensuse.org -- Use Requires/Libs.private to avoid overlinking
Patch10: libvorbis-pkgconfig.patch Patch10: libvorbis-pkgconfig.patch
# bnc608192 BuildRequires: libogg-devel
Patch11: libvorbis-r16326-CVE-2009-3379.diff BuildRequires: pkgconfig
Patch12: libvorbis-r16597-CVE-2009-3379.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -53,20 +49,34 @@ and variable bit rates from 16 to 128 kbps/channel.
The native bitstream format of Vorbis is libogg (Ogg). Alternatively, The native bitstream format of Vorbis is libogg (Ogg). Alternatively,
libmatroska (matroska) can also be used. libmatroska (matroska) can also be used.
%package -n libvorbis%{_SO_nr}
Summary: The Vorbis General Audio Compression Codec
Group: System/Libraries
# bug437293 (SLES10 -> SLES11 upgrade path)
%ifarch ppc64
Obsoletes: libvorbis-64bit
%endif
#
# libvorbis was last used in openSUSE 11.3
Provides: %{name} = %{version}
Obsoletes: %{name} <= 1.2.3
%description -n libvorbis%{_SO_nr}
Vorbis is a fully open, nonproprietary, patent-and-royalty-free, and
general-purpose compressed audio format for audio and music at fixed
and variable bit rates from 16 to 128 kbps/channel.
Authors: The native bitstream format of Vorbis is libogg (Ogg). Alternatively,
-------- libmatroska (matroska) can also be used.
Monty <monty@xiph.org>
Xiphophorus Company <team@xiph.org>
%package devel %package devel
License: BSD3c(or similar) License: BSD3c(or similar)
Summary: Include Files and Libraries mandatory for Ogg Vorbis Development Summary: Include Files and Libraries mandatory for Ogg Vorbis Development
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: glibc-devel, libogg-devel
Requires: %{name} = %{version} Requires: %{name} = %{version}
# bug437293 Requires: glibc-devel,
Requires: libogg-devel
# bug437293 (SLES10 -> SLES11 upgrade path)
%ifarch ppc64 %ifarch ppc64
Obsoletes: libvorbis-devel-64bit Obsoletes: libvorbis-devel-64bit
%endif %endif
@ -76,13 +86,6 @@ Obsoletes: libvorbis-devel-64bit
This package contains all necessary include files and libraries needed This package contains all necessary include files and libraries needed
to compile and develop applications that use libvorbis. to compile and develop applications that use libvorbis.
Authors:
--------
Monty <monty@xiph.org>
Xiphophorus Company <team@xiph.org>
%package doc %package doc
License: BSD3c(or similar) License: BSD3c(or similar)
Summary: Documentation of Ogg/Vorbis library Summary: Documentation of Ogg/Vorbis library
@ -95,52 +98,40 @@ BuildArch: noarch
This package contains documents for Ogg/Vorbis library, including the This package contains documents for Ogg/Vorbis library, including the
API reference. API reference.
Authors:
--------
Monty <monty@xiph.org>
Xiphophorus Company <team@xiph.org>
%prep %prep
%setup -q %setup -q
%patch2 %patch2
%patch3
# %patch5 -p1 # %patch5 -p1
%patch9
%patch10 %patch10
%patch11 -p1 if [ "%{_lib}" == "lib64" ]; then
%patch12 -p1
if [ "%_lib" == "lib64" ]; then
%patch1 %patch1
fi fi
%build %build
autoreconf -fi %configure --disable-static
%configure \
--with-ogg-libraries=%{_libdir} \
--disable-static
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
%makeinstall %makeinstall
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} mkdir -p %{buildroot}%{_docdir}/%{name}
mv $RPM_BUILD_ROOT%{_datadir}/doc/libvorbis-* $RPM_BUILD_ROOT%{_docdir}/%{name}/html mv %{buildroot}%{_datadir}/doc/libvorbis-* %{buildroot}%{_docdir}/%{name}
install -c -m 0644 doc/Vorbis_I_spec.* $RPM_BUILD_ROOT%{_docdir}/%{name}/html install -c -m 0644 doc/Vorbis_I_spec.* %{buildroot}%{_docdir}/%{name}
cp COPYING AUTHORS README $RPM_BUILD_ROOT%{_docdir}/%{name}
cp *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}
# remove unneeded files # remove unneeded files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/*.la
%post -p /sbin/ldconfig %check
%__make check
%postun -p /sbin/ldconfig %post -n libvorbis%{_SO_nr} -p /sbin/ldconfig
%postun -n libvorbis%{_SO_nr} -p /sbin/ldconfig
%clean %clean
[ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT [ %{buildroot} != "/" ] && rm -rf %{buildroot}
%files %files -n libvorbis%{_SO_nr}
%defattr(-,root,root) %defattr(0644,root,root,0755)
%doc COPYING AUTHORS README *.txt
%{_libdir}/lib*.so.* %{_libdir}/lib*.so.*
%files devel %files devel