diff options
Diffstat (limited to 'net-misc/minidlna')
| -rw-r--r-- | net-misc/minidlna/Manifest | 3 | ||||
| -rw-r--r-- | net-misc/minidlna/files/minidlna-1.3.3-ffmpeg7.patch | 21 | ||||
| -rw-r--r-- | net-misc/minidlna/minidlna-1.3.3.ebuild | 3 |
3 files changed, 25 insertions, 2 deletions
diff --git a/net-misc/minidlna/Manifest b/net-misc/minidlna/Manifest index 167b90f2ee09..7c9788270fac 100644 --- a/net-misc/minidlna/Manifest +++ b/net-misc/minidlna/Manifest @@ -1,7 +1,8 @@ AUX minidlna-1.0.25.confd 313 BLAKE2B f08adcd103be5fcffa02d2c62ca85537cb5803336bb70ba3457b3b61790e1800d453168aaed981c15776fa92353149d17c6c5eeafb70033727fb0aa838e4422d SHA512 e209848af0d79069ac989ad61d3be610b4c0c2783a207a50463a25ec3811b04d1da3a2acde54749878bec44e1567874ede827b978d5472c00f6a855663e5cbf8 AUX minidlna-1.1.2.service 230 BLAKE2B 13db2b522a5c27143106f7d45410f94c657133440a5e352794cc4fc48c818865b28087c666911c905efd3fb9c00b6aa9f79f9d0b014eae9130db0d40b5a0ec20 SHA512 0cfa770c43097007dce2c440512e4ca27e02678a08299c8343c91d2e9f70d4756bfd9527c6747a484c639e0e8467cad3d5f2f5a216684ce75495be084e6ac5df AUX minidlna-1.1.5.initd 682 BLAKE2B ea0522de80f8525c5db7a4cb70ac72fd68db9c2beb263d87ef4ab18a128f55117929c6d244de72e5e663e06579a551ff1aa9df385afd277135aa1a2ed0201bbb SHA512 918e282b91434c29d7510e3c04749cd5b2d11aa623fada13d60749793cd7635e4b671e74dc6b1c4e45de0c96b56a271f017a17438651f9d24c03a16df26e09d2 +AUX minidlna-1.3.3-ffmpeg7.patch 865 BLAKE2B c705533df67a924d286856cfde59c8cc3135f98b51b062ce30b2a78c19ae2a06bfbdfe190d4790730262c4ba9a1d6c40f4afb5045a6cc45cd103f604c7d517a9 SHA512 31b4b7cacefb5233df798aeae2b3f3ca40de5be9b1b8c8ae74b5c8c70a6fa4e1ee51b65aa84826541d357182c8694918d3788eb0eec87d0e09724fcb6f837b41 DIST minidlna-1.3.3.tar.gz 824527 BLAKE2B 489b7ecb54a20f6111a65388ad2c52d477164046131af490cbcef7cd3ff2b841644f549bcad708ea6d4548f4111d5b2b63bafc0f079edf160467b85c682cbc5b SHA512 3571af71b49d46aacc273a9b35e2c78aeccb966c1d6122f8186074c34f9a177ac60622ccf29f307d8d73f502c7a99f023f96f0c43bbd398c7ef82bb57d77cc1d DIST minidlna-gentoo-artwork.patch.xz 49372 BLAKE2B 37a5691ec0a6558ecfb0748b0d25a513e7339beaf4816f8e0265f3954db07c3e87eb436855cde5f3daa95b1c3af550c0cf544efaf0a81fa91563507f35414416 SHA512 3bdaadc2a2331e9ebf37ed80d1de7cebd6307ab068dc9cf067159b2c0754a765b2076c07e988602af4dd2d6c49c819da8a1f668258950e15592027b353f22b5e -EBUILD minidlna-1.3.3.ebuild 2073 BLAKE2B d5503a19aeb99ee3fd1697a4d7ad20e42ea8a61e142ff320b23dcab1b77cdb1c7d547846abe8c0a3fb9eff32ef1a64cafe2596d06c059ae4bd3675e48bd385de SHA512 e45b2385143f58461f5921b56eca2be9d2ef371a68795b928c0e4ebd2cd24b4b57674c790b593c10bab2f0de181677c1cca18f7885bf4aa777adb9b1b6528f14 +EBUILD minidlna-1.3.3.ebuild 2117 BLAKE2B 211061f0e8f2dac72438845aff0974de52f240ce287cb43410110181f8f113ebf4e3466014d586f677799a6461e277b05d9966fde66c034dc2e7091c0526f830 SHA512 92af5ae80311e42420ddb68ee779cd5881273ec77da61f2cc2ec27e4f406d26b90dd60a5ed945bd9977f0c6073fb6c99f28b40dcd9d7a84a5cbebda7557fd670 MISC metadata.xml 513 BLAKE2B 6e851975b83efd7972d5d58c85093a36bf0f51845cb6ef1f7d7b37dab65dd913a5bbd6e5f163b2142eee11d6860b55e1bd346e23b5f4f427ca0812701149eede SHA512 99fe90016717a048a38feec908049f5f0c7b81045dc9e8953b204eb22e858f74b876fd5ae3765cbf88204f9f6ece87310dccb2123bdb1cc007e3c9049967a4e1 diff --git a/net-misc/minidlna/files/minidlna-1.3.3-ffmpeg7.patch b/net-misc/minidlna/files/minidlna-1.3.3-ffmpeg7.patch new file mode 100644 index 000000000000..f0d9ae3daf5a --- /dev/null +++ b/net-misc/minidlna/files/minidlna-1.3.3-ffmpeg7.patch @@ -0,0 +1,21 @@ +https://bugs.gentoo.org/938728 +https://sourceforge.net/p/minidlna/discussion/879956/thread/81e45c3d64 + +With ffmpeg 7, the channels field that was previously deprecated with +ffmpeg 6 has been removed entirely, which breaks the build for this +package. This patch switches to the correct way of doing it now, +which is ch_layout.nb_channels. + +diff --git a/libav.h b/libav.h +index b69752c..aed9d18 100644 +--- a/libav.h ++++ b/libav.h +@@ -174,7 +174,7 @@ lav_get_interlaced(AVStream *s) + #define lav_codec_tag(s) s->codecpar->codec_tag + #define lav_sample_rate(s) s->codecpar->sample_rate + #define lav_bit_rate(s) s->codecpar->bit_rate +-#define lav_channels(s) s->codecpar->channels ++#define lav_channels(s) s->codecpar->ch_layout.nb_channels + #define lav_width(s) s->codecpar->width + #define lav_height(s) s->codecpar->height + #define lav_profile(s) s->codecpar->profile diff --git a/net-misc/minidlna/minidlna-1.3.3.ebuild b/net-misc/minidlna/minidlna-1.3.3.ebuild index e56727ba5429..2f3e5511e18c 100644 --- a/net-misc/minidlna/minidlna-1.3.3.ebuild +++ b/net-misc/minidlna/minidlna-1.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -42,6 +42,7 @@ CONFIG_CHECK="~INOTIFY_USER" PATCHES=( "${WORKDIR}"/minidlna-gentoo-artwork.patch + "${FILESDIR}"/minidlna-1.3.3-ffmpeg7.patch ) src_prepare() { |