sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master z-rejected grimoire by Andraž Levstik (f02ace9f48246f14bb549362d7d798d514f224e6)

From: Andraž Levstik <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Andraž Levstik (f02ace9f48246f14bb549362d7d798d514f224e6)
Date: Sat, 25 Apr 2009 02:52:46 -0500

GIT changes to master z-rejected grimoire by Andraž Levstik
<ruskie+2054d253 AT codemages.net>:

ChangeLog | 4 +
z-kernels/ati-fglrx/DEPENDS | 7 +-
z-kernels/ati-fglrx/HISTORY | 3
z-kernels/ati_driver-new/BUILD | 1
z-kernels/ati_driver-new/CONFIGURE | 1
z-kernels/ati_driver-new/CONFLICTS | 3
z-kernels/ati_driver-new/DEPENDS | 1
z-kernels/ati_driver-new/DETAILS | 15 ----
z-kernels/ati_driver-new/FINAL | 1
z-kernels/ati_driver-new/HISTORY | 106
-----------------------------------
z-kernels/ati_driver-new/INSTALL | 1
z-kernels/ati_driver-new/POST_REMOVE | 6 -
z-kernels/ati_driver-new/PREPARE | 6 -
z-kernels/ati_driver-new/PRE_BUILD | 1
z-kernels/ati_driver-new/PROVIDES | 2
z-kernels/ati_driver-new/TRIGGERS | 6 -
z-kernels/ati_driver/BUILD | 1
z-kernels/ati_driver/CONFIGURE | 1
z-kernels/ati_driver/CONFLICTS | 3
z-kernels/ati_driver/DEPENDS | 1
z-kernels/ati_driver/DETAILS | 15 ----
z-kernels/ati_driver/HISTORY | 87 ----------------------------
z-kernels/ati_driver/INSTALL | 1
z-kernels/ati_driver/PRE_BUILD | 1
z-kernels/ati_driver/PROVIDES | 2
z-kernels/ati_driver/TRIGGERS | 6 -
26 files changed, 13 insertions(+), 269 deletions(-)

New commits:
commit f02ace9f48246f14bb549362d7d798d514f224e6
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

ati-fglrx: if 1.6 or 1.6.1 use DPMS sub_dependency

commit a88da5b54b1b0344912fc851b9669fe3dbafa192
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

z-kernels/ati_driver: removed in favour of ati-fglrx

commit 9a1643dc2405cc917bdb6a69d4813d4c25fcaa02
Author: Andraž Levstik <ruskie+2054d253 AT codemages.net>
Commit: Andraž Levstik <ruskie+2054d253 AT codemages.net>

z-kernels/ati_driver-new: removed in favour of ati-fglrx

diff --git a/ChangeLog b/ChangeLog
index b6494d5..ddc5aff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-04-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * z-kernels/ati_driver-new: removed, has been deprecated in favour of
ati-fglrx
+ * z-kernels/ati_driver: removed, has been deprecated in favour of
ati-fglrx
+
2009-02-26 Ladislav Hagara <hgr AT vabo.cz>
* gurus.gpg: added my key 285B52A7

diff --git a/z-kernels/ati-fglrx/DEPENDS b/z-kernels/ati-fglrx/DEPENDS
index 9c8aa5b..dd5995c 100755
--- a/z-kernels/ati-fglrx/DEPENDS
+++ b/z-kernels/ati-fglrx/DEPENDS
@@ -1 +1,6 @@
-depends xorg-server
+depends xorg-server &&
+if grep -q "1.6" <<< $(installed_version xorg-server)
+then
+sub_depends xorg-server DPMS
+fi
+
diff --git a/z-kernels/ati-fglrx/HISTORY b/z-kernels/ati-fglrx/HISTORY
index 50b94f8..054f184 100644
--- a/z-kernels/ati-fglrx/HISTORY
+++ b/z-kernels/ati-fglrx/HISTORY
@@ -1,3 +1,6 @@
+2009-04-25 Andraž "ruskie" Levstik <ruskie+f03a580f AT codemages.net>
+ * DEPENDS: added DPMS sub_depends for xorg-server
+
2009-04-23 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: updated spell to 9.4
* INSTALL: some fixes
diff --git a/z-kernels/ati_driver-new/BUILD b/z-kernels/ati_driver-new/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/z-kernels/ati_driver-new/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/z-kernels/ati_driver-new/CONFIGURE
b/z-kernels/ati_driver-new/CONFIGURE
deleted file mode 100755
index cef20f5..0000000
--- a/z-kernels/ati_driver-new/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query ATI_DRIVER_QT "Do you want the firegl control panel (adds a
dependency on qt-x11)" n
diff --git a/z-kernels/ati_driver-new/CONFLICTS
b/z-kernels/ati_driver-new/CONFLICTS
deleted file mode 100755
index bb07fd1..0000000
--- a/z-kernels/ati_driver-new/CONFLICTS
+++ /dev/null
@@ -1,3 +0,0 @@
-conflicts ATI_driver y
-conflicts ati_driver-new y
-conflicts ati-fglrx y
diff --git a/z-kernels/ati_driver-new/DEPENDS
b/z-kernels/ati_driver-new/DEPENDS
deleted file mode 100755
index fe045a2..0000000
--- a/z-kernels/ati_driver-new/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends ati-fglrx
diff --git a/z-kernels/ati_driver-new/DETAILS
b/z-kernels/ati_driver-new/DETAILS
deleted file mode 100755
index c4ca05d..0000000
--- a/z-kernels/ati_driver-new/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
- SPELL=ati_driver-new
- VERSION=DEAD
- WEB_SITE=http://www.ati.com
- ENTERED=20030911
- LICENSE[0]="GPL/QPL"
- SHORT="Driver provided by ATI for Radeon 8500+/FireGL 8700+"
-cat << EOF
-These are the ATI provided binary XFree86 drivers for their graphics cards.
-
-The ATI Proprietary Linux driver currently supports RADEON 8500 and later AGP
-or PCI Express graphics products, as well as FireGL 8700 and later products.
We
-do not currently plan to include support for any products earlier than this.
-Drivers for earlier products should already be available from the DRI Project
-or Utah-GLX project.
-EOF
diff --git a/z-kernels/ati_driver-new/FINAL b/z-kernels/ati_driver-new/FINAL
deleted file mode 100755
index 0a006a7..0000000
--- a/z-kernels/ati_driver-new/FINAL
+++ /dev/null
@@ -1 +0,0 @@
-smgl-gl_select -s ati
diff --git a/z-kernels/ati_driver-new/HISTORY
b/z-kernels/ati_driver-new/HISTORY
deleted file mode 100644
index 6c00a75..0000000
--- a/z-kernels/ati_driver-new/HISTORY
+++ /dev/null
@@ -1,106 +0,0 @@
-2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * BUILD, DEPENDS, PRE_BUILD, TRIGGERS: deprecating to ati-fglrx
- * CONFLICTS, DETAILS, INSTALL, PROVIDES: deprecating to ati-fglrx
-
-2008-04-04 Eric Sandall <sandalle AT sourcemage.org>
- * PROVIDES: Provides FGLRX
-
-2006-11-1 David Kowis <dkowis AT shlrm.org>
- * DETAILS: renamed to ati_driver-new
-
-2006-10-26 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * FINAL: smgl-gl_select properly called now
- * DEPENDS: fixed typo as well
-
-2006-10-13 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: VERSION UPDATE
- * BUILD: cleanup
- * INSTALL: cleanup
- * PREPARE: added to pick version
- * POST_REMOVE: added to revert to default GL
- * DEPENDS: deypend on smgl gl selector
- * 8.10.19-2.6.11.patch: removed
- * libstdc++.so.5: removed
- * PRE_BUILD: cleanup
- * FINAL: added to pick default GL lib
-
-2006-09-12 Treeve Jelbert <treeve AT pi.be>
- * DETAILS: version 8.28.8
-
-2006-07-30 Treeve Jelbert <treeve AT pi.be>
- * DETAILS: version 8.27.10
- * DEPENDS: add missing && and X11-LIBS
- * BUILD: I don't think that the kernel patch is relevant anymore?
-
-2005-12-01 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-12-01 Seth Woolley <seth AT tautology.org>
- * PRE_BUILD: unpack api update
-
-2005-04-05 Eric Sandall <sandalle AT sourcemage.org>
- * BUILD: Apply 2.6.11 patch if needed
- * 2.6.10-fix.patch: Removed
- * 8.10.19-2.6.11.patch: Added (patch URL from Andrew Levstik)
-
-2005-04-03 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Reworded SHORT and description to give a little more detail
- about what this driver is for. Grabbed from:
- http://www.ati.com/products/catalyst/linux.html
-
-2005-03-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * INSTALL: Permission problems with the spell which broke it
-
-2005-03-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * BUILD: Next time check if patches are still valid sandalle
- Only commented out the patch leav it in till next update then remove
- * CONFIGURE: Added the REJECTED_MSG(why is this in CONFIGURE
- and not in PREPARE???)
-
-2005-03-12 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 8.10.19
-
-2005-02-09 Eric Sandall <sandalle AT sourcemage.org>
- * CONFIGURE: Added closing parenthesis. :)
-
-2005-02-06 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: BUILD_API=2, xfree-4.3. and xorg support
- * BUILD: patch for 2.6.10 kernel, BUILD_API2 conversion
- * INSTALL: added for BUILD_API2 conversion
- * CONFIGURE: ask to build the qt-x11 control panel
- * smgl.qt.fix.patch: adds a -I/usr/include/qt and removes
- the nonexistant .kdelink and .desktop files
- * 2.6.10-fix.patch: a fix for 2.6.10 kernels
- * libstdc++.so.5: this is needed to run fgl_glxgears
- I tried building it but that one seg faulted on run
-
-2004-10-18 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Added "&&"
-
-2004-09-09 Eric Schabell <eschabell AT sourcemage.org>
- * DETAILS, BUILD: updated for v3.11.1, fixes bug #7036.
-
-2004-07-17 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Renamed to ati_driver
- Added md5sum
- * CONFLICTS: Conflicts with ATI_driver
-
-2004-05-03 Seth Woolley <seth AT tautology.org>
- * DETAILS: removed space from LICENSE
-
-2004-04-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
- * TRIGGERS: added trigger for xfree86-4.3 and xorg
-
-2004-03-15 Chris Dennis <Chris.Dennis AT UAlberta.NET>
- * DETAILS: Updated to 3.7.6
-
-2003-12-10 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Put quotes around the dual licenses
- * HISTORY: Formatted to Guru Handbook
-
-2003-11-20 Chris Dennis <Chris.Dennis AT UAlberta.NET>
- * DETAILS: Updated to 3.2.8
-
-2003-09-10 Chris Dennis <Chris.Dennis AT UAlberta.NET>
- * Created this spell
-
diff --git a/z-kernels/ati_driver-new/INSTALL
b/z-kernels/ati_driver-new/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/z-kernels/ati_driver-new/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/z-kernels/ati_driver-new/POST_REMOVE
b/z-kernels/ati_driver-new/POST_REMOVE
deleted file mode 100755
index 5faa94d..0000000
--- a/z-kernels/ati_driver-new/POST_REMOVE
+++ /dev/null
@@ -1,6 +0,0 @@
-. $GRIMOIRE/FUNCTIONS &&
-if check_if_xorg_modular_libs ; then
-smgl-gl_select -s mesa
-else
-smgl_gl-select -s monolithic
-fi
diff --git a/z-kernels/ati_driver-new/PREPARE
b/z-kernels/ati_driver-new/PREPARE
deleted file mode 100755
index eb60306..0000000
--- a/z-kernels/ati_driver-new/PREPARE
+++ /dev/null
@@ -1,6 +0,0 @@
-. $GRIMOIRE/REJECTED_MSG &&
-message "The following driver versions are available:" &&
-message "8.29.6 - Doesn't support r85xx-92xx!!!" &&
-message "8.28.8 - Supports r85xx and above" &&
-config_query_list ATI_VERSION "Which version do you want?" \
- '8.29.6' '8.28.8'
diff --git a/z-kernels/ati_driver-new/PRE_BUILD
b/z-kernels/ati_driver-new/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/z-kernels/ati_driver-new/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/z-kernels/ati_driver-new/PROVIDES
b/z-kernels/ati_driver-new/PROVIDES
deleted file mode 100755
index 09da08e..0000000
--- a/z-kernels/ati_driver-new/PROVIDES
+++ /dev/null
@@ -1,2 +0,0 @@
-provides FGLRX
-provides OPENGL
diff --git a/z-kernels/ati_driver-new/TRIGGERS
b/z-kernels/ati_driver-new/TRIGGERS
deleted file mode 100755
index 4ef578c..0000000
--- a/z-kernels/ati_driver-new/TRIGGERS
+++ /dev/null
@@ -1,6 +0,0 @@
-on_cast linux cast_self
-on_cast xfree86 cast_self
-on_cast xfree86-4.3 cast_self
-on_cast xorg cast_self
-on_cast xfree86-devel cast_self
-on_cast $SPELL dispel_self
diff --git a/z-kernels/ati_driver/BUILD b/z-kernels/ati_driver/BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/z-kernels/ati_driver/BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/z-kernels/ati_driver/CONFIGURE b/z-kernels/ati_driver/CONFIGURE
deleted file mode 100755
index cef20f5..0000000
--- a/z-kernels/ati_driver/CONFIGURE
+++ /dev/null
@@ -1 +0,0 @@
-config_query ATI_DRIVER_QT "Do you want the firegl control panel (adds a
dependency on qt-x11)" n
diff --git a/z-kernels/ati_driver/CONFLICTS b/z-kernels/ati_driver/CONFLICTS
deleted file mode 100755
index bb07fd1..0000000
--- a/z-kernels/ati_driver/CONFLICTS
+++ /dev/null
@@ -1,3 +0,0 @@
-conflicts ATI_driver y
-conflicts ati_driver-new y
-conflicts ati-fglrx y
diff --git a/z-kernels/ati_driver/DEPENDS b/z-kernels/ati_driver/DEPENDS
deleted file mode 100755
index fe045a2..0000000
--- a/z-kernels/ati_driver/DEPENDS
+++ /dev/null
@@ -1 +0,0 @@
-depends ati-fglrx
diff --git a/z-kernels/ati_driver/DETAILS b/z-kernels/ati_driver/DETAILS
deleted file mode 100755
index 67bbefd..0000000
--- a/z-kernels/ati_driver/DETAILS
+++ /dev/null
@@ -1,15 +0,0 @@
- SPELL=ati_driver
- VERSION=DEAD
- WEB_SITE=http://www.ati.com
- ENTERED=20030911
- LICENSE[0]="GPL/QPL"
- SHORT="Driver provided by ATI for Radeon 8500+/FireGL 8700+"
-cat << EOF
-These are the ATI provided binary XFree86 drivers for their graphics cards.
-
-The ATI Proprietary Linux driver currently supports RADEON 8500 and later AGP
-or PCI Express graphics products, as well as FireGL 8700 and later products.
We
-do not currently plan to include support for any products earlier than this.
-Drivers for earlier products should already be available from the DRI Project
-or Utah-GLX project.
-EOF
diff --git a/z-kernels/ati_driver/HISTORY b/z-kernels/ati_driver/HISTORY
deleted file mode 100644
index 5e77905..0000000
--- a/z-kernels/ati_driver/HISTORY
+++ /dev/null
@@ -1,87 +0,0 @@
-2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * BUILD, DEPENDS, PRE_BUILD, TRIGGERS: deprecating to ati-fglrx
- * CONFLICTS, DETAILS, INSTALL, PROVIDES: deprecating to ati-fglrx
-
-2008-04-04 Eric Sandall <sandalle AT sourcemage.org>
- * PROVIDES: Provides FGLRX
-
-2006-09-12 Treeve Jelbert <treeve AT pi.be>
- * DETAILS: version 8.28.8
-
-2006-07-30 Treeve Jelbert <treeve AT pi.be>
- * DETAILS: version 8.27.10
- * DEPENDS: add missing && and X11-LIBS
- * BUILD: I don't think that the kernel patch is relevant anymore?
-
-2005-12-01 Seth Woolley <seth AT tautology.org>
- * DETAILS: MD5 -> SHA512
-
-2005-12-01 Seth Woolley <seth AT tautology.org>
- * PRE_BUILD: unpack api update
-
-2005-04-05 Eric Sandall <sandalle AT sourcemage.org>
- * BUILD: Apply 2.6.11 patch if needed
- * 2.6.10-fix.patch: Removed
- * 8.10.19-2.6.11.patch: Added (patch URL from Andrew Levstik)
-
-2005-04-03 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Reworded SHORT and description to give a little more detail
- about what this driver is for. Grabbed from:
- http://www.ati.com/products/catalyst/linux.html
-
-2005-03-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * INSTALL: Permission problems with the spell which broke it
-
-2005-03-22 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * BUILD: Next time check if patches are still valid sandalle
- Only commented out the patch leav it in till next update then remove
- * CONFIGURE: Added the REJECTED_MSG(why is this in CONFIGURE
- and not in PREPARE???)
-
-2005-03-12 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Updated to 8.10.19
-
-2005-02-09 Eric Sandall <sandalle AT sourcemage.org>
- * CONFIGURE: Added closing parenthesis. :)
-
-2005-02-06 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
- * DETAILS: BUILD_API=2, xfree-4.3. and xorg support
- * BUILD: patch for 2.6.10 kernel, BUILD_API2 conversion
- * INSTALL: added for BUILD_API2 conversion
- * CONFIGURE: ask to build the qt-x11 control panel
- * smgl.qt.fix.patch: adds a -I/usr/include/qt and removes
- the nonexistant .kdelink and .desktop files
- * 2.6.10-fix.patch: a fix for 2.6.10 kernels
- * libstdc++.so.5: this is needed to run fgl_glxgears
- I tried building it but that one seg faulted on run
-
-2004-10-18 Eric Sandall <sandalle AT sourcemage.org>
- * DEPENDS: Added "&&"
-
-2004-09-09 Eric Schabell <eschabell AT sourcemage.org>
- * DETAILS, BUILD: updated for v3.11.1, fixes bug #7036.
-
-2004-07-17 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Renamed to ati_driver
- Added md5sum
- * CONFLICTS: Conflicts with ATI_driver
-
-2004-05-03 Seth Woolley <seth AT tautology.org>
- * DETAILS: removed space from LICENSE
-
-2004-04-16 Arwed v. Merkatz <v.merkatz AT gmx.net>
- * TRIGGERS: added trigger for xfree86-4.3 and xorg
-
-2004-03-15 Chris Dennis <Chris.Dennis AT UAlberta.NET>
- * DETAILS: Updated to 3.7.6
-
-2003-12-10 Eric Sandall <sandalle AT sourcemage.org>
- * DETAILS: Put quotes around the dual licenses
- * HISTORY: Formatted to Guru Handbook
-
-2003-11-20 Chris Dennis <Chris.Dennis AT UAlberta.NET>
- * DETAILS: Updated to 3.2.8
-
-2003-09-10 Chris Dennis <Chris.Dennis AT UAlberta.NET>
- * Created this spell
-
diff --git a/z-kernels/ati_driver/INSTALL b/z-kernels/ati_driver/INSTALL
deleted file mode 100755
index 27ba77d..0000000
--- a/z-kernels/ati_driver/INSTALL
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/z-kernels/ati_driver/PRE_BUILD b/z-kernels/ati_driver/PRE_BUILD
deleted file mode 100755
index 27ba77d..0000000
--- a/z-kernels/ati_driver/PRE_BUILD
+++ /dev/null
@@ -1 +0,0 @@
-true
diff --git a/z-kernels/ati_driver/PROVIDES b/z-kernels/ati_driver/PROVIDES
deleted file mode 100755
index 09da08e..0000000
--- a/z-kernels/ati_driver/PROVIDES
+++ /dev/null
@@ -1,2 +0,0 @@
-provides FGLRX
-provides OPENGL
diff --git a/z-kernels/ati_driver/TRIGGERS b/z-kernels/ati_driver/TRIGGERS
deleted file mode 100755
index 4ef578c..0000000
--- a/z-kernels/ati_driver/TRIGGERS
+++ /dev/null
@@ -1,6 +0,0 @@
-on_cast linux cast_self
-on_cast xfree86 cast_self
-on_cast xfree86-4.3 cast_self
-on_cast xorg cast_self
-on_cast xfree86-devel cast_self
-on_cast $SPELL dispel_self

[SM-Commit] GIT changes to master z-rejected grimoire by Andraž Levstik (f02ace9f48246f14bb549362d7d798d514f224e6), Andraž Levstik, 04/25/2009