Accepting request 80118 from multimedia:libs
- Fix build with no-add-needed (forwarded request 80113 from elvigia) OBS-URL: https://build.opensuse.org/request/show/80118 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvorbis?expand=0&rev=29
This commit is contained in:
commit
772c687995
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
48
vorbis-fix-linking.patch
Normal file
48
vorbis-fix-linking.patch
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user