Add omap to VIDEO_CARDS.

4 files changed, 15 insertions, 5 deletions

diff --git a/profiles/ChangeLog b/profiles/ChangeLog
index 5e5843c3aca7..09c7f461b4d5 100644
--- a/profiles/ChangeLog
+++ b/profiles/ChangeLog
@@ -1,11 +1,16 @@
 # ChangeLog for profile directory
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6370 2012/03/29 04:08:24 ottxor Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/ChangeLog,v 1.6371 2012/03/29 12:17:50 chithanh Exp $
 #
 # This ChangeLog should include records for all changes in profiles directory.
 # Only typo fixes which don't affect portage/repoman behaviour could be avoided
 # here. If in doubt put a record here!
 
+  29 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  desc/video_cards.desc:
+  Add omap to VIDEO_CARDS, adjust description to distinguish between omap and
+  omapfb.
+
   29 Mar 2012; Christoph Junghans <ottxor@gentoo.org> package.mask:
   fftw-3.3.1 released
 
diff --git a/profiles/base/ChangeLog b/profiles/base/ChangeLog
index 60d1dc6d4cfb..6ba0101945bd 100644
--- a/profiles/base/ChangeLog
+++ b/profiles/base/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for Gentoo base-profile
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.370 2012/03/28 18:41:58 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/ChangeLog,v 1.371 2012/03/29 12:17:50 chithanh Exp $
+
+  29 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org> use.mask:
+  Mask video_cards_omap as it is not useful on most arches.
 
   28 Mar 2012; Arun Raghavan <ford_prefect@gentoo.org> package.use.mask:
   webrtc-audio-processing is only supported on x86/amd64. Possibly arm can be
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 6c1286bc975f..19787065586e 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.138 2012/03/18 14:11:20 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.139 2012/03/29 12:17:50 chithanh Exp $
 
 # not ready for primetime
 packagekit
@@ -129,6 +129,7 @@ video_cards_vmware
 video_cards_virtualbox
 
 # not needed on non-arm systems
+video_cards_omap
 video_cards_omapfb
 
 # linux-only drivers
diff --git a/profiles/desc/video_cards.desc b/profiles/desc/video_cards.desc
index f6d69d955565..9aa32c3b5a84 100644
--- a/profiles/desc/video_cards.desc
+++ b/profiles/desc/video_cards.desc
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/profiles/desc/video_cards.desc,v 1.29 2012/02/25 01:41:14 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/profiles/desc/video_cards.desc,v 1.30 2012/03/29 12:17:51 chithanh Exp $
 
 # This file contains descriptions of VIDEO_CARDS USE_EXPAND flags.
 
@@ -34,7 +34,8 @@ nouveau - VIDEO_CARDS setting to build reverse-engineered driver for nvidia card
 nsc - VIDEO_CARDS setting to build driver for nsc video cards
 nvidia - VIDEO_CARDS setting to build driver for nvidia video cards
 nv - VIDEO_CARDS setting to build driver for nv video cards
-omapfb - VIDEO_CARDS setting to build driver for omapfb video cards
+omap - VIDEO_CARDS setting to build DRM driver for TI OMAP video cards
+omapfb - VIDEO_CARDS setting to build framebuffer driver for TI OMAP video cards
 qxl - VIDEO_CARDS setting to build driver for qxl (QEMU virtual GPU)
 r100 - VIDEO_CARDS setting to build only r100 based chips code for radeon
 r128 - VIDEO_CARDS setting to build driver for ATI r128 video cards