| 1 |
commit: f870df2ea4d29117f5ad843fd0e67305127e95ca |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 27 17:00:40 2016 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 27 17:00:40 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f870df2e |
| 7 |
|
| 8 |
media-libs/slv2: fix libdl and libraptor2 underlinking, bug #371747 |
| 9 |
|
| 10 |
Thanks ftrvxmtrx for the fix! |
| 11 |
|
| 12 |
Reported-by: Diego Elio Pettenò |
| 13 |
Bug: https://bugs.gentoo.org/371747 |
| 14 |
|
| 15 |
Package-Manager: portage-2.3.0 |
| 16 |
|
| 17 |
.../slv2/files/slv2-0.6.6-raptor2-link.patch | 23 ++++++++++++++++++++++ |
| 18 |
media-libs/slv2/slv2-0.6.6-r1.ebuild | 3 ++- |
| 19 |
media-libs/slv2/slv2-0.6.6.ebuild | 3 ++- |
| 20 |
3 files changed, 27 insertions(+), 2 deletions(-) |
| 21 |
|
| 22 |
diff --git a/media-libs/slv2/files/slv2-0.6.6-raptor2-link.patch b/media-libs/slv2/files/slv2-0.6.6-raptor2-link.patch |
| 23 |
new file mode 100644 |
| 24 |
index 00000000..a6a113a |
| 25 |
--- /dev/null |
| 26 |
+++ b/media-libs/slv2/files/slv2-0.6.6-raptor2-link.patch |
| 27 |
@@ -0,0 +1,23 @@ |
| 28 |
+To reproduce it run: |
| 29 |
+ $ LDFLAGS="-Wl,--no-undefined" emerge -1 slv2 |
| 30 |
+Fixes https://bugs.gentoo.org/371747 by ftrvxmtrx |
| 31 |
+--- slv2-0.6.6.orig/wscript 2009-05-26 05:44:51.000000000 +0200 |
| 32 |
++++ slv2-0.6.6/wscript 2014-01-21 00:46:19.890443103 +0100 |
| 33 |
+@@ -51,6 +51,7 @@ |
| 34 |
+ autowaf.check_pkg(conf, 'lv2core', uselib_store='LV2CORE', atleast_version='1.0', mandatory=True) |
| 35 |
+ autowaf.check_pkg(conf, 'redland', uselib_store='REDLAND', atleast_version='1.0.6', mandatory=True) |
| 36 |
+ autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.107.0', mandatory=False) |
| 37 |
++ autowaf.check_pkg(conf, 'raptor2', uselib_store='RAPTOR2', atleast_version='2.0.8', mandatory=True) |
| 38 |
+ conf.env.append_value('CCFLAGS', '-std=c99') |
| 39 |
+ conf.define('SLV2_VERSION', SLV2_VERSION) |
| 40 |
+ conf.write_config_header('slv2-config.h') |
| 41 |
+@@ -96,7 +97,8 @@ |
| 42 |
+ obj.target = 'slv2' |
| 43 |
+ obj.vnum = SLV2_LIB_VERSION |
| 44 |
+ obj.install_path = '${LIBDIR}' |
| 45 |
+- autowaf.use_lib(bld, obj, 'REDLAND LV2CORE') |
| 46 |
++ obj.lib = ['dl'] |
| 47 |
++ autowaf.use_lib(bld, obj, 'REDLAND LV2CORE RAPTOR2') |
| 48 |
+ |
| 49 |
+ # Static library (for unit test code coverage) |
| 50 |
+ if bld.env['BUILD_TESTS']: |
| 51 |
|
| 52 |
diff --git a/media-libs/slv2/slv2-0.6.6-r1.ebuild b/media-libs/slv2/slv2-0.6.6-r1.ebuild |
| 53 |
index 97cf5d4..183cc66 100644 |
| 54 |
--- a/media-libs/slv2/slv2-0.6.6-r1.ebuild |
| 55 |
+++ b/media-libs/slv2/slv2-0.6.6-r1.ebuild |
| 56 |
@@ -1,4 +1,4 @@ |
| 57 |
-# Copyright 1999-2015 Gentoo Foundation |
| 58 |
+# Copyright 1999-2016 Gentoo Foundation |
| 59 |
# Distributed under the terms of the GNU General Public License v2 |
| 60 |
# $Id$ |
| 61 |
|
| 62 |
@@ -27,6 +27,7 @@ DEPEND="${RDEPEND} |
| 63 |
|
| 64 |
src_prepare() { |
| 65 |
epatch "${FILESDIR}"/ldconfig.patch |
| 66 |
+ epatch "${FILESDIR}"/${P}-raptor2-link.patch |
| 67 |
} |
| 68 |
|
| 69 |
src_configure() { |
| 70 |
|
| 71 |
diff --git a/media-libs/slv2/slv2-0.6.6.ebuild b/media-libs/slv2/slv2-0.6.6.ebuild |
| 72 |
index afd57fe..349e1e5 100644 |
| 73 |
--- a/media-libs/slv2/slv2-0.6.6.ebuild |
| 74 |
+++ b/media-libs/slv2/slv2-0.6.6.ebuild |
| 75 |
@@ -1,4 +1,4 @@ |
| 76 |
-# Copyright 1999-2012 Gentoo Foundation |
| 77 |
+# Copyright 1999-2016 Gentoo Foundation |
| 78 |
# Distributed under the terms of the GNU General Public License v2 |
| 79 |
# $Id$ |
| 80 |
|
| 81 |
@@ -29,6 +29,7 @@ pkg_setup() { |
| 82 |
|
| 83 |
src_prepare() { |
| 84 |
epatch "${FILESDIR}"/ldconfig.patch |
| 85 |
+ epatch "${FILESDIR}"/${P}-raptor2-link.patch |
| 86 |
} |
| 87 |
|
| 88 |
src_configure() { |
Archives