diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-10-20 13:31:47 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-10-20 13:31:47 +0000 |
| commit | 06c1cb59cc1e2a8f1b8b3eb92786e8b750abbe3b (patch) | |
| tree | c30ea2fa11384c1a2f8de967f0165d002cc87b3d /media-video | |
| parent | Revbump for respecting LDFLAGS and die on sed (diff) | |
| download | gentoo-2-06c1cb59cc1e2a8f1b8b3eb92786e8b750abbe3b.tar.gz gentoo-2-06c1cb59cc1e2a8f1b8b3eb92786e8b750abbe3b.tar.bz2 gentoo-2-06c1cb59cc1e2a8f1b8b3eb92786e8b750abbe3b.zip | |
Fix building with Linux >= 2.6.35 wrt #330919 by Pavlo Lavrenenko.
(Portage version: 2.2_rc97/cvs/Linux x86_64)
Diffstat (limited to 'media-video')
| -rw-r--r-- | media-video/em8300-modules/ChangeLog | 6 | ||||
| -rw-r--r-- | media-video/em8300-modules/em8300-modules-0.18.0.ebuild | 8 | ||||
| -rw-r--r-- | media-video/em8300-modules/files/em8300-modules-0.18.0-2.6.35.patch | 15 |
3 files changed, 26 insertions, 3 deletions
diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog index 46f314ce410d..f33cff0dd9f2 100644 --- a/media-video/em8300-modules/ChangeLog +++ b/media-video/em8300-modules/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-video/em8300-modules # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.55 2010/04/12 19:01:10 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.56 2010/10/20 13:31:46 ssuominen Exp $ + + 20 Oct 2010; Samuli Suominen <ssuominen@gentoo.org> + em8300-modules-0.18.0.ebuild, +files/em8300-modules-0.18.0-2.6.35.patch: + Fix building with Linux >= 2.6.35 wrt #330919 by Pavlo Lavrenenko. 12 Apr 2010; Markus Meier <maekke@gentoo.org> em8300-modules-0.17.4.ebuild: diff --git a/media-video/em8300-modules/em8300-modules-0.18.0.ebuild b/media-video/em8300-modules/em8300-modules-0.18.0.ebuild index 062d6e43b4ca..07e26992284d 100644 --- a/media-video/em8300-modules/em8300-modules-0.18.0.ebuild +++ b/media-video/em8300-modules/em8300-modules-0.18.0.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 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.18.0.ebuild,v 1.1 2010/02/26 16:07:27 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/em8300-modules-0.18.0.ebuild,v 1.2 2010/10/20 13:31:46 ssuominen Exp $ EAPI=2 -inherit linux-mod +inherit eutils linux-mod MY_P=${P/-modules} @@ -24,6 +24,10 @@ MODULE_NAMES="em8300(video:) bt865(video:) adv717x(video:)" S=${WORKDIR}/${MY_P}/modules +src_prepare() { + epatch "${FILESDIR}"/${P}-2.6.35.patch +} + src_compile() { set_arch_to_kernel emake KERNEL_LOCATION="${KERNEL_DIR}" || die diff --git a/media-video/em8300-modules/files/em8300-modules-0.18.0-2.6.35.patch b/media-video/em8300-modules/files/em8300-modules-0.18.0-2.6.35.patch new file mode 100644 index 000000000000..8e482d899a2a --- /dev/null +++ b/media-video/em8300-modules/files/em8300-modules-0.18.0-2.6.35.patch @@ -0,0 +1,15 @@ +http://bugs.gentoo.org/330919 + +--- ../include/linux/em8300.h ++++ ../include/linux/em8300.h +@@ -234,6 +234,10 @@ + #include <linux/wait.h> /* wait_queue_head_t */ + #include <linux/list.h> /* struct list_head */ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,34) ++#include <linux/semaphore.h> /* struct semaphore */ ++#endif ++ + #if defined(CONFIG_SND) || defined(CONFIG_SND_MODULE) + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) + #define snd_card_t struct snd_card |