commit: e531bbb35bd0457360b2f178509dac3ce297eb58 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Nov 13 04:43:19 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 13 04:44:10 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e531bbb3
media-video/vlc: add 3.0.20 * Add 3.0.20 * Filter LTO and disable strict aliasing (see bug #861143, very longstanding bug upstream) * Drop obsolete -fcommon passing (obsolete since 3.0.18) * Pass ESYSROOT for samba workaround Closes: https://bugs.gentoo.org/861143 Bug: https://bugs.gentoo.org/917274 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/vlc/Manifest | 1 + media-video/vlc/{vlc-3.0.9999.ebuild => vlc-3.0.20.ebuild} | 12 +++++------- media-video/vlc/vlc-3.0.9999.ebuild | 12 +++++------- media-video/vlc/vlc-9999.ebuild | 12 +++++------- 4 files changed, 16 insertions(+), 21 deletions(-) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 1bfb6eae78e2..0291c21e3b02 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,2 +1,3 @@ DIST vlc-3.0.18.tar.xz 26631372 BLAKE2B 73d80615d5b4789ca980bd631db248e74de13d466e5f19b66a170ca785b46f281a1a242c6fdf14686cfb224aba3ddfeda16ffce11edbef3255c4bbdff36c517d SHA512 6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e DIST vlc-3.0.19.tar.xz 25600300 BLAKE2B 62bb7c4b52c18c2464318e367183feaa324cc381d294fcba3871c50516183095a267824765a435c5415f50684f28997bcd3d323dc6d75e9c668c62a1014fb2e4 SHA512 8e4a7a35f8ab7db139c6ef1ace9947c2e21ed721af5576761c4b7b8498aaeded366273aad9853541d70ba2773422141a5e9a6196ae3c2a3a7c4dee2a2e6c3e76 +DIST vlc-3.0.20.tar.xz 25596392 BLAKE2B 4537d6b4b3445a28366cdb7ed7e12d0dc864e19a53d34efcdc0a62226642ec8653cf8d5b74d4aea30c9f324c34166e8fa71653b3b298f5abdebe29c4f21f2865 SHA512 02e58fb52dd75bf483ac4b298aecf86463b13d4782173d164adba6e4552d9262ff5e2ee1cbe1bce2c8a809801b79f328c6a8c475d34ae62aefaea02ae5ade406 diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.20.ebuild similarity index 98% copy from media-video/vlc/vlc-3.0.9999.ebuild copy to media-video/vlc/vlc-3.0.20.ebuild index 560f2bd1c57c..b683670524d6 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.20.ebuild @@ -440,8 +440,12 @@ src_configure() { ) # ^ We don't have these disabled libraries in the Portage tree yet. + # https://code.videolan.org/videolan/vlc/-/issues/17626 (bug #861143) + append-flags -fno-strict-aliasing + filter-lto + # Compatibility fix for Samba 4. - use samba && append-cppflags "-I/usr/include/samba-4.0" + use samba && append-cppflags "-I${ESYSROOT}/usr/include/samba-4.0" if use x86; then # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 @@ -450,12 +454,6 @@ src_configure() { replace-flags -Os -O2 fi - if use omxil; then - # bug #723006 - # https://trac.videolan.org/vlc/ticket/24617 - append-cflags -fcommon - fi - # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/" diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 560f2bd1c57c..b683670524d6 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -440,8 +440,12 @@ src_configure() { ) # ^ We don't have these disabled libraries in the Portage tree yet. + # https://code.videolan.org/videolan/vlc/-/issues/17626 (bug #861143) + append-flags -fno-strict-aliasing + filter-lto + # Compatibility fix for Samba 4. - use samba && append-cppflags "-I/usr/include/samba-4.0" + use samba && append-cppflags "-I${ESYSROOT}/usr/include/samba-4.0" if use x86; then # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 @@ -450,12 +454,6 @@ src_configure() { replace-flags -Os -O2 fi - if use omxil; then - # bug #723006 - # https://trac.videolan.org/vlc/ticket/24617 - append-cflags -fcommon - fi - # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/" diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 9a29b35d37e0..353aab7b20ba 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -434,8 +434,12 @@ src_configure() { ) # ^ We don't have these disabled libraries in the Portage tree yet. + # https://code.videolan.org/videolan/vlc/-/issues/17626 (bug #861143) + append-flags -fno-strict-aliasing + filter-lto + # Compatibility fix for Samba 4. - use samba && append-cppflags "-I/usr/include/samba-4.0" + use samba && append-cppflags "-I${ESYSROOT}/usr/include/samba-4.0" if use x86; then # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 @@ -444,12 +448,6 @@ src_configure() { replace-flags -Os -O2 fi - if use omxil; then - # bug #723006 - # https://trac.videolan.org/vlc/ticket/24617 - append-cflags -fcommon - fi - # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/"
