From 59f8187afe529efeffdc2f967c451b159da44d5c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 19 Apr 2023 05:57:02 +0100 Subject: gentoo auto-resync : 19:04:2023 - 05:57:01 --- media-video/Manifest.gz | Bin 25369 -> 25363 bytes media-video/mkvtoolnix/Manifest | 4 +- media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild | 132 ++++++++++++++++++++++++ media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 4 +- 4 files changed, 137 insertions(+), 3 deletions(-) create mode 100644 media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index 919337ac6e00..42f664a33e13 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index d26702c4bc1b..fdcb0597f7b8 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,6 +1,8 @@ AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e AUX mkvtoolnix-67.0.0-no-uic-qtwidgets.patch 2494 BLAKE2B 1d23ca6e908947d80e3ea7567508714cd73461a7571dda88a227bf9d4ca3ec86113ad596ff64dc6bfea641c8b097fffa1b4b359a17f5b24c0305c7e6628103b7 SHA512 982953a7f992def139140298a5a6b2ceeae6afaf5123b8e12c46523ab1f799994aa2f5d435bebb8091ca63e56bb44310a39a6382c313f8e4083cfea67daff41d DIST mkvtoolnix-72.0.0.tar.xz 10994204 BLAKE2B 2118837c01d8d31644e0147dfdec9fd619d18ffbab5d317e5dd84788a83cdf162ea7d72e98549bbc2ffc7953e0b80a0e23018658d8c5ad529fc719b291589a97 SHA512 dc18c6e63e724181e38753921ec3374752dbb7c4d20650cf0787e9049aaec4f6bb6c744e49b3783921804f192de742fba92826615a1edc8516d2a41621be658c +DIST mkvtoolnix-75.0.0.tar.xz 11009552 BLAKE2B d9c32a453ac1f07e201b99fdcaaa5e553b42c1d17fafdeb1a84808ee572caf00b4b49d04c90d7801564f4856e9b3057a45ef79041e72f76bc829c3b5d9536c58 SHA512 eca45828ec3cbb540c67d12d369f3314246d08812933a018e5c4f69e8bd2fa4e17143a33a1841c5a8da3befbc22509fa508e6688ea858980d13c44aaae4ead08 EBUILD mkvtoolnix-72.0.0.ebuild 2937 BLAKE2B ad306e107e1065ecbf0df631cb0eebb0d6f981da9f479b0a17604b016b21a6e0e544ee2f2eea50bb62cc3fcec7b8a59cfd717eee706d137f62e0717a5794584a SHA512 52e2adf07dce52e3bbf035bc11a9cfb27bc53e33109d3d781f845b1f0805b7999b4923ce9e89eb54f1b8b472819411019cd7bbb5776cdc36ccba123fc7ebfaf2 -EBUILD mkvtoolnix-9999.ebuild 2941 BLAKE2B 30aca40ae6f0cc410f9cb9d102f14b5efe0a1becbb529762b9dac566087882ac2f2b04db91c62b96825d9c4cccffebb6c7b29d3ead34558004922585f3d0b1c3 SHA512 09a813e5ae9df385fce514fd0f721f49184e4365f43b04952701e11db170889f1933b2a464f021ef804196384f63c96d0f0081e074c7d12081a5c37e99fbb92a +EBUILD mkvtoolnix-75.0.0.ebuild 2931 BLAKE2B 2629f380406135f271c581fe50e42c45c736aed11abe9fc08382fd151c0f04e7f76603eb168931573574da73fd02b0f7e11398e6b3ce514aa80ea4fa4b83bba9 SHA512 d0cc16898f193a036f067845434a8be7964d688732e49beac384825c2d4ceb6fe84d12454130b19c1db91da11b0fc6cc9b23b4a846fc5e74264a44f90b845235 +EBUILD mkvtoolnix-9999.ebuild 2931 BLAKE2B 2629f380406135f271c581fe50e42c45c736aed11abe9fc08382fd151c0f04e7f76603eb168931573574da73fd02b0f7e11398e6b3ce514aa80ea4fa4b83bba9 SHA512 d0cc16898f193a036f067845434a8be7964d688732e49beac384825c2d4ceb6fe84d12454130b19c1db91da11b0fc6cc9b23b4a846fc5e74264a44f90b845235 MISC metadata.xml 343 BLAKE2B b13d9c252a7ad2f27c772c43d3476eee87d9a173c8fcc04a3be28ca9cfb826e6f1de6eade1211b4ff5f4a379b20a0961667fc99eee91495589e0632ad94b4c0a SHA512 cb7fd77f65779de841da03890fd1d0031cea8a95153f116f01f1be7d8ef5b87bb760933fc74f64a1d49ce94bc897cde94fdd4f6b45c016c3c20b842097692dc0 diff --git a/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild new file mode 100644 index 000000000000..628d982c71e9 --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-75.0.0.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multiprocessing qmake-utils xdg + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" +fi + +DESCRIPTION="Tools to create, alter, and inspect Matroska files" +HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" + +LICENSE="GPL-2" +SLOT="0" +IUSE="dbus debug dvd gui nls pch test" +RESTRICT="!test? ( test )" + +# check NEWS.md for build system changes entries for boost/libebml/libmatroska +# version requirement updates and other packaging info +RDEPEND=" + dev-libs/boost:= + dev-libs/gmp:= + >=dev-libs/libebml-1.4.4:= + >=dev-libs/libfmt-8.0.1:= + >=dev-libs/pugixml-1.11:= + media-libs/flac:= + >=media-libs/libmatroska-1.7.1:= + media-libs/libogg:= + media-libs/libvorbis:= + sys-libs/zlib + dvd? ( media-libs/libdvdread:= ) + dev-qt/qtcore:5 + gui? ( + dev-qt/qtsvg:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtconcurrent:5 + dev-qt/qtmultimedia:5 + ) + app-text/cmark:0= + dbus? ( dev-qt/qtdbus:5 ) +" +DEPEND="${RDEPEND} + >=dev-cpp/nlohmann_json-3.9.1 + >=dev-libs/utfcpp-3.1.2 + test? ( dev-cpp/gtest ) +" +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-ruby/rake + virtual/pkgconfig + nls? ( + sys-devel/gettext + app-text/po4a + ) +" + +PATCHES=( + "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch + "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch +) + +src_prepare() { + default + + if [[ ${PV} == *9999 ]]; then + ./autogen.sh || die + fi + + # bug #692018 + sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die + + eautoreconf + + # remove bundled libs + rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die +} + +src_configure() { + # bug #692322, use system dev-libs/utfcpp + append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp + + local myeconfargs=( + $(use_enable debug) + $(usex pch "" --disable-precompiled-headers) + $(use_enable dbus) + + # Qt (of some version) is always needed, even for non-GUI builds, + # to do e.g. MIME detection. See e.g. bug #844097. + # But most of the Qt deps are conditional on a GUI build. + --disable-qt6 + --enable-qt5 + $(use_enable gui) + --with-qmake="$(qt5_get_bindir)"/qmake + + $(use_with dvd dvdread) + $(use_with nls gettext) + $(usex nls "" --with-po4a=false) + --disable-update-check + --disable-optimization + --with-boost="${ESYSROOT}"/usr + --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + rake V=1 -j$(makeopts_jobs) || die +} + +src_test() { + rake V=1 -j$(makeopts_jobs) tests:unit || die + rake V=1 -j$(makeopts_jobs) tests:run_unit || die +} + +src_install() { + DESTDIR="${D}" rake -j$(makeopts_jobs) install || die + + einstalldocs + dodoc NEWS.md + doman doc/man/*.1 +} diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild index 23a2e80da85d..628d982c71e9 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -104,7 +104,7 @@ src_configure() { $(use_with dvd dvdread) $(use_with nls gettext) - $(usex nls "" --with-po4a-translate=false) + $(usex nls "" --with-po4a=false) --disable-update-check --disable-optimization --with-boost="${ESYSROOT}"/usr -- cgit v1.2.3