diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2024-11-26 02:00:48 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2024-11-26 02:00:48 +0000 |
| commit | 403335d7014372971e9e9267493a808d08bab48e (patch) | |
| tree | ffd28ddc69e6fe6543b018a00c9fad058bdda027 /media-libs/libgphoto2 | |
| parent | 7f0b7329b3aa78ea82792fdf68ab48415fe4cc35 (diff) | |
gentoo auto-resync : 26:11:2024 - 02:00:48
Diffstat (limited to 'media-libs/libgphoto2')
| -rw-r--r-- | media-libs/libgphoto2/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/libgphoto2/files/libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch | 31 | ||||
| -rw-r--r-- | media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild | 3 |
3 files changed, 35 insertions, 2 deletions
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 035d6ef74ecb..fa78650e49dd 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,4 +1,5 @@ AUX libgphoto2-2.5.31-c99.patch 1231 BLAKE2B 161b4fceaca4f61a86f6957802c36d9566a67c554748b0d2fc6a77863bd3d420bcbbdaadc96ac54cc886ec80cb046d0e541dcd014bec99f55361914de96127d8 SHA512 f91f12e2809ef1ac6a5f01563d678f00d2dbb32880bcbf6ef7593887e8f41e7f8c4349c5f814ab56340a3e9df3825fae126716aa6ad06c80621558e7871371f1 +AUX libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch 1016 BLAKE2B 7ff9768e8620613159610df821e441d45356fed2f59c2224f707517b9e63edcda7859abf61bcfcbdc508d46ed4b6b187ab12e8679697d91e1b6d7ece14cf2886 SHA512 759b884c038ccd8f1dcf610406550a1ab3abb84ef075e150d5b3ab6b4a20c56eee2f03817093a82238ab2ebc6cf611ac55a020d4ec703e18ffda7e630838e1d8 DIST libgphoto2-2.5.31.tar.xz 6322264 BLAKE2B 9003769bf7726b205f6466e2332d1b144e2e1f2ac190c23f93200ec761597d08a7925e0a16dc65f66c9ca47f0c7e7a563c1cd5ada5cdf528bc605538cf67d80e SHA512 1061a676488aff2cad12a5ee49742be6d18750221ef808d69116763c2b357d38c1372db62933dfa8fd8411758acb97b8e3a40a5d4f37b8c563e981fd4ae4bb1f -EBUILD libgphoto2-2.5.31-r2.ebuild 6194 BLAKE2B 1b767cbd04e21b597b1544af5e96894cd1b0e0e806086d1f728e859b6914921e27bfa194451099ceb9a6f6cd8a245eaeee1665eb06a6944a5c4a76cf3a1e8535 SHA512 912fa1706faf8c289eafa276be58b4ecc2253409bc4f84629a11f0e65d06e147ee9cdefbaea6db6c9a14acf6bd082e61411cb37289a3eaf432917a36ec08d0d3 +EBUILD libgphoto2-2.5.31-r2.ebuild 6244 BLAKE2B f062cbf9f02d48bf0c28e72e4ebefaae6ffa1c54519545c9bb09cec91994edcb796c7a761dbd4259d842f1ad7894b01127574e0d42ae931080ebb403fcd37003 SHA512 566c63e2de581542a76f20483b2ac9b7fc84d281e2199b8314c8377e42259f94134f2ae58a16da0791c99b27bb551c4865826f59f3c4500776496becf832c3f0 MISC metadata.xml 458 BLAKE2B 944547ab787583b1cd6678e3183a3f6cd76cf95461fb05758887ccfd41ceb8fc0bf7278fe786fd36fe2eee3664876fe4692d849a88bff58c3707e57f256b67b0 SHA512 a6c0af734aa579d486cb4f707f84b6b6beb26121092ced9976d05a6428a8096f79591b842d3ad906e5cb76ea1c8cd2bc2d21d587d6cb03041cc3ba72905f76be 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 new file mode 100644 index 000000000000..d5f2068abff4 --- /dev/null +++ b/media-libs/libgphoto2/files/libgphoto2-2.5.31-remove-gpi_gphoto_port_type_map.patch @@ -0,0 +1,31 @@ +https://github.com/gphoto/libgphoto2/commit/8ddcae4ed2bd052318b0849617e22bf92a98dd17 +https://github.com/gphoto/libgphoto2/commit/3cf7a1d04dcffa52907026c4c2d35ee8273f3147 +From: Matt Jolly <kangie@gentoo.org> +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 <gphoto2/gphoto2-port-log.h> +-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-r2.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild index afb3be44733a..cfaa872eaf3b 100644 --- a/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild +++ b/media-libs/libgphoto2/libgphoto2-2.5.31-r2.ebuild @@ -77,7 +77,8 @@ MULTILIB_CHOST_TOOLS=( ) PATCHES=( - "${FILESDIR}"/${PN}-2.5.31-c99.patch + "${FILESDIR}"/${P}-c99.patch + "${FILESDIR}"/${P}-remove-gpi_gphoto_port_type_map.patch ) src_prepare() { |