From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 962091382C5 for ; Tue, 23 Jan 2018 08:24:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD36EE07ED; Tue, 23 Jan 2018 08:24:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9E25BE07ED for ; Tue, 23 Jan 2018 08:24:15 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 211E6335C2E for ; Tue, 23 Jan 2018 08:24:14 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82FDF15D for ; Tue, 23 Jan 2018 08:24:12 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1516694535.783576405e55e8f938fe078a4163f5c5368ad6f8.eva@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libgphoto2/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libgphoto2/Manifest media-libs/libgphoto2/libgphoto2-2.5.16.ebuild X-VCS-Directories: media-libs/libgphoto2/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 783576405e55e8f938fe078a4163f5c5368ad6f8 X-VCS-Branch: master Date: Tue, 23 Jan 2018 08:24:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 78ad72d6-f08f-4969-be4f-513cd4968f2a X-Archives-Hash: 44dd038df8ea865342e2948338a8b828 commit: 783576405e55e8f938fe078a4163f5c5368ad6f8 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Jan 23 08:02:15 2018 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Tue Jan 23 08:02:15 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78357640 media-libs/libgphoto2: version bump 2.5.14 → 2.5.16 Leave vusb configure switch to upstream default for now as it appears development related only and defaults to off. Closes: https://bugs.gentoo.org/634764 Package-Manager: Portage-2.3.20, Repoman-2.3.6 media-libs/libgphoto2/Manifest | 1 + media-libs/libgphoto2/libgphoto2-2.5.16.ebuild | 211 +++++++++++++++++++++++++ 2 files changed, 212 insertions(+) diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 7eb8d8dd7d8..d8093584af7 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1 +1,2 @@ DIST libgphoto2-2.5.14.tar.bz2 6992238 BLAKE2B 6173ada55f032ae2b630db5324c87ad9bebb3fda485fe9bc89a042d192a136a73596a92b1df3c762ffd7168cf91ca12f1fa2998e154152eb19cfd9b780ee2b2d SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688 +DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild new file mode 100644 index 00000000000..c4110354846 --- /dev/null +++ b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +# TODO +# 1. Track upstream bug --disable-docs does not work. +# https://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874 + +EAPI=6 +inherit eutils multilib multilib-minimal udev user + +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" + +# FIXME: should we also bump for libgphoto2_port.so soname version? +SLOT="0/6" # libgphoto2.so soname version + +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE="doc examples exif gd jpeg nls serial" + +# 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 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 + ricoh ricoh_g3 + samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z + toshiba_pdrm11 topfield tp6801 +" + +for camera in ${IUSE_CAMERAS}; do + IUSE="${IUSE} +cameras_${camera}" +done + +# libgphoto2 actually links to libltdl +RDEPEND=" + >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] + dev-libs/libltdl:0[${MULTILIB_USEDEP}] + >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] + cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] ) + cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] ) + exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] ) + gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] ) + jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) + serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] ) + ! /dev/null 2>&1; then + einfo "No camera drivers will be built since you did not specify any." + fi +} + +pkg_setup() { + enewgroup plugdev +} + +src_prepare() { + default + + # Handle examples ourselves + sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ + || die "examples sed failed" + + sed -e 's/sleep 2//' -i configure || die +} + +multilib_src_configure() { + local myconf + use doc || myconf=( ac_cv_path_DOXYGEN=false ) + + # Upstream doesn't default to --enable-option-checking due having another + # configure in libgphoto2_port/ that also needs to be checked on every bump + # + # Serial port uses either lockdev or ttylock, but we don't have ttylock + # --with-doc-dir needed to prevent duplicate docs installation, bug #586842 + ECONF_SOURCE=${S} \ + econf \ + --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \ + --disable-docs \ + --disable-gp2ddb \ + $(use_enable nls) \ + $(use_with exif libexif auto) \ + $(use_with gd) \ + $(use_with jpeg) \ + $(use_enable serial) \ + $(use_enable serial lockdev) \ + --with-libusb=no \ + --with-libusb-1.0=auto \ + --disable-ttylock \ + --with-camlibs=${cameras} \ + --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \ + --with-rpmbuild=$(type -P true) \ + udevscriptdir="$(get_udevdir)" \ + "${myconf[@]}" +} + +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}" + einfo "Upstream will not support you if you do not compile all camera drivers first" + else + cameras="all" + einfo "Enabled camera drivers: all" + fi + + multilib-minimal_src_configure +} + +multilib_src_compile() { + default + + if multilib_is_native_abi && use doc; then + doxygen doc/Doxyfile || die "Documentation generation failed" + fi +} + +multilib_src_install_all() { + prune_libtool_files --modules + + einstalldocs + dodoc 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 "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then + rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html" + fi + # end fixup + + local udev_rules cam_list + udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules" + cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list" + + if [ -x "${ED}"${cam_list} ]; then + # Let print-camera-list find libgphoto2.so + export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" + # Let libgphoto2 find its camera-modules + export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}" + + einfo "Generating UDEV-rules ..." + mkdir -p "${ED}"/${udev_rules%/*} + echo -e "# do not edit this file, it will be overwritten on update\n#" \ + > "${ED}"/${udev_rules} + "${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${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 201 group plugdev > ${udev_rules}" + fi + +} + +pkg_postinst() { + if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then + elog "Don't forget to add yourself to the plugdev group " + elog "if you want to be able to access your camera." + fi + + local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules + if [[ -f ${old_udev_rules} ]]; then + rm -f "${old_udev_rules}" + fi +}