gentoo auto-resync : 04:06:2023 - 03:33:17

5 files changed, 47 insertions, 6 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 64fcc84addb1..905b71109fe4 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -2,14 +2,15 @@ AUX vlc-2.1.0-fix-libtremor-libs.patch 453 BLAKE2B 526934642617384224faee8d26c0a
 AUX vlc-2.2.8-freerdp-2.patch 4478 BLAKE2B 24b34ae2015de5197a275e393a761535d3386138ca1cdd67f0254a8bb916c9b0b40e553846299036882da5e5389fd8b8722f6f0cdf3e114a05fe1d445b48801c SHA512 e71bf81d87e7d0daf6d5820ba8e6a365cb8041eca82674ef69cc0d1eabbb29349a9ac193b0c2ad212e6d231dda7cf07a71e76317b8e8fc44b5ef0467d8f86b2f
 AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf1644610588f373e17d18c2642ee6489ca00311772307d8fc67a07ecc8d29810b80aa8f14c40298285c3319d8ddede2552d28d2837e SHA512 890b91405cbf6105c932566fd7799fdccd1b27f1e0df0c6dae1511aeead2c28eb5fea7642b01af1abbcf546aae0559408c0ddf2ec82c92809f3b02d1d477bb51
 AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6
+AUX vlc-3.0.18-drop-minizip-dep.patch 1024 BLAKE2B f00df51fe46743b760785151fdc4b770347331b80fcb4208860b4cf99555504e634959384c236a3539c9235547d5eb54c0a1b18e0183b0864e0c4fc070359e15 SHA512 5911e0e64d07fd23a67b142adaec684c581125f06295a64dee9aade31e780b6010538007c7477ea9ef69e4e7b4aeb1cc30891dd22bf273c18407f694111a66f8
 AUX vlc-3.0.18-flac-crc.patch 4105 BLAKE2B 1d5d9103a5fe538f35be2f1a6a248e5d4312f75958e63f667c24abfe5d9f217d85fc79963f092041e300f8ab76363dc623a2d02b90827acba4e5ae0e3f2ced4e SHA512 8f9db986a72d0112b065699cd7459eaeae6270ff4f416b4490a11e100592ddff67adc28ebdc4c97a13433a506bbc5c6225f556545fcdb9c9c31a2524e57a1630
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 AUX vlc-9999-configure-lua-version.patch 1840 BLAKE2B 1b9f11c05ed58e12616732c73a8418917870515f9612467b2839e8414f553ba3d0d9ede4c38e15957cc9b271aecae9364961103dafd72b80c6088a826f18777b SHA512 fa6350a02a92b65e5cc1c7b8e65e14045ca279d9d6f3f1ae255ab2a8ac88b3b3ff16102aa7e91e51e65e2500712bd7fccbdc987e760a5753581098afb1259eb9
 AUX vlc-9999-fix-libtremor-libs.patch 480 BLAKE2B 86102dc088705f546185023b2f941520b5435f852e0b0e7cdb8763e15df645cdc794087c188fb17ee331be7ba4d953311276583886e3fe0f93d6de32e63e3207 SHA512 93893a0accecc3470f33e505ef2ce86aeb5f2a3a6524adc7de354366bb8e51def2d67957be4ea705ff20c1510e7274691e587e70740d4b3657b35f5c91de7280
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
 DIST vlc-3.0.18.tar.xz 26631372 BLAKE2B 73d80615d5b4789ca980bd631db248e74de13d466e5f19b66a170ca785b46f281a1a242c6fdf14686cfb224aba3ddfeda16ffce11edbef3255c4bbdff36c517d SHA512 6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e
-EBUILD vlc-3.0.18-r2.ebuild 13561 BLAKE2B 7e751782f3f1e7e8a3e46d8af93ac07d2beed3a412c66e903c1d8d9ceab7adcc5259f13dc57f1320b608270f368db3cce59ae4eac0cffac427f24fd970baedde SHA512 696e95fd1652617ed72faf9797538515def4eab8bc8a8cf5c907b4b18eea624e117161e344f3491d0edfe5e22e649d6610e745b7af251b4aaf5773e477b3be54
+EBUILD vlc-3.0.18-r3.ebuild 13603 BLAKE2B b76ca0f87241bb562eb60bb71f1a3cd49fc074e25f11844e7a4cec0347250ed0accbf7e814e860c72974a9aee7d63c0ed482a4ae9c7e39cef31466323589bf9f SHA512 8e1d57c5a708043583b6538ec45c68b4e05bedc5641b8976b221e42dbc36b55be53c3830c16c61496499b66c7ad3b7f349e58d9b22c29ffb643ca66ed5f76881
 EBUILD vlc-3.0.18.ebuild 13526 BLAKE2B 2b49edb906c471bd08cba2d7d06e2223f7619537301c84e9047edee0faaa8f330881ae2f60013addf133312e4ad7d0ef4c79758ecb05076645f6fff9fd6b32e8 SHA512 a815bea94b0d0f777e318077ee4f32cbac128bf1e67dcf288ddf63c342052bc8b77f60c065cf389d50dccd33cb51bdf1b20f301fa4b50aaac5916f63bc243c8a
-EBUILD vlc-3.0.9999.ebuild 13528 BLAKE2B be3512586bc33cf8d2653b88a1e0405ccb34c88c6bf2e06c76d36bcc7945fa6ec61010f6873709dc5173384118c23c2ea0e2b388b5a12ea3594c5d276a02b9d4 SHA512 7c4df145a1dea9452c30255ece04d0ccd2fb4c181d08ae9a4f98f58e040758bddeb14d8819168c5e8d182e834d25116e29b85d629fe3e0c884cdedc38da119ca
-EBUILD vlc-9999.ebuild 13437 BLAKE2B fbd299d3260238ec9b2df78227e67d6de4b5885b6463ca260199f4830a86878ab674f37b618d28efe9d6ecd3a23961d36c013ba10592e4796d9b3b26b31d7b2e SHA512 521555f617a7767442844109bc1e73fd8a394612ece95a70eb8cafc53c2e3df15c4c1780a181e15db9d35aede7c85b1c67dc397ab4bbf9ebc4f82a3a9767b12e
+EBUILD vlc-3.0.9999.ebuild 13570 BLAKE2B 8148d0bd881f9d679054222fc0fe2272ccfc832e8f4df403b4c8c7ed1150ea019d4051a5b3aead2fc35442ee1bd78f6d74e6973b9bbb4b56ede125ed90b44760 SHA512 6fe9c692d59f9dae4ff1e25f293818d07577be1d26bd6857bfe4b8a23c37f3935229510ca49a62a1856c343de35371a822d8e1ce9eb9d6397053b44f28f26491
+EBUILD vlc-9999.ebuild 13428 BLAKE2B 4d357b5258bbcd59a215f4f0bf5c0ca8deeda0b62baa30010d19ed15df8234d7068c536837b542936af030b149c5b4cc67cb56d33b46653ff91f660d74b312ca SHA512 4c490d5bfe7d50915aca7dd07b8b2cc7fe40bcac28b003dee2866b5c6703abf00836f4f136b0c5de8952c5c9556019ac3ad2c0e6184a712ffacfcfa549b53a4a
 MISC metadata.xml 4923 BLAKE2B b115bd6bc666f1da6a0ba4d5b6237fedfff4baada406e56eff9c0f9574968177490c456e2d8f0ad07cf73b8e52bcc122931ae9f800d6a29e41cbfdd4ed6780fe SHA512 4b953a8662e31a66af1fb710e166316106b393d136fca7c1c5b61e78bd285bc578037fc11b7ae07202a6fae2a4a6e43f7f6560400bab8d92457012a4fa7e3045
diff --git a/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch b/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch
new file mode 100644
index 000000000000..6cd7019f6ed0
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch
@@ -0,0 +1,38 @@
+Nothing uses this.
+
+From 6cd8ac42e8c296eb1c9e154b3e99dab8bffcad0a Mon Sep 17 00:00:00 2001
+From: Steve Lhomme <robux4@ycbcr.xyz>
+Date: Thu, 12 Apr 2018 13:24:38 +0200
+Subject: [PATCH] configure: remove minizip check not referenced anywhere
+
+(cherry picked from commit d22de99eb8c46786ca2feb4abca2e4f25ceeb0a8)
+--- a/configure.ac
++++ b/configure.ac
+@@ -890,23 +890,14 @@ AS_IF([test -n "${PKG_CONFIG}" ],[
+ 
+ 
+ dnl
+-dnl Check for zlib.h and -lz along with system -lminizip if available
++dnl Check for zlib.h and -lz if available
+ dnl
+ AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ])
+ AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ])
+ if test "${have_zlib}" = "yes"
+ then
+   VLC_ADD_LIBS([sap],[-lz])
+-  PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [
+-    AC_CHECK_HEADERS([unzip.h], [
+-      have_minizip=yes
+-      MINIZIP_LIBS="-lminizip -lz"
+-    ], [
+-      have_minizip=no
+-    ])
+-  ])
+ fi
+-AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ])
+ 
+ 
+ dnl
+-- 
+2.41.0
+
diff --git a/media-video/vlc/vlc-3.0.18-r2.ebuild b/media-video/vlc/vlc-3.0.18-r3.ebuild
index fda17b56a01a..8090dd85c579 100644
--- a/media-video/vlc/vlc-3.0.18-r2.ebuild
+++ b/media-video/vlc/vlc-3.0.18-r3.ebuild
@@ -64,7 +64,7 @@ BDEPEND="
 RDEPEND="
 	media-libs/libvorbis
 	net-dns/libidn:=
-	sys-libs/zlib[minizip]
+	sys-libs/zlib
 	virtual/libintl
 	virtual/opengl
 	a52? ( media-libs/a52dec )
@@ -234,6 +234,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
 	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
 	"${FILESDIR}"/${P}-flac-crc.patch
 )
 
diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild
index 1ada73f5cf53..345109f70eab 100644
--- a/media-video/vlc/vlc-3.0.9999.ebuild
+++ b/media-video/vlc/vlc-3.0.9999.ebuild
@@ -64,7 +64,7 @@ BDEPEND="
 RDEPEND="
 	media-libs/libvorbis
 	net-dns/libidn:=
-	sys-libs/zlib[minizip]
+	sys-libs/zlib
 	virtual/libintl
 	virtual/opengl
 	a52? ( media-libs/a52dec )
@@ -234,6 +234,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 	"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
 	"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-3.0.18-drop-minizip-dep.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index d3a241d4baf7..712516931946 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -63,7 +63,7 @@ BDEPEND="
 RDEPEND="
 	media-libs/libvorbis
 	net-dns/libidn:=
-	sys-libs/zlib[minizip]
+	sys-libs/zlib
 	virtual/libintl
 	virtual/opengl
 	a52? ( media-libs/a52dec )