diff options
author | Pacho Ramos <pacho@gentoo.org> | 2012-01-31 08:55:14 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2012-01-31 08:55:14 +0000 |
commit | ee4135010ede374f33479b5d9b66c5f3b3a52c39 (patch) | |
tree | 6712c5fb847cffd6bba2b4e46c4eb8bcd629c510 /media-libs/libgphoto2 | |
parent | Add new camera. (diff) | |
download | historical-ee4135010ede374f33479b5d9b66c5f3b3a52c39.tar.gz historical-ee4135010ede374f33479b5d9b66c5f3b3a52c39.tar.bz2 historical-ee4135010ede374f33479b5d9b66c5f3b3a52c39.zip |
Version bump, drop no longer needed libusb fix and automagic patch, empty dependency_libs in .la files (bug #386665 by Samuli Suominen). Drop old.
Package-Manager: portage-2.1.10.44/cvs/Linux x86_64
Diffstat (limited to 'media-libs/libgphoto2')
-rw-r--r-- | media-libs/libgphoto2/ChangeLog | 11 | ||||
-rw-r--r-- | media-libs/libgphoto2/Manifest | 15 | ||||
-rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.4.10.ebuild | 206 | ||||
-rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.4.12.ebuild (renamed from media-libs/libgphoto2/libgphoto2-2.4.11.ebuild) | 20 |
4 files changed, 28 insertions, 224 deletions
diff --git a/media-libs/libgphoto2/ChangeLog b/media-libs/libgphoto2/ChangeLog index dd965eee52a7..3276e11f1a5d 100644 --- a/media-libs/libgphoto2/ChangeLog +++ b/media-libs/libgphoto2/ChangeLog @@ -1,6 +1,13 @@ # 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.199 2011/11/08 09:32:21 naota Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/ChangeLog,v 1.200 2012/01/31 08:55:14 pacho Exp $ + +*libgphoto2-2.4.12 (31 Jan 2012) + + 31 Jan 2012; Pacho Ramos <pacho@gentoo.org> +libgphoto2-2.4.12.ebuild, + -libgphoto2-2.4.10.ebuild, -libgphoto2-2.4.11.ebuild: + Version bump, drop no longer needed libusb fix and automagic patch, empty + dependency_libs in .la files (bug #386665 by Samuli Suominen). Drop old. 04 Nov 2011; Naohiro Aota <naota@gentoo.org> libgphoto2-2.4.11-r1.ebuild: Add ~x86-fbsd diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 9b7ba4def2f4..8fa75e3ffa46 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -6,17 +6,16 @@ AUX libgphoto2-2.4.7-no-test-build.patch 910 RMD160 fbc59f08c752874df09f63beca0c 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 +DIST libgphoto2-2.4.12.tar.bz2 4430444 RMD160 be75a0d0bd29b11b611bc62331120d71ef2997af SHA1 b199e926424b7544d8877a9cf94b91686b7824ea SHA256 5b6c5d25e9f610e6b2d9e2b35ee77258b15f6ecb67de344395eddddc0345f322 EBUILD libgphoto2-2.4.11-r1.ebuild 6234 RMD160 75708c10233b129a7d7f7f9ea6d3e990767d1698 SHA1 75389da2878011652d435b912f776ac8205fbd90 SHA256 0290ae3430cbe46e213e757582b3f1b2fb056bc0a634a8bf50c674b7897fc5d5 -EBUILD libgphoto2-2.4.11.ebuild 6036 RMD160 729fa98442ed20e14bc14c1b34d0ee40b15b44c8 SHA1 6185e6e2ba8b13cd0967d5f28095d60996b58ec2 SHA256 1ee370b082fdc255fec78347dc3292b5f912ee1a67c882d282d06d4f2f8fc46e -MISC ChangeLog 32941 RMD160 14c16ea8c82251879cab1935b5fb0f7b166f8af7 SHA1 080c5dbc6c48d15d4181eb7e02f9e1d1a14797cd SHA256 c39b0153f4a64e72607a879fdef5d27ef50664012930bef6f3469a486f41f6c6 +EBUILD libgphoto2-2.4.12.ebuild 6154 RMD160 190a26df355549d270dab253c70678a5f843e7aa SHA1 88560b4b7c96331321af4cccef2525576e9f7a48 SHA256 58a467af3df8b7f1626fecc22d11e6a95b40d525df8f47633669d5d0acb7a227 +MISC ChangeLog 33256 RMD160 7047efdc4e82420d6871c6399255d9e4ec4b05f7 SHA1 71e211555a5d8d632afc1040fafc0b2be5e3dbbf SHA256 7feaf4471733266892978d17dde8158e1aa3bcf33a295fae320760ca2d6fa8ce MISC metadata.xml 182 RMD160 5f49130c67eb53fd2c6ebe0de1fc022095660261 SHA1 5ae56f5c257c146dfe43fd8556cf742e79758f3a SHA256 6ce4ccce668fc2a8c0598e348462ae041f477022bd8bc407c7c5e4ba98eabc5b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (FreeBSD) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk649ywACgkQGpDnPLSHuMB8CQCcCfb85a7QSz1altG6R1P7olpm -tR4AmwXvYKhkq0f0UetCArJqmaO1yiaS -=mD7E +iEYEARECAAYFAk8nrHgACgkQCaWpQKGI+9S9iACdGyDXmbdz4//KNkuKmoiFN6JV +eFUAn0OG4bc7FxRgBUOE+BISjoTQpQH3 +=V583 -----END PGP SIGNATURE----- diff --git a/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild deleted file mode 100644 index 4959fa0c0a78..000000000000 --- a/media-libs/libgphoto2/libgphoto2-2.4.10.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# 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.10.ebuild,v 1.9 2011/03/27 16:16:07 ssuominen 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="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} - !<sys-fs/udev-136" - -pkg_setup() { - if ! echo "${USE}" | grep "cameras_" > /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" - - # Fix copied libtool macro dnl problem, bug #336598 - epatch "${FILESDIR}/${PN}-2.4.9-dnl.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 - - 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 - -# 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 - - 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 -} diff --git a/media-libs/libgphoto2/libgphoto2-2.4.11.ebuild b/media-libs/libgphoto2/libgphoto2-2.4.12.ebuild index 610eeb084913..c3fbd3c69365 100644 --- a/media-libs/libgphoto2/libgphoto2-2.4.11.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.4.12.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 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.2 2011/07/13 14:27:00 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgphoto2/libgphoto2-2.4.12.ebuild,v 1.1 2012/01/31 08:55:14 pacho Exp $ # TODO # 1. Track upstream bug --disable-docs does not work. @@ -16,8 +16,8 @@ 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" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="doc examples exif gd jpeg 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 @@ -40,7 +40,7 @@ IUSE_CAMERAS=" 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 + template toshiba_pdrm11 topfield tp6801 " for camera in ${IUSE_CAMERAS}; do @@ -55,6 +55,8 @@ RDEPEND="virtual/libusb:0 net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) exif? ( >=media-libs/libexif-0.5.9 ) + gd? ( media-libs/gd[jpeg=] ) + jpeg? ( virtual/jpeg ) sys-devel/libtool" DEPEND="${RDEPEND} dev-util/pkgconfig @@ -99,9 +101,6 @@ src_prepare() { 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() { @@ -134,6 +133,8 @@ src_configure() { --without-hal \ $(use_enable nls) \ $(use_with exif libexif auto) \ + $(use_with gd) \ + $(use_with jpeg) \ --with-drivers=${cameras} \ --with-doc-dir=/usr/share/doc/${PF} \ --with-html-dir=/usr/share/doc/${PF}/html \ @@ -157,6 +158,9 @@ src_compile() { src_install() { emake DESTDIR="${D}" install + # Empty dependency_libs in .la files, bug #386665 + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + # Clean up unwanted files rm "${D}/usr/share/doc/${PF}/"{ABOUT-NLS,COPYING} || die "rm failed" dodoc ChangeLog NEWS* README* AUTHORS TESTERS MAINTAINERS HACKING |