From 4c552e09a1ece7792f2a20ccf4322348acbe3139 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 4 Dec 2023 16:58:27 +0000 Subject: gentoo auto-resync : 04:12:2023 - 16:58:27 --- media-libs/libgphoto2/Manifest | 2 + .../libgphoto2/files/libgphoto2-2.5.31-c99.patch | 33 +++ media-libs/libgphoto2/libgphoto2-2.5.31-r1.ebuild | 222 +++++++++++++++++++++ 3 files changed, 257 insertions(+) create mode 100644 media-libs/libgphoto2/files/libgphoto2-2.5.31-c99.patch create mode 100644 media-libs/libgphoto2/libgphoto2-2.5.31-r1.ebuild (limited to 'media-libs/libgphoto2') diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 1e6657642242..781fc739de4c 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,5 +1,7 @@ +AUX libgphoto2-2.5.31-c99.patch 1231 BLAKE2B 161b4fceaca4f61a86f6957802c36d9566a67c554748b0d2fc6a77863bd3d420bcbbdaadc96ac54cc886ec80cb046d0e541dcd014bec99f55361914de96127d8 SHA512 f91f12e2809ef1ac6a5f01563d678f00d2dbb32880bcbf6ef7593887e8f41e7f8c4349c5f814ab56340a3e9df3825fae126716aa6ad06c80621558e7871371f1 DIST libgphoto2-2.5.30.tar.xz 5890196 BLAKE2B 4da7a650bec695a9d8356d1014081786eb6d31641c4f36f75ba7171b2b395a5e8bf6f59d452adad6d9faa30eea77abeb52e62e645d963bcec2709b3eb5094a4a SHA512 969e5765dc5de9e5fb8156eda679aca069f568e744cc48b643846175eb3cff78bc6ec3a848150a4c636d948018de022f2988da7b94029f103589384f9144b7ed DIST libgphoto2-2.5.31.tar.xz 6322264 BLAKE2B 9003769bf7726b205f6466e2332d1b144e2e1f2ac190c23f93200ec761597d08a7925e0a16dc65f66c9ca47f0c7e7a563c1cd5ada5cdf528bc605538cf67d80e SHA512 1061a676488aff2cad12a5ee49742be6d18750221ef808d69116763c2b357d38c1372db62933dfa8fd8411758acb97b8e3a40a5d4f37b8c563e981fd4ae4bb1f EBUILD libgphoto2-2.5.30.ebuild 6262 BLAKE2B cd4787804543d0f92ebd93ca39f8d5ba545147fe43c29487a648a479a98005796f7cffd9947a633589acebccc9e560854841cc7cad5a3f64fccd053cb1c1d492 SHA512 b4e639d5d508cc495ee756dbfcfd9fe5a5ed9d152a8a86aebccd0de37186aa83e203e121259a6b4a2d09519c0292b0e4e30f4f0c22799a30bed502fd4b430bbc +EBUILD libgphoto2-2.5.31-r1.ebuild 6370 BLAKE2B 4d40977b273c477f6ddd1984886a941714171bc3f88bde7a707a0f92c814275fbbe62e6f5c5b3fd1025eed04e174a99a007c109f4d346f4988e0d001b27f09a9 SHA512 3ea7c072ddd792940d415fb40744a929ca2021bae2f717d4b95ebab6a13faf5d694c5d9e3d5ac3ab39a5fedd6e8dc0143bd009f7cbd5b3b5a859093e6e50627b EBUILD libgphoto2-2.5.31.ebuild 6319 BLAKE2B db3a46f04231cc9d50f6b8b14a0bf34b4a9fdd6b75344f6e6bff5340ba2eb1c8629e032ab907529861fd2eabc51e2fe942143033ec4972cdd61b4af3e80bc5db SHA512 21770b53e2d62c283f1694c68196d8fbbae003ba8c73381982ce6b4e5fd658addbd9f4e7915113f03257297be6e9338d482489ae79b5cccfc07d010cd3a82d3b MISC metadata.xml 458 BLAKE2B 944547ab787583b1cd6678e3183a3f6cd76cf95461fb05758887ccfd41ceb8fc0bf7278fe786fd36fe2eee3664876fe4692d849a88bff58c3707e57f256b67b0 SHA512 a6c0af734aa579d486cb4f707f84b6b6beb26121092ced9976d05a6428a8096f79591b842d3ad906e5cb76ea1c8cd2bc2d21d587d6cb03041cc3ba72905f76be diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.31-c99.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.31-c99.patch new file mode 100644 index 000000000000..fae8903f1e2d --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.5.31-c99.patch @@ -0,0 +1,33 @@ +https://bugs.gentoo.org/919086 +https://github.com/gphoto/libgphoto2/issues/941 +https://github.com/gphoto/libgphoto2/commit/721f7f8c3ec8058d504607873e4c317aac0c99c5 + +From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001 +From: Marcus Meissner +Date: Mon, 4 Dec 2023 13:26:08 +0100 +Subject: [PATCH] align outlen length with jpeg jeaders. fixes + https://github.com/gphoto/libgphoto2/issues/941 + +--- a/camlibs/ptp2/chdk.c ++++ b/camlibs/ptp2/chdk.c +@@ -1150,7 +1150,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, + struct jpeg_error_mgr jerr; + JSAMPROW row_ptr[1]; + uint8_t *outbuf = NULL, *tmprowbuf = NULL; +- uint64_t outlen = 0; ++ unsigned long outlen = 0; + unsigned int row_inc; + int sshift, dshift, xshift, skip; + +@@ -1161,8 +1161,8 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, + sshift = 6; + dshift = (width/height > 2) ? 6 : 12; + xshift = 4; +- /* Digic 6 cameras: 8 bit per element UYVY, +- * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ ++ /* Digic 6 cameras: 8 bit per element UYVY, ++ * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ + } else { + row_inc = buf_width*2; + sshift = 4; + diff --git a/media-libs/libgphoto2/libgphoto2-2.5.31-r1.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.31-r1.ebuild new file mode 100644 index 000000000000..660a8d299b99 --- /dev/null +++ b/media-libs/libgphoto2/libgphoto2-2.5.31-r1.ebuild @@ -0,0 +1,222 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# TODO +# 1. Track upstream bug --disable-docs does not work. +# https://sourceforge.net/p/gphoto/bugs/643/ + +EAPI=8 +inherit autotools multilib-minimal udev + +DESCRIPTION="Library that implements support for numerous digital cameras" +HOMEPAGE="http://www.gphoto.org/" +SRC_URI="mirror://sourceforge/gphoto/${P}.tar.xz" + +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 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~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=" + acct-group/plugdev + >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] + net-misc/curl[${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? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] ) + serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-util/gtk-doc-am + sys-devel/flex + >=sys-devel/gettext-0.19.1 + virtual/pkgconfig + doc? ( app-doc/doxygen ) +" + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gphoto2-port-config + /usr/bin/gphoto2-config +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.5.31-c99.patch +) + +pkg_pretend() { + if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then + einfo "No camera drivers will be built since you did not specify any." + fi +} + +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 + + eautoreconf # For configure.ac patching +} + +multilib_src_configure() { + local myconf + use doc || myconf=( ac_cv_path_DOXYGEN=no ) + + # 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 \ + --cache-file="${BUILD_DIR}"/config.cache \ + --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() { + find "${ED}" -name '*.la' -delete || die + + einstalldocs + dodoc TESTERS MAINTAINERS + + if use examples; then + docinto examples + dodoc 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 + + udev_reload +} + +pkg_postrm() { + udev_reload +} -- cgit v1.2.3