summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew White <mehw.is.me@inventati.org>2021-01-15 13:01:10 +0100
committerNick Sarnie <sarnex@gentoo.org>2021-01-15 12:10:57 -0500
commit21ffb11f616da44099e8b0b311d5176ede6c7be7 (patch)
tree82fcc5ca16173d4df2a338a86c2acb7ab2ccb5c9 /media-video/aegisub
parentprofiles: Remove python3_6 flags (diff)
downloadgentoo-21ffb11f616da44099e8b0b311d5176ede6c7be7.tar.gz
gentoo-21ffb11f616da44099e8b0b311d5176ede6c7be7.tar.bz2
gentoo-21ffb11f616da44099e8b0b311d5176ede6c7be7.zip
media-video/aegisub-9999: use wangqr repo to fix make 4.3 build
The bug presents itself during compilation as unresolved dependencies. The official Aegisub repo isn't actively updated... That leaves now a problem when make is updated to sys-devel/make-4.3. In Makefile.target it is required to use the automatic variable $(*F), rather than $*, to compile the Aegisub .a libraries with make 4.3. References about make 4.3 bug: - GNU make Automatic Variables https://www.gnu.org/software/make/manual/make.html#Automatic-Variables - Failing to compile on make 4.3 https://github.com/Aegisub/Aegisub/issues/171 - Use target name without directory in $*_OBJ macro https://github.com/wangqr/Aegisub/commit/6bd3f4c26b8fc1f76a8b797fcee11e7611d59a39 Closes: https://bugs.gentoo.org/765133 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Matteo Bianco <mehw.is.me@inventati.org> Closes: https://github.com/gentoo/gentoo/pull/19065 Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
Diffstat (limited to 'media-video/aegisub')
-rw-r--r--media-video/aegisub/aegisub-9999.ebuild4
-rw-r--r--media-video/aegisub/files/aegisub-9999-git.patch17
2 files changed, 2 insertions, 19 deletions
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index bcc8a14c9a32..58b02287943b 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -12,8 +12,8 @@ PLOCALES="ar be bg ca cs da de el es eu fa fi fr_FR gl hu id it ja ko nl pl pt_B
inherit autotools l10n lua-single wxwidgets xdg-utils git-r3
DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/Aegisub/Aegisub"
-EGIT_REPO_URI="https://github.com/${PN^}/${PN^}.git"
+HOMEPAGE="http://www.aegisub.org/ https://github.com/wangqr/Aegisub"
+EGIT_REPO_URI="https://github.com/wangqr/${PN^}.git"
# Submodules are used to pull bundled libraries.
EGIT_SUBMODULES=()
diff --git a/media-video/aegisub/files/aegisub-9999-git.patch b/media-video/aegisub/files/aegisub-9999-git.patch
index 80fd243703b1..a5883336757b 100644
--- a/media-video/aegisub/files/aegisub-9999-git.patch
+++ b/media-video/aegisub/files/aegisub-9999-git.patch
@@ -59,20 +59,3 @@ index e45a54767..1bd0120ed 100644
CPPFLAGS="$aegisub_save_CPPFLAGS"
LIBS="$aegisub_save_LIBS"
])
-diff --git a/src/libresrc/libresrc.cpp b/src/libresrc/libresrc.cpp
-index 79dc0f16c..8648d2987 100644
---- a/src/libresrc/libresrc.cpp
-+++ b/src/libresrc/libresrc.cpp
-@@ -22,9 +22,10 @@
-
- wxBitmap libresrc_getimage(const unsigned char *buff, size_t size, double scale, int dir) {
- wxMemoryInputStream mem(buff, size);
-+ auto img = wxImage(mem);
- if (dir != wxLayout_RightToLeft)
-- return wxBitmap(wxImage(mem), -1, scale);
-- return wxBitmap(wxImage(mem).Mirror(), -1, scale);
-+ return wxBitmap(img.Scale(img.GetHeight() * scale, img.GetWidth() * scale));
-+ return wxBitmap(img.Mirror().Scale(img.GetHeight() * scale, img.GetWidth() * scale));
- }
-
- wxIcon libresrc_geticon(const unsigned char *buff, size_t size) {