Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Andraž Levstik (3d493d6cda5e7e024f3e5d9752d76be14cd8a1e9)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • 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 (3d493d6cda5e7e024f3e5d9752d76be14cd8a1e9)
  • Date: Sat, 7 Feb 2009 17:54:31 -0600

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

dev/null |binary
z-kernels/ati-fglrx/DEPENDS | 3
z-kernels/ati-fglrx/DETAILS | 8
z-kernels/ati-fglrx/HISTORY | 13
z-kernels/ati-fglrx/INSTALL | 87
++++--
z-kernels/ati-fglrx/PRE_BUILD | 38 --
z-kernels/ati-fglrx/PROVIDES | 1
z-kernels/ati-fglrx/ati-driver-installer-8-12-x86.x86_64.run.sig | 0
z-kernels/ati_driver-new/BUILD | 9
z-kernels/ati_driver-new/CONFLICTS | 2
z-kernels/ati_driver-new/DEPENDS | 9
z-kernels/ati_driver-new/DETAILS | 41 --
z-kernels/ati_driver-new/HISTORY | 4
z-kernels/ati_driver-new/INSTALL | 49 ---
z-kernels/ati_driver-new/PRE_BUILD | 14
z-kernels/ati_driver-new/PROVIDES | 1
z-kernels/ati_driver-new/TRIGGERS | 1
z-kernels/ati_driver-new/smgl.qt.patch | 52 ---
z-kernels/ati_driver/8.10.19-2.6.11.patch | 145
----------
z-kernels/ati_driver/BUILD | 15 -
z-kernels/ati_driver/CONFLICTS | 2
z-kernels/ati_driver/DEPENDS | 8
z-kernels/ati_driver/DETAILS | 13
z-kernels/ati_driver/HISTORY | 4
z-kernels/ati_driver/INSTALL | 26 -
z-kernels/ati_driver/PRE_BUILD | 11
z-kernels/ati_driver/PROVIDES | 1
z-kernels/ati_driver/TRIGGERS | 1
z-kernels/ati_driver/libstdc++.so.5 | 0
z-kernels/ati_driver/smgl.qt.patch | 52 ---
z-kernels/nvidia_driver/DEPENDS | 3
z-kernels/nvidia_driver/DETAILS | 7
z-kernels/nvidia_driver/HISTORY | 12
z-kernels/nvidia_driver/INSTALL | 99
++----
z-kernels/nvidia_driver/POST_REMOVE | 24 -
z-kernels/nvidia_driver/PRE_BUILD | 30 --
z-kernels/nvidia_driver/PRE_REMOVE | 12
z-kernels/nvidia_driver/REPAIR^all^PRE_REMOVE | 12
z-kernels/nvidia_driver/glext-redef.patch | 10
z-kernels/nvidia_driver/volatiles | 6
40 files changed, 170 insertions(+), 655 deletions(-)

New commits:
commit 3d493d6cda5e7e024f3e5d9752d76be14cd8a1e9
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Andraž Levstik <ruskie AT codemages.net>

ati-fglrx: patchlevel++

commit a459f0715c9221b1ed5d900537681d2f19a1ef8f
Author: Andraž Levstik <ruskie AT codemages.net>
Commit: Andraž Levstik <ruskie AT codemages.net>

nvidia_driver: patchlevel++

commit a3bede57bf316cca1c5f4bbc9dd640f3bae430e8
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

nvidia_driver: switch to smgl-gl_select

commit 3c09d6f0b8287ba5508e19971b8db7af5f31bd81
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

ati_driver-new: deprecated

commit 35db66f5089be18c32ad9bf44ab7dc0876b9464e
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

ati-fglrx: HISTORY entry fix

commit f0eea97bd9fd17b9c2efc55639261c66d9929e69
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

ati_driver: deprecating

commit baba7cfef2a72609553d2d3c0548a35063dec2af
Author: Andraž 'ruskie' Levstik <ruskie AT codemages.net>
Commit: Andraž 'ruskie' Levstik <ruskie AT codemages.net>

ati-fglrx: smgl-gl_select and 9.1 update

diff --git a/z-kernels/ati-fglrx/DEPENDS b/z-kernels/ati-fglrx/DEPENDS
index 3a97951..391fb67 100755
--- a/z-kernels/ati-fglrx/DEPENDS
+++ b/z-kernels/ati-fglrx/DEPENDS
@@ -1 +1,2 @@
-depends X11-SERVER
+depends xorg-server &&
+depends smgl-gl_select
diff --git a/z-kernels/ati-fglrx/DETAILS b/z-kernels/ati-fglrx/DETAILS
index 803b81d..cbad785 100755
--- a/z-kernels/ati-fglrx/DETAILS
+++ b/z-kernels/ati-fglrx/DETAILS
@@ -1,15 +1,15 @@
-. $GRIMOIRE/FUNCTIONS
SPELL=ati-fglrx
- VERSION=8.12
+ VERSION=9.1
SOURCE=ati-driver-installer-${VERSION/./-}-x86.x86_64.run
#
SOURCE_HASH=sha512:89e3409580a54fcbe2833b7b44e91847a62b5599ab6c5caf7b95e3e8688fcaa7f52a71ebcd6901d7711622375c9d2f494a05bf3151d516baa699113f20e78721
- SOURCE_GPG=gurus.gpg:$SOURCE.sig:WORKS_FOR_ME
+
SOURCE_HASH=sha512:367b1c7ffa2b2b5e4a50c3d742267e04cf90bea23c7f1c9576e697e516eed6e9197b4d93277e9761008a491029146fd03c80e0eae3680bfbf887d670b0f50e5c
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=https://a248.e.akamai.net/f/674/9206/0/www2.ati.com/drivers/linux/64bit/${SOURCE}

- LICENSE[0]="GPL/QPL"
+ LICENSE[0]="$GRIMOIRE/$SECTION/$SPELL/LICENSE"
WEB_SITE=http://www.ati.com
ENTERED=20071107
REJECT="Non-GPL compatible software license"
+ PATCHELEVL=1
SHORT="X Window display driver for the ATI graphics accelerators"
DOCS="documentation/*"
cat << EOF
diff --git a/z-kernels/ati-fglrx/HISTORY b/z-kernels/ati-fglrx/HISTORY
index 200548d..a354592 100644
--- a/z-kernels/ati-fglrx/HISTORY
+++ b/z-kernels/ati-fglrx/HISTORY
@@ -1,7 +1,8 @@
-2008-12-22 Pol Vinogradov <vin.public AT gmail.com>
- * DETAILS: updated to 8.12, fixed SOURCE to use VERSION
- * PRE_BUILD: sedit -> sed -i, added dirty hack to make it build with
- recent kernels
+2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DETAILS: updated spell to 9.1, patchlevel++
+ * DEPENDS: use xorg-server, smgl-gl_select
+ * INSTALL: updates for smgl-gl_select
+ * PRE_BUILD: updates for smgl-gl_select

2008-06-01 Bearcat M. Sandor <sorceror AT feiline-soul.net>
* DETAILS: Updated to 8.5
@@ -22,6 +23,6 @@
* DOWNLOAD: Added the file to pass --no-check-certificate to wget

2007-11-07 Martin Spitzbarth <m.spitzbarth AT gmx.de>
- * BUILD, DEPENDS, DETAILS, INSTALL, LICENSE, PRE_BUILD, PREPARE,
- TRIGGERS: Created the spell
+ * BUILD,DEPENDS,DETAILS,INSTALL,LICENSE,PRE_BUILD,PREPARE,TRIGGERS:
+ Created the spell

diff --git a/z-kernels/ati-fglrx/INSTALL b/z-kernels/ati-fglrx/INSTALL
index 568ce5b..fee8b19 100755
--- a/z-kernels/ati-fglrx/INSTALL
+++ b/z-kernels/ati-fglrx/INSTALL
@@ -1,33 +1,68 @@
cd ${SOURCE_DIRECTORY} &&
+local ARCHLIB
+case "${SMGL_COMPAT_ARCHS[1]}" in
+ "ia32") ARCHLIB=lib ;;
+ "x86_64") ARCHLIB=lib64 ;;
+ *) message "${PROBLEM_COLOR}" \
+ "Unsupported architecture: ${SMGL_COMPAT_ARCHS[1]}" \
+ "${DEFAULT_COLOR}" &&
+ return 1 ;;
+esac
+

# Install the fglrx kernel module to a hopefully sane location
-mkdir -p /lib/modules/$(get_kernel_version)/kernel/drivers/char/drm &&
-install -m 644 build/lib/modules/fglrx/build_mod/fglrx.ko \
+mkdir -vp
${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/kernel/drivers/char/drm &&
+install -v -m 644 build/lib/modules/fglrx/build_mod/fglrx.ko \

${INSTALL_ROOT}/lib/modules/$(get_kernel_version)/kernel/drivers/char/drm &&

-# There is basically a complete filesystem structure present with ready to
use
-# files. We do a little clean up and merge it as a whole into $INSTALL_ROOT.
-
-rm -R build/usr/src build/usr/share/doc &&
-mv build/usr/X11R6/bin build/usr/bin &&
-case $(get_spell_provider $SPELL X11-SERVER) in
- "xorg-server")
- mv build/usr/X11R6/include/* build/usr/include &&
- mkdir -p build/usr/lib/xorg &&
-
-# the lib* stands for lib or lib64 respectively.
- mv build/usr/X11R6/lib*/* build/usr/lib/xorg &&
-
- rm -R build/usr/X11R6
- ;;
-esac &&
-chmod 0755 build/usr/bin/* &&
+# verify if there is anything conflicting with any of the other GL providers
+# nvidia_* or mesalib or xorg-server and if so put it under an ati specific
+# directory and updated smgl-gl_select

-# Abuse tar as a copy command that merges the build directory
-# with ${INSTALL_ROOT}.
-# lib is left out intentionally, as fglrx.ko is the only useful file in it
and
-# it was copied earlier in this script.
-cd ${SOURCE_DIRECTORY}/build &&
-tar -c etc/ati opt usr | tar -x --directory ${INSTALL_ROOT}/
+cd build
+mkdir -vp $INSTALL_ROOT/usr/share/applications/ \
+ $INSTALL_ROOT/usr/share/applnk/ \
+ $INSTALL_ROOT/usr/share/icons/ \
+ $INSTALL_ROOT/usr/share/man/man8/ \
+ $INSTALL_ROOT/usr/include/GL/ \
+ $INSTALL_ROOT/usr/include/X11/extensions/ \
+ $INSTALL_ROOT/usr/lib/ati/ \
+ $INSTALL_ROOT/usr/lib/xorg/modules/ \
+ $INSTALL_ROOT/usr/lib/xorg/modules/dri/ \
+ $INSTALL_ROOT/usr/lib/xorg/modules/drivers/ \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/ati \
+ $INSTALL_ROOT/usr/lib/xorg/modules/linux &&
+cp -vr etc/ati $INSTALL_ROOT/etc/ &&
+cp -vr usr/X11R6/$ARCHLIB/modules/linux/* \
+ $INSTALL_ROOT/usr/lib/xorg/modules/linux &&
+cp -vr usr/X11R6/$ARCHLIB/modules/extensions/* \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/ati &&
+cp -vr usr/X11R6/$ARCHLIB/modules/drivers/* \
+ $INSTALL_ROOT/usr/lib/xorg/modules/drivers/ &&
+cp -vr usr/X11R6/$ARCHLIB/modules/dri/* \
+ $INSTALL_ROOT/usr/lib/xorg/modules/dri/ &&
+rm -rf usr/X11R6/$ARCHLIB/modules/{dri,drivers,extensions,linux} &&
+cp -vr usr/X11R6/$ARCHLIB/modules/* \
+ $INSTALL_ROOT/usr/lib/xorg/modules/ &&
+rm -rf usr/X11R6/$ARCHLIB/modules &&
+cp -vr usr/X11R6/$ARCHLIB/libGL.so.1.2 \
+ $INSTALL_ROOT/usr/lib/ati/ &&
+pushd $INSTALL_ROOT/usr/lib/ati/ &&
+ln -sfv libGL.so.1.2 libGL.so &&
+popd &&
+rm -f usr/X11R6/$ARCHLIB/libGL.so.1.2 &&
+cp -vr usr/X11R6/$ARCHLIB/* \
+ $INSTALL_ROOT/usr/lib/ &&
+cp -vr usr/X11R6/include/X11/extensions/* \
+ $INSTALL_ROOT/usr/include/X11/extensions/ &&
+cp -vr usr/X11R6/bin/* $INSTALL_ROOT/usr/bin/ &&
+cp -vr usr/include/GL/* $INSTALL_ROOT/usr/include/GL/ &&
+cp -vr usr/$ARCHLIB/* $INSTALL_ROOT/usr/lib/ &&
+cp -vr usr/sbin/* $INSTALL_ROOT/usr/sbin/ &&
+cp -vr usr/share/man/man8/* $INSTALL_ROOT/usr/share/man/man8/ &&
+cp -vr usr/share/icons/* $INSTALL_ROOT/usr/share/icons/ &&
+cp -vr usr/share/gnome/apps/* $INSTALL_ROOT/usr/share/applications/ &&
+cp -vr usr/share/ati $INSTALL_ROOT/usr/share/ &&
+cp -vr usr/share/applnk/* $INSTALL_ROOT/usr/share/applnk/ &&
+cp -vr opt/kde3/share/applnk/* $INSTALL_ROOT/usr/share/applications/

-#
diff --git a/z-kernels/ati-fglrx/PRE_BUILD b/z-kernels/ati-fglrx/PRE_BUILD
index 33ea728..9b0ceb4 100755
--- a/z-kernels/ati-fglrx/PRE_BUILD
+++ b/z-kernels/ati-fglrx/PRE_BUILD
@@ -1,4 +1,3 @@
-local ATI_XPROVIDER
local ATI_XVERSION

#
@@ -21,10 +20,8 @@ cd ${SOURCE_DIRECTORY} &&
mv archive/common/usr/share/doc/fglrx documentation &&

# We don't always build for the currently running kernel
-sed -i "s:^KVER .*:KVER = $(get_kernel_version):" \
- archive/common/lib/modules/fglrx/build_mod/2.6.x/Makefile &&
-
-ATI_XPROVIDER="$(get_spell_provider $SPELL X11-SERVER)" &&
+sedit "s:^KVER .*:KVER = $(get_kernel_version):" \
+ archive/common/lib/modules/fglrx/build_mod/2.6.x/Makefile

#
# Preparing the build directory structure
@@ -37,25 +34,12 @@ mkdir build &&
# Merge files from different source directories to match the system
cp -R archive/common/* build &&

-sed -i 's:MODULE_LICENSE("Proprietary. (C) 2002 - ATI Technologies,
Starnberg, GERMANY");:MODULE_LICENSE("GPL");:' \
- build/lib/modules/fglrx/build_mod/firegl_public.c &&
-
-case $ATI_XPROVIDER in
- xorg-server)
- ATI_XVERSION=x710
- ;;
- xorg)
- ATI_XVERSION=x$(get_installed_version xorg) &&
- # The next two lines convert x6.9.0 to x690
- ATI_XVERSION=${ATI_XVERSION/./} &&
- ATI_XVERSION=${ATI_XVERSION/./}
- ;;
- *)
- message "${PROBLEM_COLOR}" \
- "Incompatible provider for X11-SERVER: " \
- "${SPELL_COLOR}$ATI_XPROVIDER${DEFAULT_COLOR}"
- ;;
-esac &&
+if grep -q "1.5" <<< $(installed_version xorg-server)
+then
+ ATI_XVERSION=x740
+else
+ ATI_XVERSION=x710
+fi &&

case "${SMGL_COMPAT_ARCHS[1]}" in
"ia32")
@@ -66,9 +50,11 @@ case "${SMGL_COMPAT_ARCHS[1]}" in
cp -R archive/arch/x86_64/* build &&
cp -R archive/${ATI_XVERSION}_64a/* build
;;
- *)
+ *)
message "${PROBLEM_COLOR}" \
"Unsupported architecture: ${SMGL_COMPAT_ARCHS[1]}" \
- "${DEFAULT_COLOR}"
+ "${DEFAULT_COLOR}" &&
+ return 1
;;
esac
+
diff --git a/z-kernels/ati-fglrx/PROVIDES b/z-kernels/ati-fglrx/PROVIDES
new file mode 100755
index 0000000..3fc56f6
--- /dev/null
+++ b/z-kernels/ati-fglrx/PROVIDES
@@ -0,0 +1 @@
+OPENGL
diff --git a/z-kernels/ati-fglrx/ati-driver-installer-8-12-x86.x86_64.run.sig
b/z-kernels/ati-fglrx/ati-driver-installer-8-12-x86.x86_64.run.sig
deleted file mode 100644
index c0f1d24..0000000
Binary files
a/z-kernels/ati-fglrx/ati-driver-installer-8-12-x86.x86_64.run.sig and
/dev/null differ
diff --git a/z-kernels/ati_driver-new/BUILD b/z-kernels/ati_driver-new/BUILD
index 1682e8e..27ba77d 100755
--- a/z-kernels/ati_driver-new/BUILD
+++ b/z-kernels/ati_driver-new/BUILD
@@ -1,8 +1 @@
-cd $SOURCE_DIRECTORY/lib/modules/fglrx/build_mod &&
-sh ./make.sh &&
-if [[ "${ATI_DRIVER_QT}" == "y" ]]
-then
- cd $SOURCE_DIRECTORY/fglpanel &&
- patch -p0 < ${SCRIPT_DIRECTORY}/smgl.qt.patch &&
- make
-fi
+true
diff --git a/z-kernels/ati_driver-new/CONFLICTS
b/z-kernels/ati_driver-new/CONFLICTS
index da375b8..bb07fd1 100755
--- a/z-kernels/ati_driver-new/CONFLICTS
+++ b/z-kernels/ati_driver-new/CONFLICTS
@@ -1 +1,3 @@
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
index 01eef62..fe045a2 100755
--- a/z-kernels/ati_driver-new/DEPENDS
+++ b/z-kernels/ati_driver-new/DEPENDS
@@ -1,8 +1 @@
-depends X11-LIBS &&
-depends rpmunpack &&
-depends bzip2 &&
-depends smgl-gl_select &&
-if [[ "${ATI_DRIVER_QT}" == "y" ]]
-then
- depends qt-x11
-fi
+depends ati-fglrx
diff --git a/z-kernels/ati_driver-new/DETAILS
b/z-kernels/ati_driver-new/DETAILS
index 182197a..c4ca05d 100755
--- a/z-kernels/ati_driver-new/DETAILS
+++ b/z-kernels/ati_driver-new/DETAILS
@@ -1,46 +1,7 @@
-. $GRIMOIRE/FUNCTIONS
-persistent_add ATI_XVER
-persistent_add ATI_ARCH
-local ATI_WWW
-local ATI_FILE
-local ATI_HASH
SPELL=ati_driver-new
- VERSION="${ATI_VERSION:-8.29.6}"
-if [[ ! check_if_xorg_modular_libs ]] &&
- [[ "$(get_spell_provider $SPELL X11-LIBS)" != "xorg" ]]
-then
- ATI_XVER=4_3_0
-else
- ATI_XVER=6_8_0
-fi
-if [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
- ATI_ARCH=x86_64
- ATI_WWW="64bit/"
- ATI_FILE=64
-elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]; then
- ATI_ARCH=i386
- ATI_WWW=""
- ATI_FILE=""
-else
- message "Unsupported architecture ${SMGL_COMPAT_ARCHS[1]}"
-fi
-case "$VERSION $ATI_ARCH $ATI_XVER" in
- "8.29.6 i386
6_8_0")SOURCE_HASH=sha512:18630d6eeb5799a466290ae9dbcfdadf03949befa42fdcb62d923afc55b1ffe92e8d13659f2c6f081af3edbc5cfeb62bcff4ac1f10d47913e73a25b242a7bcb1
;;
- "8.29.6 i386
4_3_0")SOURCE_HASH=sha512:ccab65e5f69cd6796c3ad599c320ab6e9eae61a0f30970026bde59bd043c9996de7ec9bdb98db1e6b8784df8fdd11c84186f0eeefb63499d1cea10a0507a6f5e
;;
- "8.29.6 x86_64
6_8_0")SOURCE_HASH=sha512:c692c337d1575e04c59330aa14eea606923cf35eff5e94e567abd29652577c54c2360e2e20884001dd92e273f01dcdec46e90a043941d23cae8a0644e79d06d1
;;
- "8.29.6 x86_64
4_3_0")SOURCE_HASH=sha512:86e2638c5df5d39f80b5029ed010c30dac599150d1f74febe5db54ae723aaa021860c39a3c4e21e29c50246e8b3ea4a86321caf1df2d56b55042ad51e4e0db4e
;;
- "8.28.8 i386
6_8_0")SOURCE_HASH=sha512:59e64076cc7690235152d3d856bf1b398f43bfebb6e400db48c0932551d1304881296685fc5c41e46092582c51922dd6239bdbfaf47f7986b14afe64841a81e7
;;
- "8.28.8 i386
4_3_0")SOURCE_HASH=sha512:ba4d9c45c645bb9bc562dbdbb9d780acf00d26c973e42e4e022d07398f1645311058c7707912b96d35d00c2dd4a5d485c88329142c930c33ac92d018975391e2
;;
- "8.28.8 x86_64
6_8_0")SOURCE_HASH=sha512:37ec5edadb16a6bcbedaab1bf2b465a363d8940286d6fe57b0cfb8ba8cfe19a08de76d0ada7737f85da3bdd19d23a04e6b2e644380160790cabc5c33b0e776c4
;;
- "8.28.8 x86_64
4_3_0")SOURCE_HASH=sha512:ac04e9b184730ed1bb3203fc45b3819f2640a31010d713e51a9f6d3860558b92e1314b21b577df387114195c020be21beb8980167f3666f55ad8e4570a6bdd2d
;;
- *) message "Unsupported architecture, version and X
version"
-esac
- SOURCE=fglrx${ATI_FILE}_${ATI_XVER}-${VERSION}-1.${ATI_ARCH}.rpm
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www2.ati.com/drivers/linux/${ATI_WWW}${SOURCE}
+ VERSION=DEAD
WEB_SITE=http://www.ati.com
ENTERED=20030911
- REJECT="Non-GPL compatible software license"
LICENSE[0]="GPL/QPL"
SHORT="Driver provided by ATI for Radeon 8500+/FireGL 8700+"
cat << EOF
diff --git a/z-kernels/ati_driver-new/HISTORY
b/z-kernels/ati_driver-new/HISTORY
index 6dc1585..6c00a75 100644
--- a/z-kernels/ati_driver-new/HISTORY
+++ b/z-kernels/ati_driver-new/HISTORY
@@ -1,3 +1,7 @@
+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

diff --git a/z-kernels/ati_driver-new/INSTALL
b/z-kernels/ati_driver-new/INSTALL
index 88e83a6..27ba77d 100755
--- a/z-kernels/ati_driver-new/INSTALL
+++ b/z-kernels/ati_driver-new/INSTALL
@@ -1,48 +1 @@
-mkdir -vp ${INSTALL_ROOT}/usr/include/GL/ &&
-mkdir -vp ${INSTALL_ROOT}/usr/lib/ati/ &&
-mkdir -vp ${INSTALL_ROOT}/usr/lib/modules/dri/ &&
-mkdir -vp ${INSTALL_ROOT}/usr/lib/xorg/modules/drivers/ &&
-mkdir -vp ${INSTALL_ROOT}/usr/lib/xorg/modules/linux/ &&
-ln -fs ${INSTALL_ROOT}/usr/lib/modules/dri/ \
- ${INSTALL_ROOT}/usr/lib/dri &&
-cd $SOURCE_DIRECTORY/lib/modules/fglrx/ &&
-sedit "s:modprobe:echo:" make_install.sh &&
-sedit "s:rmmod:echo:" make_install.sh &&
-sh ./make_install.sh &&
-cd $SOURCE_DIRECTORY &&
-install_config_file etc/fglrxrc \
- $INSTALL_ROOT/etc/fglrxrc &&
-install_config_file etc/fglrxprofiles.csv \
- $INSTALL_ROOT/etc/fglrxprofiles.csv &&
-
-
-cp -vr etc/ati $INSTALL_ROOT/etc/ &&
-cp -v usr/include/GL/* \
- ${INSTALL_ROOT}/usr/include/GL/ &&
-cp -v usr/sbin/* ${INSTALL_ROOT}/usr/sbin/ &&
-cp -vR usr/share/* ${INSTALL_ROOT}/usr/share/ &&
-cp -v usr/X11R6/bin/* ${INSTALL_ROOT}/usr/bin/ &&
-mv -v usr/X11R6/lib/libGL.so.1.2 \
- ${INSTALL_ROOT}/usr/lib/ati/libGL.so.1.2 &&
-pushd ${INSTALL_ROOT}/usr/lib/ati/ &&
-ln -s libGL.so.1.2 libGL.so.1 &&
-ln -s libGL.so.1.2 libGL.so &&
-popd &&
-if ! check_if_xorg_modular_libs ; then
-cp -vR usr/X11R6/lib/* \
- ${INSTALL_ROOT}/usr/X11R6/
-else
-cp -vR usr/X11R6/lib/modules/dri/* \
- ${INSTALL_ROOT}/usr/lib/modules/dri/ &&
-cp -vR usr/X11R6/lib/modules/drivers/* \
- ${INSTALL_ROOT}/usr/lib/xorg/modules/drivers/ &&
-cp -vR usr/X11R6/lib/modules/linux/* \
- ${INSTALL_ROOT}/usr/lib/xorg/modules/linux/
-fi
-cp -v usr/X11R6/include/* ${INSTALL_ROOT}/usr/include/ &&
-if [[ "${ATI_DRIVER_QT}" == "y" ]]
-then
- cd $SOURCE_DIRECTORY/fglpanel &&
- make install
-fi
-
+true
diff --git a/z-kernels/ati_driver-new/PRE_BUILD
b/z-kernels/ati_driver-new/PRE_BUILD
index 7504ba7..27ba77d 100755
--- a/z-kernels/ati_driver-new/PRE_BUILD
+++ b/z-kernels/ati_driver-new/PRE_BUILD
@@ -1,13 +1 @@
-. $GRIMOIRE/FUNCTIONS &&
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-unpack_file '' &&
-if [[ "${ATI_DRIVER_QT}" == "y" ]]
-then
- mkdir -p ${SOURCE_DIRECTORY}/fglpanel &&
- cd fglpanel &&
- tar -zxvf ${SOURCE_DIRECTORY}/usr/src/ATI/fglrx_panel_sources.tgz &&
- cd $SOURCE_DIRECTORY
-fi &&
-sedit "s:ln\ \-s:cp\ \-v:g" lib/modules/fglrx/make_install.sh
-
+true
diff --git a/z-kernels/ati_driver-new/PROVIDES
b/z-kernels/ati_driver-new/PROVIDES
index fb79f42..09da08e 100755
--- a/z-kernels/ati_driver-new/PROVIDES
+++ b/z-kernels/ati_driver-new/PROVIDES
@@ -1 +1,2 @@
provides FGLRX
+provides OPENGL
diff --git a/z-kernels/ati_driver-new/TRIGGERS
b/z-kernels/ati_driver-new/TRIGGERS
index d4a8851..4ef578c 100755
--- a/z-kernels/ati_driver-new/TRIGGERS
+++ b/z-kernels/ati_driver-new/TRIGGERS
@@ -3,3 +3,4 @@ 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-new/smgl.qt.patch
b/z-kernels/ati_driver-new/smgl.qt.patch
deleted file mode 100644
index ad5456e..0000000
--- a/z-kernels/ati_driver-new/smgl.qt.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- back/Makefile 2004-12-14 18:55:05.000000000 +0100
-+++ Makefile 2005-02-06 14:45:47.265954864 +0100
-@@ -87,12 +87,12 @@
- $(error environment missing: MK_QTDIR=$(MK_QTDIR))
- endif
-
--ifeq ($(shell test -e $(MK_QTDIR)/include/qglobal.h$(colon) echo $$?),1)
-+ifeq ($(shell test -e $(MK_QTDIR)/include/qt/qglobal.h$(colon) echo $$?),1)
- $(error environment incomplete: MK_QTDIR=$(MK_QTDIR))
- endif
-
- ifeq ($(QT_VER),0)
--QT_VER=$(shell grep QT_VERSION_STR $(MK_QTDIR)/include/qglobal.h | cut
-d'"' -f2 | cut -d'.' -f1)
-+QT_VER=$(shell grep QT_VERSION_STR $(MK_QTDIR)/include/qt/qglobal.h | cut
-d'"' -f2 | cut -d'.' -f1)
- endif
-
- ifeq ($(QT_VER),0)
-@@ -136,7 +136,7 @@
- DEFINES = -Dlinux -DFGLRX_USE_XEXTENSIONS -DFGLRX_OGL_INFO -DQT_NO_STL
-
- # for *.c
--CINCDIR = -I/usr/X11R6/include -I. -I./include_dummy
-+CINCDIR = -I/usr/X11R6/include -I. -I./include_dummy -I/usr/include/qt
- CDEFINES = $(DEFINES)
- ifeq ($(DEBUG),0)
- CDEBFLAGS = -g
-@@ -145,7 +145,7 @@
- LFLAGS = $(CDEBFLAGS) -L/usr/X11R6/$(LIB_DIR) -lXaw -lXmu -lXt -lXext -lX11
-
- # for *.cpp
--CCINCDIR = -I$(MK_QTDIR)/include -I. -I./include_dummy
-+CCINCDIR = -I$(MK_QTDIR)/include -I. -I./include_dummy -I/usr/include/qt
- CCDEFINES = $(DEFINES)
- ifneq ($(DEBUG),0)
- CCDEBFLAGS = -ggdb
-@@ -405,16 +405,6 @@
- cd /usr/X11R6/bin/. ; rm -f $(BASENAME) ; ln -s $(TARGET0) $(BASENAME)
- cp LICENSE.GPL /usr/X11R6/bin/.
- cp LICENSE.QPL /usr/X11R6/bin/.
-- if [ $KDEDIR ]; then\
-- cp fireglcontrol.kdelnk $(KDEDIR)/share/applnk/. ;\
-- cp ati.xpm $(KDEDIR)/share/icons/. ;\
-- fi
-- if test -d /usr/share/gnome/apps; then \
-- cp fireglcontrol.desktop /usr/share/gnome/apps/. ;\
-- if test -d /usr/share/pixmaps; then \
-- cp ati.xpm /usr/share/pixmaps/. ;\
-- fi ;\
-- fi
-
- source_package::
- @if [ -f $(PACKET_NAME).tar ]; then \
diff --git a/z-kernels/ati_driver/8.10.19-2.6.11.patch
b/z-kernels/ati_driver/8.10.19-2.6.11.patch
deleted file mode 100644
index 00e6fa3..0000000
--- a/z-kernels/ati_driver/8.10.19-2.6.11.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-diff -Nur fglrx-xorg.orig/firegl_public.c fglrx-xorg/firegl_public.c
---- fglrx-xorg.orig/firegl_public.c 2005-01-24 01:42:09.000000000 +0100
-+++ fglrx-xorg/firegl_public.c 2005-01-24 01:28:21.000000000 +0100
-@@ -1659,13 +1659,16 @@
- {
- unsigned long pte_linear;
- pgd_t* pgd_p;
-+ pud_t* pud_p;
- pmd_t* pmd_p;
- pte_t* pte_p;
- pte_t pte;
-
- pte_linear = VMALLOC_VMADDR(virtual_addr); // convert to pte linear
address (x86 => nop)
- pgd_p = pgd_offset(mm, pte_linear);
-- pmd_p = pmd_offset(pgd_p, pte_linear);
-+ pud_p = pud_offset(pgd_p, pte_linear);
-+ pmd_p = pmd_offset(pud_p, pte_linear);
-+
- #ifndef FGL_ATOMIC_PTE
- #if LINUX_VERSION_CODE > 0x020500
- pte_p = pte_offset_kernel(pmd_p, pte_linear);
-@@ -2085,6 +2088,7 @@
- unsigned long address)
- {
- pgd_t* pgd_p;
-+ pud_t* pud_p;
- pmd_t* pmd_p;
- pte_t* pte_p;
- pte_t pte;
-@@ -2185,7 +2189,8 @@
- /* alternatively we could generate a NOPAGE_OOM "out of memory" */
- }
- /* locate medium level page table (x86 => nop) */
-- pmd_p = pmd_offset(pgd_p, pte_linear);
-+ pud_p = pud_offset(pgd_p, pte_linear);
-+ pmd_p = pmd_offset(pud_p, pte_linear);
- if (!pmd_present(*pmd_p))
- {
- __KE_ERROR("FATAL ERROR: User queue buffer not present! (pmd)\n");
-@@ -2549,13 +2554,15 @@
- {
- unsigned long pte_linear;
- pgd_t* pgd_p;
-+ pud_t* pud_p;
- pmd_t* pmd_p;
- pte_t* pte_p;
- pte_t pte;
-
- pte_linear = VMALLOC_VMADDR(virtual_addr); // convert to pte linear
address (x86 => nop)
- pgd_p = pgd_offset(vma->vm_mm, pte_linear);
-- pmd_p = pmd_offset(pgd_p, pte_linear);
-+ pud_p = pud_offset(pgd_p, pte_linear);
-+ pmd_p = pmd_offset(pud_p, pte_linear);
- #ifndef FGL_ATOMIC_PTE
- #if LINUX_VERSION_CODE > 0x020500
- pte_p = pte_offset_kernel(pmd_p, pte_linear);
-@@ -2704,13 +2711,13 @@
- #endif /* __ia64__ */
- vma->vm_flags |= VM_IO; /* not in core dump */
- }
-- if (remap_page_range(FGL_VMA_API_PASS
-+ if (remap_pfn_range(FGL_VMA_API_PASS
- vma->vm_start,
-- __ke_vm_offset(vma),
-+ __ke_vm_offset(vma) >> PAGE_SHIFT,
- vma->vm_end - vma->vm_start,
- vma->vm_page_prot))
- {
-- __KE_DEBUG("remap_page_range failed\n");
-+ __KE_DEBUG("remap_pfn_range failed\n");
- return -EAGAIN;
- }
- vma->vm_flags |= VM_SHM | VM_RESERVED; /* Don't swap */
-@@ -2771,13 +2778,13 @@
- {
- if (__ke_vm_offset(vma) >= __pa(high_memory))
- vma->vm_flags |= VM_IO; /* not in
core dump */
-- if (remap_page_range(FGL_VMA_API_PASS
-+ if (remap_pfn_range(FGL_VMA_API_PASS
-
vma->vm_start,
--
__ke_vm_offset(vma),
-+
__ke_vm_offset(vma) >> PAGE_SHIFT,
-
vma->vm_end - vma->vm_start,
-
vma->vm_page_prot))
- {
-- __KE_DEBUG("remap_page_range
failed\n");
-+ __KE_DEBUG("remap_pfn_range
failed\n");
- return -EAGAIN;
- }
- #ifdef __x86_64__
-@@ -2808,13 +2815,13 @@
- {
- if (__ke_vm_offset(vma) >= __pa(high_memory))
- vma->vm_flags |= VM_IO; /* not in
core dump */
-- if (remap_page_range(FGL_VMA_API_PASS
-+ if (remap_pfn_range(FGL_VMA_API_PASS
-
vma->vm_start,
--
__ke_vm_offset(vma),
-+
__ke_vm_offset(vma) >> PAGE_SHIFT,
-
vma->vm_end - vma->vm_start,
-
vma->vm_page_prot))
- {
-- __KE_DEBUG("remap_page_range
failed\n");
-+ __KE_DEBUG("remap_pfn_range
failed\n");
- return -EAGAIN;
- }
- #ifdef __x86_64__
-@@ -2858,6 +2865,37 @@
-
- #if LINUX_VERSION_CODE >= 0x020400
-
-+#if LINUX_VERSION_CODE >= 0x02060b
-+
-+typedef struct {
-+ void (*free_memory)(struct agp_memory *);
-+ struct agp_memory * (*allocate_memory)(size_t, u32);
-+ int (*bind_memory)(struct agp_memory *, off_t);
-+ int (*unbind_memory)(struct agp_memory *);
-+ void (*enable)(u32);
-+ int (*acquire)(void);
-+ void (*release)(void);
-+ int (*copy_info)(struct agp_kern_info *);
-+} drm_agp_t;
-+
-+static const drm_agp_t drm_agp = {
-+ &agp_free_memory,
-+ &agp_allocate_memory,
-+ &agp_bind_memory,
-+ &agp_unbind_memory,
-+ &agp_enable,
-+ &agp_backend_acquire,
-+ &agp_backend_release,
-+ &agp_copy_info
-+};
-+#undef DRM_AGP_MODULE_GET
-+#undef DRM_AGP_MODULE_PUT
-+
-+#define DRM_AGP_MODULE_GET &drm_agp
-+#define DRM_AGP_MODULE_PUT
-+
-+#endif
-+
- static const drm_agp_t *drm_agp_module_stub = NULL;
-
- #define AGP_FUNCTIONS 8
diff --git a/z-kernels/ati_driver/BUILD b/z-kernels/ati_driver/BUILD
index be523c6..27ba77d 100755
--- a/z-kernels/ati_driver/BUILD
+++ b/z-kernels/ati_driver/BUILD
@@ -1,14 +1 @@
-cd $SOURCE_DIRECTORY &&
-cp -dR --parents lib/* ${INSTALL_ROOT}/ &&
-cd $INSTALL_ROOT/lib/modules/fglrx/build_mod &&
-#ATI_KERNEL_VERSION=`uname -r` &&
-#if [ "${ATI_KERNEL_VERSION%.*}" == "2.6.11" ]; then
-# patch -p1 <$SCRIPT_DIRECTORY/8.10.19-2.6.11.patch
-#fi &&
-sh ./make.sh &&
-if [ "${ATI_DRIVER_QT}" == "y" ]
-then
- cd $SOURCE_DIRECTORY/fglpanel &&
- patch -p0 < ${SCRIPT_DIRECTORY}/smgl.qt.patch &&
- make
-fi
+true
diff --git a/z-kernels/ati_driver/CONFLICTS b/z-kernels/ati_driver/CONFLICTS
index da375b8..bb07fd1 100755
--- a/z-kernels/ati_driver/CONFLICTS
+++ b/z-kernels/ati_driver/CONFLICTS
@@ -1 +1,3 @@
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
index e98ee07..fe045a2 100755
--- a/z-kernels/ati_driver/DEPENDS
+++ b/z-kernels/ati_driver/DEPENDS
@@ -1,7 +1 @@
-depends X11-LIBS &&
-depends rpmunpack &&
-depends bzip2 &&
-if [ "${ATI_DRIVER_QT}" == "y" ]
-then
- depends qt-x11
-fi
+depends ati-fglrx
diff --git a/z-kernels/ati_driver/DETAILS b/z-kernels/ati_driver/DETAILS
index d0ce2eb..67bbefd 100755
--- a/z-kernels/ati_driver/DETAILS
+++ b/z-kernels/ati_driver/DETAILS
@@ -1,16 +1,5 @@
SPELL=ati_driver
- VERSION=8.28.8
-if spell_ok xfree86-4.3
-then
- SOURCE=fglrx-4.3.0-${VERSION}-1.i386.rpm
-
SOURCE_HASH=sha512:ba4d9c45c645bb9bc562dbdbb9d780acf00d26c973e42e4e022d07398f1645311058c7707912b96d35d00c2dd4a5d485c88329142c930c33ac92d018975391e2
-elif spell_ok xorg
-then
- SOURCE=fglrx_6_8_0-${VERSION}-1.i386.rpm
-
SOURCE_HASH=sha512:59e64076cc7690235152d3d856bf1b398f43bfebb6e400db48c0932551d1304881296685fc5c41e46092582c51922dd6239bdbfaf47f7986b14afe64841a81e7
-fi
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
- SOURCE_URL[0]=http://www2.ati.com/drivers/linux/$SOURCE
+ VERSION=DEAD
WEB_SITE=http://www.ati.com
ENTERED=20030911
LICENSE[0]="GPL/QPL"
diff --git a/z-kernels/ati_driver/HISTORY b/z-kernels/ati_driver/HISTORY
index 5d286f6..5e77905 100644
--- a/z-kernels/ati_driver/HISTORY
+++ b/z-kernels/ati_driver/HISTORY
@@ -1,3 +1,7 @@
+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

diff --git a/z-kernels/ati_driver/INSTALL b/z-kernels/ati_driver/INSTALL
index e157de5..27ba77d 100755
--- a/z-kernels/ati_driver/INSTALL
+++ b/z-kernels/ati_driver/INSTALL
@@ -1,25 +1 @@
-cd $INSTALL_ROOT/lib/modules/fglrx/ &&
-sedit "s:modprobe:echo:" make_install.sh &&
-sedit "s:rmmod:echo:" make_install.sh &&
-sh ./make_install.sh &&
-cd $SOURCE_DIRECTORY &&
-cp --parents usr/include/GL/glxATI.h ${INSTALL_ROOT}/ &&
-cp -dR --parents usr/X11R6/include/* ${INSTALL_ROOT}/ &&
-cp -dR --parents usr/X11R6/lib/* ${INSTALL_ROOT}/ &&
-if [ ! -e ${INSTALL_ROOT}/usr/lib/libstdc++.so.5 ]
-then
- cp ${SCRIPT_DIRECTORY}/libstdc++.so.5 ${INSTALL_ROOT}/usr/lib
-fi &&
-cp -dR --parents usr/X11R6/bin/* ${INSTALL_ROOT}/ &&
-cp -dR --parents usr/share/doc/* ${INSTALL_ROOT}/ &&
-if [ "${ATI_DRIVER_QT}" == "y" ]
-then
- cd $SOURCE_DIRECTORY/fglpanel &&
- make install
-fi
-
-chmod a+rx /usr/X11R6/lib/modules/dri/*
-chmod a+rx /usr/X11R6/lib/modules/dri
-chmod a+rx /usr/X11R6/lib/modules
-chmod a+rx /usr/X11R6/lib
-chmod a+rx /usr/X11R6
+true
diff --git a/z-kernels/ati_driver/PRE_BUILD b/z-kernels/ati_driver/PRE_BUILD
index dbd47e0..27ba77d 100755
--- a/z-kernels/ati_driver/PRE_BUILD
+++ b/z-kernels/ati_driver/PRE_BUILD
@@ -1,10 +1 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-cd $SOURCE_DIRECTORY &&
-unpack_file &&
-if [ "${ATI_DRIVER_QT}" == "y" ]
-then
- mkdir -p ${SOURCE_DIRECTORY}/fglpanel &&
- cd fglpanel &&
- tar -zxvf ${SOURCE_DIRECTORY}/usr/src/ATI/fglrx_panel_sources.tgz
-fi &&
-cd $SOURCE_DIRECTORY
+true
diff --git a/z-kernels/ati_driver/PROVIDES b/z-kernels/ati_driver/PROVIDES
index fb79f42..09da08e 100755
--- a/z-kernels/ati_driver/PROVIDES
+++ b/z-kernels/ati_driver/PROVIDES
@@ -1 +1,2 @@
provides FGLRX
+provides OPENGL
diff --git a/z-kernels/ati_driver/TRIGGERS b/z-kernels/ati_driver/TRIGGERS
index d4a8851..4ef578c 100755
--- a/z-kernels/ati_driver/TRIGGERS
+++ b/z-kernels/ati_driver/TRIGGERS
@@ -3,3 +3,4 @@ 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/libstdc++.so.5
b/z-kernels/ati_driver/libstdc++.so.5
deleted file mode 100755
index 2815f01..0000000
Binary files a/z-kernels/ati_driver/libstdc++.so.5 and /dev/null differ
diff --git a/z-kernels/ati_driver/smgl.qt.patch
b/z-kernels/ati_driver/smgl.qt.patch
deleted file mode 100644
index ad5456e..0000000
--- a/z-kernels/ati_driver/smgl.qt.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- back/Makefile 2004-12-14 18:55:05.000000000 +0100
-+++ Makefile 2005-02-06 14:45:47.265954864 +0100
-@@ -87,12 +87,12 @@
- $(error environment missing: MK_QTDIR=$(MK_QTDIR))
- endif
-
--ifeq ($(shell test -e $(MK_QTDIR)/include/qglobal.h$(colon) echo $$?),1)
-+ifeq ($(shell test -e $(MK_QTDIR)/include/qt/qglobal.h$(colon) echo $$?),1)
- $(error environment incomplete: MK_QTDIR=$(MK_QTDIR))
- endif
-
- ifeq ($(QT_VER),0)
--QT_VER=$(shell grep QT_VERSION_STR $(MK_QTDIR)/include/qglobal.h | cut
-d'"' -f2 | cut -d'.' -f1)
-+QT_VER=$(shell grep QT_VERSION_STR $(MK_QTDIR)/include/qt/qglobal.h | cut
-d'"' -f2 | cut -d'.' -f1)
- endif
-
- ifeq ($(QT_VER),0)
-@@ -136,7 +136,7 @@
- DEFINES = -Dlinux -DFGLRX_USE_XEXTENSIONS -DFGLRX_OGL_INFO -DQT_NO_STL
-
- # for *.c
--CINCDIR = -I/usr/X11R6/include -I. -I./include_dummy
-+CINCDIR = -I/usr/X11R6/include -I. -I./include_dummy -I/usr/include/qt
- CDEFINES = $(DEFINES)
- ifeq ($(DEBUG),0)
- CDEBFLAGS = -g
-@@ -145,7 +145,7 @@
- LFLAGS = $(CDEBFLAGS) -L/usr/X11R6/$(LIB_DIR) -lXaw -lXmu -lXt -lXext -lX11
-
- # for *.cpp
--CCINCDIR = -I$(MK_QTDIR)/include -I. -I./include_dummy
-+CCINCDIR = -I$(MK_QTDIR)/include -I. -I./include_dummy -I/usr/include/qt
- CCDEFINES = $(DEFINES)
- ifneq ($(DEBUG),0)
- CCDEBFLAGS = -ggdb
-@@ -405,16 +405,6 @@
- cd /usr/X11R6/bin/. ; rm -f $(BASENAME) ; ln -s $(TARGET0) $(BASENAME)
- cp LICENSE.GPL /usr/X11R6/bin/.
- cp LICENSE.QPL /usr/X11R6/bin/.
-- if [ $KDEDIR ]; then\
-- cp fireglcontrol.kdelnk $(KDEDIR)/share/applnk/. ;\
-- cp ati.xpm $(KDEDIR)/share/icons/. ;\
-- fi
-- if test -d /usr/share/gnome/apps; then \
-- cp fireglcontrol.desktop /usr/share/gnome/apps/. ;\
-- if test -d /usr/share/pixmaps; then \
-- cp ati.xpm /usr/share/pixmaps/. ;\
-- fi ;\
-- fi
-
- source_package::
- @if [ -f $(PACKET_NAME).tar ]; then \
diff --git a/z-kernels/nvidia_driver/DEPENDS b/z-kernels/nvidia_driver/DEPENDS
index 7bce8e8..eb530e1 100755
--- a/z-kernels/nvidia_driver/DEPENDS
+++ b/z-kernels/nvidia_driver/DEPENDS
@@ -1,2 +1,3 @@
-depends X11-SERVER &&
+depends xorg-server &&
+depends smgl-gl_select &&
depends which
diff --git a/z-kernels/nvidia_driver/DETAILS b/z-kernels/nvidia_driver/DETAILS
index d70a31f..dd0302a 100755
--- a/z-kernels/nvidia_driver/DETAILS
+++ b/z-kernels/nvidia_driver/DETAILS
@@ -40,14 +40,11 @@ esac
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
WEB_SITE=http://www.nvidia.com/object/unix.html
ENTERED=20030401
- PATCHLEVEL=0
SECURITY_PATCH=1
- ARCHIVE=off
- REJECT="Non-GPL compatible software license"
+ REJECT="Non-Free Software license"
+ PATCHLEVEL=1
LICENSE[0]=http://www.nvidia.com/object/nv_swlicense.html
SHORT="Driver provided by NVIDIA for NVIDIA GPUs"
- # Remove this when bug #12843 is fixed
- STAGED_INSTALL=off
cat << EOF
NVIDIA
These are the nvidia provided binary X drivers for their graphics cards.
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index ee17712..6fcb068 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,15 @@
+2009-02-08 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+ * DEPENDS: xorg-server
+ * DETAILS: patchlevel by default is 0, ARCHIVE even if binary,
+ bug has been fixed, fixed rejected reason, patchlevel++
+ * INSTALL: fixups for smgl-gl_select
+ * POST_REMOVE: removed
+ * PRE_BUILD: fixups
+ * glext-redef.patch: removed
+ * volatiles: removed
+ * PRE_REMOVE: removed
+ * REPAIR^all^PRE_REMOVE: removed
+
2009-01-29 Julien "_kaze_" ROZO <julien AT rozo.org>
* DETAILS: updated beta version to 180.27

diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index 59b8949..8dacd0d 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -1,14 +1,6 @@
-local X_PRE X_MOD KVER &&
+local X_MOD KVER &&
KVER=$(get_kernel_version) &&

-if test "$(get_spell_provider $SPELL X11-SERVER)" = xorg-server; then
- X_PRE="${INSTALL_ROOT}$(pkg-config --variable=prefix xorg-server)" &&
- X_MOD="${INSTALL_ROOT}$(pkg-config --variable=moduledir xorg-server)"
-else
- X_PRE="${INSTALL_ROOT}/usr/X11R6" &&
- X_MOD="${INSTALL_ROOT}/usr/X11R6/lib/modules"
-fi &&
-
#
# Install kernel module 'nvidia.ko'
#
@@ -24,21 +16,18 @@ popd &&
#
pushd $SOURCE_DIRECTORY/usr/bin &&
for file in nvidia-bug-report.sh nvidia-settings nvidia-xconfig; do
- install -m 0755 -o root -g root $file $INSTALL_ROOT/usr/bin
+ install -v -m 0755 -o root -g root $file $INSTALL_ROOT/usr/bin
done &&
popd &&
-install -m 0766 -o root -g root nvidia-installer $INSTALL_ROOT/usr/bin
&&
+install -v -m 0766 -o root -g root nvidia-installer
$INSTALL_ROOT/usr/bin &&

#
# Install OpenGL headers
#
pushd $SOURCE_DIRECTORY/usr/include/GL &&
-if [ ! -d $X_PRE/include/GL ]; then
- mkdir -p $X_PRE/include/GL
-fi &&
-#patch -p0 < ${SPELL_DIRECTORY}/glext-redef.patch &&
+mkdir -vp $INSTALL_ROOT/usr/include/GL/nvidia
for file in glext.h gl.h glxext.h glx.h; do
- install -m 0644 -o root -g root $file $X_PRE/include/GL/
+ install -v -m 0644 -o root -g root $file
$INSTALL_ROOT/usr/include/GL/nvidia/
done &&
popd &&

@@ -49,24 +38,26 @@ pushd $SOURCE_DIRECTORY/usr/lib &&

# Fill in the path to libGL.so
sed -i 's|__LIBGL_PATH__|/usr/lib|' libGL.la
-for lib in libGLcore.so.${VERSION/-/.} libGL.la libGL.so.${VERSION/-/.} \
+for lib in libGL.la \
libnvidia-tls.so.${VERSION/-/.} libnvidia-cfg.so.${VERSION/-/.};
do
- install -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
-
-if [ ! -d $INSTALL_ROOT/usr/lib/tls ]; then
- mkdir -p $INSTALL_ROOT/usr/lib/tls
-fi &&
-
-install -m 0644 -o root -g root tls/libnvidia-tls.so.${VERSION/-/.} \
+mkdir -vp $INSTALL_ROOT/usr/lib/nvidia \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia/ &&
+cp -vr libGL.so.${VERSION/-/.} $INSTALL_ROOT/usr/lib/nvidia &&
+cp -vr libGLcore.so.${VERSION/-/.} \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/tls &&
+install -v -m 0644 -o root -g root tls/libnvidia-tls.so.${VERSION/-/.} \
$INSTALL_ROOT/usr/lib/tls &&
#
# Create library symlinks
#
- pushd $INSTALL_ROOT/usr/lib &&
- ln -sfn libGLcore.so.${VERSION/-/.} libGLcore.so.1 &&
+ pushd $INSTALL_ROOT/usr/lib/nvidia &&
ln -sfn libGL.so.${VERSION/-/.} libGL.so.1 &&
ln -sfn libGL.so.1 libGL.so &&
+ popd
+ pushd $INSTALL_ROOT/usr/lib &&
ln -sfn libnvidia-cfg.so.${VERSION/-/.} libnvidia-cfg.so.1 &&
ln -sfn libnvidia-cfg.so.1 libnvidia-cfg.so &&
ln -sfn libnvidia-tls.so.${VERSION/-/.} libnvidia-tls.so.1 &&
@@ -81,12 +72,12 @@ popd &&
#
pushd $SOURCE_DIRECTORY/usr/X11R6/lib &&
for lib in libXvMCNVIDIA.a libXvMCNVIDIA.so.${VERSION/-/.}; do
- install -m 0644 -o root -g root $lib $X_PRE/lib
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib
done &&
#
# Setup symlinks
#
- pushd $X_PRE/lib &&
+ pushd $INSTALL_ROOT/usr/lib &&
ln -sfn libXvMCNVIDIA.so.${VERSION/-/.} libXvMCNVIDIA_dynamic.so.1 &&
popd &&
popd &&
@@ -94,43 +85,35 @@ popd &&
#
# Install X11 modules
#
-pushd $SOURCE_DIRECTORY/usr/X11R6/lib/modules &&
-cp libnvidia-wfb.so.${VERSION/-/.} "$X_MOD/" &&
-mkdir -p $X_MOD/drivers &&
+pushd $SOURCE_DIRECTORY/usr/X11R6/lib/modules/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/nvidia/ &&
+cp -v libnvidia-wfb.so.${VERSION/-/.} \
+ $INSTALL_ROOT/usr/lib/xorg/modules/nvidia/ &&
+mkdir -vp $INSTALL_ROOT/usr/lib/xorg/modules/drivers
&&
for driver in nvidia_drv.o nvidia_drv.so; do
- install -m 0644 -o root -g root \
- drivers/$driver $X_MOD/drivers
+ install -v -m 0644 -o root -g root \
+ drivers/$driver $INSTALL_ROOT/usr/lib/xorg/modules/drivers/
done &&
-mkdir -p "$X_MOD/extensions" &&
-install -m 0644 -o root -g root \
-extensions/libglx.so.${VERSION/-/.} \
- $X_MOD/extensions &&
- #
- # Setup symlinks
- #
- ln -sfn "$X_MOD/libnvidia-wfb.so.${VERSION/-/.}" \
- "$X_MOD/libnvidia-wfb.so" &&
-
- #
- # If libwfb.so is a file, it's probably from xorg-server, leave alone
- # Bug #14819
- #
- if [[ ! -f "$X_MOD/libwfb.so" ]]; then
- ln -sfn "$X_MOD/libnvidia-wfb.so.${VERSION/-/.}" \
- "$X_MOD/libwfb.so"
- fi &&
- pushd $X_MOD/extensions &&
- ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
- popd &&
+install -v -m 0644 -o root -g root extensions/libglx.so.${VERSION/-/.} \
+ $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+#
+# Setup symlinks
+#
+pushd $INSTALL_ROOT/usr/lib/xorg/modules/nvidia/ &&
+ln -sfn "libnvidia-wfb.so.${VERSION/-/.}" \
+ "libnvidia-wfb.so" &&
+ln -sfn "libnvidia-wfb.so.${VERSION/-/.}" \
+ "libwfb.so" &&
+pushd $INSTALL_ROOT/usr/lib/xorg/modules/extensions/nvidia &&
+ln -sfn libglx.so.${VERSION/-/.} libglx.so &&
+ln -sfn libGLcore.so.${VERSION/-/.} libGLcore.so.1 &&
+popd &&
popd &&
+popd

#
# Install Freedesktop.org spec
#
-if [[ ! -d $INSTALL_ROOT/usr/share/applications ]]; then
- mkdir -p $INSTALL_ROOT/usr/share/applications
-fi &&
-
install -m 0644 -o root -g root \
$SOURCE_DIRECTORY/usr/share/applications/nvidia-settings.desktop \
$INSTALL_ROOT/usr/share/applications &&
diff --git a/z-kernels/nvidia_driver/POST_REMOVE
b/z-kernels/nvidia_driver/POST_REMOVE
deleted file mode 100755
index eb3214a..0000000
--- a/z-kernels/nvidia_driver/POST_REMOVE
+++ /dev/null
@@ -1,24 +0,0 @@
-local i X_DIR GL_DIR GL_LIB &&
-X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
-GL_DIR=$INSTALL_ROOT/usr/include/GL/ &&
-
-if spell_ok mesalib; then
- GL_LIB=$INSTALL_ROOT/usr/lib
-else
- GL_LIB=$INSTALL_ROOT/usr/X11R6/lib
-fi &&
-
-message "${MESSAGE_COLOR}Restoring X/mesalib headers and libs${SPELL_COLOR}"
&&
-
-for i in gl.h glext.h glx.h glxext.h; do
- if [ -e $X_DIR/$i ]; then
- mv -v $X_DIR/$i $GL_DIR
- fi
-done &&
-for i in $X-DIR/libGL.so.*; do
- if [ -e $i ]; then
- mv -v $i $GL_LIB
- fi
-done &&
-
-rm -rf $X_DIR
diff --git a/z-kernels/nvidia_driver/PRE_BUILD
b/z-kernels/nvidia_driver/PRE_BUILD
index a7e031e..d92e707 100755
--- a/z-kernels/nvidia_driver/PRE_BUILD
+++ b/z-kernels/nvidia_driver/PRE_BUILD
@@ -1,35 +1,5 @@
unpack_file '' &&

-message "${MESSAGE_COLOR}Backing up existing X/mesalib headers and
libs${DEFAULT_COLOR}" &&
-
-local i X_DIR GL_DIR GL_LIB &&
-X_DIR=$INSTALL_ROOT/usr/include/GL/x &&
-GL_DIR=$INSTALL_ROOT/usr/include/GL &&
-
-if spell_ok mesalib; then
- GL_LIB=$INSTALL_ROOT/usr/lib
-else
- GL_LIB=$INSTALL_ROOT/usr/X11R6/lib
-fi &&
-
-mkdir -p $X_DIR &&
-
-if ! [[ -f $X_DIR/done ]]; then
- for i in gl.h glext.h glx.h glxext.h; do
- if [ -e $GL_DIR/$i ]; then
- mv -v $GL_DIR/$i $X_DIR
- fi
- done
- for i in $GL_LIB/libGL.so.*; do
- if [ -e $i ]; then
- mv -v $i $X_DIR
- fi
- done
- touch $X_DIR/done
-else
- message "${SPELL_COLOR}X/mesalib headers and libs already backed
up${DEFAULT_COLOR}"
-fi &&
-
sh $SOURCE_CACHE/$SOURCE --extract-only \
--target $SOURCE_DIRECTORY &&
cd $SOURCE_DIRECTORY &&
diff --git a/z-kernels/nvidia_driver/PRE_REMOVE
b/z-kernels/nvidia_driver/PRE_REMOVE
deleted file mode 100755
index f76ec4c..0000000
--- a/z-kernels/nvidia_driver/PRE_REMOVE
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# If libwfb.so is a file and not a symlink it's from xorg-server, remove
-# from this spell's install log
-# Bug #14819
-#
-if [[ -f $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so &&
- ! -h $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so ]]; then
- sedit '/\/usr\/lib\/xorg\/modules\/libwfb.so/d'
$INSTALL_LOGS/$SPELL-$(installed_version $SPELL)
-
-fi &&
-
-default_pre_remove
diff --git a/z-kernels/nvidia_driver/REPAIR^all^PRE_REMOVE
b/z-kernels/nvidia_driver/REPAIR^all^PRE_REMOVE
deleted file mode 100755
index f76ec4c..0000000
--- a/z-kernels/nvidia_driver/REPAIR^all^PRE_REMOVE
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# If libwfb.so is a file and not a symlink it's from xorg-server, remove
-# from this spell's install log
-# Bug #14819
-#
-if [[ -f $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so &&
- ! -h $INSTALL_ROOT/usr/lib/xorg/modules/libwfb.so ]]; then
- sedit '/\/usr\/lib\/xorg\/modules\/libwfb.so/d'
$INSTALL_LOGS/$SPELL-$(installed_version $SPELL)
-
-fi &&
-
-default_pre_remove
diff --git a/z-kernels/nvidia_driver/glext-redef.patch
b/z-kernels/nvidia_driver/glext-redef.patch
deleted file mode 100644
index 3fb0be4..0000000
--- a/z-kernels/nvidia_driver/glext-redef.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- glext.h~ 2006-11-08 22:09:16.000000000 -0800
-+++ glext.h 2006-11-08 22:09:16.000000000 -0800
-@@ -6938,7 +6938,6 @@
- extern void APIENTRY glGetVertexAttribIivEXT (GLuint index, GLenum pname,
GLint *params);
- extern void APIENTRY glGetVertexAttribIuivEXT (GLuint index, GLenum pname,
GLuint *params);
- #endif /* GL_GLEXT_PROTOTYPES */
--typedef void (APIENTRY * PFNGLGETUNIFORMUIVEXTPROC) (GLuint program, GLint
location, GLuint *params);
- typedef void (APIENTRY * PFNGLBINDFRAGDATALOCATIONEXTPROC) (GLuint program,
GLuint color, const GLchar *name);
- typedef GLint (APIENTRY * PFNGLGETFRAGDATALOCATIONEXTPROC) (GLuint program,
const GLchar *name);
- typedef void (APIENTRY * PFNGLUNIFORM1UIEXTPROC) (GLint location, GLuint
v0);
diff --git a/z-kernels/nvidia_driver/volatiles
b/z-kernels/nvidia_driver/volatiles
deleted file mode 100755
index 246e956..0000000
--- a/z-kernels/nvidia_driver/volatiles
+++ /dev/null
@@ -1,6 +0,0 @@
-^/lib/modules/*/modules.*
-^/usr/lib/libGL.so.*
-^/usr/include/GL/gl.h
-^/usr/include/GL/glext.h
-^/usr/include/GL/glx.h
-^/usr/include/GL/glxext.h




Archive powered by MHonArc 2.6.24.

Top of Page