From 40f9ee230df1ca1baf4685e078691b480ce655a4 Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 2 Jul 2011 19:25:50 +0200 Subject: kernel, maj 2.6.39.2-4 ajout module pour broadcom --- base/kernel/Pkgfile | 17 +++++++++++++---- base/kernel/config_64 | 28 +++++++--------------------- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile index 7c67c35f6..e00fabaa3 100644 --- a/base/kernel/Pkgfile +++ b/base/kernel/Pkgfile @@ -6,7 +6,7 @@ name=kernel version=2.6.39.2 _BaseVersion=2.6.39 -release=3 +release=4 PKGMK_NO_STRIP="yes" PKGMK_IGNORE_FOOTPRINT="yes" PKGMK_IGNORE_MD5SUM="yes" @@ -23,8 +23,11 @@ ATI_VERSION=11.6 [ "`uname -m`" == "x86_64" ] && _ARCH=x86_64 [ "`uname -m`" == "i686" ] && VB_ARCH=x86 [ "`uname -m`" == "x86_64" ] && VB_ARCH=amd64 - -source=(http://download.virtualbox.org/virtualbox/${VB_VERSION}/VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run \ +[ "`uname -m`" == "i686" ] && BC_ARCH=x86_32 +[ "`uname -m`" == "x86_64" ] && BC_ARCH=x86_64 +source=(http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${BC_ARCH}-v5_100_82_38.tar.gz \ + http://www.broadcom.com/docs/linux_sta/5_100_82_38.patch \ + http://download.virtualbox.org/virtualbox/${VB_VERSION}/VirtualBox-${VB_VERSION}-${VB_BUILD}-Linux_${VB_ARCH}.run \ http://www2.ati.com/drivers/linux/ati-driver-installer-${ATI_VERSION/./-}-x86.x86_64.run \ http://nutyx.meticul.eu/files/patchs/ati/ati-${ATI_VERSION}.tar.gz \ ftp://download.nvidia.com/XFree86/Linux-${_ARCH}/${NVIDIA_VERSION}/NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run\ @@ -66,7 +69,7 @@ case `uname -m` in mv $SRC/config ./.config;; esac sed -i "s/EXTRAVERSION = .*/EXTRAVERSION =/" Makefile -# make menuconfig +make menuconfig case `uname -m` in x86_64) cp .config `prt-get printf %p --filter=$name`/$name/config_64;; @@ -80,6 +83,12 @@ case `uname -m` in i?86) cp .config `prt-get printf %p --filter=$name`/$name/config;; esac +# Module broadcom +cd $SRC +patch -Np0 -i 5_100_82_38.patch +KBUILD_NOPEDANTIC=1 make -C $SRC/linux-${_BaseVersion} M=`pwd` clean +KBUILD_NOPEDANTIC=1 make -C $SRC/linux-${_BaseVersion} M=`pwd` +install -m 0644 -D wl.ko $PKG/lib/modules/${_BaseVersion}/kernel/drivers/zzzz/wl.ko # Module nvidia cd $SRC sh NVIDIA-Linux-${_ARCH}-${NVIDIA_VERSION}.run --extract-only diff --git a/base/kernel/config_64 b/base/kernel/config_64 index 2cebd56ff..be246ffde 100644 --- a/base/kernel/config_64 +++ b/base/kernel/config_64 @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux/x86_64 2.6.39 Kernel Configuration -# Fri Jun 24 21:48:40 2011 +# Sat Jul 2 17:43:10 2011 # CONFIG_64BIT=y # CONFIG_X86_32 is not set @@ -3721,7 +3721,7 @@ CONFIG_DRM_TDFX=m CONFIG_DRM_R128=m CONFIG_DRM_RADEON=m CONFIG_DRM_RADEON_KMS=y -# CONFIG_DRM_I810 is not set +CONFIG_DRM_I810=m CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y CONFIG_DRM_MGA=m @@ -3770,14 +3770,8 @@ CONFIG_FB_VESA=y CONFIG_FB_N411=m CONFIG_FB_HGA=m CONFIG_FB_S1D13XXX=m -CONFIG_FB_NVIDIA=m -CONFIG_FB_NVIDIA_I2C=y -# CONFIG_FB_NVIDIA_DEBUG is not set -CONFIG_FB_NVIDIA_BACKLIGHT=y -CONFIG_FB_RIVA=m -CONFIG_FB_RIVA_I2C=y -# CONFIG_FB_RIVA_DEBUG is not set -CONFIG_FB_RIVA_BACKLIGHT=y +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set CONFIG_FB_LE80578=m CONFIG_FB_CARILLO_RANCH=m # CONFIG_FB_INTEL is not set @@ -3787,17 +3781,9 @@ CONFIG_FB_MATROX_MYSTIQUE=y CONFIG_FB_MATROX_G=y CONFIG_FB_MATROX_I2C=m CONFIG_FB_MATROX_MAVEN=m -CONFIG_FB_RADEON=m -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_BACKLIGHT=y -# CONFIG_FB_RADEON_DEBUG is not set -CONFIG_FB_ATY128=m -CONFIG_FB_ATY128_BACKLIGHT=y -CONFIG_FB_ATY=m -CONFIG_FB_ATY_CT=y -CONFIG_FB_ATY_GENERIC_LCD=y -CONFIG_FB_ATY_GX=y -CONFIG_FB_ATY_BACKLIGHT=y +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set CONFIG_FB_S3=m CONFIG_FB_SAVAGE=m CONFIG_FB_SAVAGE_I2C=y -- cgit v1.2.3-54-g00ecf From 182cb84aacadfd0e5d8a77563bdf50c5a79bad41 Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 2 Jul 2011 22:32:58 +0200 Subject: mesa3d, maj footprint --- xorg/mesa3d/.footprint.i686 | 4 ++-- xorg/mesa3d/.footprint.x86_64 | 19 ++++--------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/xorg/mesa3d/.footprint.i686 b/xorg/mesa3d/.footprint.i686 index 593b5d22a..3ae59182c 100644 --- a/xorg/mesa3d/.footprint.i686 +++ b/xorg/mesa3d/.footprint.i686 @@ -56,8 +56,8 @@ lrwxrwxrwx root/root usr/lib/libEGL.so -> libEGL.so.1 lrwxrwxrwx root/root usr/lib/libEGL.so.1 -> libEGL.so.1.0 -rwxr-xr-x root/root usr/lib/libEGL.so.1.0 lrwxrwxrwx root/root usr/lib/libGLU.so -> libGLU.so.1 -lrwxrwxrwx root/root usr/lib/libGLU.so.1 -> libGLU.so.1.3.071000 --rwxr-xr-x root/root usr/lib/libGLU.so.1.3.071000 +lrwxrwxrwx root/root usr/lib/libGLU.so.1 -> libGLU.so.1.3.071003 +-rwxr-xr-x root/root usr/lib/libGLU.so.1.3.071003 lrwxrwxrwx root/root usr/lib/libGLw.so -> libGLw.so.1 lrwxrwxrwx root/root usr/lib/libGLw.so.1 -> libGLw.so.1.0.0 -rwxr-xr-x root/root usr/lib/libGLw.so.1.0.0 diff --git a/xorg/mesa3d/.footprint.x86_64 b/xorg/mesa3d/.footprint.x86_64 index 829ba18b0..3ae59182c 100644 --- a/xorg/mesa3d/.footprint.x86_64 +++ b/xorg/mesa3d/.footprint.x86_64 @@ -29,6 +29,7 @@ drwxr-xr-x root/root usr/include/KHR/ -rw-r--r-- root/root usr/include/KHR/khrplatform.h drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/dri/ +-rwxr-xr-x root/root usr/lib/dri/i810_dri.so -rwxr-xr-x root/root usr/lib/dri/i915_dri.so -rwxr-xr-x root/root usr/lib/dri/i965_dri.so -rwxr-xr-x root/root usr/lib/dri/mach64_dri.so @@ -39,6 +40,7 @@ drwxr-xr-x root/root usr/lib/dri/ -rwxr-xr-x root/root usr/lib/dri/r600_dri.so -rwxr-xr-x root/root usr/lib/dri/radeon_dri.so -rwxr-xr-x root/root usr/lib/dri/savage_dri.so +-rwxr-xr-x root/root usr/lib/dri/sis_dri.so -rwxr-xr-x root/root usr/lib/dri/swrast_dri.so -rwxr-xr-x root/root usr/lib/dri/swrastg_dri.so -rwxr-xr-x root/root usr/lib/dri/tdfx_dri.so @@ -54,8 +56,8 @@ lrwxrwxrwx root/root usr/lib/libEGL.so -> libEGL.so.1 lrwxrwxrwx root/root usr/lib/libEGL.so.1 -> libEGL.so.1.0 -rwxr-xr-x root/root usr/lib/libEGL.so.1.0 lrwxrwxrwx root/root usr/lib/libGLU.so -> libGLU.so.1 -lrwxrwxrwx root/root usr/lib/libGLU.so.1 -> libGLU.so.1.3.071000 --rwxr-xr-x root/root usr/lib/libGLU.so.1.3.071000 +lrwxrwxrwx root/root usr/lib/libGLU.so.1 -> libGLU.so.1.3.071003 +-rwxr-xr-x root/root usr/lib/libGLU.so.1.3.071003 lrwxrwxrwx root/root usr/lib/libGLw.so -> libGLw.so.1 lrwxrwxrwx root/root usr/lib/libGLw.so.1 -> libGLw.so.1.0.0 -rwxr-xr-x root/root usr/lib/libGLw.so.1.0.0 @@ -65,16 +67,3 @@ drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/gl.pc -rw-r--r-- root/root usr/lib/pkgconfig/glu.pc -rw-r--r-- root/root usr/lib/pkgconfig/glw.pc -drwxr-xr-x root/root usr/lib64/ -drwxr-xr-x root/root usr/lib64/X11/ -drwxr-xr-x root/root usr/lib64/X11/modules/ -drwxr-xr-x root/root usr/lib64/X11/modules/extensions/ -lrwxrwxrwx root/root usr/lib64/libEGL.so -> libEGL.so.1 -lrwxrwxrwx root/root usr/lib64/libEGL.so.1 -> libEGL.so.1.0 --rwxr-xr-x root/root usr/lib64/libEGL.so.1.0 -lrwxrwxrwx root/root usr/lib64/libGLU.so -> libGLU.so.1 -lrwxrwxrwx root/root usr/lib64/libGLU.so.1 -> libGLU.so.1.3.071000 --rwxr-xr-x root/root usr/lib64/libGLU.so.1.3.071000 -lrwxrwxrwx root/root usr/lib64/libGLw.so -> libGLw.so.1 -lrwxrwxrwx root/root usr/lib64/libGLw.so.1 -> libGLw.so.1.0.0 --rwxr-xr-x root/root usr/lib64/libGLw.so.1.0.0 -- cgit v1.2.3-54-g00ecf From 1bf213d56c83a6504606554297bbd955574ebb39 Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 2 Jul 2011 22:59:33 +0200 Subject: kernel, maj description --- base/kernel/Pkgfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/kernel/Pkgfile b/base/kernel/Pkgfile index e00fabaa3..93d5d6d3a 100644 --- a/base/kernel/Pkgfile +++ b/base/kernel/Pkgfile @@ -1,4 +1,4 @@ -# Description: Le kernel +# Description: Le kernel avec les modules nvidia, ati, broadcom et virtualbox # URL: http://www.kernel.org # Maintainer: NuTyX core team # Packager: thierryn1 at hispeed dot ch -- cgit v1.2.3-54-g00ecf From f8b0734b19b1c6fb0a781b930b79e63b43ee6044 Mon Sep 17 00:00:00 2001 From: tnut Date: Sat, 2 Jul 2011 23:10:39 +0200 Subject: libgl, maj 7.10.3-1 --- xorg/libgl/.footprint.i686 | 4 ++-- xorg/libgl/.footprint.x86_64 | 4 ++-- xorg/libgl/.md5sum.i686 | 2 +- xorg/libgl/.md5sum.x86_64 | 2 +- xorg/libgl/Pkgfile | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xorg/libgl/.footprint.i686 b/xorg/libgl/.footprint.i686 index 92a98b7f2..9c193beee 100644 --- a/xorg/libgl/.footprint.i686 +++ b/xorg/libgl/.footprint.i686 @@ -5,5 +5,5 @@ drwxr-xr-x root/root usr/lib/X11/modules/ drwxr-xr-x root/root usr/lib/X11/modules/extensions/ lrwxrwxrwx root/root usr/lib/X11/modules/extensions/libglx.so -> libglx.xorg lrwxrwxrwx root/root usr/lib/libGL.so -> libGL.so.1 -lrwxrwxrwx root/root usr/lib/libGL.so.1 -> libGL.so.1.5.071000 --rwxr-xr-x root/root usr/lib/libGL.so.1.5.071000 +lrwxrwxrwx root/root usr/lib/libGL.so.1 -> libGL.so.1.5.071003 +-rwxr-xr-x root/root usr/lib/libGL.so.1.5.071003 diff --git a/xorg/libgl/.footprint.x86_64 b/xorg/libgl/.footprint.x86_64 index 92a98b7f2..9c193beee 100644 --- a/xorg/libgl/.footprint.x86_64 +++ b/xorg/libgl/.footprint.x86_64 @@ -5,5 +5,5 @@ drwxr-xr-x root/root usr/lib/X11/modules/ drwxr-xr-x root/root usr/lib/X11/modules/extensions/ lrwxrwxrwx root/root usr/lib/X11/modules/extensions/libglx.so -> libglx.xorg lrwxrwxrwx root/root usr/lib/libGL.so -> libGL.so.1 -lrwxrwxrwx root/root usr/lib/libGL.so.1 -> libGL.so.1.5.071000 --rwxr-xr-x root/root usr/lib/libGL.so.1.5.071000 +lrwxrwxrwx root/root usr/lib/libGL.so.1 -> libGL.so.1.5.071003 +-rwxr-xr-x root/root usr/lib/libGL.so.1.5.071003 diff --git a/xorg/libgl/.md5sum.i686 b/xorg/libgl/.md5sum.i686 index 2318e0267..db4920d79 100644 --- a/xorg/libgl/.md5sum.i686 +++ b/xorg/libgl/.md5sum.i686 @@ -1 +1 @@ -f5de82852f1243f42cc004039e10b771 MesaLib-7.10.2.tar.bz2 +5c3174a8952936197552e4cf19eead74 MesaLib-7.10.3.tar.gz diff --git a/xorg/libgl/.md5sum.x86_64 b/xorg/libgl/.md5sum.x86_64 index 2318e0267..db4920d79 100644 --- a/xorg/libgl/.md5sum.x86_64 +++ b/xorg/libgl/.md5sum.x86_64 @@ -1 +1 @@ -f5de82852f1243f42cc004039e10b771 MesaLib-7.10.2.tar.bz2 +5c3174a8952936197552e4cf19eead74 MesaLib-7.10.3.tar.gz diff --git a/xorg/libgl/Pkgfile b/xorg/libgl/Pkgfile index b2eb4bdd9..d598b9a08 100644 --- a/xorg/libgl/Pkgfile +++ b/xorg/libgl/Pkgfile @@ -6,9 +6,9 @@ # Run on: expat,libdrm,xorg-makedepend,xorg-libx11,xorg-libxext,xorg-libxxf86vm,xorg-libxt,xorg-libxdamage name=libgl -version=7.10.2 +version=7.10.3 release=1 -source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2) +source=(http://nutyx.meticul.eu/files/MesaLib-$version.tar.gz) build() { cd Mesa-$version -- cgit v1.2.3-54-g00ecf