From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1C06B138359 for ; Wed, 5 Aug 2020 16:10:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4CC42E0844; Wed, 5 Aug 2020 16:10:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 24F58E0844 for ; Wed, 5 Aug 2020 16:10:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B169134EE67 for ; Wed, 5 Aug 2020 16:10:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 307A59C for ; Wed, 5 Aug 2020 16:10:08 +0000 (UTC) From: "Nick Sarnie" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nick Sarnie" Message-ID: <1596643773.f1efe67d2c8cdc8ebbf688b587bd86146a054c60.sarnex@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/aegisub/files/, media-video/aegisub/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/aegisub/aegisub-9999.ebuild media-video/aegisub/files/aegisub-9999-git.patch X-VCS-Directories: media-video/aegisub/ media-video/aegisub/files/ X-VCS-Committer: sarnex X-VCS-Committer-Name: Nick Sarnie X-VCS-Revision: f1efe67d2c8cdc8ebbf688b587bd86146a054c60 X-VCS-Branch: master Date: Wed, 5 Aug 2020 16:10:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 63113e7b-31cc-4a78-b144-d0bc9cd755c8 X-Archives-Hash: 4ebb379f08529623401289f328fe0778 commit: f1efe67d2c8cdc8ebbf688b587bd86146a054c60 Author: Jan Seeger thenybble de> AuthorDate: Mon Aug 3 13:00:08 2020 +0000 Commit: Nick Sarnie gentoo org> CommitDate: Wed Aug 5 16:09:33 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1efe67d media-video/aegisub-9999: Updated git ebuild. Closes: https://bugs.gentoo.org/734916 Signed-off-by: Jan Seeger thenybble.de> Signed-off-by: Nick Sarnie gentoo.org> media-video/aegisub/aegisub-9999.ebuild | 12 ++-- media-video/aegisub/files/aegisub-9999-git.patch | 78 ++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 6 deletions(-) diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild index 1e6debce1e8..c1f73d3373a 100644 --- a/media-video/aegisub/aegisub-9999.ebuild +++ b/media-video/aegisub/aegisub-9999.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 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" +PLOCALES="ar be 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" inherit autotools gnome2-utils l10n wxwidgets xdg-utils git-r3 @@ -52,9 +52,7 @@ DEPEND="${RDEPEND} 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" + "${FILESDIR}/${P}-git.patch" ) src_prepare() { @@ -94,12 +92,14 @@ src_configure() { $(use_with pulseaudio libpulse) $(use_with spell hunspell) $(use_with uchardet) + --disable-compiler-flags ) econf "${myeconfargs[@]}" } src_compile() { - emake + # Concurrent builds seem to break the build process. + emake -j1 } src_test() { diff --git a/media-video/aegisub/files/aegisub-9999-git.patch b/media-video/aegisub/files/aegisub-9999-git.patch new file mode 100644 index 00000000000..80fd243703b --- /dev/null +++ b/media-video/aegisub/files/aegisub-9999-git.patch @@ -0,0 +1,78 @@ +diff --git a/Makefile.target b/Makefile.target +index 516ef3c24..65de0e767 100644 +--- a/Makefile.target ++++ b/Makefile.target +@@ -79,13 +79,13 @@ endif + all: $(LIB_TARGETS) + + clean: +- $(BIN_RM) -f $(OBJ) $(CLEANFILES) $(LIB_TARGETS) ++ $(BIN_RM) -f -- $(OBJ) $(CLEANFILES) $(LIB_TARGETS) + + distclean: clean +- $(BIN_RM) -rf $(DISTCLEANFILES) $(DEP) ++ $(BIN_RM) -rf -- $(DISTCLEANFILES) $(DEP) + + depclean: clean +- $(BIN_RM) -rf $(DEP) ++ $(BIN_RM) -rf -- $(DEP) + + install: + +diff --git a/header.mk b/header.mk +index 613b38ff1..2c238e125 100644 +--- a/header.mk ++++ b/header.mk +@@ -5,15 +5,13 @@ TOP := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))/ + include $(TOP)Makefile.inc + + subdirs := \ +- automation \ + libaegisub \ + packages/desktop \ + po \ + src \ + tests \ +- tools \ + vendor/luabins \ +- vendor/luajit ++ tools + + subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs))) + +diff --git a/m4macros/ac_agi.m4 b/m4macros/ac_agi.m4 +index e45a54767..1bd0120ed 100644 +--- a/m4macros/ac_agi.m4 ++++ b/m4macros/ac_agi.m4 +@@ -20,12 +20,14 @@ AC_DEFUN([AC_AGI_LINK],[ + aegisub_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $4" + LIBS="$LIBS $5" ++ AC_LANG_PUSH(C++) + AC_CHECK_HEADER([$3], [agi_cv_header="yes"], [agi_cv_header="no"]) + AS_IF([test "x$agi_cv_header" = xyes], + [AC_CACHE_CHECK( + [whether $1 works], [agi_cv_with_$2], + [AC_LINK_IFELSE([AC_LANG_SOURCE([$6])], [eval agi_cv_with_$2="yes"], [eval agi_cv_with_$2="no"])])] + [eval agi_cv_with_$2="no"]) ++ AC_LANG_POP(C++) + 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) {