gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 18:58:08 -07:00
Code Issues Projects Releases Wiki Activity

media-video/vlc: fix cxx standard passing

Browse Source 
Make the standard explicit instead of implicit. This should fix building
with `<=gcc-15`.

Fixes: 7d1d350e22
Closes: https://bugs.gentoo.org/976173
Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/46315
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Paul Zander
2026-05-28 15:12:25 +02:00
committed by Sam James
parent 14f6d81bbe
commit d9c4fce156
6 changed files with 80 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
media-video/vlc/vlc-3.0.23-r1.ebuild
View File

@@ -60,6 +60,7 @@ REQUIRED_USE="
"
# live+snapshots need bison+flex
BDEPEND="
dev-build/autoconf-archive
sys-devel/bison
sys-devel/flex
>=sys-devel/gettext-0.19.8
@@ -259,6 +260,19 @@ src_prepare() {
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
fi
# old bundled version
# so we need to call AX_CXX_COMPILE_STDCXX directly
rm \
m4/ax_cxx_compile_stdcxx.m4 \
m4/ax_cxx_compile_stdcxx_17.m4 \
|| die
local CXXSTD="17"
if has_version ">=dev-cpp/abseil-cpp-20260107.0"; then
# needs >=c++20
CXXSTD="20"
fi
sed -i -e "/AX_CXX_COMPILE_STDCXX/{s/_17(/(${CXXSTD}, /}" configure.ac || die
eautoreconf
}

15
media-video/vlc/vlc-3.0.23.ebuild
View File

@@ -61,6 +61,7 @@ REQUIRED_USE="
"
# live+snapshots need bison+flex
BDEPEND="
dev-build/autoconf-archive
sys-devel/bison
sys-devel/flex
>=sys-devel/gettext-0.19.8
@@ -275,8 +276,18 @@ src_prepare() {
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
fi
# do not pass -std=c++17 if it's not needed for c++17 features
sed -e '/AX_CXX_COMPILE_STDCXX_17/s/\[noext\]/[]/' -i configure.ac || die
# old bundled version
# so we need to call AX_CXX_COMPILE_STDCXX directly
rm \
m4/ax_cxx_compile_stdcxx.m4 \
m4/ax_cxx_compile_stdcxx_17.m4 \
|| die
local CXXSTD="17"
if has_version ">=dev-cpp/abseil-cpp-20260107.0"; then
# needs >=c++20
CXXSTD="20"
fi
sed -i -e "/AX_CXX_COMPILE_STDCXX/{s/_17(/(${CXXSTD}, /}" configure.ac || die
eautoreconf
}

15
media-video/vlc/vlc-3.0.9999.ebuild
View File

@@ -60,6 +60,7 @@ REQUIRED_USE="
"
# live+snapshots need bison+flex
BDEPEND="
dev-build/autoconf-archive
sys-devel/bison
sys-devel/flex
>=sys-devel/gettext-0.19.8
@@ -259,8 +260,18 @@ src_prepare() {
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
fi
# do not pass -std=c++17 if it's not needed for c++17 features
sed -e '/AX_CXX_COMPILE_STDCXX_17/s/\[noext\]/[]/' -i configure.ac || die
# old bundled version
# so we need to call AX_CXX_COMPILE_STDCXX directly
rm \
m4/ax_cxx_compile_stdcxx.m4 \
m4/ax_cxx_compile_stdcxx_17.m4 \
|| die
local CXXSTD="17"
if has_version ">=dev-cpp/abseil-cpp-20260107.0"; then
# needs >=c++20
CXXSTD="20"
fi
sed -i -e "/AX_CXX_COMPILE_STDCXX/{s/_17(/(${CXXSTD}, /}" configure.ac || die
eautoreconf
}

15
media-video/vlc/vlc-4.0.0_pre20260418.ebuild
View File

@@ -61,6 +61,7 @@ REQUIRED_USE="
"
# live+snapshots need bison+flex
BDEPEND="
dev-build/autoconf-archive
sys-devel/bison
sys-devel/flex
>=sys-devel/gettext-0.19.8
@@ -278,8 +279,18 @@ src_prepare() {
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
fi
# do not pass -std=c++17 if it's not needed for c++17 features
sed -e '/AX_CXX_COMPILE_STDCXX_17/s/\[noext\]/[]/' -i configure.ac || die
# old bundled version
# so we need to call AX_CXX_COMPILE_STDCXX directly
rm \
m4/ax_cxx_compile_stdcxx.m4 \
m4/ax_cxx_compile_stdcxx_17.m4 \
|| die
local CXXSTD="17"
if has_version ">=dev-cpp/abseil-cpp-20260107.0"; then
# needs >=c++20
CXXSTD="20"
fi
sed -i -e "/AX_CXX_COMPILE_STDCXX/{s/_17(/(${CXXSTD}, /}" configure.ac || die
eautoreconf
}

14
media-video/vlc/vlc-4.0.0_pre20260515.ebuild
View File

@@ -61,6 +61,7 @@ REQUIRED_USE="
"
# live+snapshots need bison+flex
BDEPEND="
dev-build/autoconf-archive
sys-devel/bison
sys-devel/flex
>=sys-devel/gettext-0.19.8
@@ -277,6 +278,19 @@ src_prepare() {
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
fi
# old bundled version
# so we need to call AX_CXX_COMPILE_STDCXX directly
rm \
m4/ax_cxx_compile_stdcxx.m4 \
m4/ax_cxx_compile_stdcxx_17.m4 \
|| die
local CXXSTD="17"
if has_version ">=dev-cpp/abseil-cpp-20260107.0"; then
# needs >=c++20
CXXSTD="20"
fi
sed -i -e "/AX_CXX_COMPILE_STDCXX/{s/_17(/(${CXXSTD}, /}" configure.ac || die
eautoreconf
}

15
media-video/vlc/vlc-9999.ebuild
View File

@@ -61,6 +61,7 @@ REQUIRED_USE="
"
# live+snapshots need bison+flex
BDEPEND="
dev-build/autoconf-archive
sys-devel/bison
sys-devel/flex
>=sys-devel/gettext-0.19.8
@@ -276,8 +277,18 @@ src_prepare() {
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die
fi
# do not pass -std=c++17 if it's not needed for c++17 features
sed -e '/AX_CXX_COMPILE_STDCXX_17/s/\[noext\]/[]/' -i configure.ac || die
# old bundled version
# so we need to call AX_CXX_COMPILE_STDCXX directly
rm \
m4/ax_cxx_compile_stdcxx.m4 \
m4/ax_cxx_compile_stdcxx_17.m4 \
|| die
local CXXSTD="17"
if has_version ">=dev-cpp/abseil-cpp-20260107.0"; then
# needs >=c++20
CXXSTD="20"
fi
sed -i -e "/AX_CXX_COMPILE_STDCXX/{s/_17(/(${CXXSTD}, /}" configure.ac || die
eautoreconf
}