diff options
author | John N. Laliberte <allanonjl@gentoo.org> | 2005-10-14 23:54:15 +0000 |
---|---|---|
committer | John N. Laliberte <allanonjl@gentoo.org> | 2005-10-14 23:54:15 +0000 |
commit | 757204e112211cc5945826f0e59d6ae1084bd7b2 (patch) | |
tree | a8a11f4b221507e18abb189b07d66bf4c400a5d3 | |
parent | Removed patched applied upstream. (diff) | |
download | gentoo-2-757204e112211cc5945826f0e59d6ae1084bd7b2.tar.gz gentoo-2-757204e112211cc5945826f0e59d6ae1084bd7b2.tar.bz2 gentoo-2-757204e112211cc5945826f0e59d6ae1084bd7b2.zip |
install the .group file instead of using pam_console. use plugdev group instead of default camera group in the .group file. Thanks to Rémi Cardona <remi2402@free.fr> for testing and the updating of patches on bugzie. Fixes #84628
(Portage version: 2.0.51.22-r3)
-rw-r--r-- | media-libs/libgphoto2/ChangeLog | 11 | ||||
-rw-r--r-- | media-libs/libgphoto2/Manifest | 16 | ||||
-rw-r--r-- | media-libs/libgphoto2/files/digest-libgphoto2-2.1.6-r1 | 1 | ||||
-rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild | 135 |
4 files changed, 155 insertions, 8 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index 5855c9dc9655..8e0332872e87 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.54 2005/09/03 20:54:05 corsair Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.55 2005/10/14 23:54:15 allanonjl Exp $ + +*libgphoto2-2.1.6-r1 (14 Oct 2005) + + 14 Oct 2005; John N. Laliberte <allanonjl@gentoo.org> + +libgphoto2-2.1.6-r1.ebuild: + install the .group file instead of using pam_console. use plugdev group + instead of default camera group in the .group file. Thanks to Rémi Cardona + <remi2402@free.fr> for testing and the updating of patches on bugzie. Fixes + #84628 03 Sep 2005; Markus Rothe <corsair@gentoo.org> libgphoto2-2.1.6.ebuild: Stable on ppc64 diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 890111dbbeb4..1a9f95375f54 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,16 +1,18 @@ -MD5 6f3bf2dfa76b9ba3cebdb8b2d5f0a3a3 ChangeLog 8184 MD5 9bdc55dbb224488ada58de4d1d8fd2aa libgphoto2-2.1.4.ebuild 3872 -MD5 84b14458116bed8e0c301719b08005a5 libgphoto2-2.1.5.ebuild 4011 MD5 09e03121ecd86f34ca1d457b262fcc66 libgphoto2-2.1.6.ebuild 4097 +MD5 387a63a5d89d3ab97137fe8d86d93b46 libgphoto2-2.1.6-r1.ebuild 4391 +MD5 84b14458116bed8e0c301719b08005a5 libgphoto2-2.1.5.ebuild 4011 +MD5 76fefb431bdfa220186a71847dbe77cb ChangeLog 8547 MD5 80850151bae2bd61c4ac796f83656ef6 metadata.xml 217 -MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575 MD5 e396fe3bbcfd38d33ec78004f27db148 files/digest-libgphoto2-2.1.4 70 MD5 c1ead5696ef5db4a488f3457529e0a6c files/digest-libgphoto2-2.1.5 69 MD5 b99fd4203cf4ad0c3b53222749d3b06f files/digest-libgphoto2-2.1.6 69 -MD5 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533 -MD5 e860333a276c3461b4fc8cfdd0b09263 files/libgphoto2-2.1.2-canon.patch 4929 +MD5 f7704d68a87116356901f49376fa1778 files/libgphoto2-2.1.4-canon.patch 3594 MD5 91db4be9fea579f0440cef2d114fcab3 files/libgphoto2-2.1.2-norpm.patch 533 -MD5 1a200bb63548924b958987cd87c45dda files/libgphoto2-2.1.3-canon.patch 8487 +MD5 8fc24b590738d4420bb8df6521fbbda0 files/canon.powershot.usermap 4575 MD5 d9f7cf4aab81ea4981c30a5e313f3f8e files/libgphoto2-2.1.4-blink2.patch 1655 -MD5 f7704d68a87116356901f49376fa1778 files/libgphoto2-2.1.4-canon.patch 3594 +MD5 e860333a276c3461b4fc8cfdd0b09263 files/libgphoto2-2.1.2-canon.patch 4929 +MD5 1a200bb63548924b958987cd87c45dda files/libgphoto2-2.1.3-canon.patch 8487 +MD5 b99fd4203cf4ad0c3b53222749d3b06f files/digest-libgphoto2-2.1.6-r1 69 +MD5 ededea10cd8bf8a2f0d3f106c10b20ff files/libgphoto2-2.1.1-norpm.patch 533 MD5 3b33f744c18b1251ef1d6ce48978dd6b files/libgphoto2-2.1.4-gcc2_fixes.patch 1680 diff --git a/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6-r1 b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6-r1 new file mode 100644 index 000000000000..906a369c0f89 --- /dev/null +++ b/media-libs/libgphoto2/files/digest-libgphoto2-2.1.6-r1 @@ -0,0 +1 @@ +MD5 1938cbd9718595fd419907bf2f7c3195 libgphoto2-2.1.6.tar.gz 3205731 diff --git a/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild new file mode 100644 index 000000000000..28145696d4fc --- /dev/null +++ b/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild @@ -0,0 +1,135 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.1.6-r1.ebuild,v 1.1 2005/10/14 23:54:15 allanonjl Exp $ + +inherit libtool eutils + +DESCRIPTION="Library that implements support for numerous digital cameras" +HOMEPAGE="http://www.gphoto.org/" +SRC_URI="mirror://sourceforge/gphoto/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="nls doc exif nousb jpeg" + +# needs >usbutils-0.11-r2 to avoid /usr/lib/libusb* +# conflicts with dev-libs/libusb +RDEPEND="!nousb? ( + >=dev-libs/libusb-0.1.8 + >=sys-apps/usbutils-0.11-r2 + sys-apps/hotplug + ) + exif? ( >=media-libs/libexif-0.5.9 )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + doc? ( dev-util/gtk-doc )" + +# By default, drivers for all supported cards will be compiled. +# If you want to only compile for specific card(s), set CAMERAS +# environment to a comma-separated list (no spaces) of drivers that +# you want to build. +IUSE_CAMERAS="adc65 agfa-cl20 aox barbie canon casio digita dimera directory enigma13 fuji gsmart300 iclick jamcam jd11 +kodak konica largan mars minolta mustek panasonic pccam300 pccam600 polaroid ptp2 ricoh samsung +sierra sipix smal sonydscf1 sonydscf55 soundvision spca50x sq905 stv0674 stv0680 sx330z toshiba" + +pkg_setup() { + if [ -z "${CAMERAS}" ] ; then + ewarn "All camera drivers will be built since you did not specify" + ewarn "via the CAMERAS variable what camera you use." + einfo "libgphoto2 supports: all ${IUSE_CAMERAS}" + fi + echo + use jpeg && ewarn "For 'exif' support, you need to set USE=exif" + + enewgroup plugdev || die "Error creating plugdev group" +} + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PN}-2.1.2-norpm.patch + + # make default group 'plugdev', not camera + sed -e 's:=camera:=plugdev:' -i packaging/linux-hotplug/usbcam.group +} + +src_compile() { + local cameras + local cam + for cam in ${CAMERAS} ; do + has ${cam} ${IUSE_CAMERAS} && cameras="${cameras},${cam}" + done + [ -z "${cameras}" ] \ + && cameras="all" \ + || cameras="${cameras:1}" + einfo $cameras + + elibtoolize + + local myconf + + myconf="--with-rpmbuild=/bin/false" + myconf="--with-drivers=${cameras}" + use exif \ + && myconf="${myconf} --with-exif-prefix=/usr" \ + || myconf="${myconf} --without-exif" + myconf="${myconf} `use_enable nls`" + myconf="${myconf} `use_enable doc docs`" + econf ${myconf} || die "econf failed" + # or the documentation fails. + emake -j1 || die "make failed" +} + +src_install() { + if use !nousb; then + make DESTDIR=${D} \ + gphotodocdir=/usr/share/doc/${PF} \ + HTML_DIR=/usr/share/doc/${PF}/sgml \ + hotplugdocdir=/usr/share/doc/${PF}/linux-hotplug \ + install || die "install failed" + else + make DESTDIR=${D} \ + gphotodocdir=/usr/share/doc/${PF} \ + HTML_DIR=/usr/share/doc/${PF}/sgml \ + install || die "install failed" + fi + + # manually move apidocs + if use doc; then + dodir /usr/share/doc/${PF}/api + mv ${D}/usr/share/doc/libgphoto2/html/api/* ${D}/usr/share/doc/${PF}/api/ + mv ${D}/usr/share/doc/libgphoto2_port/html/api/* ${D}/usr/share/doc/${PF}/api/ + fi + rm -rf ${D}/usr/share/doc/libgphoto2 + rm -rf ${D}/usr/share/doc/libgphoto2_port + + dodoc ChangeLog NEWS* README AUTHORS TESTERS MAINTAINERS HACKING CHANGES + + # install hotplug support + if use !nousb; then + insinto /etc/hotplug/usb + newins ${S}/packaging/linux-hotplug/usbcam.group usbcam + chmod +x ${D}/etc/hotplug/usb/usbcam + fi +} + +pkg_postinst() { + if use !nousb; then + einfo "Generating usbcam-gphoto2.usermap .." + HOTPLUG_USERMAP="/etc/hotplug/usb/usbcam-gphoto2.usermap" + if [ -x ${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap ]; then + echo "# !!! DO NOT EDIT THIS FILE !!! This file is automatically generated." > ${ROOT}/${HOTPLUG_USERMAP} + echo "# Put your custom entries in /etc/hotplug/usb/usbcam.usermap" >> ${ROOT}/${HOTPLUG_USERMAP} + ${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap >> ${ROOT}/${HOTPLUG_USERMAP} + else + eerror "Unable to find ${ROOT}/usr/$(get_libdir)/libgphoto2/print-usb-usermap" + eerror "and therefore unable to generate hotplug usermap." + eerror "You will have to manually generate it by running:" + eerror " /usr/$(get_libdir)/libgphoto2/print-usb-usermap > ${HOTPLUG_USERMAP}" + fi + fi + + einfo "Don't forget to add yourself to the plugdev group " + einfo "if you want to be able to access your camera." +} |