From 972eb3cfba6c819704bdde26992b71dff68d3337 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Diego=20Elio=20Petten=C3=B2?= Date: Thu, 16 Nov 2006 19:24:59 +0000 Subject: [PATCH] Fix for building with newer kernels, thanks to Samuli Suominen in bug #155117, who's going to take care of this until arj come back at least. Package-Manager: portage-2.1.2_rc1-r7 --- media-video/em8300-libraries/ChangeLog | 9 ++- .../em8300-libraries-0.15.3-r1.ebuild | 67 ++++++++++++++++ .../files/digest-em8300-libraries-0.15.3-r1 | 3 + media-video/em8300-libraries/metadata.xml | 12 ++- media-video/em8300-modules/ChangeLog | 9 ++- .../em8300-modules-0.15.3-r1.ebuild | 77 +++++++++++++++++++ .../files/digest-em8300-modules-0.15.3-r1 | 3 + media-video/em8300-modules/metadata.xml | 12 ++- 8 files changed, 186 insertions(+), 6 deletions(-) create mode 100644 media-video/em8300-libraries/em8300-libraries-0.15.3-r1.ebuild create mode 100644 media-video/em8300-libraries/files/digest-em8300-libraries-0.15.3-r1 create mode 100644 media-video/em8300-modules/em8300-modules-0.15.3-r1.ebuild create mode 100644 media-video/em8300-modules/files/digest-em8300-modules-0.15.3-r1 diff --git a/media-video/em8300-libraries/ChangeLog b/media-video/em8300-libraries/ChangeLog index a4cab0b2c5f7..57a380691c05 100644 --- a/media-video/em8300-libraries/ChangeLog +++ b/media-video/em8300-libraries/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/em8300-libraries # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/ChangeLog,v 1.24 2006/05/14 16:52:34 arj Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/ChangeLog,v 1.25 2006/11/16 19:24:26 flameeyes Exp $ + +*em8300-libraries-0.15.3-r1 (16 Nov 2006) + + 16 Nov 2006; Diego Pettenò metadata.xml, + +em8300-libraries-0.15.3-r1.ebuild: + Fix for building with newer kernels, thanks to Samuli Suominen in bug + #155117, who's going to take care of this until arj come back at least. 14 May 2006; Anders Rune Jensen em8300-libraries-0.15.3.ebuild, -em8300-libraries-0.15.2.ebuild: diff --git a/media-video/em8300-libraries/em8300-libraries-0.15.3-r1.ebuild b/media-video/em8300-libraries/em8300-libraries-0.15.3-r1.ebuild new file mode 100644 index 000000000000..6dec0fdb3485 --- /dev/null +++ b/media-video/em8300-libraries/em8300-libraries-0.15.3-r1.ebuild @@ -0,0 +1,67 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-libraries/em8300-libraries-0.15.3-r1.ebuild,v 1.1 2006/11/16 19:24:26 flameeyes Exp $ + +WANT_AUTOMAKE=1.9 +WANT_AUTOCONF=2.5 + +inherit flag-o-matic autotools + +MY_P="${P/_/-}" ; MY_P="${MY_P/-libraries/}" + +DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card libraries" +HOMEPAGE="http://dxr3.sourceforge.net" +SRC_URI="http://dxr3.sourceforge.net/download/${MY_P}.tar.gz" + +RDEPEND="media-video/em8300-modules + gtk? ( >=x11-libs/gtk+-2.0 )" + +DEPEND="dev-util/pkgconfig + gtk? ( >=x11-libs/gtk+-2.0 )" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="gtk" + +S="${WORKDIR}/${MY_P}" + +src_unpack() { + unpack "${A}" + cd "${S}" + + # Separate kernel modules. + sed -i -e 's:modules/\ ::g' Makefile.am + + # Fix Makefile bug. + sed -i -e "s:test -z \"\$(firmwaredir)\":test -z\"\$(DESTDIR)(firmwaredir)\":g" Makefile.am + + eautomake +} + +src_compile () { + use amd64 && append-flags -fPIC + + econf \ + $(use_enable gtk gtktest) || die "econf failed." + + emake || die "emake failed." +} + +src_install () { + dodir /lib/firmware + emake DESTDIR="${D}" em8300incdir=/usr/include/linux install || die "emake + install failed." + + dodoc AUTHORS ChangeLog NEWS README +} + +pkg_postinst() { + elog "The em8300 libraries and modules have now been installed," + elog "you will probably want to add /usr/bin/em8300setup to your" + elog "/etc/conf.d/local.start so that your em8300 card is " + elog "properly initialized on boot." + elog + elog "If you still need a microcode other than the one included" + elog "with the package, you can simply use em8300setup " +} diff --git a/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.3-r1 b/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.3-r1 new file mode 100644 index 000000000000..f1e70c040a5f --- /dev/null +++ b/media-video/em8300-libraries/files/digest-em8300-libraries-0.15.3-r1 @@ -0,0 +1,3 @@ +MD5 58a6765d469cc507c1e0dff152ce3d30 em8300-0.15.3.tar.gz 327572 +RMD160 9beb731d24c02408879c64e4b9d0439033be3882 em8300-0.15.3.tar.gz 327572 +SHA256 84d952406c2596b9e5a81002017cf91006546d7c2b650dde0c4ba332e1585da2 em8300-0.15.3.tar.gz 327572 diff --git a/media-video/em8300-libraries/metadata.xml b/media-video/em8300-libraries/metadata.xml index 0e3b862ed279..22e01182b470 100644 --- a/media-video/em8300-libraries/metadata.xml +++ b/media-video/em8300-libraries/metadata.xml @@ -2,8 +2,16 @@ video + -arj@gentoo.org -Anders Rune Jensen + sasuomin@uusikaupunki.fi + Samuli Suominen + Proxied maintainer + + + + flameeyes@gentoo.org + Diego Pettenò + Proxying maintainer diff --git a/media-video/em8300-modules/ChangeLog b/media-video/em8300-modules/ChangeLog index 9bfdebc2ff6b..8a71b8ecc1d5 100644 --- a/media-video/em8300-modules/ChangeLog +++ b/media-video/em8300-modules/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-video/em8300-modules # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.26 2006/06/13 10:34:05 uberlord Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/em8300-modules/ChangeLog,v 1.27 2006/11/16 19:24:59 flameeyes Exp $ + +*em8300-modules-0.15.3-r1 (16 Nov 2006) + + 16 Nov 2006; Diego Pettenò metadata.xml, + +em8300-modules-0.15.3-r1.ebuild: + Fix for building with newer kernels, thanks to Samuli Suominen in bug + #155117, who's going to take care of this until arj come back at least. 13 Jun 2006; Roy Marples em8300-modules-0.13.0.ebuild, em8300-modules-0.15.2.ebuild, diff --git a/media-video/em8300-modules/em8300-modules-0.15.3-r1.ebuild b/media-video/em8300-modules/em8300-modules-0.15.3-r1.ebuild new file mode 100644 index 000000000000..658225751e8f --- /dev/null +++ b/media-video/em8300-modules/em8300-modules-0.15.3-r1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2006 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.3-r1.ebuild,v 1.1 2006/11/16 19:24:59 flameeyes Exp $ + +inherit eutils linux-info + +MY_P="${P/_/-}" ; MY_P="${MY_P/-modules/}" + +DESCRIPTION="em8300 (RealMagic Hollywood+/Creative DXR3) video decoder card kernel modules" +HOMEPAGE="http://dxr3.sourceforge.net" +SRC_URI="http://dxr3.sourceforge.net/download/${MY_P}.tar.gz" + +DEPEND="virtual/linux-sources" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +S="${WORKDIR}/${MY_P}" + +src_compile () { + check_KV + set_arch_to_kernel + 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 + emake || die "emake failed." + set_arch_to_portage +} + +src_install () { + insinto "/usr/include/linux" + doins ../include/linux/em8300.h + + check_KV + + # The driver goes into the standard modules location + insinto "/lib/modules/${KV}/kernel/drivers/video" + + if [ "${KV:0:3}" == "2.6" ] + then + doins em8300.ko bt865.ko adv717x.ko + else + doins em8300.o bt865.o adv717x.o + fi + + dodoc README-modoptions README-modules.conf devfs_symlinks + + insinto /etc/modules.d + newins ${FILESDIR}/modules.em8300 em8300 + + insinto /etc/udev/rules.d + newins em8300-udev.rules 15-em8300.rules +} + +pkg_postinst () { + if [ "${ROOT}" = "/" ] + then + /sbin/modules-update + fi + + elog "The em8300 kernel modules have been installed into the modules" + elog "directory of your currently running kernel. They haven't been" + elog "loaded. Please read the documentation, and if you would like" + elog "to have the modules load at startup, add em8300, bt865, adv717x" + elog "to your /etc/modules.autoload they may need module options to " + elog "work correctly on your system. You will also need to add" + elog "the contents of /usr/share/doc/${P}/devfs_symlinks.gz" + elog "to your devfsd.conf so that the em8300 devices will be linked" + elog "correctly." + elog + elog "You will also need to have the i2c kernel modules compiled for" + elog "this to be happy, no need to patch any kernel though just turn" + elog "all the i2c stuff in kernel config to M and you'll be fine." +} diff --git a/media-video/em8300-modules/files/digest-em8300-modules-0.15.3-r1 b/media-video/em8300-modules/files/digest-em8300-modules-0.15.3-r1 new file mode 100644 index 000000000000..f1e70c040a5f --- /dev/null +++ b/media-video/em8300-modules/files/digest-em8300-modules-0.15.3-r1 @@ -0,0 +1,3 @@ +MD5 58a6765d469cc507c1e0dff152ce3d30 em8300-0.15.3.tar.gz 327572 +RMD160 9beb731d24c02408879c64e4b9d0439033be3882 em8300-0.15.3.tar.gz 327572 +SHA256 84d952406c2596b9e5a81002017cf91006546d7c2b650dde0c4ba332e1585da2 em8300-0.15.3.tar.gz 327572 diff --git a/media-video/em8300-modules/metadata.xml b/media-video/em8300-modules/metadata.xml index 0e3b862ed279..22e01182b470 100644 --- a/media-video/em8300-modules/metadata.xml +++ b/media-video/em8300-modules/metadata.xml @@ -2,8 +2,16 @@ video + -arj@gentoo.org -Anders Rune Jensen + sasuomin@uusikaupunki.fi + Samuli Suominen + Proxied maintainer + + + + flameeyes@gentoo.org + Diego Pettenò + Proxying maintainer -- 2.26.2