Fix DPMS detection at configure time with -Wl,--as-needed.

Package-Manager: portage-2.1.3.4

4 files changed, 32 insertions, 11 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c00fdc5b0ee3..6fe99441fa55 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.504 2007/07/28 15:25:18 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.505 2007/08/12 18:04:15 drac Exp $
+
+  12 Aug 2007; Samuli Suominen <drac@gentoo.org> +files/mplayer-dpms.patch,
+  mplayer-1.0.20070622-r3.ebuild:
+  Fix DPMS detection at configure time with -Wl,--as-needed.
 
 *mplayer-1.0.20070622-r3 (28 Jul 2007)
 
diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest
index efca5dc0f611..0d97277a652f 100644
--- a/media-video/mplayer/Manifest
+++ b/media-video/mplayer/Manifest
@@ -2,6 +2,10 @@ AUX mplayer-1.0_rc1-asmrules.patch 1450 RMD160 370877b45b314c9deb2d89739f8067a4a
 MD5 f0b71c38b1207c1d604be091876ac051 files/mplayer-1.0_rc1-asmrules.patch 1450
 RMD160 370877b45b314c9deb2d89739f8067a4a77c0844 files/mplayer-1.0_rc1-asmrules.patch 1450
 SHA256 3f71e6f4e07940d4d55084d0df12404371bc4e534a3a6b0756ca73e44ddbc3c4 files/mplayer-1.0_rc1-asmrules.patch 1450
+AUX mplayer-dpms.patch 459 RMD160 81e348e8557b4748a828177d00691e79668ac38e SHA1 973dbe08f19a84519a31d3f53a6810e52e4eb911 SHA256 ff143de7b9bcf65d4b479a84bd8a2b6c9aad362d71c0f8619b449d8e07b214a0
+MD5 4299339ebf82ae9d316be5442adb3ffc files/mplayer-dpms.patch 459
+RMD160 81e348e8557b4748a828177d00691e79668ac38e files/mplayer-dpms.patch 459
+SHA256 ff143de7b9bcf65d4b479a84bd8a2b6c9aad362d71c0f8619b449d8e07b214a0 files/mplayer-dpms.patch 459
 AUX mplayer-undefined-reference-fix.patch 316 RMD160 cbbcc1df4e0011f12baffdbae3ec6037123e628e SHA1 63a8b250a9e3e929549f10786000daf5fab9bc3a SHA256 1b7004af914727c1710602dfef3dd2828896f5d4f309c1742ee0dcbd1989b346
 MD5 04bb7e15784fc0b9898526d873bc1ba9 files/mplayer-undefined-reference-fix.patch 316
 RMD160 cbbcc1df4e0011f12baffdbae3ec6037123e628e files/mplayer-undefined-reference-fix.patch 316
@@ -47,10 +51,10 @@ EBUILD mplayer-1.0.20070622-r2.ebuild 17381 RMD160 f6e4942c5a71409f53c1d76cd72ba
 MD5 dc7ecd20e389a8126fd28b5b3310ad1e mplayer-1.0.20070622-r2.ebuild 17381
 RMD160 f6e4942c5a71409f53c1d76cd72bae1d2f673c2e mplayer-1.0.20070622-r2.ebuild 17381
 SHA256 c994a4e0c6a8deab442f1da8566732ed03bed588d9fc2ec3cc9412f1b0a25624 mplayer-1.0.20070622-r2.ebuild 17381
-EBUILD mplayer-1.0.20070622-r3.ebuild 16901 RMD160 0a68e164ab97b23c1a7b349003aafecca6c35c7e SHA1 f9b24c815146550a9fff5bd1989ceefc40a51c77 SHA256 edcfb44754f928fd25b578bcd9e805a9a8678db076c1714c9bd4e6f76041809e
-MD5 ff7ff75d4878653b7b2848c6915c45ba mplayer-1.0.20070622-r3.ebuild 16901
-RMD160 0a68e164ab97b23c1a7b349003aafecca6c35c7e mplayer-1.0.20070622-r3.ebuild 16901
-SHA256 edcfb44754f928fd25b578bcd9e805a9a8678db076c1714c9bd4e6f76041809e mplayer-1.0.20070622-r3.ebuild 16901
+EBUILD mplayer-1.0.20070622-r3.ebuild 16934 RMD160 1bcb97d7ca2f82844fb5d84cab8952dd538f1143 SHA1 0dc075861975fb43d4c8b7ee26f2b3b01ee8b0f2 SHA256 f20d25fa93d4b1c5a32ac823821ce4399521ebb884f3c38ed4355aaa7459d906
+MD5 5a15f0db5ff49cf396940e944ea03235 mplayer-1.0.20070622-r3.ebuild 16934
+RMD160 1bcb97d7ca2f82844fb5d84cab8952dd538f1143 mplayer-1.0.20070622-r3.ebuild 16934
+SHA256 f20d25fa93d4b1c5a32ac823821ce4399521ebb884f3c38ed4355aaa7459d906 mplayer-1.0.20070622-r3.ebuild 16934
 EBUILD mplayer-1.0.20070622.ebuild 16712 RMD160 d99c4cbf7b99556061ea416a437ebed55f3e9e62 SHA1 248dc43d1b27908101b6c2817cad595b1b103280 SHA256 9bc7413e403037140ad29899a1a35a678198bd36c97ab4576814496b7b5c04ed
 MD5 843b6d2937a4c42dc7edbf48a04a1a98 mplayer-1.0.20070622.ebuild 16712
 RMD160 d99c4cbf7b99556061ea416a437ebed55f3e9e62 mplayer-1.0.20070622.ebuild 16712
@@ -59,10 +63,10 @@ EBUILD mplayer-1.0_rc1-r2.ebuild 16352 RMD160 53b9ded898627d499ecee5c6199cdce36f
 MD5 9c1bc453a1bf43eca4165e8102d4fb4a mplayer-1.0_rc1-r2.ebuild 16352
 RMD160 53b9ded898627d499ecee5c6199cdce36f8974e1 mplayer-1.0_rc1-r2.ebuild 16352
 SHA256 fdc56cba9ae42c8ee700376b79d73d3a79e2192993120bddc1b4fbf5b667482a mplayer-1.0_rc1-r2.ebuild 16352
-MISC ChangeLog 89219 RMD160 c98e6f441d5170ddebcb76912597d9f622034565 SHA1 e43e869f15e25de7de3df26d38fb281ab41cd1db SHA256 01f1240ffaf68e339ecf57e0a69af8cb81199aa95667923b535fe9694478b986
-MD5 bced02ecbd86991078a7fa7b785cce3c ChangeLog 89219
-RMD160 c98e6f441d5170ddebcb76912597d9f622034565 ChangeLog 89219
-SHA256 01f1240ffaf68e339ecf57e0a69af8cb81199aa95667923b535fe9694478b986 ChangeLog 89219
+MISC ChangeLog 89388 RMD160 a8919075fc4ffa23ee142c3918d4980d78b96801 SHA1 a4ead20193b16e654fdcfc1a07599ac69fc6684f SHA256 b61216b9863a7fc5c7a900f8bc26ce5fbca0fa7144f4d4fe3a5fb4ae061ca9fb
+MD5 0572d46392c81f4a3dea5cde96cadb7f ChangeLog 89388
+RMD160 a8919075fc4ffa23ee142c3918d4980d78b96801 ChangeLog 89388
+SHA256 b61216b9863a7fc5c7a900f8bc26ce5fbca0fa7144f4d4fe3a5fb4ae061ca9fb ChangeLog 89388
 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
 MD5 0338bfb24d7bfb6450aac4dd025c0096 metadata.xml 223
 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 metadata.xml 223
diff --git a/media-video/mplayer/files/mplayer-dpms.patch b/media-video/mplayer/files/mplayer-dpms.patch
new file mode 100644
index 000000000000..23f3010c36b9
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-dpms.patch
@@ -0,0 +1,13 @@
+diff -ur mplayer-20070622.orig/configure mplayer-20070622/configure
+--- mplayer-20070622.orig/configure	2007-06-21 22:01:29.000000000 +0300
++++ mplayer-20070622/configure	2007-08-12 20:54:51.000000000 +0300
+@@ -3923,7 +3923,7 @@
+   (void) DPMSQueryExtension(0, 0, 0);
+ }
+ EOF
+-  cc_check && _xdpms4=yes
++  cc_check -lXext && _xdpms4=yes
+ fi
+ if test "$_xdpms4" = yes ; then
+   _def_xdpms='#define HAVE_XDPMS 1'
+Only in mplayer-20070622.orig: mplayer-20070622
diff --git a/media-video/mplayer/mplayer-1.0.20070622-r3.ebuild b/media-video/mplayer/mplayer-1.0.20070622-r3.ebuild
index 7aca54c1fb31..d0643df50f7c 100644
--- a/media-video/mplayer/mplayer-1.0.20070622-r3.ebuild
+++ b/media-video/mplayer/mplayer-1.0.20070622-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20070622-r3.ebuild,v 1.1 2007/07/28 15:25:18 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0.20070622-r3.ebuild,v 1.2 2007/08/12 18:04:15 drac Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -189,7 +189,7 @@ src_unpack() {
 
 	# Fix XShape detection
 	epatch ${FILESDIR}/${PN}-xshape.patch
-
+	epatch ${FILESDIR}/${PN}-dpms.patch
 }
 
 src_compile() {