summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--abs/core/kernel26/PKGBUILD22
-rw-r--r--abs/core/kernel26/config14
-rw-r--r--abs/core/kernel26/config.x86_6416
-rw-r--r--abs/core/kernel26/hdpvr.patch24
-rw-r--r--abs/core/mesa-demos/PKGBUILD2
-rw-r--r--abs/core/mesa-demos/__changelog4
-rw-r--r--abs/core/v4l-dvb/PKGBUILD10
-rw-r--r--abs/core/v4l-dvb/hdpvr.diff6
-rw-r--r--abs/extra/glew/PKGBUILD3
-rw-r--r--abs/extra/xbmc/PKGBUILD4
-rw-r--r--abs/extra/xbmc/__changelog1
11 files changed, 67 insertions, 39 deletions
diff --git a/abs/core/kernel26/PKGBUILD b/abs/core/kernel26/PKGBUILD
index 69cb6af..4b96810 100644
--- a/abs/core/kernel26/PKGBUILD
+++ b/abs/core/kernel26/PKGBUILD
@@ -6,31 +6,31 @@ pkgname=('kernel26' 'kernel26-headers' 'kernel26-docs') # Build stock -ARCH kern
#pkgname=kernel26-LINHES # Build kernel with a different name
_kernelname=${pkgname#kernel26}
_basekernel=2.6.36
-pkgver=${_basekernel}
-pkgrel=3
+pkgver=${_basekernel}.2
+pkgrel=1
makedepends=('xmlto' 'docbook-xsl')
_patchname="patch-${pkgver}-${pkgrel}-ARCH"
#_patchname="patch-${pkgver}-1-ARCH"
+_fbpatchname="fbcondecor-0.9.6-2.6.36-rc8.patch"
arch=(i686 x86_64)
license=('GPL2')
url="http://www.kernel.org"
source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
ftp://ftp.archlinux.org/other/kernel26/${_patchname}.bz2
+ http://dev.gentoo.org/~spock/projects/fbcondecor/archive/${_fbpatchname}
+ hdpvr.patch
# the main kernel config files
config config.x86_64
# standard config files for mkinitcpio ramdisk
kernel26.preset)
-md5sums=('61f3739a73afb6914cb007f37fb09b62'
- '5b3c66f93c0de79aacd986a545f863b6'
- '1ed53b9b64b8889563502177b0b428b5'
- '89ba24b9c346a930378ca22cf377c75f'
- '25584700a0a679542929c4bed31433b6')
build() {
cd ${srcdir}/linux-$_basekernel
# Add -ARCH patches
# See http://projects.archlinux.org/linux-2.6-ARCH.git/
patch -Np1 -i ${srcdir}/${_patchname}
+ patch -Np1 -i ${srcdir}/${_fbpatchname}
+ patch -Np1 -i ${srcdir}/hdpvr.patch
if [ "$CARCH" = "x86_64" ]; then
cat ../config.x86_64 >./.config
@@ -237,7 +237,9 @@ find $pkgdir -type d -exec chmod 755 {} \;
rm -f $pkgdir/usr/src/linux-$_kernver/Documentation/DocBook/Makefile
}
md5sums=('61f3739a73afb6914cb007f37fb09b62'
- '5b3c66f93c0de79aacd986a545f863b6'
- 'ccfe0d9145188eaee4aa956e01fb92f7'
- '89ba24b9c346a930378ca22cf377c75f'
+ '998b597b8659f1ac2667bbc13d1905b8'
+ 'c361ff66dcf4bb0efaa1e653e6604402'
+ '46ba5b98c1a830dc0e7a2efa2c1fae42'
+ 'b13742601ad3842a977eb661ff7a7bc8'
+ 'c171acbcff1c013c5c9bafbe1531bd3b'
'25584700a0a679542929c4bed31433b6')
diff --git a/abs/core/kernel26/config b/abs/core/kernel26/config
index dfbf378..3f27252 100644
--- a/abs/core/kernel26/config
+++ b/abs/core/kernel26/config
@@ -3563,11 +3563,11 @@ CONFIG_FB_SYS_IMAGEBLIT=m
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_SYS_FOPS=m
CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_SVGALIB=m
+# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
CONFIG_FB_BACKLIGHT=y
CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
+# CONFIG_FB_TILEBLITTING is not set
#
# Frame buffer hardware drivers
@@ -3610,7 +3610,7 @@ CONFIG_FB_ATY_CT=y
CONFIG_FB_ATY_GENERIC_LCD=y
CONFIG_FB_ATY_GX=y
CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
+# CONFIG_FB_S3 is not set
CONFIG_FB_SAVAGE=m
CONFIG_FB_SAVAGE_I2C=y
CONFIG_FB_SAVAGE_ACCEL=y
@@ -3625,7 +3625,7 @@ CONFIG_FB_3DFX=m
CONFIG_FB_3DFX_ACCEL=y
CONFIG_FB_3DFX_I2C=y
CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
+# CONFIG_FB_VT8623 is not set
CONFIG_FB_TRIDENT=m
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set
@@ -3675,6 +3675,7 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FB_CON_DECOR=y
CONFIG_FONTS=y
# CONFIG_FONT_8x8 is not set
CONFIG_FONT_8x16=y
@@ -3686,10 +3687,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
diff --git a/abs/core/kernel26/config.x86_64 b/abs/core/kernel26/config.x86_64
index a756fe2..53981bd 100644
--- a/abs/core/kernel26/config.x86_64
+++ b/abs/core/kernel26/config.x86_64
@@ -70,7 +70,7 @@ CONFIG_EXPERIMENTAL=y
CONFIG_LOCK_KERNEL=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-ARCH"
+CONFIG_LOCALVERSION="-LinHES"
CONFIG_LOCALVERSION_AUTO=y
CONFIG_HAVE_KERNEL_GZIP=y
CONFIG_HAVE_KERNEL_BZIP2=y
@@ -3384,11 +3384,11 @@ CONFIG_FB_SYS_IMAGEBLIT=m
# CONFIG_FB_FOREIGN_ENDIAN is not set
CONFIG_FB_SYS_FOPS=m
CONFIG_FB_DEFERRED_IO=y
-CONFIG_FB_SVGALIB=m
+# CONFIG_FB_SVGALIB is not set
# CONFIG_FB_MACMODES is not set
CONFIG_FB_BACKLIGHT=y
CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_TILEBLITTING=y
+# CONFIG_FB_TILEBLITTING is not set
#
# Frame buffer hardware drivers
@@ -3429,7 +3429,7 @@ CONFIG_FB_ATY_CT=y
CONFIG_FB_ATY_GENERIC_LCD=y
CONFIG_FB_ATY_GX=y
CONFIG_FB_ATY_BACKLIGHT=y
-CONFIG_FB_S3=m
+# CONFIG_FB_S3 is not set
CONFIG_FB_SAVAGE=m
CONFIG_FB_SAVAGE_I2C=y
CONFIG_FB_SAVAGE_ACCEL=y
@@ -3444,7 +3444,7 @@ CONFIG_FB_3DFX=m
CONFIG_FB_3DFX_ACCEL=y
CONFIG_FB_3DFX_I2C=y
CONFIG_FB_VOODOO1=m
-CONFIG_FB_VT8623=m
+# CONFIG_FB_VT8623 is not set
CONFIG_FB_TRIDENT=m
# CONFIG_FB_ARK is not set
# CONFIG_FB_PM3 is not set
@@ -3494,6 +3494,7 @@ CONFIG_DUMMY_CONSOLE=y
CONFIG_FRAMEBUFFER_CONSOLE=y
# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set
CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FB_CON_DECOR=y
CONFIG_FONTS=y
# CONFIG_FONT_8x8 is not set
CONFIG_FONT_8x16=y
@@ -3505,10 +3506,7 @@ CONFIG_FONT_8x16=y
# CONFIG_FONT_SUN8x16 is not set
# CONFIG_FONT_SUN12x22 is not set
# CONFIG_FONT_10x18 is not set
-CONFIG_LOGO=y
-CONFIG_LOGO_LINUX_MONO=y
-CONFIG_LOGO_LINUX_VGA16=y
-CONFIG_LOGO_LINUX_CLUT224=y
+# CONFIG_LOGO is not set
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
diff --git a/abs/core/kernel26/hdpvr.patch b/abs/core/kernel26/hdpvr.patch
new file mode 100644
index 0000000..5de88ab
--- /dev/null
+++ b/abs/core/kernel26/hdpvr.patch
@@ -0,0 +1,24 @@
+diff -ruaN linux-2.6.36.orig/drivers/media/video/hdpvr/hdpvr-core.c linux-2.6.36/drivers/media/video/hdpvr/hdpvr-core.c
+--- linux-2.6.36.orig/drivers/media/video/hdpvr/hdpvr-core.c 2010-10-20 20:30:22.000000000 +0000
++++ linux-2.6.36/drivers/media/video/hdpvr/hdpvr-core.c 2011-01-04 06:34:52.000000000 +0000
+@@ -60,6 +60,7 @@
+ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID1) },
+ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID2) },
+ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID3) },
++ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID4) },
+ { } /* Terminating entry */
+ };
+ MODULE_DEVICE_TABLE(usb, hdpvr_table);
+diff -ruaN linux-2.6.36.orig/drivers/media/video/hdpvr/hdpvr.h linux-2.6.36/drivers/media/video/hdpvr/hdpvr.h
+--- linux-2.6.36.orig/drivers/media/video/hdpvr/hdpvr.h 2010-10-20 20:30:22.000000000 +0000
++++ linux-2.6.36/drivers/media/video/hdpvr/hdpvr.h 2011-01-04 06:35:14.000000000 +0000
+@@ -30,7 +30,8 @@
+ #define HD_PVR_PRODUCT_ID 0x4900
+ #define HD_PVR_PRODUCT_ID1 0x4901
+ #define HD_PVR_PRODUCT_ID2 0x4902
+-#define HD_PVR_PRODUCT_ID3 0x4982
++#define HD_PVR_PRODUCT_ID3 0x4903
++#define HD_PVR_PRODUCT_ID4 0x4982
+
+ #define UNSET (-1U)
+
diff --git a/abs/core/mesa-demos/PKGBUILD b/abs/core/mesa-demos/PKGBUILD
index 105de67..dfeb84a 100644
--- a/abs/core/mesa-demos/PKGBUILD
+++ b/abs/core/mesa-demos/PKGBUILD
@@ -25,6 +25,8 @@ package() {
make DESTDIR="${pkgdir}" install
install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
install -m755 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
+ mv ${pkgdir}/usr/bin/clear ${pkgdir}/usr/bin/glxclear
+ mv ${pkgdir}/usr/bin/line ${pkgdir}/usr/bin/glxline
}
md5sums=('320c2a4b6edc6faba35d9cb1e2a30bf4'
diff --git a/abs/core/mesa-demos/__changelog b/abs/core/mesa-demos/__changelog
new file mode 100644
index 0000000..7b2e5a6
--- /dev/null
+++ b/abs/core/mesa-demos/__changelog
@@ -0,0 +1,4 @@
+--renamed conflicting files
+ mv ${pkgdir}/usr/bin/clear ${pkgdir}/usr/bin/glxclear
+ mv ${pkgdir}/usr/bin/line ${pkgdir}/usr/bin/glxline
+
diff --git a/abs/core/v4l-dvb/PKGBUILD b/abs/core/v4l-dvb/PKGBUILD
index 610472b..c5b96fc 100644
--- a/abs/core/v4l-dvb/PKGBUILD
+++ b/abs/core/v4l-dvb/PKGBUILD
@@ -2,9 +2,9 @@
# Maintainer: Cecil Watson<knoppmyth@gmail.com>
pkgname=v4l-dvb
-_kernver=2.6.28-LinHES
+_kernver=2.6.36-LinHES
pkgver=1
-pkgrel=17
+pkgrel=18
pkgdesc="V4L-DVB drivers from mercurial"
arch=('i686' 'x86_64')
license=('GPL2')
@@ -16,7 +16,7 @@ source=('http://linuxtv.org/hg/v4l-dvb/archive/tip.tar.gz' 'hdpvr.diff')
build() {
cd $startdir/src/v4l-dvb*/
-# patch -p1 < ../hdpvr.diff
+ patch -p1 < ../hdpvr.diff
make KERNDIR=/lib/modules/$_kernver/build \
DESTDIR=$startdir/pkg KERNELRELEASE=$_kernver all || return 1
make KERNDIR=/lib/modules/$_kernver/build \
@@ -24,5 +24,5 @@ build() {
rm -fr $startdir/pkg/lib/modules/$_kernver/modules*
}
-md5sums=('e0c4eb1f436d44118e0bf0757516310c'
- 'd50c96211d23fba48ebc4c5e2d1e6102')
+md5sums=('d2631ec2051bb00bc3f379f35b002450'
+ '336b14da668a7b79d55624a769b28f63')
diff --git a/abs/core/v4l-dvb/hdpvr.diff b/abs/core/v4l-dvb/hdpvr.diff
index bf465e5..257ce05 100644
--- a/abs/core/v4l-dvb/hdpvr.diff
+++ b/abs/core/v4l-dvb/hdpvr.diff
@@ -5,7 +5,8 @@ diff -ruaN v4l-dvb-31eaa9423f98.orig/linux/drivers/media/video/hdpvr/hdpvr-core.
{ USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID) },
{ USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID1) },
{ USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID2) },
-+ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID3) },
+ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID3) },
++ { USB_DEVICE(HD_PVR_VENDOR_ID, HD_PVR_PRODUCT_ID4) },
{ } /* Terminating entry */
};
MODULE_DEVICE_TABLE(usb, hdpvr_table);
@@ -16,7 +17,8 @@ diff -ruaN v4l-dvb-31eaa9423f98.orig/linux/drivers/media/video/hdpvr/hdpvr.h v4l
#define HD_PVR_PRODUCT_ID 0x4900
#define HD_PVR_PRODUCT_ID1 0x4901
#define HD_PVR_PRODUCT_ID2 0x4902
-+#define HD_PVR_PRODUCT_ID3 0x4982
+ #define HD_PVR_PRODUCT_ID3 0x4982
++#define HD_PVR_PRODUCT_ID4 0x4903
#define UNSET (-1U)
diff --git a/abs/extra/glew/PKGBUILD b/abs/extra/glew/PKGBUILD
index 389b4d4..291abce 100644
--- a/abs/extra/glew/PKGBUILD
+++ b/abs/extra/glew/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id$
+# $Id: PKGBUILD 98297 2010-11-06 17:51:38Z stephane $
# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
# Contributor: SleepyDog
@@ -26,4 +26,3 @@ package() {
}
# vim: set noexpandtab tabstop=8 shiftwidth=8 textwidth=132 autoindent
-
diff --git a/abs/extra/xbmc/PKGBUILD b/abs/extra/xbmc/PKGBUILD
index 13ca0c9..214b609 100644
--- a/abs/extra/xbmc/PKGBUILD
+++ b/abs/extra/xbmc/PKGBUILD
@@ -11,7 +11,7 @@ _prefix=/usr
pkgname=xbmc
pkgver=10.0
-pkgrel=3
+pkgrel=4
pkgdesc="XBMC Media Center"
arch=('i686' 'x86_64')
url="http://xbmc.org"
@@ -20,7 +20,7 @@ depends=( 'bzip2' 'curl' 'enca' 'faac' 'faad2' 'fontconfig' 'fribidi'
'glew' 'jasper' 'libcdio' 'libgl' 'libmad' 'libmms'
'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libxinerama'
'libxrandr' 'libxtst' 'lzo2' 'sdl_image' 'sdl_mixer'
- 'smbclient' 'wavpack' 'mesa' 'xorg-utils' 'libmicrohttpd'
+ 'smbclient' 'wavpack' 'mesa-demos' 'xorg-utils' 'libmicrohttpd'
'libssh' 'libva' 'libmodplug' 'rtmpdump')
if [ "$_ext_python" != "disable" ]; then
depends=( '${depends[@]}' 'python2' )
diff --git a/abs/extra/xbmc/__changelog b/abs/extra/xbmc/__changelog
deleted file mode 100644
index b2533c9..0000000
--- a/abs/extra/xbmc/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-1/2/11 - chw - change mesa-demo dep to just mesa (since we are still on 7.9).
generated by cgit v0.12 at 2024-11-25 00:46:56 (GMT)