Github messages for voidlinux
 help / color / mirror / Atom feed
From: pudiva <pudiva@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] Aegisub: update to wangqr fork 3.3.2 (fix #31637)
Date: Tue, 03 Aug 2021 22:15:30 +0200	[thread overview]
Message-ID: <20210803201530.LI7UDo_zYjsKC7aIIK0AG-XvI-KFhQws0m6hmvT3g5A@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32162@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1551 bytes --]

There is an updated pull request by pudiva against master on the void-packages repository

https://github.com/pudiva/void-packages aegisub-wangqr-git
https://github.com/void-linux/void-packages/pull/32162

Aegisub: update to wangqr fork 3.3.2 (fix #31637)
~~This is a -git package because releases seem to be broken upstream and
don't build...~~

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116

#### General
- [x] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [x] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [ ] armv7l
  - [ ] armv6l-musl


A patch file from https://github.com/void-linux/void-packages/pull/32162.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-aegisub-wangqr-git-32162.patch --]
[-- Type: text/x-diff, Size: 29784 bytes --]

From 69e39542fb3a52ad940a55c0ebf39be3390ea125 Mon Sep 17 00:00:00 2001
From: pudiva <rogi@skylittlesystem.org>
Date: Sat, 24 Jul 2021 02:22:25 +0100
Subject: [PATCH] Aegisub: update to wangqr fork 3.3.2 (fix #31637)

This package fetches from git because upstream doesn't support release
tarballs. The tarballs present on its github releases page are
auto-generated and fail to build with:

    checking for version... git repo not found and no cached git_version.h

See: https://github.com/wangqr/Aegisub/issues/116
---
 srcpkgs/Aegisub/patches/boost-1.68.patch      |  34 ----
 srcpkgs/Aegisub/patches/boost-1.69.patch      |  66 ------
 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch  |  87 --------
 .../Aegisub/patches/fix-icu-62-build.patch    |  57 ------
 .../Aegisub/patches/fix-no-narrowing.patch    |  12 --
 srcpkgs/Aegisub/patches/libatomic.patch       |  35 ----
 srcpkgs/Aegisub/patches/luajit_21.patch       | 190 ------------------
 srcpkgs/Aegisub/patches/make43.patch          |  23 ---
 .../remove-vendor-luajit-dependency.patch     |  68 -------
 srcpkgs/Aegisub/patches/system-luajit.patch   |  43 ----
 srcpkgs/Aegisub/patches/wxwidgets.patch       |  24 ---
 srcpkgs/Aegisub/template                      |  62 ++----
 12 files changed, 22 insertions(+), 679 deletions(-)
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.68.patch
 delete mode 100644 srcpkgs/Aegisub/patches/boost-1.69.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-icu-62-build.patch
 delete mode 100644 srcpkgs/Aegisub/patches/fix-no-narrowing.patch
 delete mode 100644 srcpkgs/Aegisub/patches/libatomic.patch
 delete mode 100644 srcpkgs/Aegisub/patches/luajit_21.patch
 delete mode 100644 srcpkgs/Aegisub/patches/make43.patch
 delete mode 100644 srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
 delete mode 100644 srcpkgs/Aegisub/patches/system-luajit.patch
 delete mode 100644 srcpkgs/Aegisub/patches/wxwidgets.patch

diff --git a/srcpkgs/Aegisub/patches/boost-1.68.patch b/srcpkgs/Aegisub/patches/boost-1.68.patch
deleted file mode 100644
index 578360616563..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.68.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d8336d2fed73c72d1227b343d6acfb991bc1651b Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Mon, 9 Jul 2018 20:15:29 +0000
-Subject: [PATCH] Keep using std::distance after Boost 1.68
-
-src/search_replace_engine.cpp:256:14: error: call to
-      'distance' is ambiguous
-                                count += distance(
-                                         ^~~~~~~~
-/usr/include/c++/v1/iterator:511:1: note: candidate function [with _InputIter =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-distance(_InputIter __first, _InputIter __last)
-^
-/usr/local/include/boost/iterator/distance.hpp:49:9: note: candidate function [with SinglePassIterator =
-      boost::u32regex_iterator<std::__1::__wrap_iter<const char *> >]
-        distance(SinglePassIterator first, SinglePassIterator last)
-        ^
----
- src/search_replace_engine.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git src/search_replace_engine.cpp src/search_replace_engine.cpp
-index 594c21e5e..14c71680d 100644
---- a/src/search_replace_engine.cpp
-+++ b/src/search_replace_engine.cpp
-@@ -253,7 +253,7 @@ bool SearchReplaceEngine::ReplaceAll() {
- 			if (MatchState ms = matches(&diag, 0)) {
- 				auto& diag_field = diag.*get_dialogue_field(settings.field);
- 				std::string const& text = diag_field.get();
--				count += distance(
-+				count += std::distance(
- 					boost::u32regex_iterator<std::string::const_iterator>(begin(text), end(text), *ms.re),
- 					boost::u32regex_iterator<std::string::const_iterator>());
- 				diag_field = u32regex_replace(text, *ms.re, settings.replace_with);
diff --git a/srcpkgs/Aegisub/patches/boost-1.69.patch b/srcpkgs/Aegisub/patches/boost-1.69.patch
deleted file mode 100644
index b67e06dfa3b0..000000000000
--- a/srcpkgs/Aegisub/patches/boost-1.69.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From bb1f66a01f6e4661ab9c6610c5c2eee67bd0bd61 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 15 Nov 2018 12:42:53 -0500
-Subject: [PATCH] Bump boost version to 1.69.0.beta1
-
-Fix Aegisub/Aegisub#93
----
- src/colour_button.cpp             | 2 +-
- src/subtitles_provider_libass.cpp | 2 +-
- src/video_frame.cpp               | 2 +-
- src/video_provider_dummy.cpp      | 2 +-
- vendor/boost                      | 2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/colour_button.cpp b/src/colour_button.cpp
-index c0b1c5d58..48a87856c 100644
---- a/src/colour_button.cpp
-+++ b/src/colour_button.cpp
-@@ -18,7 +18,7 @@
- 
- #include "dialogs.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- AGI_DEFINE_EVENT(EVT_COLOR, agi::Color);
- 
-diff --git a/src/subtitles_provider_libass.cpp b/src/subtitles_provider_libass.cpp
-index efb5cb481..fb62e3334 100644
---- a/src/subtitles_provider_libass.cpp
-+++ b/src/subtitles_provider_libass.cpp
-@@ -46,7 +46,7 @@
- #include <libaegisub/util.h>
- 
- #include <atomic>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <memory>
- #include <mutex>
- 
-diff --git a/src/video_frame.cpp b/src/video_frame.cpp
-index 610005879..c51f929ac 100644
---- a/src/video_frame.cpp
-+++ b/src/video_frame.cpp
-@@ -16,7 +16,7 @@
- 
- #include "video_frame.h"
- 
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- #include <wx/image.h>
- 
- namespace {
-diff --git a/src/video_provider_dummy.cpp b/src/video_provider_dummy.cpp
-index b68b206b7..eca5ac261 100644
---- a/src/video_provider_dummy.cpp
-+++ b/src/video_provider_dummy.cpp
-@@ -45,7 +45,7 @@
- #include <boost/algorithm/string/predicate.hpp>
- #include <boost/filesystem/path.hpp>
- #include <libaegisub/format.h>
--#include <boost/gil/gil_all.hpp>
-+#include <boost/gil.hpp>
- 
- DummyVideoProvider::DummyVideoProvider(double fps, int frames, int width, int height, agi::Color colour, bool pattern)
- : framecount(frames)
diff --git a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch b/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
deleted file mode 100644
index 70acd48f37c7..000000000000
--- a/srcpkgs/Aegisub/patches/fix-ffms2-2.40.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-Source: @pullmoll
-Upstream: no
-Reason: ffms2 no longer provides color space enum values; use the ffmpeg ones
-
---- a/src/ffmpegsource_common.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/ffmpegsource_common.cpp	2021-01-18 21:12:42.209582337 +0100
-@@ -98,7 +98,6 @@
- 			ps->SetProgress(Current, Total);
- 			return ps->IsCancelled();
- 		};
--		Index = FFMS_DoIndexing(Indexer, Trackmask, FFMS_TRACKMASK_NONE,
--			nullptr, nullptr, IndexEH, callback, ps, &ErrInfo);
-+		Index = FFMS_DoIndexing2(Indexer, FFMS_IEH_ABORT, &ErrInfo);
- 	});
- 
---- a/src/video_provider_ffmpegsource.cpp	2014-12-08 01:07:09.000000000 +0100
-+++ b/src/video_provider_ffmpegsource.cpp	2021-01-18 21:07:47.205800051 +0100
-@@ -42,6 +42,7 @@
- 
- #include <libaegisub/fs.h>
- #include <libaegisub/make_unique.h>
-+#include <libavutil/pixfmt.h>
- 
- namespace {
- /// @class FFmpegSourceVideoProvider
-@@ -78,7 +79,7 @@
- 		if (matrix == RealColorSpace)
- 			FFMS_SetInputFormatV(VideoSource, CS, CR, FFMS_GetPixFmt(""), nullptr);
- 		else if (matrix == "TV.601")
--			FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
-+			FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), nullptr);
- 		else
- 			return;
- 		ColorSpace = matrix;
-@@ -103,16 +104,16 @@
- 	std::string str = cr == FFMS_CR_JPEG ? "PC" : "TV";
- 
- 	switch (cs) {
--		case FFMS_CS_RGB:
-+		case AVCOL_SPC_RGB:
- 			return "None";
--		case FFMS_CS_BT709:
-+		case AVCOL_SPC_BT709:
- 			return str + ".709";
--		case FFMS_CS_FCC:
-+		case AVCOL_SPC_FCC:
- 			return str + ".FCC";
--		case FFMS_CS_BT470BG:
--		case FFMS_CS_SMPTE170M:
-+		case AVCOL_SPC_BT470BG:
-+		case AVCOL_SPC_SMPTE170M:
- 			return str + ".601";
--		case FFMS_CS_SMPTE240M:
-+		case AVCOL_SPC_SMPTE240M:
- 			return str + ".240M";
- 		default:
- 			throw VideoOpenError("Unknown video color space");
-@@ -208,8 +209,6 @@
- 
- 	// set thread count
- 	int Threads = OPT_GET("Provider/Video/FFmpegSource/Decoding Threads")->GetInt();
--	if (FFMS_GetVersion() < ((2 << 24) | (17 << 16) | (2 << 8) | 1) && FFMS_GetSourceType(Index) == FFMS_SOURCE_LAVF)
--		Threads = 1;
- 
- 	// set seekmode
- 	// TODO: give this its own option?
-@@ -240,15 +239,15 @@
- 	CS = TempFrame->ColorSpace;
- 	CR = TempFrame->ColorRange;
- 
--	if (CS == FFMS_CS_UNSPECIFIED)
--		CS = Width > 1024 || Height >= 600 ? FFMS_CS_BT709 : FFMS_CS_BT470BG;
-+	if (CS == AVCOL_SPC_UNSPECIFIED)
-+		CS = Width > 1024 || Height >= 600 ? AVCOL_SPC_BT709 : AVCOL_SPC_BT470BG;
- 	RealColorSpace = ColorSpace = colormatrix_description(CS, CR);
- 
- #if FFMS_VERSION >= ((2 << 24) | (17 << 16) | (1 << 8) | 0)
--	if (CS != FFMS_CS_RGB && CS != FFMS_CS_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
--		if (FFMS_SetInputFormatV(VideoSource, FFMS_CS_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
-+	if (CS != AVCOL_SPC_RGB && CS != AVCOL_SPC_BT470BG && ColorSpace != colormatrix && (colormatrix == "TV.601" || OPT_GET("Video/Force BT.601")->GetBool())) {
-+		if (FFMS_SetInputFormatV(VideoSource, AVCOL_SPC_BT470BG, CR, FFMS_GetPixFmt(""), &ErrInfo))
- 			throw VideoOpenError(std::string("Failed to set input format: ") + ErrInfo.Buffer);
--		ColorSpace = colormatrix_description(FFMS_CS_BT470BG, CR);
-+		ColorSpace = colormatrix_description(AVCOL_SPC_BT470BG, CR);
- 	}
- #endif
- 
diff --git a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch b/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
deleted file mode 100644
index 9fbb2a6289a6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-icu-62-build.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Upstream: Yes
-Author: sidneys <sidneys.github.io@outlook.com>
-Reason: fix build w/ ICU >= 60
---- a/libaegisub/common/character_count.cpp
-+++ b/libaegisub/common/character_count.cpp
-@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
- 	static std::once_flag token;
- 	std::call_once(token, [&] {
- 		UErrorCode status = U_ZERO_ERROR;
--		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
-+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
- 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
- 	});
- 
-@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
- 
- 	size_t count = 0;
- 	auto pos = character_bi.first();
--	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
-+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
- 		if (!mask)
- 			++count;
- 		else {
-@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
- 	auto& bi = get_break_iterator(&str[0], str.size());
- 
- 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
--		if (end == BreakIterator::DONE)
-+		if (end == icu::BreakIterator::DONE)
- 			return str.size();
- 		if (n == 0)
- 			return pos;
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
- }
- 
- wxString LocalizedLanguageName(wxString const& lang) {
--       Locale iculoc(lang.c_str());
-+       icu::Locale iculoc(lang.c_str());
-        if (!iculoc.isBogus()) {
--               UnicodeString ustr;
-+               icu::UnicodeString ustr;
-                iculoc.getDisplayName(iculoc, ustr);
- #ifdef _MSC_VER
-                return wxString(ustr.getBuffer());
---- a/src/utils.cpp
-+++ b/src/utils.cpp
-@@ -44,6 +44,7 @@
- #include <boost/filesystem/path.hpp>
- #include <map>
- #include <unicode/locid.h>
-+#include <unicode/unistr.h>
- #include <wx/clipbrd.h>
- #include <wx/filedlg.h>
- #include <wx/stdpaths.h>
-
diff --git a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch b/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
deleted file mode 100644
index c865978dffb6..000000000000
--- a/srcpkgs/Aegisub/patches/fix-no-narrowing.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac	2021-01-18 20:39:16.546501531 +0100
-+++ b/configure.ac	2021-01-18 20:57:43.667587518 +0100
-@@ -142,7 +142,8 @@
-   CFLAGS="$CFLAGS -Wall -Wextra -Wno-unused-parameter -std=gnu99 -pipe -g"
-   CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wno-unused-parameter -fno-strict-aliasing -pipe -g"
-   AC_CXX_FLAG([-std=c++11])
--  AC_CXX_FLAG([-Wno-c++11-narrowing])
-+  AC_CXX_FLAG([-Wno-narrowing])
-+  AC_CXX_FLAG([-Wno-deprecated-copy])
-   AC_C_FLAG([-Wno-unused-local-typedefs])
-   AC_CXX_FLAG([-Wno-unused-local-typedefs])
- 
diff --git a/srcpkgs/Aegisub/patches/libatomic.patch b/srcpkgs/Aegisub/patches/libatomic.patch
deleted file mode 100644
index a608752e57aa..000000000000
--- a/srcpkgs/Aegisub/patches/libatomic.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -8,6 +8,7 @@ HAVE_OSS        = @with_oss@
- HAVE_PORTAUDIO  = @with_portaudio@
- HAVE_FFMS2      = @with_ffms2@
- HAVE_LIBPULSE   = @with_libpulse@
-+HAVE_LIBATOMIC  = @with_libatomic@
- 
- ##############
- # BUILD OUTPUT
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,9 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+AC_ARG_WITH([libatomic], AS_HELP_STRING([--with-libatomic],[Use libatomic. [no]]))
-+AC_SUBST(with_libatomic)
-+
- ######################################################
- # Debugging support
- ######################################################
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -179,6 +179,10 @@ src_LIBS += $(LIBS_HUNSPELL)
- src_OBJ += $(d)spellchecker_hunspell.o
- endif
- 
-+ifeq (yes, $(HAVE_LIBATOMIC))
-+src_LIBS += -latomic
-+endif
-+
- #####################
- # SOURCE-LEVEL CFLAGS
- #####################
diff --git a/srcpkgs/Aegisub/patches/luajit_21.patch b/srcpkgs/Aegisub/patches/luajit_21.patch
deleted file mode 100644
index b4d145366a23..000000000000
--- a/srcpkgs/Aegisub/patches/luajit_21.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-Subject: Fix luajit 2.1 FTBFS
-Origin: Upstream
-Forwarded: Not-needed
-Last-Update:
-Bug: 873327
-Acked-by: Gunnar Wolf <gwolf@debian.org>
-Applied-upstream: yes
-
-Index: libaegisub/lua/modules/lpeg.c
-===================================================================
---- a/libaegisub/lua/modules/lpeg.c
-+++ b/libaegisub/lua/modules/lpeg.c
-@@ -2334,7 +2334,7 @@ static int matchl (lua_State *L) {
- }
- 
- 
--static struct luaL_reg pattreg[] = {
-+static struct luaL_Reg pattreg[] = {
-   {"match", matchl},
-   {"print", printpat_l},
-   {"locale", locale_l},
-@@ -2360,7 +2360,7 @@ static struct luaL_reg pattreg[] = {
- };
- 
- 
--static struct luaL_reg metapattreg[] = {
-+static struct luaL_Reg metapattreg[] = {
-   {"__add", union_l},
-   {"__pow", star_l},
-   {"__sub", diff_l},
-Index: vendor/luabins/AUTHORS
-===================================================================
---- a/vendor/luabins/AUTHORS
-+++ b/vendor/luabins/AUTHORS
-@@ -2,3 +2,4 @@ Luabins authors:
- ----------------
- 
- Alexander Gladysh <agladysh@gmail.com>
-+hanxi <hanxi@gmail.com>
-Index: vendor/luabins/README.md
-===================================================================
---- a/vendor/luabins/README.md
-+++ b/vendor/luabins/README.md
-@@ -4,6 +4,8 @@ luabins — Lua Binary Serialization Lib
- Allows to save tuples of primitive Lua types into binary chunks
- and to load saved data back.
- 
-+NB: You may be better off with luatexts: https://github.com/agladysh/luatexts.
-+
- On serialization
- ----------------
- 
-Index: vendor/luabins/src/luabins.c
-===================================================================
---- a/vendor/luabins/src/luabins.c
-+++ b/vendor/luabins/src/luabins.c
-@@ -54,7 +54,7 @@ static int l_load(lua_State * L)
- }
- 
- /* luabins Lua module API */
--static const struct luaL_reg R[] =
-+static const struct luaL_Reg R[] =
- {
-   { "save", l_save },
-   { "load", l_load },
-Index: vendor/luabins/src/luaheaders.h
-===================================================================
---- a/vendor/luabins/src/luaheaders.h
-+++ b/vendor/luabins/src/luaheaders.h
-@@ -7,6 +7,16 @@ extern "C" {
- 
- #include <lua.h>
- #include <lauxlib.h>
-+
-+#if !defined LUA_VERSION_NUM
-+#define luaL_Reg luaL_reg
-+#endif
-+
-+#if LUA_VERSION_NUM > 501
-+#define luaL_register(L,n,R) (luaL_newlib(L,R))
-+#define lua_objlen(L,i) lua_rawlen(L, (i))
-+#endif
-+
- #if defined (__cplusplus) && !defined (LUABINS_LUABUILTASCPP)
- }
- #endif
-Index: vendor/luabins/src/luainternals.h
-===================================================================
---- a/vendor/luabins/src/luainternals.h
-+++ b/vendor/luabins/src/luainternals.h
-@@ -7,6 +7,24 @@
- #ifndef LUABINS_LUAINTERNALS_H_INCLUDED_
- #define LUABINS_LUAINTERNALS_H_INCLUDED_
- 
-+#ifndef LUAI_BITSINT
-+/*
-+* LUAI_BITSINT defines the number of bits in an int.
-+*  CHANGE here if Lua cannot automatically detect the number of bits of
-+*  your machine. Probably you do not need to change this.
-+*
-+* avoid overflows in comparison */
-+#if INT_MAX-20 < 32760
-+#define LUAI_BITSINT    16
-+#elif INT_MAX > 2147483640L
-+/* int has at least 32 bits */
-+#define LUAI_BITSINT    32
-+#else
-+#error "you must define LUA_BITSINT with number of bits in an integer"
-+#endif
-+
-+#endif // ifndef LUAI_BITSINT
-+
- /*
- * BEGIN COPY-PASTE FROM Lua 5.1.4 luaconf.h
- * WARNING: If your Lua config differs, fix this!
-@@ -38,7 +56,6 @@ int luaO_log2 (unsigned int x);
- /*
- ** max size of array part is 2^MAXBITS
- */
--#define LUAI_BITSINT 32
- #if LUAI_BITSINT > 26
- #define MAXBITS		26
- #else
-Index: vendor/luabins/src/lualess.c
-===================================================================
---- /dev/null
-+++ b/vendor/luabins/src/lualess.c
-@@ -0,0 +1,32 @@
-+/*
-+* lualess.h
-+* Lua-related definitions for lua-less builds (based on Lua manual)
-+* See copyright notice in luabins.h
-+*/
-+
-+#include <stdlib.h>
-+
-+/*
-+* lua_Alloc-compatible allocator to use in Lua-less applications
-+* with lbs_SaveBuffer. Based on sample code from Lua 5.1 manual.
-+*/
-+void * lbs_simplealloc(
-+    void * ud,
-+    void * ptr,
-+    size_t osize,
-+    size_t nsize
-+  )
-+{
-+  (void) ud;
-+  (void) osize;  /* not used */
-+
-+  if (nsize == 0)
-+  {
-+    free(ptr);
-+    return NULL;
-+  }
-+  else
-+  {
-+    return realloc(ptr, nsize);
-+  }
-+}
-Index: vendor/luabins/test/test.lua
-===================================================================
---- a/vendor/luabins/test/test.lua
-+++ b/vendor/luabins/test/test.lua
-@@ -6,6 +6,8 @@
- 
- package.cpath = "./?.so;"..package.cpath
- 
-+local pack = pack or table.pack
-+local unpack = unpack or table.unpack
- local randomseed = 1235134892
- --local randomseed = os.time()
- 
-@@ -145,6 +147,7 @@ end
- -- Test helper functions
- -- ----------------------------------------------------------------------------
- 
-+luabins = require 'luabins'
- local luabins_local = require 'luabins'
- assert(luabins_local == luabins)
- 
-@@ -281,7 +284,7 @@ check_fail_save(
-     "can't save: unsupported type detected",
-     coroutine.create(function() end)
-   )
--check_fail_save("can't save: unsupported type detected", newproxy())
-+check_fail_save("can't save: unsupported type detected", function()end)
- 
- print("---> basic table tests")
- 
diff --git a/srcpkgs/Aegisub/patches/make43.patch b/srcpkgs/Aegisub/patches/make43.patch
deleted file mode 100644
index 6edb8c3b5e7d..000000000000
--- a/srcpkgs/Aegisub/patches/make43.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From f4cc905c69ca69c68cb95674cefce4abc37ce046 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Mon, 17 Feb 2020 14:42:07 +0800
-Subject: [PATCH] Use target name without directory in $*_OBJ macro
-
-Fix Aegisub/Aegisub#171
----
- Makefile.target | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.target b/Makefile.target
-index 516ef3c24..5c4c5d259 100644
---- a/Makefile.target
-+++ b/Makefile.target
-@@ -112,7 +112,7 @@ POST_FLAGS = $($@_FLAGS) -c -o $@ $<
- # Libraries contain all object files they depend on (but they may depend on other files)
- # Not using libtool on OS X because it has an unsilenceable warning about a
- # compatibility issue with BSD 4.3 (wtf)
--lib%.a: $$($$*_OBJ)
-+lib%.a: $$($$(*F)_OBJ)
- 	@$(BIN_MKDIR_P) $(dir $@)
- 	$(BIN_AR) cru $@ $(filter %.o,$^)
- 	$(BIN_RANLIB) $@
diff --git a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch b/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
deleted file mode 100644
index 0b0e67a499b2..000000000000
--- a/srcpkgs/Aegisub/patches/remove-vendor-luajit-dependency.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Subject: vendor/luajit is removed in the Debian package
-Author: Sebastian Reichel <sre@debian.org>
-Forwarded: not-needed
-Last-Update: 2014-08-06
-Upstream: Yes
-Reason: Use system luajit
-
---- a/header.mk
-+++ b/header.mk
-@@ -13,7 +13,6 @@
- 	tests \
- 	tools \
- 	vendor/luabins \
--	vendor/luajit \
- 	vendor/universalchardet
- 
- subdirs := $(addprefix $(TOP),$(addsuffix /Makefile,$(subdirs)))
---- a/Makefile.inc.in
-+++ b/Makefile.inc.in
-@@ -78,7 +78,7 @@
- CFLAGS_ICU         = @ICU_I18N_CFLAGS@
- CFLAGS_LIBASS      = @LIBASS_CFLAGS@
- CFLAGS_LIBPULSE    = @LIBPULSE_CFLAGS@
--CFLAGS_LUA         = -I$(TOP)vendor/luajit/include
-+CFLAGS_LUA         = @LUAJIT_CFLAGS@
- CFLAGS_OPENAL      = @OPENAL_CFLAGS@
- CFLAGS_OSS         = @OSS_CFLAGS@
- CFLAGS_PORTAUDIO   = @PORTAUDIO_CFLAGS@
-@@ -96,7 +96,7 @@
- LIBS_ICU           = @ICU_UC_LIBS@ @ICU_I18N_LIBS@
- LIBS_LIBASS        = @LIBASS_LIBS@
- LIBS_LIBPULSE      = @LIBPULSE_LIBS@
--LIBS_LUA           = $(TOP)vendor/luajit/src/libluajit.a
-+LIBS_LUA           = @LUAJIT_LIBS@
- LIBS_OPENAL        = @OPENAL_LIBS@
- LIBS_PORTAUDIO     = @PORTAUDIO_LIBS@
- LIBS_PTHREAD       = @PTHREAD_LIBS@
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -12,6 +12,4 @@
- 
- PROGRAM += $(d)repack-thes-dict
- 
--$(TOP)tools/respack.lua: $(TOP)vendor/luajit/src/host/minilua
--
- include $(TOP)Makefile.target
---- a/tools/respack.lua
-+++ b/tools/respack.lua
-@@ -44,7 +44,7 @@ out_cpp:write('#include "libresrc.h"\n')
- for line in manifest:lines() do
-   if line:find('.') then
-     local file = try_open(path..line, 'rb')
--    local id = line:gsub('^.*/', ''):gsub('\.[a-z]+$', '')
-+    local id = line:gsub('^.*/', ''):gsub('%.[a-z]+$', '')
-     out_cpp:write("const unsigned char " .. id .. "[] = {")
- 
-     local len = 0
---- a/src/libresrc/Makefile
-+++ b/src/libresrc/Makefile
-@@ -10,7 +10,7 @@
- 
- $(resrc_OBJ): $(d)default_config.h $(d)bitmap.h $(d)default_config.cpp $(d)bitmap.cpp
- 
--RESPACK := cd $(TOP)src/libresrc; $(TOP)vendor/luajit/src/host/minilua $(TOP)tools/respack.lua
-+RESPACK := cd $(TOP)src/libresrc; $(TOP)tools/respack.lua
- 
- $(d)bitmap.cpp: $(d)bitmap.h
- $(d)default_config.cpp: $(d)default_config.h
diff --git a/srcpkgs/Aegisub/patches/system-luajit.patch b/srcpkgs/Aegisub/patches/system-luajit.patch
deleted file mode 100644
index 5ae4a004d987..000000000000
--- a/srcpkgs/Aegisub/patches/system-luajit.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: Upstream
-Upstream: Yes
-Reason: Use system luajit
- diff --git a/configure.ac b/configure.ac
-index be657b0..2c03951 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -376,6 +376,34 @@ AGI_OPT_PKG(ffms2, [build without ffms2 A/V provider [auto]], [Enable FFMS2 supp
- AGI_OPT_PKG(fftw3, [build without fftw support [auto]], [Enable fftw support])
- AGI_OPT_PKG(hunspell, [build without hunspell spell-checking [auto]], [Enable Hunspell support])
- 
-+########
-+# LuaJIT
-+########
-+system_luajit="bundled"
-+AC_ARG_WITH(system-luajit, AS_HELP_STRING([--without-system-luajit], [Use built-in LuaJIT [auto]]))
-+# Check if it's available at all
-+AS_IF([test x$with_system_luajit = xno], [],
-+      [PKG_CHECK_MODULES(LUAJIT, luajit >= 2.0.0, [], [
-+       AS_IF([test x$with_system_luajit = xyes],
-+             [AC_MSG_FAILURE([--with-sytem-luajit was specified, but luajit could not be found])])
-+       with_system_luajit="no"])])
-+
-+with_system_luajit="yes"
-+system_luajit="system"
-+
-+
-+AS_IF([test $with_system_luajit = no],
-+      [AC_SUBST([LUAJIT_CFLAGS], ['-I$(TOP)vendor/luajit/include'])
-+       AC_SUBST([LUAJIT_LIBS], ['$(TOP)vendor/luajit/src/libluajit.a'])])
-+
-+# We also need a Lua binary to run part of the build system
-+# Which version doesn't matter as the scripts are portable between them
-+AC_CHECK_PROGS([LUA], [lua luajit lua5.3 lua-5.3 lua5.2 lua-5.2 lua5.1 lua-5.1])
-+
-+# If the user doesn't have an installed copy of Lua, just use the one built
-+# as part of building LuaJIT
-+AS_IF([test -z $LUA], [LUA="$srcdir/vendor/luajit/src/host/minilua"])
-+
- ######################################################
- # Debugging support
- ######################################################
-
diff --git a/srcpkgs/Aegisub/patches/wxwidgets.patch b/srcpkgs/Aegisub/patches/wxwidgets.patch
deleted file mode 100644
index f33fcd35d4c6..000000000000
--- a/srcpkgs/Aegisub/patches/wxwidgets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 592250eeaafe2a34b08e973ac97afe389617a3e6 Mon Sep 17 00:00:00 2001
-From: wangqr <wangqr@wangqr.tk>
-Date: Thu, 6 Jun 2019 15:24:40 -0400
-Subject: [PATCH] Remove call to wxSizer::CalcMin and wxSizer::RecalcSizes
-
-As they are used internally by Layout and should not be called
-directly.
----
- src/frame_main.cpp | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/frame_main.cpp b/src/frame_main.cpp
-index b35c32960..df115b27c 100644
---- a/src/frame_main.cpp
-+++ b/src/frame_main.cpp
-@@ -240,8 +240,6 @@ void FrameMain::SetDisplayMode(int video, int audio) {
- 	TopSizer->Show(videoBox, showVideo, true);
- 	ToolsSizer->Show(audioBox, showAudio, true);
- 
--	MainSizer->CalcMin();
--	MainSizer->RecalcSizes();
- 	MainSizer->Layout();
- 	Layout();
- 
diff --git a/srcpkgs/Aegisub/template b/srcpkgs/Aegisub/template
index 2ddf6c24ee6e..ef707096da28 100644
--- a/srcpkgs/Aegisub/template
+++ b/srcpkgs/Aegisub/template
@@ -1,22 +1,25 @@
 # Template file for 'Aegisub'
 pkgname=Aegisub
-version=3.2.2
-revision=12
-build_style=gnu-configure
-configure_args="--disable-update-checker --with-alsa --with-ffms2
- --with-wx-config=wx-config-gtk3 $(vopt_with fftw fftw3) $(vopt_with openal)
- $(vopt_with portaudio)"
-hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config"
+version=3.3.2
+revision=1
+_githash=723d01d13088d9b1bccc821f1129d045a0b74e2c
+build_style=cmake
+cmake_builddir="BUILD"
+configure_args="
+  -DwxWidgets_CONFIG_EXECUTABLE=/usr/bin/wx-config-gtk3
+  -DWITH_PORTAUDIO=$(vopt_if portaudio ON OFF)
+  -DWITH_OPENAL=$(vopt_if openal ON OFF)
+  -DWITH_FFTW3=$(vopt_if fftw ON OFF)"
+hostmakedepends="automake gettext-devel intltool libtool LuaJIT pkg-config git"
 makedepends="alsa-lib-devel boost-devel libcurl-devel fontconfig-devel
- freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel LuaJIT-devel
- MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw fftw-devel)
- $(vopt_if openal libopenal-devel) $(vopt_if portaudio portaudio-devel)"
-short_desc="Tool for creating and modifying subtitles"
-maintainer="Enno Boland <gottox@voidlinux.org>"
+  freetype-devel hunspell-devel icu-devel libass-devel libffms2-devel
+  LuaJIT-devel MesaLib-devel wxWidgets-gtk3-devel $(vopt_if fftw
+  fftw-devel) $(vopt_if openal libopenal-devel) $(vopt_if portaudio
+  portaudio-devel)"
+short_desc="Subtitle editor (ssa, ass, srt)"
+maintainer="pudiva <rogi@skylittlesystem.org>"
 license="BSD-3-Clause, MIT"
-homepage="http://www.aegisub.org"
-distfiles="https://github.com/Aegisub/Aegisub/archive/v${version}.tar.gz"
-checksum=62757dd491455268a240f983b59734a801cc2e899039a7493deeaf5e24a61dcd
+homepage="https://github.com/wangqr/Aegisub"
 
 build_options="fftw openal portaudio"
 build_options_default="fftw"
@@ -24,29 +27,10 @@ build_options_default="fftw"
 desc_option_fftw="Enable support for rendering of audio waveforms/spectrum"
 desc_option_openal="Enable support for openal"
 
-LDFLAGS+=" -pthread"
-
-if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
-	makedepends+="libatomic-devel"
-	configure_args+=" --with-libatomic"
-fi
-
-if [ "$CROSS_BUILD" ]; then
-	# When cross building the detection of iconv const parameters is wrong
-	configure_args+=" agi_cv_with_iconv_const=no"
-	# and cross is broken because of boost::icu_regex_trais anyway ...
-	broken="/usr/aarch64-linux-gnu/usr/include/boost/regex/v4/perl_matcher_common.hpp:512: undefined reference to 'boost ::icu_regex_traits::isctype(int, unsigned long) const'"
-fi
-
-case "$XBPS_TARGET_MACHINE" in
-	*musl) broken="segfaults on startup";;
-esac
-
-post_extract() {
-	# Fix shebang to use system luajit instead of vendored minilua
-	sed -e \
-		"s:../vendor/luajit/src/host/minilua:/usr/bin/luajit:" \
-		-i tools/respack.lua
+do_fetch() {
+	git clone git://github.com/wangqr/Aegisub.git $wrksrc
+	cd $wrksrc
+	git checkout $_githash
 }
 
 pre_configure() {
@@ -54,8 +38,6 @@ pre_configure() {
 	# with the x11 backend
 	sed "s/Exec=@AEGISUB_COMMAND@ %f/Exec=env GDK_BACKEND=x11 @AEGISUB_COMMAND@ %f/" -i \
 		packages/desktop/aegisub.desktop.template.in
-
-	autoreconf -fi
 }
 
 post_install() {

  parent reply	other threads:[~2021-08-03 20:15 UTC|newest]

Thread overview: 79+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-24  1:33 [PR PATCH] New package: Aegisub-wangqr-git " pudiva
2021-07-24  1:44 ` abenson
2021-07-24  1:48 ` abenson
2021-07-24  1:49 ` abenson
2021-07-24  1:56 ` pudiva
2021-07-24  1:59 ` pudiva
2021-07-24  1:59 ` pudiva
2021-07-24  8:35 ` paper42
2021-07-24 12:56 ` pudiva
2021-07-24 13:18 ` [PR PATCH] [Updated] " pudiva
2021-07-24 13:21 ` pudiva
2021-07-24 14:22 ` paper42
2021-07-24 14:24 ` [PR REVIEW] " paper42
2021-07-24 21:15 ` ericonr
2021-07-24 21:19 ` [PR REVIEW] " ericonr
2021-07-27  3:11 ` pudiva
2021-07-27  3:40 ` ericonr
2021-07-29  0:18 ` pudiva
2021-07-29  0:45 ` [PR PATCH] [Updated] " pudiva
2021-07-29  0:48 ` pudiva
2021-07-29  0:50 ` [PR REVIEW] Aegisub: update to wangqr fork 3.3.2 " pudiva
2021-08-03 17:07 ` paper42
2021-08-03 17:07 ` paper42
2021-08-03 17:07 ` paper42
2021-08-03 17:07 ` paper42
2021-08-03 17:07 ` paper42
2021-08-03 20:11 ` pudiva
2021-08-03 20:12 ` [PR PATCH] [Updated] " pudiva
2021-08-03 20:12 ` [PR REVIEW] " ericonr
2021-08-03 20:13 ` ericonr
2021-08-03 20:14 ` [PR PATCH] [Updated] " pudiva
2021-08-03 20:14 ` [PR REVIEW] " pudiva
2021-08-03 20:15 ` pudiva [this message]
2021-08-03 20:15 ` pudiva
2021-08-03 20:17 ` [PR PATCH] [Updated] " pudiva
2021-08-03 20:19 ` pudiva
2021-08-03 20:20 ` [PR REVIEW] " pudiva
2021-08-04 12:01 ` ericonr
2021-08-04 20:27 ` [PR PATCH] [Updated] " pudiva
2021-08-10 21:56 ` pudiva
2021-08-10 22:13 ` pudiva
2021-08-11  2:13 ` [PR REVIEW] " ericonr
2021-08-11  2:13 ` ericonr
2021-08-11 12:06 ` pudiva
2021-08-11 12:07 ` pudiva
2021-08-11 12:12 ` [PR PATCH] [Updated] " pudiva
2021-08-11 12:13 ` [PR REVIEW] " pudiva
2021-08-11 12:13 ` pudiva
2021-08-11 12:22 ` pudiva
2021-08-11 12:23 ` pudiva
2021-08-11 12:33 ` pudiva
2021-08-11 15:09 ` ericonr
2021-08-12 10:11 ` pudiva
2021-08-12 17:56 ` [PR PATCH] [Updated] " pudiva
2021-08-12 18:17 ` pudiva
2021-08-13 14:50 ` pudiva
2021-08-13 15:51 ` pudiva
2021-08-13 17:59 ` pudiva
2021-08-13 18:02 ` pudiva
2021-08-23 17:54 ` pudiva
2021-08-27 16:05 ` [PR PATCH] [Updated] " pudiva
2021-08-27 16:08 ` pudiva
2021-09-10 17:16 ` pudiva
2021-09-16  2:28 ` [PR REVIEW] " ericonr
2021-09-16  2:56 ` ericonr
2021-09-16  3:20 ` ericonr
2021-09-16 22:38 ` [PR REVIEW] " pudiva
2021-09-16 22:42 ` pudiva
2021-09-17 13:18 ` [PR REVIEW] " ericonr
2021-09-17 13:18 ` ericonr
2021-09-17 18:12 ` [PR REVIEW] " pudiva
2021-09-17 18:45 ` ericonr
2021-09-17 19:10 ` [PR PATCH] [Updated] " pudiva
2021-09-17 19:11 ` pudiva
2021-09-17 19:15 ` pudiva
2021-09-20 19:37 ` [PR PATCH] [Updated] " ericonr
2021-09-20 19:38 ` ericonr
2021-09-20 19:38 ` [PR PATCH] [Merged]: " ericonr
2021-09-21  0:00 ` q66

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210803201530.LI7UDo_zYjsKC7aIIK0AG-XvI-KFhQws0m6hmvT3g5A@z \
    --to=pudiva@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).