From f24d50eab658df5b226421fbc22cad2efc611aca02440f6f697fe54acaacb4eb Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 9 May 2011 07:15:16 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/libvorbis revision 28.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libvorbis?expand=0&rev=9dcbd5235f180f03cc1c4a8ef5f152bf --- libvorbis.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libvorbis.spec b/libvorbis.spec index c663afa..e093a9f 100644 --- a/libvorbis.spec +++ b/libvorbis.spec @@ -1,7 +1,7 @@ # -# spec file for package libvorbis (Version 1.3.2) +# spec file for package libvorbis # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -19,7 +19,7 @@ Name: libvorbis Version: 1.3.2 -Release: 2 +Release: 8 #to_be_filled_by_service License: BSD3c(or similar) Summary: The Vorbis General Audio Compression Codec From c7bbac80fa7d077711d1183e53d028afd9db0c6c10ceba39f487ff322b91d36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Mon, 29 Aug 2011 19:15:13 +0000 Subject: [PATCH 2/2] Accepting request 80113 from home:elvigia:branches:multimedia:libs - Fix build with no-add-needed OBS-URL: https://build.opensuse.org/request/show/80113 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/libvorbis?expand=0&rev=29 --- libvorbis.changes | 5 +++++ libvorbis.spec | 5 ++++- vorbis-fix-linking.patch | 48 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 vorbis-fix-linking.patch diff --git a/libvorbis.changes b/libvorbis.changes index 0edc558..3e794e5 100644 --- a/libvorbis.changes +++ b/libvorbis.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 29 19:00:55 UTC 2011 - crrodriguez@opensuse.org + +- Fix build with no-add-needed + ------------------------------------------------------------------- Thu May 5 22:56:15 CEST 2011 - dmueller@suse.de diff --git a/libvorbis.spec b/libvorbis.spec index e093a9f..ffcf619 100644 --- a/libvorbis.spec +++ b/libvorbis.spec @@ -38,6 +38,7 @@ Patch2: libvorbis-m4.dif # '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 BuildRequires: libogg-devel BuildRequires: fdupes pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -139,9 +140,11 @@ API reference. if [ "%{_lib}" == "lib64" ]; then %patch1 fi +%patch11 %build -%configure --disable-static +autoreconf -fiv +%configure --disable-examples --disable-static make %{?_smp_mflags} %install diff --git a/vorbis-fix-linking.patch b/vorbis-fix-linking.patch new file mode 100644 index 0000000..ed6d641 --- /dev/null +++ b/vorbis-fix-linking.patch @@ -0,0 +1,48 @@ +--- test/Makefile.am.orig ++++ test/Makefile.am +@@ -10,7 +10,7 @@ check: $(check_PROGRAMS) + ./test$(EXEEXT) + + test_SOURCES = util.c util.h write_read.c write_read.h test.c +-test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ ++test_LDADD = -lm ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ + + debug: + $(MAKE) all CFLAGS="@DEBUG@" +--- configure.ac.orig ++++ configure.ac +@@ -8,13 +8,12 @@ dnl ------------------------------------ + AC_INIT([libvorbis],[1.3.2],[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_MAINTAINER_MODE + AM_CONFIG_HEADER([config.h]) +- + dnl Add parameters for aclocal + AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") + +@@ -53,7 +52,9 @@ dnl ------------------------------------ + dnl save $CFLAGS since AC_PROG_CC likes to insert "-g -O2" + dnl if $CFLAGS is blank + cflags_save="$CFLAGS" +-AC_PROG_CC ++AC_PROG_CC_STDC ++AC_USE_SYSTEM_EXTENSIONS ++AC_SYS_LARGEFILE + AC_PROG_CPP + CFLAGS="$cflags_save" + +--- Makefile.am.orig ++++ Makefile.am +@@ -1,5 +1,6 @@ + ## Process this file with automake to produce Makefile.in + ++ACLOCAL_AMFLAGS = -I m4 + AUTOMAKE_OPTIONS = 1.7 foreign dist-zip dist-bzip2 + + SUBDIRS = m4 include vq lib test doc