public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ati-drivers-9.6.ebuild ChangeLog
@ 2009-06-27 16:53 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-06-27 16:53 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/06/27 16:53:18

  Modified:             ati-drivers-9.6.ebuild ChangeLog
  Log:
  Fix few typos that somehow didnt get here from mine overlay.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  x11-drivers/ati-drivers/ati-drivers-9.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?r1=1.3&r2=1.4

Index: ati-drivers-9.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ati-drivers-9.6.ebuild	27 Jun 2009 16:45:41 -0000	1.3
+++ ati-drivers-9.6.ebuild	27 Jun 2009 16:53:18 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.3 2009/06/27 16:45:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.4 2009/06/27 16:53:18 scarabeus Exp $
 
 EAPI="1"
 
@@ -27,7 +27,7 @@
 	>=app-admin/eselect-opengl-1.0.7
 	>=sys-apps/portage-2.1.1-r1
 	sys-libs/libstdc++-v3
-	>=x11-base/xorg-server-1.5
+	>=x11-base/xorg-server-1.5.3-r7
 	x11-libs/libXrandr
 	amd64? ( app-emulation/emul-linux-x86-xlibs )
 	acpi? (
@@ -138,7 +138,7 @@
 	elog
 	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
 	elog "as replacement is highly recommended. Rather than staying with"
-	elog "Old versions of this driver."
+	elog "old versions of this driver."
 	einfo
 }
 
@@ -210,7 +210,6 @@
 		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
 	# Add a category.
 	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
-	cd ..
 }
 
 src_compile() {



1.161                x11-drivers/ati-drivers/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.161&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.161&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.160&r2=1.161

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -r1.160 -r1.161
--- ChangeLog	27 Jun 2009 16:45:41 -0000	1.160
+++ ChangeLog	27 Jun 2009 16:53:18 -0000	1.161
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.160 2009/06/27 16:45:41 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.161 2009/06/27 16:53:18 scarabeus Exp $
+
+  27 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  ati-drivers-9.6.ebuild:
+  Fix few typos that somehow didnt get here from mine overlay.
 
   27 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   ati-drivers-9.6.ebuild:






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ati-drivers-9.6.ebuild ChangeLog
@ 2009-07-21 10:43 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-07-21 10:43 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/07/21 10:43:20

  Modified:             ati-drivers-9.6.ebuild ChangeLog
  Log:
  Add multilib to IUSE.
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.13                 x11-drivers/ati-drivers/ati-drivers-9.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?r1=1.12&r2=1.13

Index: ati-drivers-9.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ati-drivers-9.6.ebuild	16 Jul 2009 09:24:51 -0000	1.12
+++ ati-drivers-9.6.ebuild	21 Jul 2009 10:43:20 -0000	1.13
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.12 2009/07/16 09:24:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.13 2009/07/21 10:43:20 scarabeus Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@
 HOMEPAGE="http://www.ati.com"
 ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
 SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
-IUSE="acpi debug +modules"
+IUSE="acpi debug +modules multilib"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
 KEYWORDS="~amd64 ~x86"



1.168                x11-drivers/ati-drivers/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.168&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.168&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.167&r2=1.168

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- ChangeLog	16 Jul 2009 09:24:51 -0000	1.167
+++ ChangeLog	21 Jul 2009 10:43:20 -0000	1.168
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.167 2009/07/16 09:24:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.168 2009/07/21 10:43:20 scarabeus Exp $
+
+  21 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  ati-drivers-9.6.ebuild:
+  Add multilib to IUSE.
 
   16 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   ati-drivers-9.6.ebuild:






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ati-drivers-9.6.ebuild ChangeLog
@ 2009-07-16  9:24 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-07-16  9:24 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/07/16 09:24:51

  Modified:             ati-drivers-9.6.ebuild ChangeLog
  Log:
  Fix few things in variable order. Add back wrongly removed deps.
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.12                 x11-drivers/ati-drivers/ati-drivers-9.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?r1=1.11&r2=1.12

Index: ati-drivers-9.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ati-drivers-9.6.ebuild	16 Jul 2009 00:45:08 -0000	1.11
+++ ati-drivers-9.6.ebuild	16 Jul 2009 09:24:51 -0000	1.12
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.11 2009/07/16 00:45:08 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.12 2009/07/16 09:24:51 scarabeus Exp $
 
 EAPI="2"
 
@@ -20,6 +20,7 @@
 	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
 	>=app-admin/eselect-opengl-1.0.7
+	sys-libs/libstdc++-v3
 	>=x11-base/xorg-server-1.5.3-r7
 	x11-libs/libXinerama
 	x11-libs/libXrandr
@@ -27,6 +28,7 @@
 		sys-power/acpid
 		x11-apps/xauth
 	)
+	amd64? ( multilib? ( app-emulation/emul-linux-x86-xlibs ) )
 "
 
 DEPEND="${RDEPEND}
@@ -133,8 +135,8 @@
 	if use modules; then
 		MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
 		BUILD_TARGETS="kmod_build"
-		BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
 		linux-mod_pkg_setup
+		BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"
 		_check_kernel_config
 	fi
 



1.167                x11-drivers/ati-drivers/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.167&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.167&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.166&r2=1.167

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- ChangeLog	15 Jul 2009 09:54:12 -0000	1.166
+++ ChangeLog	16 Jul 2009 09:24:51 -0000	1.167
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.166 2009/07/15 09:54:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.167 2009/07/16 09:24:51 scarabeus Exp $
+
+  16 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  ati-drivers-9.6.ebuild:
+  Fix few things in variable order. Add back wrongly removed deps.
 
   15 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   ati-drivers-9.6.ebuild, metadata.xml:






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ati-drivers-9.6.ebuild ChangeLog
@ 2009-07-06 11:12 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-07-06 11:12 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/07/06 11:12:47

  Modified:             ati-drivers-9.6.ebuild ChangeLog
  Log:
  Fix uninstall of ati-drivers per bug #238686.
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.9                  x11-drivers/ati-drivers/ati-drivers-9.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?r1=1.8&r2=1.9

Index: ati-drivers-9.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ati-drivers-9.6.ebuild	6 Jul 2009 10:58:12 -0000	1.8
+++ ati-drivers-9.6.ebuild	6 Jul 2009 11:12:47 -0000	1.9
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.8 2009/07/06 10:58:12 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.9 2009/07/06 11:12:47 scarabeus Exp $
 
 EAPI="1"
 
@@ -483,6 +483,11 @@
 }
 
 pkg_prerm() {
-	linux-mod-pkg_prerm
+	linux-mod_pkg_prerm
+	/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	linux-mod_pkg_postrm
 	/usr/bin/eselect opengl set --use-old xorg-x11
 }



1.165                x11-drivers/ati-drivers/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.165&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.165&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.164&r2=1.165

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- ChangeLog	5 Jul 2009 20:10:09 -0000	1.164
+++ ChangeLog	6 Jul 2009 11:12:47 -0000	1.165
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.164 2009/07/05 20:10:09 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.165 2009/07/06 11:12:47 scarabeus Exp $
+
+  06 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  ati-drivers-9.6.ebuild:
+  Fix uninstall of ati-drivers per bug #238686.
+
+  06 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  ati-drivers-9.6.ebuild:
+  Fix various comments and deps per bugs #263669, #263779, #260329.
 
   05 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   ati-drivers-9.6.ebuild:






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ati-drivers-9.6.ebuild ChangeLog
@ 2009-07-05 20:10 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-07-05 20:10 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/07/05 20:10:09

  Modified:             ati-drivers-9.6.ebuild ChangeLog
  Log:
  Fix prerm phase per bug #275918.
  (Portage version: 2.2_rc33/cvs/Linux i686)

Revision  Changes    Path
1.7                  x11-drivers/ati-drivers/ati-drivers-9.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?r1=1.6&r2=1.7

Index: ati-drivers-9.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ati-drivers-9.6.ebuild	27 Jun 2009 22:53:22 -0000	1.6
+++ ati-drivers-9.6.ebuild	5 Jul 2009 20:10:09 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.6 2009/06/27 22:53:22 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.7 2009/07/05 20:10:09 scarabeus Exp $
 
 EAPI="1"
 
@@ -455,5 +455,6 @@
 }
 
 pkg_prerm() {
-	/usr/bin/eselect opengl set xorg-x11
+	linux-mod-pkg_prerm
+	/usr/bin/eselect opengl set --use-old xorg-x11
 }



1.164                x11-drivers/ati-drivers/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.164&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.164&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.163&r2=1.164

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- ChangeLog	27 Jun 2009 17:52:48 -0000	1.163
+++ ChangeLog	5 Jul 2009 20:10:09 -0000	1.164
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.163 2009/06/27 17:52:48 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.164 2009/07/05 20:10:09 scarabeus Exp $
+
+  05 Jul 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  ati-drivers-9.6.ebuild:
+  Fix prerm phase per bug #275918.
 
   27 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   ati-drivers-9.6.ebuild:






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ati-drivers-9.6.ebuild ChangeLog
@ 2009-06-27 17:52 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-06-27 17:52 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/06/27 17:52:48

  Modified:             ati-drivers-9.6.ebuild ChangeLog
  Log:
  Remove obsolete kernel config checks per bug #275488.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  x11-drivers/ati-drivers/ati-drivers-9.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?r1=1.4&r2=1.5

Index: ati-drivers-9.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ati-drivers-9.6.ebuild	27 Jun 2009 16:53:18 -0000	1.4
+++ ati-drivers-9.6.ebuild	27 Jun 2009 17:52:48 -0000	1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.4 2009/06/27 16:53:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.5 2009/06/27 17:52:48 scarabeus Exp $
 
 EAPI="1"
 
@@ -66,15 +66,6 @@
 		die "${P} is not compatible with RCU Preemption (bug #223281), please disable it"
 	fi
 
-	if kernel_is ge 2 6 26 && ! linux_chkconfig_present UNUSED_SYMBOLS; then
-			ewarn "You have to Enable unused/obsolete exported symbols in Kernel hacking section of kernel config for fglrx to load"
-	fi
-
-	if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then
-		eerror "${P} requires support for pci_find_slot."
-		die "${P} requires support for pci_find_slot."
-	fi
-
 	if kernel_is ge 2 6 29; then
 		ewarn "Kernels newer then 2.6.28 are heavily patched and might result in runtime failitures."
 		ewarn "Consider them as unsupported by us."



1.163                x11-drivers/ati-drivers/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.163&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.163&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.162&r2=1.163

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- ChangeLog	27 Jun 2009 17:41:58 -0000	1.162
+++ ChangeLog	27 Jun 2009 17:52:48 -0000	1.163
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.162 2009/06/27 17:41:58 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.163 2009/06/27 17:52:48 scarabeus Exp $
+
+  27 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  ati-drivers-9.6.ebuild:
+  Remove obsolete kernel config checks per bug #275488.
 
   27 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   ati-drivers-9.6.ebuild:






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ati-drivers-9.6.ebuild ChangeLog
@ 2009-06-27 16:45 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-06-27 16:45 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/06/27 16:45:41

  Modified:             ati-drivers-9.6.ebuild ChangeLog
  Log:
  Add elog informations about supported video cards and also recomend other driver. Also move slot to 1 so user can still use x11-drivers/ati-drivers:0 in world set and for easier masking for blocking automatic update.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  x11-drivers/ati-drivers/ati-drivers-9.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?r1=1.2&r2=1.3

Index: ati-drivers-9.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ati-drivers-9.6.ebuild	26 Jun 2009 12:53:26 -0000	1.2
+++ ati-drivers-9.6.ebuild	27 Jun 2009 16:45:41 -0000	1.3
@@ -1,39 +1,46 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.2 2009/06/26 12:53:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.3 2009/06/27 16:45:41 scarabeus Exp $
+
+EAPI="1"
 
 IUSE="acpi debug"
 
 inherit eutils multilib linux-mod toolchain-funcs versionator
 
-DESCRIPTION="Ati precompiled drivers for recent chipsets"
+DESCRIPTION="Ati precompiled drivers for r600 (HD Series) and newer chipsets"
 HOMEPAGE="http://www.ati.com"
 ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
 SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
 KEYWORDS="~amd64 ~x86"
+SLOT="1"
+
 
 # The portage dep is for COLON_SEPARATED support in env-update.
 # The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
-RDEPEND=">=x11-base/xorg-server-1.5
+RDEPEND="
+	!x11-drivers/ati-drivers:0
 	!x11-apps/ati-drivers-extra
 	>=app-admin/eselect-1.0.9
-	app-admin/eselect-opengl
+	>=app-admin/eselect-opengl-1.0.7
+	>=sys-apps/portage-2.1.1-r1
 	sys-libs/libstdc++-v3
+	>=x11-base/xorg-server-1.5
+	x11-libs/libXrandr
 	amd64? ( app-emulation/emul-linux-x86-xlibs )
 	acpi? (
 		x11-apps/xauth
 		sys-power/acpid
 	)
-	x11-libs/libXrandr
-	>=sys-apps/portage-2.1.1-r1"
+"
 
 DEPEND="${RDEPEND}
 	x11-proto/xf86miscproto
 	x11-proto/xf86vidmodeproto
 	x11-proto/inputproto
-	!<x11-drivers/ati-drivers-8.552-r1"
+"
 
 EMULTILIB_PKG="true"
 
@@ -123,6 +130,16 @@
 		PKG_LIBDIR=lib
 		ARCH_DIR="${S}/arch/x86"
 	fi
+
+	elog
+	elog "Please note that this driver supports only graphic cards based on"
+	elog "r600 chipset and newer."
+	elog "This represent the ATI Radeon HD series at this moment."
+	elog
+	elog "If your card is older then usage of ${CATEGORY}/xf86-video-ati"
+	elog "as replacement is highly recommended. Rather than staying with"
+	elog "Old versions of this driver."
+	einfo
 }
 
 src_unpack() {



1.160                x11-drivers/ati-drivers/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.160&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.160&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.159&r2=1.160

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- ChangeLog	26 Jun 2009 12:53:26 -0000	1.159
+++ ChangeLog	27 Jun 2009 16:45:41 -0000	1.160
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.159 2009/06/26 12:53:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.160 2009/06/27 16:45:41 scarabeus Exp $
+
+  27 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  ati-drivers-9.6.ebuild:
+  Add elog informations about supported video cards and also recomend other
+  driver. Also move slot to 1 so user can still use
+  x11-drivers/ati-drivers:0 in world set and for easier masking for blocking
+  automatic update.
 
   26 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   ati-drivers-9.6.ebuild:






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ati-drivers-9.6.ebuild ChangeLog
@ 2009-06-26 12:53 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-06-26 12:53 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/06/26 12:53:26

  Modified:             ati-drivers-9.6.ebuild ChangeLog
  Log:
  Update path to xen patch.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  x11-drivers/ati-drivers/ati-drivers-9.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?r1=1.1&r2=1.2

Index: ati-drivers-9.6.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ati-drivers-9.6.ebuild	25 Jun 2009 16:31:08 -0000	1.1
+++ ati-drivers-9.6.ebuild	26 Jun 2009 12:53:26 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.1 2009/06/25 16:31:08 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.2 2009/06/26 12:53:26 scarabeus Exp $
 
 IUSE="acpi debug"
 
@@ -131,7 +131,7 @@
 	local src="${DISTDIR}/${A}"
 	sh "${src}" --extract "${S}"  2&>1 /dev/null
 	cd "${S}"
-	epatch "${FILESDIR}"/ati-drivers-xen-8.552.patch || die "epatch failed"
+	epatch "${FILESDIR}"/ati-drivers-xen.patch || die "epatch failed"
 
 	if kernel_is ge 2 6 29; then
 		epatch "${FILESDIR}"/kernel/2.6.29*.patch



1.159                x11-drivers/ati-drivers/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.159&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.159&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.158&r2=1.159

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -r1.158 -r1.159
--- ChangeLog	26 Jun 2009 11:19:43 -0000	1.158
+++ ChangeLog	26 Jun 2009 12:53:26 -0000	1.159
@@ -1,6 +1,10 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.158 2009/06/26 11:19:43 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.159 2009/06/26 12:53:26 scarabeus Exp $
+
+  26 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  ati-drivers-9.6.ebuild:
+  Update path to xen patch.
 
   26 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/kernel/2.6.29.patch, +files/kernel/2.6.30-enable_msi.patch,






^ permalink raw reply	[flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ati-drivers-9.6.ebuild ChangeLog
@ 2009-06-25 16:31 Tomas Chvatal (scarabeus)
  0 siblings, 0 replies; 9+ messages in thread
From: Tomas Chvatal (scarabeus) @ 2009-06-25 16:31 UTC (permalink / raw
  To: gentoo-commits

scarabeus    09/06/25 16:31:08

  Modified:             ChangeLog
  Added:                ati-drivers-9.6.ebuild
  Log:
  Add new version of ati drivers (9.6). Since now it follows the upstream versioning scheme. Kernels .29 and .30 are not supported, but patched to work somehow in this release. NOTE: to lu_zero> i am not aware of the aproperiate bug numbers and rather than placing various wrong ones in here please close the correct ones and add the numbers to ChangeLog.
  (Portage version: 2.2_rc33/cvs/Linux x86_64)

Revision  Changes    Path
1.157                x11-drivers/ati-drivers/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.157&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?rev=1.157&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ChangeLog?r1=1.156&r2=1.157

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- ChangeLog	6 Jun 2009 01:32:41 -0000	1.156
+++ ChangeLog	25 Jun 2009 16:31:08 -0000	1.157
@@ -1,6 +1,17 @@
 # ChangeLog for x11-drivers/ati-drivers
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.156 2009/06/06 01:32:41 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ChangeLog,v 1.157 2009/06/25 16:31:08 scarabeus Exp $
+
+*ati-drivers-9.6 (25 Jun 2009)
+
+  25 Jun 2009; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/kernel/2.6.29.patch, +files/kernel/2.6.30-enable_msi.patch,
+  +files/kernel/2.6.30-irqreturn_t.patch,
+  +files/kernel/2.6.30-rt_compat.patch,
+  +files/kernel/2.6.30-tlb_flush.patch, +ati-drivers-9.6.ebuild:
+  Add new version of ati drivers (9.6). Since now it follows the upstream
+  versioning scheme. Kernels .29 and .30 are not supported, but patched to
+  work somehow in this release.
 
   06 Jun 2009; Jeff Gardner <je_fro@gentoo.org> metadata.xml:
   Removing myself and adding chainsaw to metadata.xml



1.1                  x11-drivers/ati-drivers/ati-drivers-9.6.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild?rev=1.1&content-type=text/plain

Index: ati-drivers-9.6.ebuild
===================================================================
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-9.6.ebuild,v 1.1 2009/06/25 16:31:08 scarabeus Exp $

IUSE="acpi debug"

inherit eutils multilib linux-mod toolchain-funcs versionator

DESCRIPTION="Ati precompiled drivers for recent chipsets"
HOMEPAGE="http://www.ati.com"
ATI_URL="https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/"
SRC_URI="${ATI_URL}/ati-driver-installer-${PV/./-}-x86.x86_64.run"

LICENSE="AMD GPL-2 QPL-1.0 as-is"
KEYWORDS="~amd64 ~x86"

# The portage dep is for COLON_SEPARATED support in env-update.
# The eselect dep (>=1.0.9) is for COLON_SEPARATED in eselect env update.
RDEPEND=">=x11-base/xorg-server-1.5
	!x11-apps/ati-drivers-extra
	>=app-admin/eselect-1.0.9
	app-admin/eselect-opengl
	sys-libs/libstdc++-v3
	amd64? ( app-emulation/emul-linux-x86-xlibs )
	acpi? (
		x11-apps/xauth
		sys-power/acpid
	)
	x11-libs/libXrandr
	>=sys-apps/portage-2.1.1-r1"

DEPEND="${RDEPEND}
	x11-proto/xf86miscproto
	x11-proto/xf86vidmodeproto
	x11-proto/inputproto
	!<x11-drivers/ati-drivers-8.552-r1"

EMULTILIB_PKG="true"

S="${WORKDIR}"

pkg_setup() {

	# Define module dir.
	MODULE_DIR="${S}/common/lib/modules/fglrx/build_mod"

	#check kernel and sets up KV_OBJ
	MODULE_NAMES="fglrx(video:${S}/common/lib/modules/fglrx/build_mod/2.6.x)"
	BUILD_TARGETS="kmod_build"
	linux-mod_pkg_setup
	BUILD_PARAMS="GCC_VER_MAJ=$(gcc-major-version) KVER=${KV_FULL} KDIR=${KV_DIR}"

	if ! kernel_is 2 6; then
		eerror "Need a 2.6 kernel to compile against!"
		die "Need a 2.6 kernel to compile against!"
	fi

	if kernel_is ge 2 6 25 && linux_chkconfig_present PREEMPT_RCU; then
		die "${P} is not compatible with RCU Preemption (bug #223281), please disable it"
	fi

	if kernel_is ge 2 6 26 && ! linux_chkconfig_present UNUSED_SYMBOLS; then
			ewarn "You have to Enable unused/obsolete exported symbols in Kernel hacking section of kernel config for fglrx to load"
	fi

	if kernel_is ge 2 6 24 && ! linux_chkconfig_present PCI_LEGACY; then
		eerror "${P} requires support for pci_find_slot."
		die "${P} requires support for pci_find_slot."
	fi

	if kernel_is ge 2 6 29; then
		ewarn "Kernels newer then 2.6.28 are heavily patched and might result in runtime failitures."
		ewarn "Consider them as unsupported by us."
		ewarn "All bug reports are needed to be tested with 2.6.28 kernel"
	fi

	if ! linux_chkconfig_present MTRR; then
		ewarn "You don't have MTRR support enabled, the direct rendering will not work."
	fi

	if linux_chkconfig_builtin DRM; then
		ewarn "You have DRM support enabled builtin, the direct rendering will not work."
	fi

	if ! linux_chkconfig_present AGP && \
		! linux_chkconfig_present PCIEPORTBUS; then
		ewarn "You need AGP and/or PCI Express support for direct rendering to work."
	fi

	if linux_chkconfig_present PARAVIRT; then
		eerror "The current ati-drivers don't compile when having"
		eerror "paravirtualization active due to GPL symbol export"
		eerror "restrictions."
		eerror "Please disable it:"
		eerror "	CONFIG_PARAVIRT=n"
		eerror "in /usr/src/linux/.config or"
		eerror "	Processor type and features -->"
		eerror "		[ ] Paravirtualization support (EXPERIMENTAL)"
		eerror "in 'menuconfig'"
		die "CONFIG_PARAVIRT enabled"
	fi

	if ! linux_chkconfig_present MAGIC_SYSRQ; then
		eerror "You need MAGIC_SYSRQ enabled in order to build ati-drivers"
		die "CONFIG_MAGIC_SYSRQ disabled"
	fi

	# Only support xorg-server >=1.5
	BASE_DIR="${S}/x740"

	if ! linux_chkconfig_present PCI_MSI; then
		eerror "You need PCI_MSI enabled in order to build ati-drivers"
		die "CONFIG_PCI_MSI disabled"
	fi

	# This is used like $(get_libdir) for paths in ati's package.
	if use amd64 ; then
		MY_BASE_DIR="${BASE_DIR}_64a"
		PKG_LIBDIR=lib64
		ARCH_DIR="${S}/arch/x86_64"
	else
		MY_BASE_DIR="${BASE_DIR}"
		PKG_LIBDIR=lib
		ARCH_DIR="${S}/arch/x86"
	fi
}

src_unpack() {
	#Switching to a standard way to extract the files since otherwise no signature file
	#would be created
	local src="${DISTDIR}/${A}"
	sh "${src}" --extract "${S}"  2&>1 /dev/null
	cd "${S}"
	epatch "${FILESDIR}"/ati-drivers-xen-8.552.patch || die "epatch failed"

	if kernel_is ge 2 6 29; then
		epatch "${FILESDIR}"/kernel/2.6.29*.patch
	fi
	if kernel_is ge 2 6 30; then
		epatch "${FILESDIR}"/kernel/2.6.30*.patch
	fi

	# These are the userspace utilities that we also have source for.
	# We rebuild these later.
	rm \
		"${ARCH_DIR}"/usr/X11R6/bin/{fgl_glxgears,fglrx_xgamma} \
		"${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR}/libfglrx_gamma* \
		|| die "bin rm failed"

	if use debug; then
		# Enable debug mode in the Source Code.
		sed -i '/^#define DRM_DEBUG_CODE/s/0/1/' \
			"${MODULE_DIR}/firegl_public.c" \
			|| die "Failed to enable debug output."
	fi

	if use acpi; then
		sed -i \
			-e "s:/var/lib/xdm/authdir/authfiles/:/var/run/xauth/:" \
			-e "s:/var/lib/gdm/:/var/gdm/:" \
			"${S}/common/etc/ati/authatieventsd.sh" \
			|| die "sed failed."

		# Since "who" is in coreutils, we're using that one instead of "finger".
		sed -i -e 's:finger:who:' \
			"${S}/common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh" \
			|| die "Replacing 'finger' with 'who' failed."
		# Adjust paths in the script from /usr/X11R6/bin/ to /opt/bin/ and
		# add function to detect default state.
		epatch "${FILESDIR}"/ati-powermode-opt-path-2.patch || die "Failed to epatch powermode-opt-path-2.patch"
	fi

	pushd ${MODULE_DIR} >/dev/null
	ln -s "${ARCH_DIR}"/lib/modules/fglrx/build_mod/libfglrx_ip.a.GCC$(gcc-major-version) \
		|| die "symlinking precompiled core failed"

	convert_to_m 2.6.x/Makefile || die "convert_to_m failed"

	# When built with ati's make.sh it defines a bunch of macros if
	# certain .config values are set, falling back to less reliable
	# detection methods if linux/autoconf.h is not available. We
	# simply use the linux/autoconf.h settings directly, bypassing the
	# detection script.
	sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed"
	sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \
		|| die "MODVERSIONS sed failed"
	popd >/dev/null

	mkdir extra || die "mkdir failed"
	cd extra
	unpack ./../common/usr/src/ati/fglrx_sample_source.tgz
	sed -i -e 's:include/extensions/extutil.h:X11/extensions/extutil.h:' \
		lib/fglrx_gamma/fglrx_gamma.c || die "include fixup failed"
	# Add a category.
	mv programs/fglrx_gamma/fglrx_xgamma.{man,1} || die "man mv failed"
	cd ..
}

src_compile() {
	linux-mod_src_compile

	einfo "Building fgl_glxgears"
	cd "${S}"/extra/fgl_glxgears
	# These extra libs/utils either have an Imakefile that does not
	# work very well without tweaking or a Makefile ignoring CFLAGS
	# and the like. We bypass those.

	# The -DUSE_GLU is needed to compile using nvidia headers
	# according to a comment in ati-drivers-extra-8.33.6.ebuild.
	"$(tc-getCC)" -o fgl_glxgears ${CFLAGS} ${LDFLAGS} -DUSE_GLU \
		-I"${S}"/common/usr/include fgl_glxgears.c \
		-lGL -lGLU -lX11 -lm || die "fgl_glxgears build failed"

	einfo "Building fglrx_gamma lib"
	cd "${S}"/extra/lib/fglrx_gamma
	"$(tc-getCC)" -shared -fpic -o libfglrx_gamma.so.1.0 ${CFLAGS} ${LDFLAGS} \
		-DXF86MISC -Wl,-soname,libfglrx_gamma.so.1.0 fglrx_gamma.c \
		-lXext || die "fglrx_gamma lib build failed"
	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so || die "ln failed"
	ln -s libfglrx_gamma.so.1.0 libfglrx_gamma.so.1 || die "ln failed"

	einfo "Building fglrx_gamma util"
	cd "${S}"/extra/programs/fglrx_gamma
	"$(tc-getCC)" -o fglrx_xgamma ${CFLAGS} ${LDFLAGS} \
		-I../../../common/usr/X11R6/include -L../../lib/fglrx_gamma \
		fglrx_xgamma.c -lm -lfglrx_gamma -lX11 \
		|| die "fglrx_gamma util build failed"

}

src_install() {
	linux-mod_src_install

	# We can do two things here, and neither of them is very nice.

	# For direct rendering libGL has to be able to load one or more
	# dri modules (files ending in _dri.so, like fglrx_dri.so).
	# Gentoo's mesa looks for these files in the location specified by
	# LIBGL_DRIVERS_PATH or LIBGL_DRIVERS_DIR, then in the hardcoded
	# location /usr/$(get_libdir)/dri. Ati's libGL does the same
	# thing, but the hardcoded location is /usr/X11R6/lib/modules/dri
	# on x86 and amd64 32bit, /usr/X11R6/lib64/modules/dri on amd64
	# 64bit. So we can either put the .so files in that (unusual,
	# compared to "normal" mesa libGL) location or set
	# LIBGL_DRIVERS_PATH. We currently do the latter. See also bug
	# 101539.

	# The problem with this approach is that LIBGL_DRIVERS_PATH
	# *overrides* the default hardcoded location, it does not extend
	# it. So if ati-drivers is merged but a non-ati libGL is selected
	# and its hardcoded path does not match our LIBGL_DRIVERS_PATH
	# (because it changed in a newer mesa or because it was compiled
	# for a different set of multilib abis than we are) stuff breaks.

	# We create one file per ABI to work with "native" multilib, see
	# below.

	echo "COLON_SEPARATED=LIBGL_DRIVERS_PATH" > "${T}/03ati-colon-sep"
	doenvd "${T}/03ati-colon-sep"

	# All libraries that we have a 32 bit and 64 bit version of on
	# amd64 are installed in src_install-libs. Everything else
	# (including libraries only available in native 64bit on amd64)
	# goes in here.

	# There used to be some code here that tried to detect running
	# under a "native multilib" portage ((precursor of)
	# http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it
	# should just work (only doing some duplicate work). --marienz
	if has_multilib_profile; then
		local OABI=${ABI}
		for ABI in $(get_install_abis); do
			src_install-libs
		done
		ABI=${OABI}
		unset OABI
	else
		src_install-libs
	fi

	# This is sorted by the order the files occur in the source tree.

	# X modules.
	exeinto /usr/$(get_libdir)/xorg/modules/drivers
	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so
	exeinto /usr/$(get_libdir)/xorg/modules/linux
	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/linux/libfglrxdrm.so
	exeinto /usr/$(get_libdir)/xorg/modules
	doexe "${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/{esut.a,glesx.so,amdxmm.so}

	# Arch-specific files.
	# (s)bin.
	into /opt
	if use acpi; then
		dosbin "${ARCH_DIR}"/usr/sbin/atieventsd
	fi
	# We cleaned out the compilable stuff in src_unpack
	dobin "${ARCH_DIR}"/usr/X11R6/bin/*

	# lib.
	exeinto /usr/$(get_libdir)
	# Everything except for the libGL.so installed in src_install-libs.
	doexe $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
		-maxdepth 1 -type f -name '*.so*' -not -name 'libGL.so*')
	insinto /usr/$(get_libdir)
	doins $(find "${ARCH_DIR}"/usr/X11R6/${PKG_LIBDIR} \
		-maxdepth 1 -type f -not -name '*.so*')

	# Common files.
	# etc.
	insinto /etc/ati
	# Everything except for the authatieventsd.sh script.
	doins common/etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default}
	if use acpi; then
		insopts -m0755
		doins common/etc/ati/authatieventsd.sh
	fi

	# include.
	insinto /usr
	doins -r common/usr/include
	insinto /usr/include/X11/extensions
	doins common/usr/X11R6/include/X11/extensions/fglrx_gamma.h

	# Just the atigetsysteminfo.sh script.
	into /usr
	dosbin common/usr/sbin/*

	# data files for the control panel.
	insinto /usr/share
	doins -r common/usr/share/ati
	insinto /usr/share/pixmaps
	doins common/usr/share/icons/ccc_{large,small}.xpm
	make_desktop_entry amdcccle 'ATI Catalyst Control Center' \
		ccc_large System

	# doc.
	dohtml -r common/usr/share/doc/fglrx

	if use acpi; then
		doman common/usr/share/man/man8/atieventsd.8

		pushd common/usr/share/doc/fglrx/examples/etc/acpi >/dev/null

		exeinto /etc/acpi
		doexe ati-powermode.sh
		insinto /etc/acpi/events
		doins events/*

		popd >/dev/null
	fi

	# Done with the "source" tree. Install tools we rebuilt:
	dobin extra/fgl_glxgears/fgl_glxgears
	newdoc extra/fgl_glxgears/README README.fgl_glxgears

	dolib extra/lib/fglrx_gamma/*so*
	newdoc extra/lib/fglrx_gamma/README README.libfglrx_gamma

	dobin extra/programs/fglrx_gamma/fglrx_xgamma
	doman extra/programs/fglrx_gamma/fglrx_xgamma.1
	newdoc extra/programs/fglrx_gamma/README README.fglrx_gamma

	# Gentoo-specific stuff:
	if use acpi; then
		newinitd "${FILESDIR}"/atieventsd.init atieventsd \
			|| die "Failed to install atieventsd.init.d"
		echo 'ATIEVENTSDOPTS=""' > "${T}"/atieventsd.conf
		newconfd "${T}"/atieventsd.conf atieventsd
	fi
}

src_install-libs() {
	if [[ "${ABI}" == "amd64" ]]; then
		local EX_BASE_DIR="${BASE_DIR}_64a"
		local pkglibdir=lib64
		local MY_ARCH_DIR="${S}/arch/x86_64"
	else
		local EX_BASE_DIR="${BASE_DIR}"
		local pkglibdir=lib
		local MY_ARCH_DIR="${S}/arch/x86"
	fi
	einfo "ati tree '${pkglibdir}' -> '$(get_libdir)' on system"

	local ATI_ROOT=/usr/$(get_libdir)/opengl/ati
	# To make sure we do not miss a spot when these change.
	local libmajor=1 libminor=2
	local libver=${libmajor}.${libminor}

	# The GLX libraries
	# (yes, this really is "lib" even on amd64/multilib --marienz)
	exeinto ${ATI_ROOT}/lib
	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/libGL.so.${libver}
	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so.${libmajor}
	dosym libGL.so.${libver} ${ATI_ROOT}/lib/libGL.so

	exeinto ${ATI_ROOT}/extensions
	doexe "${EX_BASE_DIR}"/usr/X11R6/${pkglibdir}/modules/extensions/*

	# DRI modules, installed into the path used by recent versions of mesa.
	exeinto /usr/$(get_libdir)/dri
	doexe "${MY_ARCH_DIR}"/usr/X11R6/${pkglibdir}/modules/dri/fglrx_dri.so

	# AMD Cal libraries
	exeinto /usr/$(get_libdir)
	doexe "${MY_ARCH_DIR}"/usr/${pkglibdir}/*.so

	# Make up a libGL.la. Ati does not provide one, but mesa does. If
	# a (libtool-based) libfoo is built with libGL.la present a
	# reference to it is put into libfoo.la, and compiling
	# (libtool-based) things that link too libfoo.la will complain if
	# libGL.la disappears. So if we do not make up a libGL.la
	# switching between mesa and ati becomes painful.
	local revision=$(printf '%d%02d%02d' $(get_version_components))
	sed -e "s:\${libmajor}:${libmajor}:g" \
		-e "s:\${libminor}:${libminor}:g" \
		-e "s:\${libdir}:$(get_libdir):g" \
		-e "s:\${revision}:${revision}:g" \
		"${FILESDIR}"/libGL.la.in > "${D}"/${ATI_ROOT}/lib/libGL.la \
		|| die "sed failed to make libGL.la"

	local envname="${T}"/04ati-dri-path
	if [[ -n ${ABI} ]]; then
		envname="${envname}-${ABI}"
	fi
	echo "LIBGL_DRIVERS_PATH=/usr/$(get_libdir)/dri" > "${envname}"
	doenvd "${envname}"
}

pkg_postinst() {
	/usr/bin/eselect opengl set --use-old ati

	elog "To switch to ATI OpenGL, run \"eselect opengl set ati\""
	elog "To change your xorg.conf you can use the bundled \"aticonfig\""
	elog
	elog "If you experience unexplained segmentation faults and kernel crashes"
	elog "with this driver and multi-threaded applications such as wine,"
	elog "set UseFastTLS in xorg.conf to either 0 or 1, but not 2."
	elog
	elog "You will have to source /etc/profile (or logout and back in) for dri"
	elog "to work, unless you previously had ati-drivers installed."

	# Workaroud screen corruption
	ewarn "If you experience screen corruption with this driver, try putting"
	ewarn '         Option "XAANoOffscreenPixmaps" "true"'
	ewarn "in the Device Section of /etc/X11/xorg.conf."

	linux-mod_pkg_postinst
}

pkg_prerm() {
	/usr/bin/eselect opengl set xorg-x11
}






^ permalink raw reply	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2009-07-21 10:43 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-27 16:53 [gentoo-commits] gentoo-x86 commit in x11-drivers/ati-drivers: ati-drivers-9.6.ebuild ChangeLog Tomas Chvatal (scarabeus)
  -- strict thread matches above, loose matches on Subject: below --
2009-07-21 10:43 Tomas Chvatal (scarabeus)
2009-07-16  9:24 Tomas Chvatal (scarabeus)
2009-07-06 11:12 Tomas Chvatal (scarabeus)
2009-07-05 20:10 Tomas Chvatal (scarabeus)
2009-06-27 17:52 Tomas Chvatal (scarabeus)
2009-06-27 16:45 Tomas Chvatal (scarabeus)
2009-06-26 12:53 Tomas Chvatal (scarabeus)
2009-06-25 16:31 Tomas Chvatal (scarabeus)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox