diff options
| author |   Anders Rune Jensen <arj@gentoo.org> | 2005-11-22 22:37:11 +0000 |
|---|---|---|
| committer | Anders Rune Jensen <arj@gentoo.org> | 2005-11-22 22:37:11 +0000 |
| commit | f43ccb0f78268ea2914601eb762a6d3ecd008714 (patch) | |
| tree | 6279b3e2a88614dca3594a134889056212bdbf79 /media-video/em8300-modules | |
| parent | Fix installation path of ru man page - bug #112205 thanks to Sandro (diff) | |
| download | gentoo-2-f43ccb0f78268ea2914601eb762a6d3ecd008714.tar.gz gentoo-2-f43ccb0f78268ea2914601eb762a6d3ecd008714.tar.bz2 gentoo-2-f43ccb0f78268ea2914601eb762a6d3ecd008714.zip | |
fix bug
(Portage version: 2.0.53_rc7)
Diffstat (limited to 'media-video/em8300-modules')
4 files changed, 55 insertions, 4 deletions
diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog index 6e7bf7379336..0f32936d275e 100644 --- a/media-video/em8300-modules/ChangeLog +++ b/media-video/em8300-modules/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-video/em8300-modules # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.19 2005/10/18 14:45:02 arj Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.20 2005/11/22 22:37:11 arj Exp $ + + 22 Nov 2005; Anders Rune Jensen <arj@gentoo.org> em8300-modules-0.15.1.ebuild: + Fix #113215 (build with kernel 2.6.14) *em8300-modules-0.15.1 (18 Oct 2005) 18 Oct 2005; Anders Rune Jensen <arj@gentoo.org> diff --git a/media-video/em8300-modules/Manifest b/media-video/em8300-modules/Manifest index e7cfa9615bf8..68f385f7abd4 100644 --- a/media-video/em8300-modules/Manifest +++ b/media-video/em8300-modules/Manifest @@ -1,9 +1,10 @@ MD5 8949b9b37d21e2fead0ba6d9e13e6ab8 ChangeLog 3528 MD5 9557b4f8c9c17637a04a126438963dad em8300-modules-0.13.0.ebuild 2433 MD5 4c36f1e57f417946efba2a3b4290248f em8300-modules-0.15.0.ebuild 2312 -MD5 0655f9e97b37b95b44f16ea33551cbf0 em8300-modules-0.15.1.ebuild 2310 +MD5 ba81916fa5ef414ef6147734d0b62368 em8300-modules-0.15.1.ebuild 2334 MD5 29a6f23e30a4e4d57e5a0daf1d61f8c5 files/digest-em8300-modules-0.13.0 65 MD5 ee5ed479a61194274ece9b4d034bf598 files/digest-em8300-modules-0.15.0 65 MD5 f0b1bbd962955837a701644a03b32eed files/digest-em8300-modules-0.15.1 65 +MD5 c0e9d9f1003317b0baf353e82a121468 files/em8300-modules-0.15.1-fix-isa.patch 1787 MD5 40448834cd5bc1bdc07ab84d8a3727cc files/modules.em8300 28 MD5 5bf3ce68ed1923dc3a3996a58987a360 metadata.xml 247 diff --git a/media-video/em8300-modules/em8300-modules-0.15.1.ebuild b/media-video/em8300-modules/em8300-modules-0.15.1.ebuild index 2b0f5b66e45e..29f07a03612a 100644 --- a/media-video/em8300-modules/em8300-modules-0.15.1.ebuild +++ b/media-video/em8300-modules/em8300-modules-0.15.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.1.ebuild,v 1.1 2005/10/18 14:45:02 arj Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.1.ebuild,v 1.2 2005/11/22 22:37:11 arj Exp $ inherit eutils linux-info @@ -19,6 +19,7 @@ IUSE="" src_unpack () { unpack ${A} + epatch ${FILESDIR}/${P}-fix-isa.patch cd ${S} } @@ -27,7 +28,7 @@ src_compile () { check_KV set_arch_to_kernel cd .. - for file in autotools/config.guess configure em8300.sysv.in modules/ldm modules/Makefile modules/INSTALL; do + for file in autotools/config.guess configure modules/ldm modules/Makefile modules/INSTALL; do sed -i -e 's/uname[[:space:]]*-r/echo ${KV}/' $file done cd modules diff --git a/media-video/em8300-modules/files/em8300-modules-0.15.1-fix-isa.patch b/media-video/em8300-modules/files/em8300-modules-0.15.1-fix-isa.patch new file mode 100644 index 000000000000..d6e0f65dc64c --- /dev/null +++ b/media-video/em8300-modules/files/em8300-modules-0.15.1-fix-isa.patch @@ -0,0 +1,46 @@ +diff -ruN em8300-0.15.1/modules/adv717x.c em8300-0.15.1-modified/modules/adv717x.c +--- em8300-0.15.1/modules/adv717x.c 2005-04-09 21:23:54.000000000 +0100 ++++ em8300-0.15.1-modified/modules/adv717x.c 2005-11-21 22:53:56.000000000 +0000 +@@ -41,6 +41,7 @@ + #include <asm/uaccess.h> + + #include <linux/i2c.h> ++#include <linux/i2c-isa.h> + #include <linux/i2c-algo-bit.h> + #include <linux/video_encoder.h> + +@@ -85,11 +86,6 @@ + MODULE_PARM(color_bars, "1-" __MODULE_STRING(EM8300_MAX) "i"); + MODULE_PARM_DESC(color_bars, "If you set this to 1 a set of color bars will be displayed on your screen (used for testing if the chip is working). Defaults to 0."); + +-#define i2c_is_isa_client(clientptr) \ +- ((clientptr)->adapter->algo->id == I2C_ALGO_ISA) +-#define i2c_is_isa_adapter(adapptr) \ +- ((adapptr)->algo->id == I2C_ALGO_ISA) +- + + #define ADV7175_REG_MR0 0 + #define ADV7175_REG_MR1 1 +diff -ruN em8300-0.15.1/modules/bt865.c em8300-0.15.1-modified/modules/bt865.c +--- em8300-0.15.1/modules/bt865.c 2005-04-09 21:23:54.000000000 +0100 ++++ em8300-0.15.1-modified/modules/bt865.c 2005-11-21 22:54:19.000000000 +0000 +@@ -45,6 +45,7 @@ + #include <asm/uaccess.h> + + #include <linux/i2c.h> ++#include <linux/i2c-isa.h> + #include <linux/i2c-algo-bit.h> + #include <linux/video_encoder.h> + +@@ -65,11 +66,6 @@ + MODULE_PARM(rgb_mode, "1-" __MODULE_STRING(EM8300_MAX) "i"); + MODULE_PARM_DESC(rgb_mode, "If you set this to 1, RGB output is enabled. You will need to hack the DXR3 hardware. Defaults to 0."); + +-#define i2c_is_isa_client(clientptr) \ +- ((clientptr)->adapter->algo->id == I2C_ALGO_ISA) +-#define i2c_is_isa_adapter(adapptr) \ +- ((adapptr)->algo->id == I2C_ALGO_ISA) +- + + static int bt865_attach_adapter(struct i2c_adapter *adapter); + int bt865_detach_client(struct i2c_client *client); |