Commit cb3503dd authored by Manuel's avatar Manuel
Browse files

Merge branch 'testing' of gitorious.org:chakra-packages/platform into testing

parents 7d5bc477 5c9265b7
diff -bBur acerhk-0.5.35-old/acerhk.c acerhk-0.5.35/acerhk.c
--- acerhk-0.5.35-old/acerhk.c 2007-02-10 17:46:23.000000000 +0200
+++ acerhk-0.5.35/acerhk.c 2007-04-28 19:18:49.000000000 +0300
@@ -550,6 +550,7 @@
*/
static asmlinkage void call_bios_6xx(struct register_buffer *buf)
{
+#ifndef __x86_64__
if (bios_routine) {
local_irq_disable();
__asm__ __volatile__(
@@ -578,10 +579,12 @@
);
local_irq_enable();
}
+#endif
}
static asmlinkage void call_bios_52x(struct register_buffer *buf)
{
+#ifndef __x86_64__
if (bios_routine) {
local_irq_disable();
__asm__ __volatile__(
@@ -611,6 +614,7 @@
);
local_irq_enable();
}
+#endif
}
#define PRINT_BUFFER(x) \
@@ -783,7 +787,8 @@
unsigned char c = 0;
spin_lock_irqsave (&rtc_lock, flags);
-#ifndef DUMMYHW
+/* #ifndef DUMMYHW */
+#if !(defined(DUMMYHW) || defined(__x86_64__))
if (cmos_index)
c = CMOS_READ(cmos_index);
else if (verbose > 3)
@@ -867,9 +872,9 @@
static struct proc_dir_entry *proc_acer_dir;
-static unsigned int __init find_hk_area(void)
+static unsigned long __init find_hk_area(void)
{
- int offset, sig;
+ long offset, sig;
unsigned int fkt;
fkt = 0;
sig = -1; /* offset to signature in io area */
@@ -887,9 +892,9 @@
fkt = readl(reg1 + sig + 5);
/* adjust fkt to address of mapped IO area */
if (fkt >= 0xf0000)
- fkt = (unsigned int)reg1 + fkt - 0xf0000;
+ fkt = (unsigned long)reg1 + fkt - 0xf0000;
else if (fkt >= 0xe0000)
- fkt = (unsigned int)reg1 + fkt - 0xe0000;
+ fkt = (unsigned long)reg1 + fkt - 0xe0000;
else
fkt = 0;
}
@@ -1144,6 +1149,7 @@
case 2000:
case 2010:
case 2020:
+ case 5100:
/* Aspire 13xx series laptops use dritek hardware, no
acerhk-mapping needed
VolUp and VolDown are managed as normal keys
@@ -1458,6 +1464,7 @@
case 1800:
case 2010:
case 2020:
+ case 5100:
/* Dritek EC, bluetooth, wifi, mail */
acerhk_type = TM_dritek;
acerhk_model_features = TM_F_MAIL_LED_EC2 | TM_F_WLAN_EC2 | TM_F_BLUE_EC2;
@@ -1792,6 +1799,8 @@
break;
case '2': series = 5020; break;
}
+ } else if (str[8] == '1' && str[9] == '0') {
+ series = 5100;
} else {
if (verbose > 1)
printk(KERN_INFO"acerhk: model string indicates unknown Aspire 5xxx series\n");
@@ -2117,7 +2126,8 @@
/* polling timer handler */
static void acerhk_poll_event(unsigned long save_size)
{
-#ifndef DUMMYHW
+/* #ifndef DUMMYHW */
+#if !(defined(DUMMYHW) || defined(__x86_64__))
unsigned int max = MAX_POLLING_LOOPS;
/* make sure not to loop more then 32 times */
if (!max || max > 32)
@@ -2139,7 +2149,8 @@
{
if (acerhk_blueled_blinking != -1) {
acerhk_blueled_blinking = !acerhk_blueled_blinking;
-#ifndef DUMMYHW
+/* #ifndef DUMMYHW */
+#if !(defined(DUMMYHW) || defined(__x86_64__))
wbutton_fct_1(acerhk_blueled_blinking);
#endif
acerhk_timer_blinking.expires = jiffies + acerhk_blueled_blinking_delay;
@@ -2904,7 +2915,8 @@
/* attach to input system */
init_input();
memset(acerhk_model_string, 0x00, ACERHK_MODEL_STRLEN);
-#ifdef DUMMYHW
+/* #ifdef DUMMYHW */
+#if !(defined(DUMMYHW) || defined(__x86_64__))
acerhk_model_addr = (void*)0x12345678;
/* copy the string, but not more than 15 characters */
strncpy(acerhk_model_string, "TravelmateDummy", ACERHK_MODEL_STRLEN-1);
......@@ -11,26 +11,24 @@ pkgdesc="Acer hotkey driver"
url="http://www.cakey.de/acerhk/"
arch=('i686') # Unavailable for x86_64
license=('GPL')
depends=('kernel26>=2.6.39' 'kernel26<2.6.40')
makedepends=('kernel26-headers')
depends=('kernel26>=2.6.36' 'kernel26<2.6.40')
makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.40')
source=(http://www.cakey.de/acerhk/archives/${pkgname}-${pkgver}.tgz acerhk.rc
2.6.30.patch kernelversion.patch 2.6.36.patch)
2.6.30.patch kernelversion.patch 5100.patch 2.6.36.patch)
install=acerhk.install
# Find the kernel name inside the chroot
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
_kernver=2.6.39-CHAKRA
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
sed -i 's/CFLAGS/EXTRA_CFLAGS/' Makefile
sed \
-e 's~#include <linux/config.h>~~g' \
-i acerhk.c
patch -Np1 -i "${srcdir}/5100.patch" || return 1
patch -Np1 -i "${srcdir}/2.6.30.patch" || return 1
patch -Np0 -i "${srcdir}/2.6.36.patch" || return 1
patch -N -p1 < "$srcdir/kernelversion.patch" || return 1
sed -i 's@linux/config.h@linux/input.h@' "${srcdir}/${pkgname}-${pkgver}/acerhk.c"
# Set KERNELSRC. The makefile tries to autodetect it with uname,
# but that is unreliable.
make KERNELSRC="/lib/modules/${_kernver}/build" acerhk.ko || return 1
make CONFIG_FUNCTION_TRACER= KERNELSRC="/lib/modules/${_kernver}/build" acerhk.ko || return 1
install -Dm644 "${srcdir}/${pkgname}-${pkgver}/acerhk.ko" \
"${pkgdir}/lib/modules/${_kernver}/kernel/drivers/block/acerhk.ko" || return 1
install -Dm755 "${srcdir}/acerhk.rc" "${pkgdir}/etc/rc.d/acerhk" || return 1
......@@ -41,4 +39,5 @@ md5sums=('05255919f312cb76af473a760c284433'
'935584b3e4bfbb3af8460558e5b98bb5'
'2a0bc99e5b12e25096441df4d53d7df7'
'fd2ef062ecbc9d670e1b42aa5866d32d'
'd257a4e9223ebfde48b9608805df9c99')
'8966a93e66200a535179cf9eb689fe4d'
'd257a4e9223ebfde48b9608805df9c99')
\ No newline at end of file
......@@ -6,13 +6,15 @@
pkgname=catalyst-utils
pkgver=11.6
pkgrel=2
pkgrel=3
pkgdesc="AMD/ATI Catalyst drivers utilities and libraries."
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
license=('custom')
depends=('xorg-server>=1.7.0' 'xorg-server<1.11.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs' 'libgl')
optdepends=('qt: to run ATi Catalyst Control Center (amdcccle)')
depends=('xorg-server>=1.7.0' 'xorg-server<1.11.0' 'netkit-bsd-finger' 'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs')
optdepends=('qt: to run ATi Catalyst Control Center (amdcccle)'
'libgl: support for AMD PowerXpress'
)
conflicts=('catalyst-testing' 'nvidia-utils')
provides=("libatical=${pkgver}")
install=${pkgname}.install
......@@ -20,13 +22,16 @@ install=${pkgname}.install
source=(
http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
catalyst.sh
radeon.conf
amdcccle.desktop
atieventsd.sh)
md5sums=('516ea47b13d367e09a90acb9422df738'
md5sums=('645e3b06f802e3edaa52244ff550c4f7'
'bdafe749e046bfddee2d1c5e90eabd83'
'9ad03a78a863bc0b9f279b330669bd4c'
'4efa8414a8fe9eeb50da38b5522ef81d'
'f729bf913613f49b0b9759c246058a87')
build() {
## Unpack archive
/bin/sh ./ati-driver-installer-${pkgver/./-}-x86.x86_64.run --extract archive_files
......@@ -38,6 +43,7 @@ package() {
install -m755 -d "${pkgdir}/etc/ati"
install -m755 -d "${pkgdir}/etc/rc.d"
install -m755 -d "${pkgdir}/etc/profile.d"
install -m755 -d "${pkgdir}/etc/modprobe.d"
install -m755 -d "${pkgdir}/etc/acpi/events"
install -m755 -d "${pkgdir}/etc/security/console.apps"
......@@ -61,6 +67,9 @@ package() {
install -m755 -d "${pkgdir}/usr/share/man/man8"
install -m755 -d "${pkgdir}/usr/share/pixmaps"
# Blacklist radeon
install -m644 "${srcdir}/radeon.conf" "${pkgdir}/etc/profile.d"
# X.org driver
if [ "${CARCH}" = "i686" ]; then
cd "${srcdir}/archive_files/xpic/usr/X11R6/lib/modules" || return 1
......@@ -109,6 +118,10 @@ package() {
install -m755 X11R6/${_lib}/modules/dri/*.so "${pkgdir}/usr/lib/xorg/modules/dri/" || return 1
install -m755 ${_lib}/*.so* "${pkgdir}/usr/lib/" || return 1
# Install powerXpress scripts
install -m755 ${_lib}/fglrx/switchlibGL "${pkgdir}/usr/lib/fglrx"
install -m755 ${_lib}/fglrx/switchlibglx "${pkgdir}/usr/lib/fglrx"
## QT libs (only 2 files) - un-comment 2 lines below if you don't want to install qt package
# install -m755 -d "${pkgdir}/usr/share/ati/${_lib}"
# install -m755 share/ati/${_lib}/*.so* "${pkgdir}/usr/share/ati/${_lib}/" || return 1
......@@ -155,4 +168,4 @@ package() {
# License
install -m644 "${srcdir}/archive_files/ATI_LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
}
\ No newline at end of file
}
......@@ -33,12 +33,20 @@ check_libdri_so(){
}
link_libgl_so(){
#check if libGL is installed
LIBGL=`pacman -Qq libgl`
MARCH=`uname -m`
if [ "$LIBGL" = "libgl" ]; then
if [ "$MARCH" = "x86_64" ]; then
ln -snf /usr/lib /usr/lib64
fi
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/FGL.renamed.libGL.so.1.2
ln -snf libglx.xorg /usr/lib/xorg/modules/extensions/FGL.renamed.libglx.so
fi
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so.1.2
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so.1
ln -snf /usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/libGL.so
ln -snf /usr/lib/libGL.so.1.2 /usr/lib/libGL.so.1
ln -snf /usr/lib/libGL.so.1.2 /usr/lib/libGL.so
ln -snf /usr/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so /usr/lib/xorg/modules/extensions/libglx.so
ln -snf libglx.xorg /usr/lib/xorg/modules/extensions/FGL.renamed.libglx.so
ln -snf /usr/lib/libGL.so.1.2.mesa /usr/lib/FGL.renamed.libGL.so.1.2
}
restore_libgl_so(){
......
......@@ -10,12 +10,12 @@ _kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=catalyst
pkgver=11.6
pkgrel=1
pkgrel=3
pkgdesc="AMD/ATI Catalyst drivers for kernel26. fglrx kernel module only"
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
license=('custom')
depends=('kernel26>=2.6.38' 'kernel26<2.6.39' 'catalyst-utils')
depends=('kernel26>=2.6.39' 'kernel26<2.6.40' 'catalyst-utils')
makedepends=('gcc-libs' 'gcc>4.0.0' 'make' 'kernel26-headers')
conflicts=('catalyst-test' 'nvidia' 'xf86-video-ati' 'xf86-video-radeonhd' 'ati-dri')
install=${pkgname}.install
......@@ -23,13 +23,15 @@ install=${pkgname}.install
source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run
ati_make.sh
makefile_compat.patch
no_bkl.patch)
no_bkl.patch
2.6.39_bkl.patch)
md5sums=('516ea47b13d367e09a90acb9422df738'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'6a6b2133aa6ef3bcd377731b19c0553a')
md5sums=('645e3b06f802e3edaa52244ff550c4f7'
'660396540b0ceaff71d6155c986734de'
'3e1b82bd69774ea808da69c983d6a43b'
'6a6b2133aa6ef3bcd377731b19c0553a'
'eb24250f8e537273bae9dbd79a022d61')
build() {
......@@ -65,6 +67,11 @@ build() {
patch -Np1 -i ../no_bkl.patch || return 1
fi
if [[ ${_kernver:0:6} == "2.6.39" ]] || [[ ${_kernver:0:6} > "2.6.39" ]]; then
patch -Np1 -i ../no_bkl.patch || return 1
patch -Np1 -i ../2.6.39_bkl.patch || return 1
fi
cd "${srcdir}/archive_files/common/lib/modules/fglrx/build_mod"
cp "${srcdir}/archive_files/arch/${_archdir}/lib/modules/fglrx/build_mod/libfglrx_ip.a" . || return 1
cp 2.6.x/Makefile . || return 1
......@@ -87,4 +94,4 @@ package() {
install -m644 "${srcdir}/archive_files/ATI_LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/" $startdir/*.install
}
\ No newline at end of file
}
KERNEL_VERSION=2.6.38-CHAKRA
KERNEL_VERSION=2.6.39-CHAKRA
whisperer(){
......
......@@ -4,14 +4,13 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# include global config
source ../_buildscripts/${current_repo}-${_arch}-cfg.conf
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=nvidia-173xx
pkgver=173.14.30
pkgrel=3
pkgrel=2
# Find the kernel name inside the chroot
_kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgdesc="NVIDIA drivers for kernel26, 173xx branch."
arch=('i686' 'x86_64')
[ "$CARCH" = "i686" ] && ARCH=x86
......
......@@ -9,11 +9,11 @@ _kernver=`pacman -Qf kernel26 | cut -c10-15 | sed 's/kernel26 //g'`-CHAKRA
pkgname=nvidia
pkgver=275.09.07
pkgrel=1
pkgrel=2
pkgdesc="NVIDIA drivers for kernel26."
arch=('i686' 'x86_64')
url="http://www.nvidia.com/"
depends=('kernel26>=2.6.38' 'kernel26<2.6.39' "nvidia-utils=${pkgver}")
depends=('kernel26>=2.6.39' 'kernel26<2.6.40' "nvidia-utils=${pkgver}")
makedepends=('kernel26-headers')
conflicts=('nvidia-96xx' 'nvidia-173xx')
license=('custom')
......
post_install() {
KERNEL_VERSION='2.6.38-CHAKRA'
KERNEL_VERSION='2.6.39-CHAKRA'
depmod $KERNEL_VERSION
}
......@@ -9,6 +9,6 @@ post_upgrade() {
}
post_remove() {
KERNEL_VERSION='2.6.38-CHAKRA'
KERNEL_VERSION='2.6.39-CHAKRA'
depmod $KERNEL_VERSION
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment