diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 4f73359584c7..4ee0f0938e63 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,3 +1,2 @@ -DIST libgphoto2-2.5.31.tar.xz 6322264 BLAKE2B 9003769bf7726b205f6466e2332d1b144e2e1f2ac190c23f93200ec761597d08a7925e0a16dc65f66c9ca47f0c7e7a563c1cd5ada5cdf528bc605538cf67d80e SHA512 1061a676488aff2cad12a5ee49742be6d18750221ef808d69116763c2b357d38c1372db62933dfa8fd8411758acb97b8e3a40a5d4f37b8c563e981fd4ae4bb1f DIST libgphoto2-2.5.32.tar.xz 6919992 BLAKE2B 8984f245f7659f2d574b6bc6eb79157ee6e67fe33d0c2f4410fc0608d2f9de12b1b3c7914347d01c6152a3874123f29ac79100bbf49347fb2bb3a42ddadc9661 SHA512 a70d8658038f6f68c03b324afb39301442c5735fc55840a61f22d49dd1cd99a1699396a8c115be3eec79f73b3805bb6e3eb8f68eb16338e96845a427eeaa7dea DIST libgphoto2-2.5.33.tar.xz 6958144 BLAKE2B 9064b65426543f04257669cf06be952d03ab529f11b93cecbe9b58ebd060c7e410994848794db9a28127c288d08610f5b6e1f2ed3d4778fb45472d965113b841 SHA512 249338968d0cbe36a3a400719794a738f5c28ea4e5d9540e0c5b1ed27592071d5fdd499845ef7ef5826a9314c95e43b3a1ee5d5c92efa320729af6ec3f5cb925 diff --git a/media-libs/libgphoto2/files/libgphoto2-2.5.31-c99.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.31-c99.patch deleted file mode 100644 index fae8903f1e2d..000000000000 --- a/media-libs/libgphoto2/files/libgphoto2-2.5.31-c99.patch +++ /dev/null @@ -1,33 +0,0 @@ -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/files/libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch b/media-libs/libgphoto2/files/libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch deleted file mode 100644 index d5f2068abff4..000000000000 --- a/media-libs/libgphoto2/files/libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch +++ /dev/null @@ -1,31 +0,0 @@ -https://github.com/gphoto/libgphoto2/commit/8ddcae4ed2bd052318b0849617e22bf92a98dd17 -https://github.com/gphoto/libgphoto2/commit/3cf7a1d04dcffa52907026c4c2d35ee8273f3147 -From: Matt Jolly -Date: Mon, 25 Nov 2024 15:50:22 +1000 -Subject: [PATCH] consolidate removal of `gpi_gphoto_port_type_map` - -This was several upstream commits - ---- a/libgphoto2_port/gphoto2/gphoto2-port-info-list.h -+++ b/libgphoto2_port/gphoto2/gphoto2-port-info-list.h -@@ -62,7 +62,6 @@ extern "C" { - - #ifdef _GPHOTO2_INTERNAL_CODE - #include --extern const StringFlagItem gpi_gphoto_port_type_map[]; - #endif - - int gp_port_info_new (GPPortInfo *info); ---- a/libgphoto2_port/libgphoto2_port/libgphoto2_port.ver -+++ b/libgphoto2_port/libgphoto2_port/libgphoto2_port.ver -@@ -71,7 +71,6 @@ LIBGPHOTO2_5_0 { - - # These are only supposed to be used by libgphoto2 internally. - LIBGPHOTO2_INTERNAL { -- gpi_gphoto_port_type_map; - gpi_enum_to_string; - gpi_string_to_enum; - gpi_string_to_flag; --- -2.47.0 - diff --git a/media-libs/libgphoto2/libgphoto2-2.5.31-r3.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.31-r3.ebuild deleted file mode 100644 index b73b78699b6b..000000000000 --- a/media-libs/libgphoto2/libgphoto2-2.5.31-r3.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# Copyright 1999-2025 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="https://downloads.sourceforge.net/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 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86" - -# 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 -) - -IUSE="doc examples exif gd jpeg nls serial ${IUSE_CAMERAS[@]/#/+cameras_}" -REQUIRED_USE="|| ( ${IUSE_CAMERAS[@]/#/cameras_} )" - -# 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-build/gtk-doc-am - app-alternatives/lex - >=sys-devel/gettext-0.19.1 - virtual/pkgconfig - doc? ( app-text/doxygen ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gphoto2-port-config - /usr/bin/gphoto2-config -) - -PATCHES=( - "${FILESDIR}"/${P}-c99.patch - "${FILESDIR}"/${P}-remove-gpi_gphoto_port_type_map.patch -) - -src_prepare() { - default - - # Handle examples ourselves - sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ - || die "examples sed failed" - - 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+=",${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 -}