diff options
| author |   Anders Rune Jensen <arj@gentoo.org> | 2004-08-17 14:02:24 +0000 |
|---|---|---|
| committer | Anders Rune Jensen <arj@gentoo.org> | 2004-08-17 14:02:24 +0000 |
| commit | df5d1fd06b59f263ae3b31fb8c9c2403322defc2 (patch) | |
| tree | 48be84181b0f5f37807bfad5c18f0c7e5b7da681 /media-video | |
| parent | added macos keyword (diff) | |
| download | historical-df5d1fd06b59f263ae3b31fb8c9c2403322defc2.tar.gz historical-df5d1fd06b59f263ae3b31fb8c9c2403322defc2.tar.bz2 historical-df5d1fd06b59f263ae3b31fb8c9c2403322defc2.zip | |
fix
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/em8300-modules/ChangeLog | 7 | ||||
| -rw-r--r-- | media-video/em8300-modules/Manifest | 4 | ||||
| -rw-r--r-- | media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild | 18 |
3 files changed, 19 insertions, 10 deletions
diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog index 56da47313675..910ec1207e91 100644 --- a/media-video/em8300-modules/ChangeLog +++ b/media-video/em8300-modules/ChangeLog @@ -1,7 +1,12 @@ # ChangeLog for media-video/em8300-modules # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.8 2004/08/11 10:50:10 arj Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.9 2004/08/17 14:02:24 arj Exp $ + 17 Aug 2004; Anders Rune Jensen <arj@gentoo.org> em8300-modules-0.15.0_pre20040525 : + Don't install 2.4 modules on a 2.6 kernel. Will confuse modprobe. Thanx + to Rasmus B. Nielsen <r10@cs.auc.dk> for pointing it out. Also get the + correct kernel version. + *em8300-modules-0.15.0_pre20040525 (11 Aug 2004) 11 Aug 2004; Anders Rune Jensen <arj@gentoo.org> em8300-modules-0.15.0_pre20040525 : diff --git a/media-video/em8300-modules/Manifest b/media-video/em8300-modules/Manifest index f7096ae9985d..446fb919ad43 100644 --- a/media-video/em8300-modules/Manifest +++ b/media-video/em8300-modules/Manifest @@ -1,9 +1,9 @@ -MD5 262d8717441b6a53f284dce890acfdf6 ChangeLog 1320 +MD5 5aeb391c429d272fe24315debae83161 ChangeLog 1582 MD5 10f07db2bcca72c2d9fd2b13148f6894 em8300-modules-0.12.0.ebuild 2434 MD5 9557b4f8c9c17637a04a126438963dad em8300-modules-0.13.0.ebuild 2433 MD5 5828ff39d73ab92b6ec6262e6a1d8d58 em8300-modules-0.14.0.ebuild 1940 MD5 16988ac949cb63432166c321258197a9 metadata.xml 253 -MD5 d34cff3a9607dde330b7f17ac109f80a em8300-modules-0.15.0_pre20040525.ebuild 2165 +MD5 f52ca16c7ecf6cff3e4b349b256bcb3a em8300-modules-0.15.0_pre20040525.ebuild 2226 MD5 8acb1fa133b6be82b4ec6a12350690c0 files/digest-em8300-modules-0.12.0 65 MD5 29a6f23e30a4e4d57e5a0daf1d61f8c5 files/digest-em8300-modules-0.13.0 65 MD5 40448834cd5bc1bdc07ab84d8a3727cc files/modules.em8300 28 diff --git a/media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild b/media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild index 2fb43b7ca233..e7d5d28f7786 100644 --- a/media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild +++ b/media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 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.0_pre20040525.ebuild,v 1.1 2004/08/11 10:50:10 arj Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.15.0_pre20040525.ebuild,v 1.2 2004/08/17 14:02:24 arj Exp $ DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card kernel modules" HOMEPAGE="http://dxr3.sourceforge.net" @@ -20,7 +20,6 @@ src_unpack () { unpack ${A} cd ${S} - } src_compile () { @@ -36,12 +35,17 @@ src_install () { insinto "/usr/include/linux" doins ../include/linux/em8300.h + KERNEL=`uname -r` + # The driver goes into the standard modules location - insinto "/lib/modules/${KV}/kernel/drivers/video" - # 2.6 - doins em8300.ko bt865.ko adv717x.ko - # 2.4 - doins em8300.o bt865.o adv717x.o + insinto "/lib/modules/${KERNEL}/kernel/drivers/video" + + if [ "${KERNEL:0:3}" == "2.6" ] + then + doins em8300.ko bt865.ko adv717x.ko + else + doins em8300.o bt865.o adv717x.o + fi # Docs dodoc README-modoptions \ |