From: Pacho Ramos Date: Sat, 8 May 2010 11:23:30 +0000 (+0000) Subject: Version bump including updated drivers for ptp2, ST2205, AX203 and digita. Thanks... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f42369635e8f7c94e69954792b7a781d8d0de716;p=gentoo.git Version bump including updated drivers for ptp2, ST2205, AX203 and digita. Thanks to Lebedev Roman for reporting bug #318027 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index 6e1afe25b08b..2f6ece4a284a 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-libs/libgphoto2 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.169 2010/04/05 14:57:39 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.170 2010/05/08 11:23:30 pacho Exp $ + +*libgphoto2-2.4.9 (08 May 2010) + + 08 May 2010; Pacho Ramos +libgphoto2-2.4.9.ebuild: + Version bump including updated drivers for ptp2, ST2205, AX203 and digita. + Thanks to Lebedev Roman for reporting bug #318027 05 Apr 2010; Raúl Porcel libgphoto2-2.4.8.ebuild: alpha/ia64/sparc stable wrt #308549 diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 8dc298a9f7cf..c3105ae82e16 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX libgphoto2-2.4.7-extra-dist.patch 451 RMD160 c908aafa0946e41cb43c2891ecca42859f219207 SHA1 ed0089c85ca129eb515412d2493475409147f0dc SHA256 d447cdc4fcfde5e28ef50e6d6bf3a0a01440473fbecedca99ecd105ed43d2866 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 @@ -5,9 +8,18 @@ AUX libgphoto2-2.4.8-increase_max_entries.patch 477 RMD160 4be0b81331eedd0233b57 DIST libgphoto2-2.4.6.tar.bz2 5268340 RMD160 cca194a6db6658887b1b997838c7d6a5af9e2609 SHA1 f9fd10495ababce3cf992b36f3a29359e598aea7 SHA256 cbfad37afb6a65f93ce16fbe1e8a1201ef3586c614deca5cc51afc8011245606 DIST libgphoto2-2.4.7.tar.bz2 5279581 RMD160 f5773f3b194f4dcc4a82ddbbf7ecad12e11dae93 SHA1 f91aef06204f3b1b0f3e07facba452881bedc2e1 SHA256 9e7613f21ac3dd7cf1decbab5c47c1e9a16d39c32062d7f8632adb4fc8d0271f DIST libgphoto2-2.4.8.tar.bz2 5371128 RMD160 0edc03231e1c646e45621b9adb09e268582b4437 SHA1 6ad0d9ffcafe2e9eba0cae958a4455ebb4cf2037 SHA256 69d7e0723b40e8a0c4fa897b96f6aecb5ae5548c3cce98c48e37b70623d9ffc3 +DIST libgphoto2-2.4.9.tar.bz2 5643227 RMD160 1af4e817281d6bfac1650a0b427a2903c997a9bb SHA1 7d876fd650430e4f52fe10e53f378688e6026387 SHA256 d4bd7da50f073c121ebca2832a7eeb23d2f7a493e902d80a0ab7f7f0f4eb110a EBUILD libgphoto2-2.4.6.ebuild 5861 RMD160 ec31b2783dcea0687b2495f930af02b0482ef703 SHA1 55cc824df0c14b09cbe191247651cf04b5db1aeb SHA256 ece5b746417de446029a3b1a87902370b57298e4df5a605e565eec2da2f8975d EBUILD libgphoto2-2.4.7-r2.ebuild 6588 RMD160 02bf29cdf40405f586232cb21fe35f9faf67b4d4 SHA1 921cd1b2625815875b580f034cbf433601bc91f7 SHA256 c3c4e2ec8e41a0e0410d459f37433690a891f9a60ed32575f5be1fde12279805 EBUILD libgphoto2-2.4.8-r1.ebuild 6630 RMD160 0cb41f2adf942e07e42a906c7fe5d88015d4f4fa SHA1 d24b9d7c61608e27f37e3385629f379ef3efd1d2 SHA256 b321c54fdef2d9ad8371fba20cacbd0b21ca531aacee843623e7441790ebcdf2 EBUILD libgphoto2-2.4.8.ebuild 6499 RMD160 007f1df30a7f37a163c53c3d48e7fa0c3b517400 SHA1 60b4accd7296be7b49a503498a8637d1cafa8e11 SHA256 fd5d75147802692468c2988683138cedfb77be92219f9e65a7f922235a2873e9 -MISC ChangeLog 28338 RMD160 e7e7121c56c47d921af1b309354fa3487a0daad2 SHA1 3e1ed10feaa8dab6a77cf362d72922ce107edd2a SHA256 8573a9ab2050d78e861c70988c091d6a9817b209592a08810f1c41c57897777b +EBUILD libgphoto2-2.4.9.ebuild 6627 RMD160 2c879cc260b58c3202392fd23dec69a6fce6a2dc SHA1 ea3fbaaf922b7af15d5b1403d2034633f93463d0 SHA256 0064a94d616822463fd0ae6f51116c8a15c359985e10011ae4b996c77eede4ff +MISC ChangeLog 28571 RMD160 18b16c5b9d323e69b8126695ed3a8d06bfe551fa SHA1 ade1184f0631a717948d29474379d0dfc4c80a33 SHA256 f1f9184b54a821a69f495a6da559bae0118b008f9410416c1faae0ca0efbfe90 MISC metadata.xml 255 RMD160 182d44452574b19b29c12dc7e757a2a4aa9cbc20 SHA1 7e912f6a5b9a294509849512ba044bd88b59065f SHA256 d2cc84bd8e8d171980c022b0af42cf2f2d829e37c05183988a211fccafcf363b +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.14 (GNU/Linux) + +iEYEARECAAYFAkvlSbgACgkQCaWpQKGI+9TkXACeO5jKKOOlQj2+ZdTO9HeFuQ5t +ukYAnjnneKup2IBZGVMqzrCllLBl7JYr +=2XEL +-----END PGP SIGNATURE----- diff --git a/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild new file mode 100644 index 000000000000..9a2b58fcacaf --- /dev/null +++ b/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild @@ -0,0 +1,206 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.9.ebuild,v 1.1 2010/05/08 11:23:30 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="2" + +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="bonjour doc examples exif hal nls kernel_linux" + +# ??? +#RESTRICT="test" + +# 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 barbie canon casio_qv clicksmart310 +digigr8 digita dimera3500 directory enigma13 fuji gsmart300 hp215 iclick +jamcam jd11 jl2005a kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 +konica konica_qm150 largan lg_gsm mars dimagev 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 stv0674 stv0680 sx330z template toshiba_pdrm11 +topfield" + +# jl2005c is still experimental -> not enabled + +for camera in ${IUSE_CAMERAS}; do + IUSE="${IUSE} cameras_${camera}" +done + +# libgphoto2 actually links to libtool +RDEPEND="virtual/libusb:0 + bonjour? ( || ( + net-dns/avahi[mdnsresponder-compat] + net-misc/mDNSResponder ) ) + exif? ( >=media-libs/libexif-0.5.9 ) + hal? ( + >=sys-apps/hal-0.5 + >=sys-apps/dbus-1 )" +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 "libgphoto2 supports: all ${IUSE_CAMERAS}" + einfo "All camera drivers will be built since you did not specify" + einfo "via the CAMERAS variable what camera you use." + einfo "NOTICE: Upstream will not support you if you do not compile all camera drivers first" + 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=bonjour, 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 + for cam in ${IUSE_CAMERAS} ; do + use "cameras_${cam}" && cameras="${cameras},${cam}" + done + + [ -z "${cameras}" ] \ + && cameras="all" \ + || cameras="${cameras:1}" + + einfo "Enabled camera drivers: ${cameras}" + [ "${cameras}" != "all" ] && \ + ewarn "Upstream will not support you if you do not compile all camera drivers first" + + econf \ + --disable-docs \ + --disable-gp2ddb \ + $(use_with bonjour) \ + $(use_with 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 + +# FIXME: gtk-doc is currently broken +# $(use_enable doc docs) +} + +src_compile() { + emake || die "make failed" + + if use doc; then + doxygen doc/Doxyfile || die "Documentation generation failed" + fi +} + +src_install() { + emake DESTDIR="${D}" install || die "install failed" + + # Clean up unwanted files + rm "${D}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed" + dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING || die "dodoc failed" + + if use examples; then + insinto /usr/share/doc/${PF}/examples + doins examples/README examples/*.c examples/*.h || die "examples installation failed" + 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 + + HAL_FDI="/usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2.fdi" + UDEV_RULES="/etc/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}" + + if use hal && [ -n "$("${D}"${CAM_LIST} idlist)" ]; then + einfo "Generating HAL FDI files ..." + mkdir -p "${D}"/${HAL_FDI%/*} + "${D}"${CAM_LIST} hal-fdi >> "${D}"/${HAL_FDI} \ + || die "failed to create hal-fdi" + elif use hal; then + ewarn "No HAL FDI file generated because no real camera driver enabled" + fi + + 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 or HAL FDI files." + eerror "You will have to manually generate it by running:" + eerror " ${CAM_LIST} udev-rules version 136 group plugdev > ${UDEV_RULES}" + eerror " ${CAM_LIST} hal-fdi > ${HAL_FDI}" + 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 +}