summaryrefslogtreecommitdiff
path: root/media-video
diff options
context:
space:
mode:
Diffstat (limited to 'media-video')
-rw-r--r--media-video/Manifest.gzbin23224 -> 23197 bytes
-rw-r--r--media-video/aegisub/Manifest10
-rw-r--r--media-video/aegisub/aegisub-3.4.0.ebuild145
-rw-r--r--media-video/aegisub/aegisub-9999.ebuild71
-rw-r--r--media-video/aegisub/files/3.4.0/Fix-build-without-pch.patch229
-rw-r--r--media-video/aegisub/files/3.4.0/Use-generated-git-version.patch20
-rw-r--r--media-video/aegisub/files/3.4.0/git_version.h5
-rw-r--r--media-video/aegisub/files/9999/git_version.h5
-rw-r--r--media-video/aegisub/metadata.xml4
-rw-r--r--media-video/qmplay2/Manifest4
-rw-r--r--media-video/qmplay2/qmplay2-24.12.23-r1.ebuild (renamed from media-video/qmplay2/qmplay2-24.12.23.ebuild)2
-rw-r--r--media-video/qmplay2/qmplay2-9999.ebuild2
-rw-r--r--media-video/vlc/Manifest2
-rw-r--r--media-video/vlc/vlc-9999.ebuild2
14 files changed, 450 insertions, 51 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 138f7522a800..718ffbf1a7f0 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
Binary files differ
diff --git a/media-video/aegisub/Manifest b/media-video/aegisub/Manifest
index f3e8f8847952..1f9645f9f044 100644
--- a/media-video/aegisub/Manifest
+++ b/media-video/aegisub/Manifest
@@ -12,8 +12,14 @@ AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-support-system-gtest.patch 2452 BLAK
AUX 3.2.2_p20160518/aegisub-3.2.2_p20160518-tests_luarocks_lua_version.patch 505 BLAKE2B d92ab5c7604b9c04296ea82d3c5b093a900bb9345289539262e5d057bf21d003ce1fdfce7e6f57b8dad3cb62c3e604ada6e9bd596a3673afbbced338230ba638 SHA512 71bc5511bc0fcb9d55e893300066f7e755da5bad04f74e0ba103e622cac6ebf99d1fa7b1ca9f08d2b5169d305a4bee6a7782cb14304352ca108d126931851a5b
AUX 3.3.3/aegisub-3.3.3-support-icu-75.patch 763 BLAKE2B d816a88c954d3153a3c1ee6b313fff700107489d0d8c88a480030ab82dc74a646f270e93507740d088e3e7f1855e9dc108a5d487e274e6f7bfc85b03ffcc81eb SHA512 d80549dbcf4292af53230b6bc4fdf12d6b6d1efc3e9bbf5322a38aa623677e138ffdb2d867d46093cda7f89101e01545fddaf37338b1d38c5f88136f229be471
AUX 3.3.3/aegisub-3.3.3-support-system-gtest.patch 2932 BLAKE2B e05519e4734f7532f605d63d27fd9386fba7eb0b36055235701ad65ee704f86424fbfc89fa36da6137c11fb149d11e793f37ae1e3c1e7820eaf236a774d2fa83 SHA512 643b7525e6f170d552551b6ebeffc9a5b37b8a38570f654fb93d523d2ccce355403ce50ddb337ee1761a4997235e12440d86684f296619196c418183989727cd
+AUX 3.4.0/Fix-build-without-pch.patch 6586 BLAKE2B 9a7df7afc364179686c0f1cda9683f57e10c05349b19ebbec4f7d918abe2d188c4463000cca50a676f13aae779ebc9d726fe0972d8c27b84904b8bb1c7085d1d SHA512 0f3746ebc5612885e13f9bc82aff1da9037be0d9aaa3c547656dde3ca51b783dd80a9593c320094b6e94b9db7425b727e96513ca49052aadaa89953a9c05a70e
+AUX 3.4.0/Use-generated-git-version.patch 626 BLAKE2B 8a4aa53e21988270ce4e7a6e61d2691c1830a89963e877a57260fb9e3dc73d2165b0713bd6d7c01323aa25428a1226ef43732143746f5f6bf98931600a7f6f3e SHA512 f44eaa0cef348488ce81982b5f104a89acaf7ad0e26b7308cee0e392dcfe6262bd456aa725a4b13be9f9268ae82c457f041a4b616af35da65aa3be85f5999dca
+AUX 3.4.0/git_version.h 175 BLAKE2B 9d4981a93e5d000533d30e24a9d89407b148162795bac3f42f012a538c3d1bfb22376e29e2016319e214535210f60b5ced2b07753e55caa89c15d3416a827283 SHA512 9d38a05064df1dcaf53e7e7d7d2aba291a14a955072a12980a0b8340dfc907f8718ebbd2f916ed15e1ca0525b7168b18afb81d328981e6e7d7a2f898e9f3bece
+AUX 9999/git_version.h 175 BLAKE2B 3f6378c56734ad13cb1b7bc9d09675ed133b93b436fd7d1459152573856a163c5e19533debb4862da38360dadee88c4628c987b07ce1907ccbc7485288415cb1 SHA512 c1f3a2f6d5c51517377450e54292bfb7404ca8f9bdad4ae3a12324d5f8c020338a1cf2e2290845478c63c91f5f380175615645890bbbd8b448be5393f6507399
DIST aegisub-3.3.3.tar.gz 6580314 BLAKE2B b6a6b6d9a805fb1aec943f00452e5f074c050d7d8970e0fa57da54a7a3c12b86241eafafd957577625bcce395c9f909fe60a22c9d76fcf8f018a4ea03921dacf SHA512 19e44667ad8742560559387c15f6c00339194cd26e1140624c63f34c6b4da6bb0b80be0f636a2d1cd0b15f1598e0580218d648e0622635b12eeaad3a40df9abc
+DIST aegisub-3.4.0.tar.gz 6294724 BLAKE2B 6ab466a33082107f509675eb062a679c68da5b3ec9d97847d0c50ad43d717ff50efcb4fb59a2e8c23f57e893de846b651b7a80a117f047734e6d54ccf6522ef3 SHA512 364f56aece74b14f37d796e364ffcc5b9d8ab5816f8e118b7f44d2d4e3bdf8afa0731c36995269dd953d2f532e7a905729bcbfa907c672a8eb91b68565c1ade0
EBUILD aegisub-3.3.3-r1.ebuild 3969 BLAKE2B 2f179f41f1c5cd57635d08472499c6eb4bbd8b4ed8c7020ed43d1e02ede8422a33d81418ceee50f9e2604c8a816a1ef3b9bb93577785464dedbaf3fbf9ef847c SHA512 bea0bc450338b5c17d4f3f07382f49474920e60c5e7cebaf42ab81df1b3b21582955ef8680cf07bad37a94e085507575cfd37afc4608572dbab729d280cfe8dc
EBUILD aegisub-3.3.3.ebuild 3915 BLAKE2B e23ce10ea46e06315826b446d3f4f00368271432e9ad3d235c7d413c69cf83bebf65e43de5354bb5f52cce57be10963346d6c3abf42713ea10f4a66924d7fad3 SHA512 ddf52ad9a4bb353a048a6c5b406173d6389a65ab1fd5e5765acf785e0f48dcd57f7397ffcafe1153a928e9e225e9bbef76fa1b44d30577f93bf296fecc54e224
-EBUILD aegisub-9999.ebuild 3971 BLAKE2B 9e87a96bc66a9ef52337f0e76dace3cbba68b3bc7a1fee75a3341be6db2f637dc83fcbc841b9fa44409a64b7a8bc6f1c7bb681574ce9b1fad937c3d85726ae86 SHA512 52cca502f798cf3c246477319dcb49c44d4b95b8c7e38f7c8a31a7c21595e818a1255169fed589ffa8897932ffc2bd291cb5a3f11204de6044992c1881af23a6
-MISC metadata.xml 490 BLAKE2B dd77320afb5975e48eae5240c165ed9470fe5ae1ed917b8ba022a9c63d1b446c75b820eafef914c885afb9c32c8634bf6ee55e1340a1efce91d0fe019a589cc8 SHA512 deee9b5cbcbd3fa37a665b333094334c3a298face98c7deb992127191d77cbe0f7781945fd8297ce9f26ca34988539a4abc27877c4dff79228d64dc1c4bfeddd
+EBUILD aegisub-3.4.0.ebuild 3647 BLAKE2B b7377ae8b078f42b5bf99f1f482ef77dc22b74537cac5e0439e67d84af5c431a46e38c7dd65ebafc005e20b99e371f9591bafdb317f3b2769cac06f999e81e90 SHA512 217339bd72e40d203acbe0d6777ba09198a174486fcd7d342b053c110f76ca0df1ce6086cf44054e8684e544b85ff4b2f2801fd130111bddfeb2019e7d7e271f
+EBUILD aegisub-9999.ebuild 3650 BLAKE2B aa75a999b286547a612ad8d605d98827f59932264234948ff2b93b67632c86c154c89bd6fcddd0820d864dda096431353bf556b7bc9ee28f903e0bb5d31d1fe5 SHA512 760ea2114054dd890a59a8084019248a230d919280ef0985443f3671295940ceab6a7dab03598da915854aa93aa468a06770f1b447996a9e58f707ee668c4d0d
+MISC metadata.xml 510 BLAKE2B 46c0880517c62df4ec49e282a69c5841dedd832e2350fccc74328da7af8dca4a70f084d868de0699b87b9a399b564ab622c34469cbbc54b53290959bce1213bc SHA512 b518855b2e19d26985d1340b87e33c53b9bfd3f0f84159841c999ea6481eb50f81b933bb6c4f7e307cd144e6f34008364e8e6d40179dd50fc73ac8052b072eee
diff --git a/media-video/aegisub/aegisub-3.4.0.ebuild b/media-video/aegisub/aegisub-3.4.0.ebuild
new file mode 100644
index 000000000000..82d80b7054ce
--- /dev/null
+++ b/media-video/aegisub/aegisub-3.4.0.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( luajit )
+LUA_REQ_USE="lua52compat"
+
+WX_GTK_VER=3.2-gtk3
+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 meson flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot toolchain-funcs
+
+DESCRIPTION="Advanced subtitle editor"
+HOMEPAGE="http://www.aegisub.org/ https://github.com/TypesettingTools/Aegisub"
+
+if [[ ${PV} == *9999 ]]; then
+ EGIT_REPO_URI="https://github.com/TypesettingTools/${PN^}.git"
+ # Submodules are used to pull bundled libraries.
+ EGIT_SUBMODULES=()
+ inherit git-r3
+else
+ SRC_URI="https://github.com/TypesettingTools/Aegisub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="BSD MIT"
+SLOT="0"
+IUSE="+alsa debug +fftw openal portaudio pulseaudio spell test +uchardet"
+RESTRICT="test"
+
+# aegisub bundles luabins (https://github.com/agladysh/luabins).
+# Unfortunately, luabins upstream is practically dead since 2010.
+# Thus unbundling luabins isn't worth the effort.
+RDEPEND="${LUA_DEPS}
+ x11-libs/wxGTK:${WX_GTK_VER}[X,opengl,debug?]
+ dev-libs/boost:=[icu,nls]
+ dev-libs/icu:=
+ media-libs/ffmpegsource:=
+ media-libs/fontconfig
+ media-libs/freetype
+ media-libs/libass:=[fontconfig]
+ sys-libs/zlib
+ virtual/libiconv
+ virtual/opengl
+ alsa? ( media-libs/alsa-lib )
+ fftw? ( >=sci-libs/fftw-3.3:= )
+ openal? ( media-libs/openal )
+ portaudio? ( =media-libs/portaudio-19* )
+ pulseaudio? ( media-libs/libpulse )
+ spell? ( app-text/hunspell:= )
+ uchardet? ( app-i18n/uchardet )
+"
+DEPEND="${RDEPEND}"
+# luarocks is only used as a command-line tool so there is no need to enforce
+# LUA_SINGLE_USEDEP on it. On the other hand, this means we must use version
+# bounds in order to make sure we use a version migrated to Lua eclasses.
+BDEPEND="dev-util/intltool
+ sys-devel/gettext
+ virtual/pkgconfig
+ test? (
+ ${RDEPEND}
+ >=dev-cpp/gtest-1.8.1
+ >=dev-lua/luarocks-3.4.0-r100
+ $(lua_gen_cond_dep '
+ dev-lua/busted[${LUA_USEDEP}]
+ ')
+ )
+"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+ || ( alsa openal portaudio pulseaudio )"
+
+BUILD_DIR="${WORKDIR}/${P}-build"
+
+PATCHES=(
+"${FILESDIR}/3.4.0/Fix-build-without-pch.patch"
+"${FILESDIR}/3.4.0/Use-generated-git-version.patch"
+)
+
+aegisub_check_compiler() {
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++20; then
+ die "Your compiler lacks C++20 support."
+ fi
+}
+
+pkg_pretend() {
+ aegisub_check_compiler
+}
+
+pkg_setup() {
+ aegisub_check_compiler
+ lua-single_pkg_setup
+}
+
+src_prepare() {
+ default_src_prepare
+
+ # Remove tests that require unavailable uuid Lua module.
+ rm automation/tests/modules/lfs.moon || die
+
+ remove_locale() {
+ rm "po/${1}.po" || die
+ }
+
+ plocale_find_changes 'po' '' '.po'
+ plocale_for_each_disabled_locale remove_locale
+
+ use test || sed -i "s|subdir('tests')||g" "${S}"/meson.build || die
+
+ mkdir "${BUILD_DIR}" || die
+ cp "${FILESDIR}/${PV}"/git_version.h "${BUILD_DIR}"/git_version.h || die
+}
+
+src_configure() {
+ tc-export PKG_CONFIG
+ use debug && EMESON_BUILDTYPE=debug
+ setup-wxwidgets
+ local emesonargs=(
+ -Denable_update_checker=false
+ -Dffms2=enabled
+ -Dsystem_luajit=true
+ $(meson_feature alsa)
+ $(meson_feature fftw fftw3)
+ $(meson_feature openal)
+ $(meson_feature portaudio)
+ $(meson_feature pulseaudio libpulse)
+ $(meson_feature spell hunspell)
+ $(meson_feature uchardet)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ meson_src_test test-libaegisub
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 530606341ba5..382c883351f0 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -7,25 +7,25 @@ LUA_COMPAT=( luajit )
LUA_REQ_USE="lua52compat"
WX_GTK_VER=3.2-gtk3
-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"
+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 tr uk_UA vi zh_CN zh_TW"
-inherit autotools flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot toolchain-funcs
+inherit meson flag-o-matic lua-single plocale wxwidgets xdg-utils vcs-snapshot toolchain-funcs
DESCRIPTION="Advanced subtitle editor"
-HOMEPAGE="http://www.aegisub.org/ https://github.com/wangqr/Aegisub"
+HOMEPAGE="http://www.aegisub.org/ https://github.com/TypesettingTools/Aegisub"
if [[ ${PV} == *9999 ]]; then
- EGIT_REPO_URI="https://github.com/wangqr/${PN^}.git"
+ EGIT_REPO_URI="https://github.com/TypesettingTools/${PN^}.git"
# Submodules are used to pull bundled libraries.
EGIT_SUBMODULES=()
inherit git-r3
else
- SRC_URI="https://github.com/wangqr/Aegisub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ SRC_URI="https://github.com/TypesettingTools/Aegisub/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
LICENSE="BSD MIT"
SLOT="0"
-IUSE="+alsa debug +fftw openal oss portaudio pulseaudio spell test +uchardet"
+IUSE="+alsa debug +fftw openal portaudio pulseaudio spell test +uchardet"
RESTRICT="test"
# aegisub bundles luabins (https://github.com/agladysh/luabins).
@@ -68,19 +68,18 @@ BDEPEND="dev-util/intltool
"
REQUIRED_USE="${LUA_REQUIRED_USE}
- || ( alsa openal oss portaudio pulseaudio )"
+ || ( alsa openal portaudio pulseaudio )"
+
+BUILD_DIR="${WORKDIR}/${P}-build"
PATCHES=(
- "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-system-luajit-build.patch"
- "${FILESDIR}/3.3.3/${PN}-3.3.3-support-system-gtest.patch"
- "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-tests_luarocks_lua_version.patch"
- "${FILESDIR}/3.2.2_p20160518/${PN}-3.2.2_p20160518-fix-boost-181-build.patch"
- "${FILESDIR}/3.3.3/${PN}-3.3.3-support-icu-75.patch"
+"${FILESDIR}/3.4.0/Fix-build-without-pch.patch"
+"${FILESDIR}/3.4.0/Use-generated-git-version.patch"
)
aegisub_check_compiler() {
- if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++17; then
- die "Your compiler lacks C++17 support."
+ if [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++20; then
+ die "Your compiler lacks C++20 support."
fi
}
@@ -106,43 +105,33 @@ src_prepare() {
plocale_find_changes 'po' '' '.po'
plocale_for_each_disabled_locale remove_locale
- # See http://devel.aegisub.org/ticket/1914
- config_rpath_update "${S}"/config.rpath
+ use test || sed -i "s|subdir('tests')||g" "${S}"/meson.build || die
- eautoreconf
+ mkdir "${BUILD_DIR}" || die
+ cp "${FILESDIR}/${PV}"/git_version.h "${BUILD_DIR}"/git_version.h || die
}
src_configure() {
tc-export PKG_CONFIG
- # Prevent access violations from OpenAL detection. See Gentoo bug 508184.
- use openal && export agi_cv_with_openal="yes"
-
+ use debug && EMESON_BUILDTYPE=debug
setup-wxwidgets
- local myeconfargs=(
- --disable-update-checker
- --with-ffms2
- --with-system-luajit
- $(use_enable debug)
- $(use_with alsa)
- $(use_with fftw fftw3)
- $(use_with openal)
- $(use_with oss)
- $(use_with portaudio)
- $(use_with pulseaudio libpulse)
- $(use_with spell hunspell)
- $(use_with uchardet)
+ local emesonargs=(
+ -Denable_update_checker=false
+ -Dffms2=enabled
+ -Dsystem_luajit=true
+ $(meson_feature alsa)
+ $(meson_feature fftw fftw3)
+ $(meson_feature openal)
+ $(meson_feature portaudio)
+ $(meson_feature pulseaudio libpulse)
+ $(meson_feature spell hunspell)
+ $(meson_feature uchardet)
)
- export FORCE_GIT_VERSION="v${PV}"
- econf "${myeconfargs[@]}"
-}
-
-src_compile() {
- emake WITH_SYSTEM_GTEST=$(usex test)
+ meson_src_configure
}
src_test() {
- emake test-automation
- emake test-libaegisub
+ meson_src_test test-libaegisub
}
pkg_postinst() {
diff --git a/media-video/aegisub/files/3.4.0/Fix-build-without-pch.patch b/media-video/aegisub/files/3.4.0/Fix-build-without-pch.patch
new file mode 100644
index 000000000000..2f88b130c975
--- /dev/null
+++ b/media-video/aegisub/files/3.4.0/Fix-build-without-pch.patch
@@ -0,0 +1,229 @@
+From c5e3d6e927e638796b7d0862f6a0c4e19e9fbe6b Mon Sep 17 00:00:00 2001
+From: Nick Sarnie <sarnex@gentoo.org>
+Date: Fri, 27 Dec 2024 20:26:36 +0900
+Subject: [PATCH] Fix build without PCH
+
+Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
+---
+ libaegisub/ass/uuencode.cpp | 2 +-
+ libaegisub/audio/provider_dummy.cpp | 1 +
+ libaegisub/common/cajun/reader.cpp | 1 +
+ libaegisub/common/calltip_provider.cpp | 2 +-
+ libaegisub/common/mru.cpp | 2 +-
+ libaegisub/common/option.cpp | 1 +
+ libaegisub/common/thesaurus.cpp | 1 +
+ libaegisub/include/libaegisub/lua/ffi.h | 1 +
+ libaegisub/lua/modules/unicode.cpp | 2 +-
+ libaegisub/unix/path.cpp | 2 ++
+ src/aegisublocale.cpp | 2 ++
+ src/audio_timing_dialogue.cpp | 2 ++
+ src/base_grid.h | 2 ++
+ src/command/command.h | 1 +
+ src/frame_main.cpp | 2 +-
+ src/preferences.cpp | 1 +
+ 16 files changed, 20 insertions(+), 5 deletions(-)
+
+diff --git a/libaegisub/ass/uuencode.cpp b/libaegisub/ass/uuencode.cpp
+index 893268d07..ee5441144 100644
+--- a/libaegisub/ass/uuencode.cpp
++++ b/libaegisub/ass/uuencode.cpp
+@@ -17,7 +17,7 @@
+ #include <libaegisub/ass/uuencode.h>
+
+ #include <algorithm>
+-
++#include <cstring>
+ // Despite being called uuencoding by ass_specs.doc, the format is actually
+ // somewhat different from real uuencoding. Each 3-byte chunk is split into 4
+ // 6-bit pieces, then 33 is added to each piece. Lines are wrapped after 80
+diff --git a/libaegisub/audio/provider_dummy.cpp b/libaegisub/audio/provider_dummy.cpp
+index 3e7f104ef..1de35b2b6 100644
+--- a/libaegisub/audio/provider_dummy.cpp
++++ b/libaegisub/audio/provider_dummy.cpp
+@@ -18,6 +18,7 @@
+
+ #include "libaegisub/fs.h"
+
++#include <cstring>
+ #include <random>
+
+ /*
+diff --git a/libaegisub/common/cajun/reader.cpp b/libaegisub/common/cajun/reader.cpp
+index 6f32d2ff4..0c69ef9c2 100644
+--- a/libaegisub/common/cajun/reader.cpp
++++ b/libaegisub/common/cajun/reader.cpp
+@@ -9,6 +9,7 @@ Author: Terry Caton
+ #include "libaegisub/cajun/reader.h"
+
+ #include <boost/interprocess/streams/bufferstream.hpp>
++#include <algorithm>
+ #include <cassert>
+
+ /*
+diff --git a/libaegisub/common/calltip_provider.cpp b/libaegisub/common/calltip_provider.cpp
+index de693e637..d24d6277a 100644
+--- a/libaegisub/common/calltip_provider.cpp
++++ b/libaegisub/common/calltip_provider.cpp
+@@ -19,7 +19,7 @@
+ #include "libaegisub/ass/dialogue_parser.h"
+
+ #include <algorithm>
+-
++#include <cstring>
+ namespace {
+ struct proto_lit {
+ const char *name;
+diff --git a/libaegisub/common/mru.cpp b/libaegisub/common/mru.cpp
+index 81db2715a..ef2a06944 100644
+--- a/libaegisub/common/mru.cpp
++++ b/libaegisub/common/mru.cpp
+@@ -21,7 +21,7 @@
+ #include "libaegisub/log.h"
+ #include "libaegisub/option.h"
+ #include "libaegisub/option_value.h"
+-
++#include <algorithm>
+ namespace {
+ std::string_view mru_names[] = {
+ "Audio",
+diff --git a/libaegisub/common/option.cpp b/libaegisub/common/option.cpp
+index 13e93a3a0..c90ae9c46 100644
+--- a/libaegisub/common/option.cpp
++++ b/libaegisub/common/option.cpp
+@@ -26,6 +26,7 @@
+ #include "libaegisub/option_value.h"
+
+ #include <boost/interprocess/streams/bufferstream.hpp>
++#include <algorithm>
+ #include <cassert>
+ #include <memory>
+
+diff --git a/libaegisub/common/thesaurus.cpp b/libaegisub/common/thesaurus.cpp
+index 23366e82c..6626316d9 100644
+--- a/libaegisub/common/thesaurus.cpp
++++ b/libaegisub/common/thesaurus.cpp
+@@ -20,6 +20,7 @@
+ #include "libaegisub/split.h"
+
+ #include <boost/interprocess/streams/bufferstream.hpp>
++#include <algorithm>
+
+ namespace agi {
+
+diff --git a/libaegisub/include/libaegisub/lua/ffi.h b/libaegisub/include/libaegisub/lua/ffi.h
+index 17cf0088d..29902f77a 100644
+--- a/libaegisub/include/libaegisub/lua/ffi.h
++++ b/libaegisub/include/libaegisub/lua/ffi.h
+@@ -17,6 +17,7 @@
+ #include <libaegisub/type_name.h>
+
+ #include <cstdlib>
++#include <cstring>
+ #include <lua.hpp>
+
+ namespace agi::lua {
+diff --git a/libaegisub/lua/modules/unicode.cpp b/libaegisub/lua/modules/unicode.cpp
+index 9ee64b114..7f700918b 100644
+--- a/libaegisub/lua/modules/unicode.cpp
++++ b/libaegisub/lua/modules/unicode.cpp
+@@ -17,7 +17,7 @@
+ #include <libaegisub/lua/ffi.h>
+
+ #include <unicode/unistr.h>
+-
++#include <cstring>
+ namespace {
+ char *wrap(void (*fn)(icu::UnicodeString&), const char *str, char **err) {
+ auto ustr = icu::UnicodeString::fromUTF8(str);
+diff --git a/libaegisub/unix/path.cpp b/libaegisub/unix/path.cpp
+index a171bc2a4..5a33bf68b 100644
+--- a/libaegisub/unix/path.cpp
++++ b/libaegisub/unix/path.cpp
+@@ -21,6 +21,8 @@
+
+ #include <pwd.h>
+
++#include "../acconf.h"
++
+ #ifndef __APPLE__
+ #include <fstream>
+ #include <stdlib.h>
+diff --git a/src/aegisublocale.cpp b/src/aegisublocale.cpp
+index cc5f4e10d..754d867d7 100644
+--- a/src/aegisublocale.cpp
++++ b/src/aegisublocale.cpp
+@@ -38,6 +38,8 @@
+ #include "options.h"
+ #include "utils.h"
+
++#include "../acconf.h"
++
+ #include <libaegisub/path.h>
+
+ #include <algorithm>
+diff --git a/src/audio_timing_dialogue.cpp b/src/audio_timing_dialogue.cpp
+index fd15582b1..9ca06eff5 100644
+--- a/src/audio_timing_dialogue.cpp
++++ b/src/audio_timing_dialogue.cpp
+@@ -39,6 +39,8 @@
+ #include "selection_controller.h"
+ #include "utils.h"
+
++#include <list>
++
+ #include <libaegisub/ass/time.h>
+
+ #include <boost/range/algorithm.hpp>
+diff --git a/src/base_grid.h b/src/base_grid.h
+index 2f28a21dc..017d8b35c 100644
+--- a/src/base_grid.h
++++ b/src/base_grid.h
+@@ -32,6 +32,8 @@
+ #include <memory>
+ #include <string>
+ #include <vector>
++#include <wx/brush.h>
++#include <wx/scrolbar.h>
+ #include <wx/window.h>
+
+ namespace agi {
+diff --git a/src/command/command.h b/src/command/command.h
+index c90b230a0..b9582630b 100644
+--- a/src/command/command.h
++++ b/src/command/command.h
+@@ -17,6 +17,7 @@
+ /// @ingroup command
+
+ #include <map>
++#include <memory>
+ #include <string>
+ #include <vector>
+
+diff --git a/src/frame_main.cpp b/src/frame_main.cpp
+index 24ef314d7..e81c07761 100644
+--- a/src/frame_main.cpp
++++ b/src/frame_main.cpp
+@@ -67,7 +67,7 @@
+ #include <wx/sizer.h>
+ #include <wx/statline.h>
+ #include <wx/sysopt.h>
+-
++#include <wx/toolbar.h>
+ enum {
+ ID_APP_TIMER_STATUSCLEAR = 12002
+ };
+diff --git a/src/preferences.cpp b/src/preferences.cpp
+index 1b0033b05..ccc52a905 100644
+--- a/src/preferences.cpp
++++ b/src/preferences.cpp
+@@ -47,6 +47,7 @@
+
+ #include <wx/checkbox.h>
+ #include <wx/combobox.h>
++#include <wx/dc.h>
+ #include <wx/event.h>
+ #include <wx/listctrl.h>
+ #include <wx/msgdlg.h>
+--
+2.45.2
+
diff --git a/media-video/aegisub/files/3.4.0/Use-generated-git-version.patch b/media-video/aegisub/files/3.4.0/Use-generated-git-version.patch
new file mode 100644
index 000000000000..ebee2aa3cd4f
--- /dev/null
+++ b/media-video/aegisub/files/3.4.0/Use-generated-git-version.patch
@@ -0,0 +1,20 @@
+diff --git a/tools/version.sh b/tools/version.sh
+index 8df33e175..1293d1578 100755
+--- a/tools/version.sh
++++ b/tools/version.sh
+@@ -3,7 +3,6 @@ srcdir="$2"
+
+ # If no git repo try to read from the existing git_version.h, for building from tarballs
+ version_h_path="${builddir}/git_version.h"
+-if ! test -d "${srcdir}/.git"; then
+ if test -f "${version_h_path}"; then
+ while read line; do
+ set -- $line
+@@ -19,7 +18,6 @@ if ! test -d "${srcdir}/.git"; then
+ echo "git repo not found and no cached git_version.h"
+ exit 2
+ fi
+-fi
+ osx_bundle_sed_path="${builddir}/osx-bundle.sed"
+
+ last_svn_revision=6962
diff --git a/media-video/aegisub/files/3.4.0/git_version.h b/media-video/aegisub/files/3.4.0/git_version.h
new file mode 100644
index 000000000000..1e0344e9ca99
--- /dev/null
+++ b/media-video/aegisub/files/3.4.0/git_version.h
@@ -0,0 +1,5 @@
+#define BUILD_GIT_VERSION_NUMBER 340
+#define BUILD_GIT_VERSION_STRING "3.4.0"
+#define TAGGED_RELEASE 0
+#define INSTALLER_VERSION "0.0.0"
+#define RESOURCE_BASE_VERSION 0, 0, 0
diff --git a/media-video/aegisub/files/9999/git_version.h b/media-video/aegisub/files/9999/git_version.h
new file mode 100644
index 000000000000..b015ecba42ec
--- /dev/null
+++ b/media-video/aegisub/files/9999/git_version.h
@@ -0,0 +1,5 @@
+#define BUILD_GIT_VERSION_NUMBER 9999
+#define BUILD_GIT_VERSION_STRING "9999"
+#define TAGGED_RELEASE 0
+#define INSTALLER_VERSION "0.0.0"
+#define RESOURCE_BASE_VERSION 0, 0, 0
diff --git a/media-video/aegisub/metadata.xml b/media-video/aegisub/metadata.xml
index 331bf705f1d7..91d2b087b736 100644
--- a/media-video/aegisub/metadata.xml
+++ b/media-video/aegisub/metadata.xml
@@ -9,7 +9,7 @@
<flag name="uchardet">Enable charset discovery via <pkg>app-i18n/uchardet</pkg></flag>
</use>
<upstream>
- <bugs-to>https://github.com/wangqr/Aegisub/issues</bugs-to>
- <remote-id type="github">wangqr/Aegisub</remote-id>
+ <bugs-to>https://github.com/TypesettingTools/Aegisub/issues</bugs-to>
+ <remote-id type="github">TypesettingTools/Aegisub</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest
index 49dcfd9b3e70..61f2b04de8c9 100644
--- a/media-video/qmplay2/Manifest
+++ b/media-video/qmplay2/Manifest
@@ -3,6 +3,6 @@ DIST QMPlay2-src-24.12.06.tar.xz 2058012 BLAKE2B adc53f14c9614114b6c401a757278fa
DIST QMPlay2-src-24.12.23.tar.xz 2065360 BLAKE2B d1f015246ad1a38645009bd7f41ec48236f0d7ed0a1cce3ef7960245af44b317890cba6a06018c018d2181c0a93e61155cf9a267cfe3750949a8c19c5fd9b959 SHA512 c7d563e3c35ea4fffa4878a5747b6e648601fb5281d129f57f3fc8784aba938025cd160763963ee1eeecda2e336a358738255bbe560b58cc609fb122b2531e81
EBUILD qmplay2-24.06.16.ebuild 3377 BLAKE2B 0a1decfcdf7c00665f4886f5b027649d071341a373b186328b094eba94411a40cabb60ed6a7027636a619486305b1c74a53fcae426a4944a690bcf2a34cc47dd SHA512 cf9a7cc2bc5d1aa92e12d31954ffec60dd70d5c76eb0bfadc8edd83149f90b437f9f5f863b616608239e5302fdb7032bea50b4f4c6d05ccdec9fca2f0d534e29
EBUILD qmplay2-24.12.06.ebuild 3378 BLAKE2B 6cc5773edb049423e62502ea823991428a07d737d46a90f1a470ab3214cf7d82212f3706eef61a9981c0c8fa9405b7fcf95101f44cd4019d9c285da38da855f6 SHA512 c6d941954a4887457264c06fec0721b4ae152731bc344923fc77443b35bc38b71c8dc0e5852e7031ad5894359b880762abec56c5c1ebeea4e0bc683827c95c5a
-EBUILD qmplay2-24.12.23.ebuild 3378 BLAKE2B 6cc5773edb049423e62502ea823991428a07d737d46a90f1a470ab3214cf7d82212f3706eef61a9981c0c8fa9405b7fcf95101f44cd4019d9c285da38da855f6 SHA512 c6d941954a4887457264c06fec0721b4ae152731bc344923fc77443b35bc38b71c8dc0e5852e7031ad5894359b880762abec56c5c1ebeea4e0bc683827c95c5a
-EBUILD qmplay2-9999.ebuild 3378 BLAKE2B 6cc5773edb049423e62502ea823991428a07d737d46a90f1a470ab3214cf7d82212f3706eef61a9981c0c8fa9405b7fcf95101f44cd4019d9c285da38da855f6 SHA512 c6d941954a4887457264c06fec0721b4ae152731bc344923fc77443b35bc38b71c8dc0e5852e7031ad5894359b880762abec56c5c1ebeea4e0bc683827c95c5a
+EBUILD qmplay2-24.12.23-r1.ebuild 3380 BLAKE2B 9134114136cc761234c9c9cd23edca9ec9b5efaa73a3746113956b85288c5b692ba34786d01ec8562b9aeb33b8bacb87c337794a004d4a2395f17ec55bc4678b SHA512 f1d1fcfcec96d737fe5cda773b994252164d7d44508ed82b0cf2d4f6870874e830dc6cd664326b5653a7a9c43786c9fde05e35abd643d3590ad9c6c17fdaeb74
+EBUILD qmplay2-9999.ebuild 3380 BLAKE2B becc2bd8deb3e9728a2c4a0acd9d16972d47276680708d857649685e3fdca7fccf943ba0234b7cd6e70b2ea1dc31d0039a3e578baa1751c743e2bb47eb85a232 SHA512 1acbc2b08fac39251fbf960507574d328aaad097559d76d51a60ff0e693a32e996ea18339811b3753fd1bd4811d365f5ae96c006e06c3c1efc6f1b446a35b4d6
MISC metadata.xml 1225 BLAKE2B 9fc74ea3d0319bc8822e0ff56968efcbe4ab40b758bfeca900883ed4dbbe80608a6954ffe95a1f61d0dd988ae88afd29d2c4485f3d62b2b839b9fea289fe3b72 SHA512 94f8b05578de759be210af0eb26f15d48e15112b07e586b6336737bd9cb3dd768c7dbefc3b667753239c10bdb1fa6ebdd39d5abe234742ead51f189bf63f8173
diff --git a/media-video/qmplay2/qmplay2-24.12.23.ebuild b/media-video/qmplay2/qmplay2-24.12.23-r1.ebuild
index 1bb22871659a..08b367fb933f 100644
--- a/media-video/qmplay2/qmplay2-24.12.23.ebuild
+++ b/media-video/qmplay2/qmplay2-24.12.23-r1.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
pulseaudio? ( media-libs/libpulse )
sid? ( media-libs/libsidplayfp )
shaders? ( >=media-libs/shaderc-2020.1 )
- taglib? ( media-libs/taglib )
+ taglib? ( media-libs/taglib:= )
vaapi? ( media-libs/libva[X] )
vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
xv? ( x11-libs/libXv )
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild
index 1bb22871659a..88438e2c0dd5 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -57,7 +57,7 @@ RDEPEND="
pulseaudio? ( media-libs/libpulse )
sid? ( media-libs/libsidplayfp )
shaders? ( >=media-libs/shaderc-2020.1 )
- taglib? ( media-libs/taglib )
+ taglib? ( media-libs/taglib:= )
vaapi? ( media-libs/libva[X] )
vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
xv? ( x11-libs/libXv )
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index a7efe308a441..810da340e7ba 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -12,5 +12,5 @@ DIST vlc-3.0.21.tar.xz 25649288 BLAKE2B 0ad05282d624611ba8a2b6ca062c68aabeac8f37
EBUILD vlc-3.0.21-r1.ebuild 13629 BLAKE2B aed2c09a3d1705ca0a6d778927e6446510349e2f1e95f412c7af7edc106662f390fd6f1ed8a1a192212570247bd1ead67f8e99f6a3bd402c9742aad508ac0675 SHA512 696a8c81c719597ae9721fa0590b6ef6ab3c587f6e261d602641f49e2cbdf9e66f71155d6257ee52cc29d83aeedcc84afaa40400f2a11a2eefed2c01b33082d9
EBUILD vlc-3.0.21.ebuild 13632 BLAKE2B cdf1b077440ba3400b7504018eb5d3af65f2cd18232a2c12072331dedd81ee5a0ddf245145cc55915807c297c07681485cf785361e0dc371261652a0467a3a46 SHA512 ef40a8bc248737c874527774e29107d8d89d36d5cc251ada4ea65c12b7194db850c207a06f982eca2df3982c37f7ac2dc3aca5615be335bfe0ef3a18f93de768
EBUILD vlc-3.0.9999.ebuild 13634 BLAKE2B 802356e9f6fa00b27c7eb154daed99545907f8cea0eac931201380ac3f6cf36b3ad561ed6702b37193f513529f924fc396602f2cb3305bd1e7a32cc3db4c2a02 SHA512 d702509a432f46f15ebac1ad572f285a232075b7a1fa5e0e54b47a44bc8997b41e7d3b5d9f6a93312bb94f8dff99d0809d33c9ece01d72d00f67b90e65674182
-EBUILD vlc-9999.ebuild 13532 BLAKE2B 111e062ea2274e308c3c78cbf41fbfc71137438523ab0eee21d8b6b7e5c42ddfd22dfa71ad91d5df822381c146f6e4028c4deab13a0c7bc81de048bb1c0b67ea SHA512 a7a7c23a4c9ca063009ba2665219dadd2eee58a037e7f56c5ba3e7aae59eb576a7fd91d92df7b6bd7e1aa32e43ce844469a3ce084ec66e7ad9f03eaa32aa40c8
+EBUILD vlc-9999.ebuild 13528 BLAKE2B 6f2b1d1b5a708565c66d13b0e519bddfdc51ead8b4f28cb9e62fdbc7d6496c817fa413d488a86f21a84915e1b60bfaf10f0ec22c44744d625b40659dea70a362 SHA512 baa9aaf6056b6b62942804dc10ab9074bc9ad48200b9d6f92d8ace9b23f7791fce5658ca86d9bff61419a1205262449d7f08ed31ab3da7687d13dc8ad2cda61c
MISC metadata.xml 4815 BLAKE2B 90ef1af4058b83694f6b233c0b2daf46f45f6d23517103923b324db6ca167bb0e04226cae62162fc86a39bca5666b969b13f9d53d8b967a14af2595943d8c4e6 SHA512 544df4a6e4ed05f055f0aababa8c396932440f21336705818cbbce1397d0810ea5050ec16cdf2e3ebf0d7d63b70e77cd07c35edffeecde182ae2ecc571a1dbf7
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 80a34ce1ebdf..105ed766410a 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -193,7 +193,7 @@ RDEPEND="
gnome-base/librsvg:2
x11-libs/cairo
)
- taglib? ( >=media-libs/taglib-1.9 )
+ taglib? ( media-libs/taglib:= )
theora? ( media-libs/libtheora )
tremor? ( media-libs/tremor )
truetype? (
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-21 00:58:48 +0000