Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Julien ROZO (5cef3cdf1eb2e62cec26c0711956900d0ef5c908)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Julien ROZO <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Julien ROZO (5cef3cdf1eb2e62cec26c0711956900d0ef5c908)
  • Date: Mon, 15 Mar 2010 03:33:07 -0500

GIT changes to master z-rejected grimoire by Julien ROZO <julien AT rozo.org>:

z-kernels/ati-fglrx/DETAILS | 4
z-kernels/ati-fglrx/HISTORY | 6
z-kernels/ati-fglrx/INSTALL | 2
z-kernels/ati-fglrx/PRE_BUILD | 7 +
z-kernels/ati-fglrx/fglrx-2.6.33.patch | 227
+++++++++++++++++++++++++++++++++
z-kernels/nvidia_driver/HISTORY | 3
z-kernels/nvidia_driver/INSTALL | 11 +
7 files changed, 256 insertions(+), 4 deletions(-)

New commits:
commit 5cef3cdf1eb2e62cec26c0711956900d0ef5c908
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

ati-fglrx: updated version to 10.2
fixed path for symlinks to libGL.so in INSTALL
added fglrx-2.6.33.patch in PRE_BUILD to fix compilation issue with
kernel 2.6.33

commit 7fad9977deeb833276e4b5a6d44f721dfc1a708a
Author: Julien ROZO <julien AT rozo.org>
Commit: Julien ROZO <julien AT rozo.org>

nvidia_driver: fixed vdpau libs installation

diff --git a/z-kernels/ati-fglrx/DETAILS b/z-kernels/ati-fglrx/DETAILS
index 7c64a2e..c63cdff 100755
--- a/z-kernels/ati-fglrx/DETAILS
+++ b/z-kernels/ati-fglrx/DETAILS
@@ -1,7 +1,7 @@
SPELL=ati-fglrx
- VERSION=9.11
+ VERSION=10.2
SOURCE=ati-driver-installer-${VERSION/./-}-x86.x86_64.run
-
SOURCE_HASH=sha512:7e247e828d0bc70ca9108ba57e8219ea509d666dcba887bf38a9e64f5f34d7387545fa95a6c3ea4f2ac7744f1bdc16f57286df58a94a5cd1352553cda9f0c71c
+
SOURCE_HASH=sha512:961704799e7f461e0d10727eb2c019611c2083c8c866396a5e90ff579f3850c2aa884b274d69fa9ea6183deea373b27fa2cab215ef6aa91f1c7fda40ca7873df
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

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

LICENSE[0]="$GRIMOIRE/$SECTION/$SPELL/LICENSE"
diff --git a/z-kernels/ati-fglrx/HISTORY b/z-kernels/ati-fglrx/HISTORY
index 39e8e0f..71b1b08 100644
--- a/z-kernels/ati-fglrx/HISTORY
+++ b/z-kernels/ati-fglrx/HISTORY
@@ -1,3 +1,9 @@
+2010-03-14 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * DETAILS: updated version to 10.2
+ * INSTALL: fixed path for symlinks to libGL.so
+ * PRE_BUILD, fglrx-2.6.33.patch: fixed compilation issue with kernel
+ 2.6.33
+
2009-11-29 Pol Vinogradov <vin.public AT gmail.com>
* DETAILS: Updated to 9.11
* PRE_BUILD: removed ATI_XVERSION, no x710_64a directory in archive
diff --git a/z-kernels/ati-fglrx/INSTALL b/z-kernels/ati-fglrx/INSTALL
index 7e7c4f7..5f690ec 100755
--- a/z-kernels/ati-fglrx/INSTALL
+++ b/z-kernels/ati-fglrx/INSTALL
@@ -49,7 +49,7 @@ cp -vr usr/X11R6/$ARCHLIB/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/ &&
+pushd $INSTALL_ROOT/usr/lib/ati &&
ln -sfv libGL.so.1.2 libGL.so &&
popd &&
rm -f usr/X11R6/$ARCHLIB/libGL.so.1.2 &&
diff --git a/z-kernels/ati-fglrx/PRE_BUILD b/z-kernels/ati-fglrx/PRE_BUILD
index 317baa1..1c07492 100755
--- a/z-kernels/ati-fglrx/PRE_BUILD
+++ b/z-kernels/ati-fglrx/PRE_BUILD
@@ -21,6 +21,13 @@ mv archive/common/usr/share/doc/fglrx documentation &&
sedit "s:^KVER .*:KVER = $(get_kernel_version):" \
archive/common/lib/modules/fglrx/build_mod/2.6.x/Makefile

+# patch for 2.6.33 kernel
+if [[ "$(get_kernel_version|cut -d. -f3)" == "33" ]]; then
+ cd archive
+ patch -p1 < $SPELL_DIRECTORY/fglrx-2.6.33.patch
+ cd ..
+fi
+
#
# Preparing the build directory structure
#
diff --git a/z-kernels/ati-fglrx/fglrx-2.6.33.patch
b/z-kernels/ati-fglrx/fglrx-2.6.33.patch
new file mode 100755
index 0000000..3994711
--- /dev/null
+++ b/z-kernels/ati-fglrx/fglrx-2.6.33.patch
@@ -0,0 +1,227 @@
+Index: ati10.2/common/lib/modules/fglrx/build_mod/drmP.h
+===================================================================
+--- ati10.2/common/lib/modules/fglrx/build_mod/drmP.h
++++ ati10.2/common/lib/modules/fglrx/build_mod/drmP.h 2010-01-28
19:57:07.562644291 +0200
+@@ -42,7 +42,12 @@
+ * can build the DRM (part of PI DRI). 4/21/2000 S + B */
+ #include <asm/current.h>
+ #endif /* __alpha__ */
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/module.h>
+ #include <linux/kernel.h>
+ #include <linux/miscdevice.h>
+@@ -51,7 +56,6 @@
+ #include <linux/init.h>
+ #include <linux/file.h>
+ #include <linux/pci.h>
+-#include <linux/version.h>
+ #include <linux/sched.h>
+ #include <linux/smp_lock.h> /* For (un)lock_kernel */
+ #include <linux/mm.h>
+Index: ati10.2/common/lib/modules/fglrx/build_mod/firegl_public.c
+===================================================================
+--- ati10.2/common/lib/modules/fglrx/build_mod/firegl_public.c
++++ ati10.2/common/lib/modules/fglrx/build_mod/firegl_public.c 2010-01-29
14:21:58.687999115 +0200
+@@ -28,7 +28,11 @@
+ #error Kernel versions older than 2.6.0 are no longer supported by this
module.
+ #endif
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+
+ #if !defined(CONFIG_X86)
+ #if !defined(CONFIG_X86_PC)
+@@ -163,8 +167,12 @@
+
+ // For 2.6.18 or higher, the UTS_RELEASE is defined in the
linux/utsrelease.h.
+ #ifndef UTS_RELEASE
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/utsrelease.h>
++#else
+ #include <linux/utsrelease.h>
+ #endif
++#endif
+
+ #if defined(__i386__)
+ #ifndef do_div
+@@ -1470,7 +1478,16 @@
+ #ifndef __HAVE_ARCH_CMPXCHG
+ return __fgl_cmpxchg(ptr,old,new,size);
+ #else
+- return __cmpxchg(ptr,old,new,size);
++ /* expanding __cmpxchg macro causes a reference on an undefined symbol
++ * when used with non-constant size */
++ switch (size) {
++ case 1: return __cmpxchg((unsigned long *)ptr,old,new,1);
++ case 2: return __cmpxchg((unsigned long *)ptr,old,new,2);
++ case 4: return __cmpxchg((unsigned long *)ptr,old,new,4);
++ case 8: return __cmpxchg((unsigned long *)ptr,old,new,8);
++ }
++ WARN_ON(1);
++ return old;
+ #endif
+ }
+
+Index: ati10.2/common/lib/modules/fglrx/build_mod/kcl_acpi.c
+===================================================================
+--- ati10.2/common/lib/modules/fglrx/build_mod/kcl_acpi.c
++++ ati10.2/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2010-01-28
19:57:17.897225045 +0200
+@@ -15,7 +15,11 @@
+
****************************************************************************/
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/acpi.h>
+
+ #include "kcl_config.h"
+Index: ati10.2/common/lib/modules/fglrx/build_mod/kcl_agp.c
+===================================================================
+--- ati10.2/common/lib/modules/fglrx/build_mod/kcl_agp.c
++++ ati10.2/common/lib/modules/fglrx/build_mod/kcl_agp.c 2010-01-28
19:57:26.104892082 +0200
+@@ -31,7 +31,11 @@
+ */
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/pci.h>
+ #include <linux/agp_backend.h>
+ #include <linux/string.h>
+Index: ati10.2/common/lib/modules/fglrx/build_mod/kcl_io.c
+===================================================================
+--- ati10.2/common/lib/modules/fglrx/build_mod/kcl_io.c
++++ ati10.2/common/lib/modules/fglrx/build_mod/kcl_io.c 2010-01-28
19:57:34.337558105 +0200
+@@ -37,7 +37,11 @@
+ */
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/poll.h>
+ #include <linux/signal.h>
+ #include <asm/io.h>
+Index: ati10.2/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
+===================================================================
+--- ati10.2/common/lib/modules/fglrx/build_mod/kcl_osconfig.h
++++ ati10.2/common/lib/modules/fglrx/build_mod/kcl_osconfig.h 2010-01-28
19:57:43.599182385 +0200
+@@ -20,7 +20,11 @@
+ #define KCL_OSCONFIG_H
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+
+ // Choose modern way to call 32-on-64 IOCTLs if configured in the kernel
+ #if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9)
+Index: ati10.2/common/lib/modules/fglrx/build_mod/kcl_pci.c
+===================================================================
+--- ati10.2/common/lib/modules/fglrx/build_mod/kcl_pci.c
++++ ati10.2/common/lib/modules/fglrx/build_mod/kcl_pci.c 2010-01-28
19:57:51.295870149 +0200
+@@ -31,7 +31,11 @@
+ */
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/pci.h>
+
+ #include "kcl_config.h"
+Index: ati10.2/common/lib/modules/fglrx/build_mod/kcl_str.c
+===================================================================
+--- ati10.2/common/lib/modules/fglrx/build_mod/kcl_str.c
++++ ati10.2/common/lib/modules/fglrx/build_mod/kcl_str.c 2010-01-28
19:57:59.728528058 +0200
+@@ -30,7 +30,12 @@
+ *
+ */
+
++#include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/string.h>
+ #include <linux/module.h>
+
+Index: ati10.2/common/lib/modules/fglrx/build_mod/kcl_wait.c
+===================================================================
+--- ati10.2/common/lib/modules/fglrx/build_mod/kcl_wait.c
++++ ati10.2/common/lib/modules/fglrx/build_mod/kcl_wait.c 2010-01-28
19:58:08.936154527 +0200
+@@ -31,7 +31,11 @@
+ */
+
+ #include <linux/version.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,33)
++#include <generated/autoconf.h>
++#else
+ #include <linux/autoconf.h>
++#endif
+ #include <linux/wait.h>
+ #include <linux/highmem.h>
+ #include <linux/sched.h>
+Index: ati10.2/common/lib/modules/fglrx/build_mod/make.sh
+===================================================================
+--- ati10.2/common/lib/modules/fglrx/build_mod/make.sh
++++ ati10.2/common/lib/modules/fglrx/build_mod/make.sh 2010-01-28
19:55:10.849378991 +0200
+@@ -218,8 +218,15 @@
+ # UTS-define is in external version-*.h files, i.e.
linux-2.2.14-5.0-RedHat does this flaw
+ kernel_release=`cat $linuxincludes/linux/version-*.h | grep
UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
+ else
+- # For 2.6.18 or higher, UTS-define is defined in utsrelease.h.
+- kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep
UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
++ UTS_REL_COUNT=`cat $linuxincludes/generated/utsrelease.h
2>/dev/null | grep UTS_RELEASE -c`
++
++ if [ $UTS_REL_COUNT -gt 0 ]; then
++ # 2.6.33+
++ kernel_release=`cat $linuxincludes/generated/utsrelease.h | grep
UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
++ else
++ # For 2.6.18 to 2.6.32, UTS-define is defined in utsrelease.h.
++ kernel_release=`cat $linuxincludes/linux/utsrelease.h | grep
UTS_RELEASE | grep \"$OsRelease\" | cut -d'"' -f2`
++ fi
+ fi
+ fi
+ fi
+@@ -302,7 +309,8 @@
+ # 3
+ # linux/autoconf.h may contain this: #define CONFIG_SMP 1
+
+-src_file=$linuxincludes/linux/autoconf.h
++src_file=$linuxincludes/generated/autoconf.h
++[ -e $src_file ] || src_file=$linuxincludes/linux/autoconf.h
+
+ if [ ! -e $src_file ]; then
+ echo "Warning:" >>
$logfile
+@@ -355,7 +363,8 @@
+ MODVERSIONS=0
+
+ # linux/autoconf.h may contain this: #define CONFIG_MODVERSIONS 1
+-src_file=$linuxincludes/linux/autoconf.h
++src_file=$linuxincludes/generated/autoconf.h
++[ -e $src_file ] || src_file=$linuxincludes/linux/autoconf.h
+ if [ ! -e $src_file ];
+ then
+ echo "Warning:" >>
$logfile
diff --git a/z-kernels/nvidia_driver/HISTORY b/z-kernels/nvidia_driver/HISTORY
index ce80303..7dc8863 100644
--- a/z-kernels/nvidia_driver/HISTORY
+++ b/z-kernels/nvidia_driver/HISTORY
@@ -1,3 +1,6 @@
+2010-03-14 Julien "_kaze_" ROZO <julien AT rozo.org>
+ * INSTALL: fixed vdpau libs installation
+
2010-03-12 Julien "_kaze_" ROZO <julien AT rozo.org>
* INSTALL: added installation of libs and headers for cuda and vdpau,
and installation of libs and headers for OpenCL for beta version
diff --git a/z-kernels/nvidia_driver/INSTALL b/z-kernels/nvidia_driver/INSTALL
index c234dfc..c5ac688 100755
--- a/z-kernels/nvidia_driver/INSTALL
+++ b/z-kernels/nvidia_driver/INSTALL
@@ -140,6 +140,11 @@ popd &&
#
# Install VDPAU libraries
#
+pushd $SOURCE_DIRECTORY/usr/lib &&
+for lib in libvdpau.so.${VERSION/-/.}; do
+ install -v -m 0644 -o root -g root $lib $INSTALL_ROOT/usr/lib/
+done &&
+popd &&
pushd $SOURCE_DIRECTORY/usr/lib/vdpau &&
mkdir -vp $INSTALL_ROOT/usr/lib/vdpau
for lib in libvdpau_nvidia.so.${VERSION/-/.}
libvdpau_trace.so.${VERSION/-/.}; do
@@ -148,7 +153,11 @@ done &&
#
# Setup symlinks
#
- pushd $INSTALL_ROOT/usr/lib &&
+ pushd $INSTALL_ROOT/usr/lib
&&
+ ln -sfn libvdpau.so.${VERSION/-/.} libvdpau.so.1
&&
+ ln -sfn libvdpau.so.1 libvdpau.so
&&
+ popd
&&
+ pushd $INSTALL_ROOT/usr/lib/vdpau
&&
ln -sfn libvdpau_nvidia.so.${VERSION/-/.} libvdpau_nvidia.so.1
&&
ln -sfn libvdpau_nvidia.so.1 libvdpau_nvidia.so
&&
ln -sfn libvdpau_trace.so.${VERSION/-/.} libvdpau_trace.so.1
&&



  • [SM-Commit] GIT changes to master z-rejected grimoire by Julien ROZO (5cef3cdf1eb2e62cec26c0711956900d0ef5c908), Julien ROZO, 03/15/2010

Archive powered by MHonArc 2.6.24.

Top of Page