summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2014-03-29 05:10:33 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2014-03-29 05:10:33 +0000
commitef2c09660c7b86423c275ed3a70224567a93ce18 (patch)
tree10fa518fb60dac9df1b5a5520665b4f5e67143b8 /media-libs
parentUnbreak the gentoo-x86 as reverse dependencies such as sys-power/upower have ... (diff)
downloadgentoo-2-ef2c09660c7b86423c275ed3a70224567a93ce18.tar.gz
gentoo-2-ef2c09660c7b86423c275ed3a70224567a93ce18.tar.bz2
gentoo-2-ef2c09660c7b86423c275ed3a70224567a93ce18.zip
Fix underlinking (missing -lm for function rintf()) wrt #504270 by Hector Martin
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libtheora/ChangeLog9
-rw-r--r--media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch14
-rw-r--r--media-libs/libtheora/libtheora-1.1.1-r1.ebuild5
3 files changed, 24 insertions, 4 deletions
diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index abdf768aabf9..f0fd1380f3a4 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/libtheora
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.114 2013/10/14 17:47:48 mgorny Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.115 2014/03/29 05:10:33 ssuominen Exp $
+
+ 29 Mar 2014; Samuli Suominen <ssuominen@gentoo.org>
+ +files/libtheora-1.1.1-underlinking.patch, libtheora-1.1.1-r1.ebuild:
+ Fix underlinking (missing -lm for function rintf()) wrt #504270 by Hector
+ Martin
14 Oct 2013; Michał Górny <mgorny@gentoo.org> libtheora-1.1.1-r1.ebuild:
Explicitly call einstalldocs in multilib_src_install_all() to accomodate bug
diff --git a/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch b/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch
new file mode 100644
index 000000000000..b45a368ebd76
--- /dev/null
+++ b/media-libs/libtheora/files/libtheora-1.1.1-underlinking.patch
@@ -0,0 +1,14 @@
+http://bugs.gentoo.org/504270
+
+--- examples/Makefile.am
++++ examples/Makefile.am
+@@ -22,7 +22,7 @@
+
+ player_example_SOURCES = player_example.c
+ player_example_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)
+-player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS) $(OSS_LIBS)
++player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS) $(OSS_LIBS) -lm
+
+ encoder_example_SOURCES = encoder_example.c
+ EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
+
diff --git a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
index 2e3ab381d050..e74b9516e0c7 100644
--- a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
+++ b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1.1-r1.ebuild,v 1.3 2013/10/14 17:47:48 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1.1-r1.ebuild,v 1.4 2014/03/29 05:10:33 ssuominen Exp $
EAPI=5
inherit autotools eutils flag-o-matic multilib-minimal
@@ -37,6 +37,7 @@ DOCS=( AUTHORS CHANGES README )
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-1.0_beta2-flags.patch \
+ "${FILESDIR}"/${P}-underlinking.patch \
"${FILESDIR}"/${P}-libpng16.patch #465450
# bug 467006