From 4c09c5b3163f1a451585bc59fce3098c62109f27 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Mon, 20 Jun 2011 16:29:28 +0000 Subject: Version bump, fix doxygen detection with USE '-doc' (bug #360979 by Jeroen Roovers). Package-Manager: portage-2.1.9.50/cvs/Linux x86_64 --- media-libs/libgphoto2/ChangeLog | 8 +- media-libs/libgphoto2/Manifest | 14 +- media-libs/libgphoto2/libgphoto2-2.4.11.ebuild | 206 +++++++++++++++++++++++++ 3 files changed, 226 insertions(+), 2 deletions(-) create mode 100644 media-libs/libgphoto2/libgphoto2-2.4.11.ebuild (limited to 'media-libs') diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index bdcfb271615a..fb82e23186b0 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.190 2011/03/27 16:16:07 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.191 2011/06/20 16:29:28 pacho Exp $ + +*libgphoto2-2.4.11 (20 Jun 2011) + + 20 Jun 2011; Pacho Ramos +libgphoto2-2.4.11.ebuild: + Version bump, fix doxygen detection with USE '-doc' (bug #360979 by Jeroen + Roovers). 27 Mar 2011; Samuli Suominen libgphoto2-2.4.10.ebuild: Remove support for sys-apps/hal wrt #313389. diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 652acf189011..dc5e9b3162db 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,8 +1,20 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX libgphoto2-2.4.7-no-test-build.patch 910 RMD160 fbc59f08c752874df09f63beca0c89fc5e6a2e96 SHA1 4518c19cc1e21eac86cbbaf8ca3d33193ee6adc8 SHA256 a5d7ab59c51bb9751ade660828447d4767ab6266192345dbb22c820232e9291e AUX libgphoto2-2.4.7-respect-bonjour.patch 643 RMD160 09724f2d7ad94938785709548ca7d246aa3bfac4 SHA1 49334840e851f3ab0c632df5031acbbae7335c57 SHA256 00b09825d9b6493a2a65577c6bf0b2a5549c6901b8b5fb839f886d989e29c055 AUX libgphoto2-2.4.8-increase_max_entries.patch 477 RMD160 4be0b81331eedd0233b577226f70e0c220b869ae SHA1 2b6cd2967b6d16ab13ef7826781a93b852be69a1 SHA256 596ab7c4edc7573044e89ac548505b82de18f791616126273ff4fe13c935b4f8 AUX libgphoto2-2.4.9-dnl.patch 471 RMD160 062158e62551d43f9515f64054dd37ad0c9b1517 SHA1 9dfbe07ccb18b57e545cdbd35f8654832727a62d SHA256 6f657277d3262d8295b35d5bd49c79a229fef5a9b587191d9e1a91ed73564bf5 DIST libgphoto2-2.4.10.tar.bz2 5699257 RMD160 d4f6e33c745910877ddc1f804911a76e47f5f5da SHA1 0fbbcfdfe13c3cf128505e3079faf55407b647c5 SHA256 8bb28232c246c19465724dbca2f511dd56feaee3cdb018589e8370c46f1cf1cd +DIST libgphoto2-2.4.11.tar.bz2 4396949 RMD160 f4978edecd0869f91d15b0c9805dd856b856f14c SHA1 615776c8c0201e98bfe158ae8c2cec35f93236f0 SHA256 5116bbacea57dfe22585e8e939ea30b5fb99fe08de526002788c84e37105c423 EBUILD libgphoto2-2.4.10.ebuild 6181 RMD160 213c4a690436147784034e1cd1cee5c80998bfdd SHA1 7f23c9a1c3ce222051468d6fcad83b8be13e9437 SHA256 e5b4299b49b2a6676ee2f291fe1b131f5db59d2ff13109f78eba102235d66822 -MISC ChangeLog 31688 RMD160 69b8bdf91604e8a9ac9af2dd438cba2665af31ea SHA1 c27e1220091d918ee0af20a54812075ba12f3371 SHA256 f43cc27d2daa48a475b273d6f35ad56e47a946c5ecac5fde6e6a2cfd813d4927 +EBUILD libgphoto2-2.4.11.ebuild 6056 RMD160 68db231a6c84505245c1916a7a82f47bc18e4a3e SHA1 7a7b485b74b35a2bc4d5c3d9f616277dbe35de55 SHA256 1a7a74be348fa44c4710378d4bac74685294fcf3e104afb0146f5af5ab7ca3e7 +MISC ChangeLog 31881 RMD160 00bb9c82b4aa830eca70814adbc6a3d9a499017d SHA1 aa3fd518040f73a62879f57bcb0fa78accafc377 SHA256 68161b1dbe94f450e1ed7d132e4818758b57d4be5623dd4937c6c1d74519144f MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iEYEARECAAYFAk3/dW4ACgkQCaWpQKGI+9RsLACfQMut2duy/LZhEjJT9ZJbeou0 +DOEAn1ZvGiFG7wK0THyz06Gn+n87oAvW +=a4qB +-----END PGP SIGNATURE----- diff --git a/media-libs/libgphoto2/libgphoto2-2.4.11.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.11.ebuild new file mode 100644 index 000000000000..8d0c61c666aa --- /dev/null +++ b/media-libs/libgphoto2/libgphoto2-2.4.11.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.11.ebuild,v 1.1 2011/06/20 16:29:28 pacho Exp $ + +# TODO +# 1. Track upstream bug --disable-docs does not work. +# http://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874 + +EAPI="4" + +inherit autotools eutils multilib + +DESCRIPTION="Library that implements support for numerous digital cameras" +HOMEPAGE="http://www.gphoto.org/" +SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc examples exif nls kernel_linux zeroconf" + +# By default, drivers for all supported cameras will be compiled. +# If you want to only compile for specific camera(s), set CAMERAS +# environment to a space-separated list (no commas) of drivers that +# you want to build. +IUSE_CAMERAS=" + adc65 agfa_cl20 aox ax203 + barbie + canon casio_qv clicksmart310 + digigr8 digita dimagev dimera3500 directory + enigma13 + fuji + gsmart300 + hp215 + iclick + jamcam jd11 jl2005a jl2005c + kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 + largan lg_gsm + mars mustek + panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 + ricoh ricoh_g3 + samsung sierra sipix_blink sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z + template toshiba_pdrm11 topfield +" + +for camera in ${IUSE_CAMERAS}; do + IUSE="${IUSE} cameras_${camera}" +done + +# libgphoto2 actually links to libtool +RDEPEND="virtual/libusb:0 + cameras_ax203? ( media-libs/gd ) + cameras_st2205? ( media-libs/gd ) + zeroconf? ( || ( + net-dns/avahi[mdnsresponder-compat] + net-misc/mDNSResponder ) ) + exif? ( >=media-libs/libexif-0.5.9 ) + sys-devel/libtool" +DEPEND="${RDEPEND} + dev-util/pkgconfig + sys-devel/flex + >=sys-devel/gettext-0.14.1 + doc? ( app-doc/doxygen )" +# FIXME: gtk-doc is broken +# >=dev-util/gtk-doc-1.10 )" + +RDEPEND="${RDEPEND} + ! /dev/null 2>&1; then + einfo "No camera drivers will be built since you did not specify any." + fi + + if use cameras_template || use cameras_sipix_blink; then + einfo "Upstream considers sipix_blink & template driver as obsolete" + fi + + enewgroup plugdev +} + +src_prepare() { + # Handle examples ourselves + sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ + || die "examples sed failed" + + # Fix pkgconfig file when USE="-exif" + if ! use exif; then + sed -i "s/, @REQUIREMENTS_FOR_LIBEXIF@//" libgphoto2.pc.in || die " libgphoto2.pc sed failed" + fi + + # Fix USE=zeroconf, bug #283332 + epatch "${FILESDIR}/${PN}-2.4.7-respect-bonjour.patch" + + # Do not build test if not running make check, bug #226241 + epatch "${FILESDIR}/${PN}-2.4.7-no-test-build.patch" + + # Increase max entries from 1024 to 8192 to fix bug #291049 + epatch "${FILESDIR}/${PN}-2.4.8-increase_max_entries.patch" + + eautoreconf + + # Fix bug #216206, libusb detection + sed -i "s:usb_busses:usb_find_busses:g" libgphoto2_port/configure || die "libusb sed failed" +} + +src_configure() { + local cameras + local cam + local cam_warn=no + for cam in ${IUSE_CAMERAS} ; do + if use "cameras_${cam}"; then + cameras="${cameras},${cam}" + else + cam_warn=yes + fi + done + + if [ "${cam_warn}" = "yes" ]; then + [ -z "${cameras}" ] || cameras="${cameras:1}" + einfo "Enabled camera drivers: ${cameras:-none}" + ewarn "Upstream will not support you if you do not compile all camera drivers first" + else + cameras="all" + einfo "Enabled camera drivers: all" + fi + + local myconf + use doc || myconf="ac_cv_path_DOXYGEN=false" + econf \ + --disable-docs \ + --disable-gp2ddb \ + $(use_with zeroconf bonjour) \ + --without-hal \ + $(use_enable nls) \ + $(use_with exif libexif auto) \ + --with-drivers=${cameras} \ + --with-doc-dir=/usr/share/doc/${PF} \ + --with-html-dir=/usr/share/doc/${PF}/html \ + --with-hotplug-doc-dir=/usr/share/doc/${PF}/hotplug \ + --with-rpmbuild=$(type -P true) \ + udevscriptdir=/$(get_libdir)/udev \ + ${myconf} + +# FIXME: gtk-doc is currently broken +# $(use_enable doc docs) +} + +src_compile() { + emake + + if use doc; then + doxygen doc/Doxyfile || die "Documentation generation failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install + + # Clean up unwanted files + rm "${D}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed" + dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins examples/README examples/*.c examples/*.h + fi + + # FIXME: fixup autoconf bug + if ! use doc && [ -d "${D}/usr/share/doc/${PF}/apidocs.html" ]; then + rm -fr "${D}/usr/share/doc/${PF}/apidocs.html" + fi + # end fixup + + UDEV_RULES="/$(get_libdir)/udev/rules.d/70-libgphoto2.rules" + CAM_LIST="/usr/$(get_libdir)/libgphoto2/print-camera-list" + + if [ -x "${D}"${CAM_LIST} ]; then + # Let print-camera-list find libgphoto2.so + export LD_LIBRARY_PATH="${D}/usr/$(get_libdir)" + # Let libgphoto2 find its camera-modules + export CAMLIBS="${D}/usr/$(get_libdir)/libgphoto2/${PV}" + + einfo "Generating UDEV-rules ..." + mkdir -p "${D}"/${UDEV_RULES%/*} + echo -e "# do not edit this file, it will be overwritten on update\n#" \ + > "${D}"/${UDEV_RULES} + "${D}"${CAM_LIST} udev-rules version 136 group plugdev >> "${D}"/${UDEV_RULES} \ + || die "failed to create udev-rules" + else + eerror "Unable to find print-camera-list" + eerror "and therefore unable to generate hotplug usermap." + eerror "You will have to manually generate it by running:" + eerror " ${CAM_LIST} udev-rules version 136 group plugdev > ${UDEV_RULES}" + fi + +} + +pkg_postinst() { + elog "Don't forget to add yourself to the plugdev group " + elog "if you want to be able to access your camera." + local OLD_UDEV_RULES="${ROOT}"etc/udev/rules.d/99-libgphoto2.rules + if [[ -f ${OLD_UDEV_RULES} ]]; then + rm -f "${OLD_UDEV_RULES}" + fi +} -- cgit v1.2.3-65-gdbad