commit: 01c90376343b3883da48f42accbbf0a6de4193e2 Author: Nick Sarnie <sarnex <AT> gentoo <DOT> org> AuthorDate: Fri Jul 12 01:36:13 2019 +0000 Commit: Nick Sarnie <sarnex <AT> gentoo <DOT> org> CommitDate: Fri Jul 12 01:43:15 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c90376
media-video/aegisub: Fix build against boost 1.70.0 Patch from: Damien Thébault <damien.thebault <AT> gmail.com> Fixes: https://bugs.gentoo.org/689196 Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Nick Sarnie <sarnex <AT> gentoo.org> ...99.ebuild => aegisub-3.2.2_p20160518-r3.ebuild} | 47 +++++++++++++---- media-video/aegisub/aegisub-9999.ebuild | 1 + ...egisub-3.2.2_p20160518-fix-boost170-build.patch | 61 ++++++++++++++++++++++ 3 files changed, 99 insertions(+), 10 deletions(-) diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild similarity index 67% copy from media-video/aegisub/aegisub-9999.ebuild copy to media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild index fcbfb2a2dc8..69d4b3f6f5e 100644 --- a/media-video/aegisub/aegisub-9999.ebuild +++ b/media-video/aegisub/aegisub-3.2.2_p20160518-r3.ebuild @@ -5,20 +5,18 @@ EAPI=6 WX_GTK_VER=3.0 PLOCALES="ar bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_BR pt_PT ru sr_RS sr_RS@latin uk_UA vi zh_CN zh_TW" +COMMIT_ID="b118fe7e7a5c37540e2f0aa75af105e272bad234" -inherit autotools gnome2-utils l10n wxwidgets xdg-utils git-r3 +inherit autotools flag-o-matic gnome2-utils l10n wxwidgets xdg-utils vcs-snapshot DESCRIPTION="Advanced subtitle editor" HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"; -EGIT_REPO_URI="https://github.com/${PN^}/${PN^}.git"; -# Submodules are used to pull bundled libraries. -EGIT_SUBMODULES=() +SRC_URI="https://github.com/Aegisub/Aegisub/archive/${COMMIT_ID}.tar.gz -> ${P}.tar.gz" LICENSE="BSD MIT" SLOT="0" -KEYWORDS="" -IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell +uchardet" -RESTRICT="test" +KEYWORDS="~amd64 ~x86" +IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet" # aegisub bundles luabins (https://github.com/agladysh/luabins). # Unfortunately, luabins upstream is practically dead since 2010. @@ -47,15 +45,38 @@ DEPEND="${RDEPEND} dev-util/intltool sys-devel/gettext virtual/pkgconfig + test? ( + >=dev-cpp/gtest-1.8.1 + dev-lua/busted + dev-lua/luarocks + ) " REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )" PATCHES=( - "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch" - "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-respect-compiler-flags.patch" + "${FILESDIR}/${PV}/${P}-fix-system-luajit-build.patch" + "${FILESDIR}/${PV}/${P}-respect-compiler-flags.patch" + "${FILESDIR}/${PV}/${P}-support-system-gtest.patch" + "${FILESDIR}/${PV}/${P}-fix-icu59-build.patch" + "${FILESDIR}/${PV}/${P}-fix-icu62-build.patch" + "${FILESDIR}/${PV}/${P}-fix-boost170-build.patch" ) +aegisub_check_compiler() { + if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11; then + die "Your compiler lacks C++11 support. Use GCC>=4.7.0 or Clang>=3.3." + fi +} + +pkg_pretend() { + aegisub_check_compiler +} + +pkg_setup() { + aegisub_check_compiler +} + src_prepare() { default_src_prepare @@ -73,6 +94,12 @@ src_prepare() { config_rpath_update "${S}"/config.rpath eautoreconf + + cat <<- EOF > build/git_version.h || die + #define BUILD_GIT_VERSION_NUMBER 8897 + #define BUILD_GIT_VERSION_STRING "${PV}" + #define TAGGED_RELEASE 0 + EOF } src_configure() { @@ -98,7 +125,7 @@ src_configure() { } src_compile() { - emake + emake WITH_SYSTEM_GTEST=$(usex test) } src_test() { diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild index fcbfb2a2dc8..7377cdca67a 100644 --- a/media-video/aegisub/aegisub-9999.ebuild +++ b/media-video/aegisub/aegisub-9999.ebuild @@ -54,6 +54,7 @@ REQUIRED_USE="|| ( alsa openal oss portaudio pulseaudio )" PATCHES=( "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch" "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-respect-compiler-flags.patch" + "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost170-build.patch" ) src_prepare() { diff --git a/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch new file mode 100644 index 00000000000..30473e4828d --- /dev/null +++ b/media-video/aegisub/files/3.2.2_p20160518/aegisub-3.2.2_p20160518-fix-boost170-build.patch @@ -0,0 +1,61 @@ +diff a/src/colour_button.cpp b/src/colour_button.cpp +--- a/src/colour_button.cpp ++++ b/src/colour_button.cpp +@@ -18,7 +18,11 @@ + + #include "dialogs.h" + ++#if BOOST_VERSION >= 106900 ++#include <boost/gil.hpp> ++#else + #include <boost/gil/gil_all.hpp> ++#endif + + AGI_DEFINE_EVENT(EVT_COLOR, agi::Color); + +diff a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp +--- a/src/subtitles_provider_libass.cpp ++++ b/src/subtitles_provider_libass.cpp +@@ -46,7 +46,11 @@ + #include <libaegisub/util.h> + + #include <atomic> ++#if BOOST_VERSION >= 106900 ++#include <boost/gil.hpp> ++#else + #include <boost/gil/gil_all.hpp> ++#endif + #include <memory> + #include <mutex> + +diff a/src/video_frame.cpp b/src/video_frame.cpp +--- a/src/video_frame.cpp ++++ b/src/video_frame.cpp +@@ -16,7 +16,11 @@ + + #include "video_frame.h" + ++#if BOOST_VERSION >= 106900 ++#include <boost/gil.hpp> ++#else + #include <boost/gil/gil_all.hpp> ++#endif + #include <wx/image.h> + + namespace { +diff a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp +--- a/src/video_provider_dummy.cpp ++++ b/src/video_provider_dummy.cpp +@@ -45,7 +45,11 @@ + #include <boost/algorithm/string/predicate.hpp> + #include <boost/filesystem/path.hpp> + #include <libaegisub/format.h> ++#if BOOST_VERSION >= 106900 ++#include <boost/gil.hpp> ++#else + #include <boost/gil/gil_all.hpp> ++#endif + + DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern) + : framecount(frames) +
