From b68b1dece89846f41296551cfb74a9247469df65 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Fri, 23 Dec 2011 03:17:04 +0000
Subject: Fix underlinking (missing -ldl as used by pluginserver.C) wrt #367509
 by Diego Elio Pettenò
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64
---
 media-video/cinelerra/ChangeLog                       |  7 ++++++-
 media-video/cinelerra/Manifest                        | 19 ++++++++++---------
 media-video/cinelerra/cinelerra-20111223.ebuild       |  5 +++--
 .../cinelerra/files/cinelerra-underlinking.patch      | 15 +++++++++++++++
 4 files changed, 34 insertions(+), 12 deletions(-)
 create mode 100644 media-video/cinelerra/files/cinelerra-underlinking.patch

(limited to 'media-video')

diff --git a/media-video/cinelerra/ChangeLog b/media-video/cinelerra/ChangeLog
index 7936108a686d..0dab00603d05 100644
--- a/media-video/cinelerra/ChangeLog
+++ b/media-video/cinelerra/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/cinelerra
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.48 2011/12/23 03:03:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/ChangeLog,v 1.49 2011/12/23 03:17:04 ssuominen Exp $
+
+  23 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  cinelerra-20111223.ebuild, +files/cinelerra-underlinking.patch:
+  Fix underlinking (missing -ldl as used by pluginserver.C) wrt #367509 by
+  Diego Elio Pettenò
 
 *cinelerra-20111223 (23 Dec 2011)
 
diff --git a/media-video/cinelerra/Manifest b/media-video/cinelerra/Manifest
index a45c930a298a..5e8198fc40aa 100644
--- a/media-video/cinelerra/Manifest
+++ b/media-video/cinelerra/Manifest
@@ -3,21 +3,22 @@ Hash: SHA1
 
 AUX cinelerra-entry.patch 307 RMD160 824705fa04c61e976dc091617a016ac52f83569e SHA1 ffda8fe16c4ec213f027e019a720167d2fdc35b9 SHA256 58b95865a77fc2805e2e171f9380283b0d6f62130330029eb8afd866cb2c89d3
 AUX cinelerra-ffmpeg.patch 2472 RMD160 1f7587b753e158a5c8a902e6accdf46e4d2a47bb SHA1 9c324c8de25d86fbaee25e70d31f6513756c91e7 SHA256 d97aac356406258d064a28879c0550ef8e69eaffa247fdb2ebd44b6d858ed3a2
+AUX cinelerra-underlinking.patch 287 RMD160 f95b43a38f255243862c296dd3057afe8da672aa SHA1 d006186dfe3a2a483576f164216686bf80df4a08 SHA256 58aaec1cee53498c9fa16f1e565e4cc98a9cfcb93ca652c3c1919b0606bb802d
 AUX cinelerra-v4l1_removal.patch 3878 RMD160 d8a0a901286a5f60777272565b742e9cdd962397 SHA1 b279d440d48968cde0af134db8209ad07333093d SHA256 50f232fb034bb8aba496e2fb078cdb33d27bb09ba7cb33d99715e171811cff12
 DIST cinelerra-20101104.tar.xz 22336148 RMD160 143f0f90ce7a815fa99c9e311d21a2d229d619c8 SHA1 9d68107e5d5c009a630d1027cd0f73ff87505206 SHA256 9e708667b05d200779c41f63f678f74a0ff927b4945254e3e9a290a741b818fc
 DIST cinelerra-20111223.tar.xz 22543128 RMD160 670c2c054b3e0bd573dfc47682357c02bba5dec8 SHA1 bdd7637e656ce8108df645cd2315f6c144f203e4 SHA256 f125a6d2b16acedb379351eff1e91f8571f18993f13187959bc3cf8f8217053b
 EBUILD cinelerra-20101104.ebuild 2249 RMD160 9460943e7e1adb3a82e158bfac162bda919f60fc SHA1 049efb87ca032c56e45e7e396933c2014c8c0b6f SHA256 045f24d264847318882aa08db6686d23935b4a70c73a32798a2571b3bf33aa7d
-EBUILD cinelerra-20111223.ebuild 2191 RMD160 8e5492b01094349c5d1a7d5865fa37603c5fbe06 SHA1 40a9540253976dd3a1efba9afee134fbe97e8bd9 SHA256 5c11139273de0ed1f7041c14569725ec25353826eb6802acc6a7ce16aa723cd4
-MISC ChangeLog 11693 RMD160 6ff6e717b0b0b301a79037ea3a2f241cfb75e8a7 SHA1 4d28ed2a01fd81d954a5fde1ff04227cc5f27207 SHA256 4260f6fd151d0e10ff7c3c9fdb5107ef8ec16570d47446e7aebd99f0955a1a9d
+EBUILD cinelerra-20111223.ebuild 2234 RMD160 3fec7ee7d73504e9c9354b763e6ea89779876d3d SHA1 5a498b7ffc29233943ffc4dba1817d8ec42d1d62 SHA256 554b9a2102ab4acbee37abd92a401d7ff39f1a78e2484c46006b2d9bcc83c4fe
+MISC ChangeLog 11911 RMD160 25b2bec42209ad66cd097a1dc08a6a3189185e83 SHA1 38e3440d11c7627c8f5a60bd6526031609beaef1 SHA256 747b171e457e0c37a0f238ccef3b8eff26c2a640b267e6234d1dfe5f03ebd569
 MISC metadata.xml 159 RMD160 21717801992314b5fc85dfeb6da77bf71fc54c7e SHA1 26b6ea95dc60c40d9b482830ce7e7c54233a7698 SHA256 38df217d3a650829cd34e6c74bd2710a01751ccd5511b5be296e3f48dd4d81cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO8+9BAAoJEEdUh39IaPFNsaEH/RD9zMAMGVemXsUUIC6KPkNA
-L5ZUVAPAVm4LarBHpE0RjVSy0tarRqdkKTs+D5Su89uSQ8az+m7JTmx8ef/gyQFn
-oVkzaALLx+2r4KycqgaVZO/Rrtw5OqqX8otR53rS2ZngguBWDQgFFOf5fqBNJspA
-36zNm56XoU4tHrpZN3X33XFWUtqroADdx5n3a5KQV4EVaeJi2O8eyFRnWlyU/7f3
-wZU6J52GdWOnfTy2eX59Vi7by/giN8rKtfmHZLYyRdsCCIvj2EkaleKLpKy+QVhF
-pR3j4UQ91smvE2+PXn7Dj0UcOCKoaceVjUJbrl/+Re/unPMHAxbmk3hoK+YmJcE=
-=mZsI
+iQEcBAEBAgAGBQJO8/J5AAoJEEdUh39IaPFNvVIH+gNWvIsqVy7txZgMsNytJNOw
+wQAHsHs+LYKQGnMK99V6Y7R1NRzlKrDHgSgfiKRhzJDc4uqogMQLak2RI1OdAV3T
+8t/4mMHUuqqneH6s4HpRyXqqIAPKL0O193/U4w3+pappKVDqw5A1z+FhOv89pYD8
+V3m59OI6WrWWxuZVBjObXzi7ICinPNkk2F8NqI848v2YXV3oV/C3e5TW8MFWMcjr
+RM9DQWHFW/tRCFwUo6WJtgyLTf8AugK+N21Ip8y3jicgxLFRqSlyWzqZyti41Fy/
+fb5gENEPXjTXhcli9FWEdKQzrkzq48boOZsbIYCFtAM7kvP7TO2782ohfhXaF10=
+=9AEQ
 -----END PGP SIGNATURE-----
diff --git a/media-video/cinelerra/cinelerra-20111223.ebuild b/media-video/cinelerra/cinelerra-20111223.ebuild
index 1c306d9978b5..e485cfdec581 100644
--- a/media-video/cinelerra/cinelerra-20111223.ebuild
+++ b/media-video/cinelerra/cinelerra-20111223.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20111223.ebuild,v 1.1 2011/12/23 03:03:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/cinelerra/cinelerra-20111223.ebuild,v 1.2 2011/12/23 03:17:04 ssuominen Exp $
 
 EAPI=4
 inherit autotools eutils multilib flag-o-matic
@@ -53,7 +53,8 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	epatch \
 		"${FILESDIR}"/${PN}-entry.patch \
-		"${FILESDIR}"/${PN}-ffmpeg.patch
+		"${FILESDIR}"/${PN}-ffmpeg.patch \
+		"${FILESDIR}"/${PN}-underlinking.patch
 
 	eautoreconf
 }
diff --git a/media-video/cinelerra/files/cinelerra-underlinking.patch b/media-video/cinelerra/files/cinelerra-underlinking.patch
new file mode 100644
index 000000000000..1411d57cccd8
--- /dev/null
+++ b/media-video/cinelerra/files/cinelerra-underlinking.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/367509
+
+pluginserver.C is using dlsym, dlopen, dlclose and dlerror
+
+--- cinelerra/Makefile.am
++++ cinelerra/Makefile.am
+@@ -685,6 +685,7 @@
+ 	$(FIREWIRE_LDFLAGS) \
+ 	$(LIBDV_LIBS) \
+ 	-luuid \
+-	$(MJPEG_LIBS)
++	$(MJPEG_LIBS) \
++	-ldl
+ 
+ EXTRA_DIST = gen-feather-h
-- 
cgit v1.2.3-65-gdbad