From 0a7395d8ba2ba0df800d037e1a6398689679ad0c Mon Sep 17 00:00:00 2001 From: Javier Villavicencio Date: Tue, 2 Jan 2007 22:23:06 +0000 Subject: [PATCH] Fixes i810 video card selection for FreeBSD. Package-Manager: portage-2.1.2_rc4-r4 --- x11-base/x11-drm/ChangeLog | 6 +++++- x11-base/x11-drm/Manifest | 16 ++++++++-------- x11-base/x11-drm/x11-drm-20060608-r1.ebuild | 14 ++++++++++---- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/x11-base/x11-drm/ChangeLog b/x11-base/x11-drm/ChangeLog index 391db1c84335..6ff5464f0ac5 100644 --- a/x11-base/x11-drm/ChangeLog +++ b/x11-base/x11-drm/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-base/x11-drm # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.48 2007/01/02 22:06:04 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/ChangeLog,v 1.49 2007/01/02 22:23:06 the_paya Exp $ + + 02 Jan 2007; Javier Villavicencio + x11-drm-20060608-r1.ebuild: + Fixes i810 video cards selection for FreeBSD. 02 Jan 2007; Donnie Berkholz ; x11-drm-20060608-r1.ebuild: diff --git a/x11-base/x11-drm/Manifest b/x11-base/x11-drm/Manifest index 7217a7d2a8c9..a4ac705b7d90 100644 --- a/x11-base/x11-drm/Manifest +++ b/x11-base/x11-drm/Manifest @@ -10,18 +10,18 @@ EBUILD x11-drm-20051223.ebuild 6384 RMD160 e28ebee2ce1caf5c90dc2e944a04911ba2c02 MD5 95c3e96dee51eaca5684499b709a2b9b x11-drm-20051223.ebuild 6384 RMD160 e28ebee2ce1caf5c90dc2e944a04911ba2c02089 x11-drm-20051223.ebuild 6384 SHA256 1b38d0282cab1bfbbeb36bade40ea03a3604e8d50121aef958611afcadc464ac x11-drm-20051223.ebuild 6384 -EBUILD x11-drm-20060608-r1.ebuild 8380 RMD160 69efdf87f74d5072dcb0b789bb2ecf2dde2bfa00 SHA1 1835be5889fc99435c052e572320fde49c50af0f SHA256 b8e9920a6af43fb25d435517bcc4d9234a947dbd15c81b2505e928fb68ceb563 -MD5 fd5401ef856a16ccf0ca477f5e810552 x11-drm-20060608-r1.ebuild 8380 -RMD160 69efdf87f74d5072dcb0b789bb2ecf2dde2bfa00 x11-drm-20060608-r1.ebuild 8380 -SHA256 b8e9920a6af43fb25d435517bcc4d9234a947dbd15c81b2505e928fb68ceb563 x11-drm-20060608-r1.ebuild 8380 +EBUILD x11-drm-20060608-r1.ebuild 8513 RMD160 2e680d57699a9bf03d6f25a49722209262ffb9ce SHA1 b50f30ae4547d4f30eb80b77f0010bcb53358b84 SHA256 6d65a6e02e8075d38deb765e84f76951b1909310e92ece4e947c3ec44fa36bce +MD5 04ed1d03a59fc9c174b8524f38f9a57a x11-drm-20060608-r1.ebuild 8513 +RMD160 2e680d57699a9bf03d6f25a49722209262ffb9ce x11-drm-20060608-r1.ebuild 8513 +SHA256 6d65a6e02e8075d38deb765e84f76951b1909310e92ece4e947c3ec44fa36bce x11-drm-20060608-r1.ebuild 8513 EBUILD x11-drm-20060608.ebuild 6376 RMD160 344926ccafbeb9dcc255104cab6569c6703f6f96 SHA1 61de65fc208106a93a7810ce0df0e164a35a128f SHA256 4cdc79e123eb0c04c892e289470236f98e15823cd5729767c0c776ef7f6d1d71 MD5 f7f8ce4209fcee05755190b5df140954 x11-drm-20060608.ebuild 6376 RMD160 344926ccafbeb9dcc255104cab6569c6703f6f96 x11-drm-20060608.ebuild 6376 SHA256 4cdc79e123eb0c04c892e289470236f98e15823cd5729767c0c776ef7f6d1d71 x11-drm-20060608.ebuild 6376 -MISC ChangeLog 22173 RMD160 52d10a48d43ad01af200b0bf77e14a5961320c58 SHA1 f89b34cab86fb259155c4c016ac2631b7cdb64c4 SHA256 5c71ef2ad00f691c003e8cc6d4854f67e1aab0045524af081447f4af08ebd478 -MD5 9a599031e2713e264435a0e71a1b2a4a ChangeLog 22173 -RMD160 52d10a48d43ad01af200b0bf77e14a5961320c58 ChangeLog 22173 -SHA256 5c71ef2ad00f691c003e8cc6d4854f67e1aab0045524af081447f4af08ebd478 ChangeLog 22173 +MISC ChangeLog 22309 RMD160 f20040e822d868646343a8b72a8bb23118b16202 SHA1 b0182b507d3f27e1b1271c9a44146e98880bd9bb SHA256 d0d9cee8538e4e8c0c0ccf09281c81bd1a29d1767c2738d4e18761fcdc36d519 +MD5 33a1ed1287e5161c1871c9c76ae39475 ChangeLog 22309 +RMD160 f20040e822d868646343a8b72a8bb23118b16202 ChangeLog 22309 +SHA256 d0d9cee8538e4e8c0c0ccf09281c81bd1a29d1767c2738d4e18761fcdc36d519 ChangeLog 22309 MISC metadata.xml 368 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 SHA1 5104adf2f1ebe1ddffe4ca95e7b5e5f06267f842 SHA256 e73a5c428f39881de8ae5acf40958e8ad37a5fe92c2bb8cc4060704c9be45ef1 MD5 782be9470cf76716a15aa5a70f4b8af7 metadata.xml 368 RMD160 cbe279aeafeae0af3633fbd1ecaa59d2f54579b8 metadata.xml 368 diff --git a/x11-base/x11-drm/x11-drm-20060608-r1.ebuild b/x11-base/x11-drm/x11-drm-20060608-r1.ebuild index 2b5d5cc4df54..7505251272d4 100644 --- a/x11-base/x11-drm/x11-drm-20060608-r1.ebuild +++ b/x11-base/x11-drm/x11-drm-20060608-r1.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/x11-base/x11-drm/x11-drm-20060608-r1.ebuild,v 1.3 2007/01/02 22:06:04 dberkholz Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/x11-drm/x11-drm-20060608-r1.ebuild,v 1.4 2007/01/02 22:23:06 the_paya Exp $ inherit eutils x11 linux-mod @@ -160,14 +160,20 @@ kernel_setup() { } set_vidcards() { - use kernel_linux && set_kvobj - use kernel_FreeBSD && KV_OBJ="ko" + if use kernel_linux; then + set_kvobj + I810_VIDCARDS="i810.${KV_OBJ} i830.${KV_OBJ} i915.${KV_OBJ}" + elif use kernel_FreeBSD; then + KV_OBJ="ko" + # bsd does not have i810/i830, only i915: + I810_VIDCARDS="i915.${KV_OBJ}" + fi VIDCARDS="" if [[ -n "${VIDEO_CARDS}" ]]; then use video_cards_i810 && \ - VIDCARDS="${VIDCARDS} i810.${KV_OBJ} i830.${KV_OBJ} i915.${KV_OBJ}" + VIDCARDS="${VIDCARDS} ${I810_VIDCARDS}" use video_cards_mach64 && \ VIDCARDS="${VIDCARDS} mach64.${KV_OBJ}" use video_cards_mga && \ -- 2.26.2