Accepting request 223581 from home:AndreasStieger:branches:multimedia:libs

Xiph libvorbis 1.3.4

OBS-URL: https://build.opensuse.org/request/show/223581
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libvorbis?expand=0&rev=45

libvorbis-1.3.3.tar.gz

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

libvorbis-1.3.4.tar.xz

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

libvorbis-pkgconfig.patch

@@ -1,37 +0,0 @@
-Index: vorbis.pc.in
-================================================================================
---- vorbis.pc.in
-+++ vorbis.pc.in
-@@ -8,7 +8,8 @@
- Name: vorbis
- Description: vorbis is the primary Ogg Vorbis library
- Version: @VERSION@
--Requires: ogg
-+Requires.private: ogg
- Conflicts:
--Libs: -L${libdir} -lvorbis -lm
-+Libs: -L${libdir} -lvorbis 
-+Libs.private: -lm
- Cflags: -I${includedir}
---- vorbisenc.pc.in
-+++ vorbisenc.pc.in
-@@ -8,7 +8,7 @@
- Name: vorbisenc
- Description: vorbisenc is a library that provides a convenient API for setting up an encoding environment using libvorbis
- Version: @VERSION@
--Requires: vorbis
-+Requires.private: vorbis
- Conflicts:
- Libs: -L${libdir} -lvorbisenc
- Cflags: -I${includedir}
---- vorbisfile.pc.in
-+++ vorbisfile.pc.in
-@@ -8,7 +8,7 @@
- Name: vorbisfile
- Description: vorbisfile is a library that provides a convenient high-level API for decoding and basic manipulation of all Vorbis I audio streams
- Version: @VERSION@
--Requires: vorbis
-+Requires.private: vorbis
- Conflicts:
- Libs: -L${libdir} -lvorbisfile
- Cflags: -I${includedir}

libvorbis.changes

@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sun Feb 23 19:43:16 UTC 2014 - andreas.stieger@gmx.de
+
+- Xiph libvorbis 1.3.4
+  * reduced static data size in libvorbisenc
+  * associated minor changes required to libvorbis and libvorbisfile
+  * minor build fixes and build system updates
+  * no functional changes over the previous 1.3.3 release
+- removed libvorbis-pkgconfig.patch, in upstream
+- updated vorbis-fix-linking.patch for context changes
+
 -------------------------------------------------------------------
 Tue Apr 16 06:46:59 UTC 2013 - mmeister@suse.com
 

libvorbis.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package libvorbis
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,7 +17,7 @@
 
 
 Name:           libvorbis
-Version:        1.3.3
+Version:        1.3.4
 Release:        0
 #to_be_filled_by_service
 Summary:        The Vorbis General Audio Compression Codec
@@ -29,20 +29,20 @@ Url:            http://www.vorbis.com/
 Obsoletes:      libvorbis-64bit
 %endif
 #
-Source:         http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.gz
+Source:         http://downloads.xiph.org/releases/vorbis/%{name}-%{version}.tar.xz
 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
 Patch11:        vorbis-fix-linking.patch
 Patch12:        vorbis-ocloexec.patch
 BuildRequires:  fdupes
 BuildRequires:  libogg-devel
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
+BuildRequires:  xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -133,14 +133,11 @@ API reference.
 %setup -q
 %patch2
 # %%patch5 -p1
-%patch10
 if [ "%{_lib}" == "lib64" ]; then
 %patch1
 fi
-%patch11
+%patch11 -p1
 %patch12
-# automake-1.13 deprecated the old macro
-sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.ac
 
 %build
 # Fix optimization level

vorbis-fix-linking.patch

@@ -1,5 +1,12 @@
---- Makefile.am	2010-12-21 17:46:03.000000000 +0900
+---
-+++ Makefile.am	2012-06-16 15:43:41.143756104 +0900
+ Makefile.am  |    4 ++--
+ configure.ac |    2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+Index: libvorbis-1.3.4/Makefile.am
+===================================================================
+--- libvorbis-1.3.4.orig/Makefile.am	2014-01-22 09:53:32.000000000 +0000
++++ libvorbis-1.3.4/Makefile.am	2014-02-23 19:35:36.000000000 +0000
 @@ -1,8 +1,8 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -11,14 +18,16 @@
  SUBDIRS = m4 include vq lib test doc
  
  if BUILD_EXAMPLES 
---- configure.ac	2012-02-04 07:00:34.000000000 +0900
+Index: libvorbis-1.3.4/configure.ac
-+++ configure.ac	2012-06-16 15:43:05.647225479 +0900
+===================================================================
-@@ -8,7 +8,7 @@
+--- libvorbis-1.3.4.orig/configure.ac	2014-01-22 11:09:44.000000000 +0000
- AC_INIT([libvorbis],[1.3.3],[vorbis-dev@xiph.org])
++++ libvorbis-1.3.4/configure.ac	2014-02-23 19:35:36.000000000 +0000
+@@ -8,7 +8,7 @@ dnl ------------------------------------
+ AC_INIT([libvorbis],[1.3.4],[vorbis-dev@xiph.org])
  
  AC_CONFIG_SRCDIR([lib/mdct.c])
 -
 +AC_CONFIG_MACRO_DIR([m4])
  AC_CANONICAL_TARGET([])
  
- AM_INIT_AUTOMAKE($PACKAGE_NAME,$PACKAGE_VERSION)
+ AM_INIT_AUTOMAKE