From 08f45b8db181b19041b7d75e417ff5040df54922 Mon Sep 17 00:00:00 2001 From: Cecil Date: Mon, 3 Jan 2011 22:40:07 -0800 Subject: v4l-dvb:Latest mercurial (doesn't compile at present). --- abs/core/v4l-dvb/PKGBUILD | 10 +++++----- abs/core/v4l-dvb/hdpvr.diff | 6 ++++-- 2 files changed, 9 insertions(+), 7 deletions(-) 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 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) -- cgit v0.12 From 7c860c250fff97bb77088a70dc53478a44a24f05 Mon Sep 17 00:00:00 2001 From: Cecil Date: Tue, 4 Jan 2011 00:35:55 -0800 Subject: kernel26:Updated to latest. Fixes muted audio w/ PVR 2/350. Added patch for all known HDPVRs and fbcondecor. --- abs/core/kernel26/PKGBUILD | 22 ++++++++++++---------- abs/core/kernel26/config | 14 ++++++-------- abs/core/kernel26/config.x86_64 | 16 +++++++--------- abs/core/kernel26/hdpvr.patch | 24 ++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 27 deletions(-) create mode 100644 abs/core/kernel26/hdpvr.patch 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) + -- cgit v0.12