From e748ba9741f6540f4675c23e3e37b73e822c13a4 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 May 2021 20:59:14 +0100 Subject: gentoo resync : 31.05.2021 --- media-video/mkvtoolnix/Manifest | 7 +- .../files/mkvtoolnix-56.1.0-optlevel.patch | 15 +++ media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild | 4 +- media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild | 3 +- media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild | 131 +++++++++++++++++++++ 5 files changed, 155 insertions(+), 5 deletions(-) create mode 100644 media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch create mode 100644 media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild (limited to 'media-video/mkvtoolnix') diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index ae3c7b758333..b64ffd284305 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,4 +1,5 @@ AUX mkvtoolnix-49.0.0-qt5dbus.patch 1442 BLAKE2B 041c33dcb691377b4b50a4c24f1eac528dda0227ccf2baf3732239b481ff6007bf5a8ddd9304dd7c2faff149f1cfbdbfb194eb30a3b19eea0803f10734572421 SHA512 d9a72bb0b8fc7c9915e4efa1e9758d4f9d6b68f1ad6ef9898dd0b5e693c8e1236b37fc97a9786c233f8909417309ea6bb9c1fb71054818f31eeb4c43faa46a06 +AUX mkvtoolnix-56.1.0-optlevel.patch 607 BLAKE2B 62c3ef3717a54030b1acc586e9468f4d8d783755f7762ccebe18b0f8b0214268477a5a218b2fc02f3e2f770664507d43119f13046a31c94f865f01d0000a8a68 SHA512 b8eec05844aa8ef4f27416a78f5231496e34a112126e8ef403d18cab26b94756bd60323b51cf0d59a5a44d7b379bbf09f6b7b1b7e29b9282a0a2e82a5b3f325e DIST mkvtoolnix-37.0.0.tar.xz 7307984 BLAKE2B 4ee59d6ed186e7181733f5723fc8ab5abed5056c7562cf646b123f0e4d9e6b191176feab549231d8210b669d4cec36aaa6e33bf1b666b92ba471696d83e98c8e SHA512 196f8d12f36d95d077b8afeda4d651fe7fe5a0d6c9e71a49608732cbf6d68052681ec855875ed4a79e8aa0589502f4475a4306eaa9464523288a1af740b84df8 DIST mkvtoolnix-47.0.0.tar.xz 7532248 BLAKE2B 7b2c8763a2b2b038933dc96a58e000f13031ffbb7bc89eedb1990c3df58598c9d1f6e03ded14a9468283b3d276ecc8c7e03941bbb977a9fd9c340ed8776693f8 SHA512 dad1c976acfbbaaa75114ea21ebd5bd1367b3fb843178c11fa5ac995169411a1f9210d43bc3adfd8990a8e69ba3c5dbe6b7416bcd9250a804df1a571d04afc2d DIST mkvtoolnix-48.0.0.tar.xz 7476388 BLAKE2B 995c468f9e2069204b539cdc3200d5543ed159c2e969bce207af828ff2ab9bd56767a10359486ed3717efcf28e1aa13f2d6b538af58fcbbc965ee5c050310739 SHA512 33cd028eb990a01433b511416b613ae0c44b398a80c4f2d56a8d419b0b76fde2c36f04024a182402d7e787ff369222df7f22873db34efe7af03746c1c2def80d @@ -6,12 +7,14 @@ DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 2f1266a3c4117b8369b361e92728d0b19a DIST mkvtoolnix-50.0.0.tar.xz 7559852 BLAKE2B ffcc0c608915d32d20fc823208857bf54dc3d645d56d3b8b9f7e33b213ce5046b977b6f3de41d1b779d958d6ffc8578fe0cbac41d92d88bb4c779363739ee437 SHA512 ef0c6f4be768e32e3b0887c17d77f8441fd1b19294120c043dd9b2fdd9b76357bea721a156c3e99e0677d2e83dee92ea776df906347a0d44acbc2631b66c73ea DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69 SHA512 2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e DIST mkvtoolnix-56.1.0.tar.xz 7632872 BLAKE2B 805ddc9fadca4eba2ea4f3d8371f191c20ab6ca74c1564a216f1c001d272d038ee9622a562034b4584e118859a24cdcf36840e9e0bf7d5f2cc9893b91cf1c29b SHA512 7ee1c580c5b8824491652571f30559829700e50b1a74cf92affba77154c2756bd613cfd5776cdd180d1eaa888949ca898caac1bfadc690c68086fb136d41b2a6 +DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99 EBUILD mkvtoolnix-37.0.0.ebuild 2633 BLAKE2B 4bb1bc4c3defb6dfd672ca24322f9c220155b29ee11a355720de0aea495b9dc5d9a9a21f76c75bf7a91df8d96ed52850ac8e8b371efee6a4fbc9eda4770b0028 SHA512 22ec4a4753909bd92426841c2e2025ace80b3bc6de57e00182c67ab1c2bc8d1e7d03acd0312123f6979b09f6756ecb511ec1f2f97b6e939a591476a03f40bc7b EBUILD mkvtoolnix-47.0.0.ebuild 2708 BLAKE2B fcae224ed255e1e3ae82e78d901b14e7e230fc9ac77d02901df03b9ca3f866af9695313ac1337ccf3f3b2480c7f71639926b98422388ec8c033d2146a3bb5ebb SHA512 aee260c756079917131a64721a109b65358081f9a5eb2098034e15fac7f601b69e35811efd28da20c601765505194a8d1f30af2aca66a0ccbe0292ab8152951f EBUILD mkvtoolnix-48.0.0.ebuild 2704 BLAKE2B bd58d60ce6c5f1d4365223b149790fea8558ec0aa458d0b21e08fe144d3140c3a3d8ea8f477ebe016da21b2db538eb4a21b31c10d6946718189d4de6d6af572b SHA512 754cd160947385bdc5e8cd5cc66bc2140c7706848b35baa2e9ec9b5f13017fa807c6c97d41609bcfe874a848a73df94b3c4998e97260c0e37a2368871f894a52 EBUILD mkvtoolnix-49.0.0.ebuild 2813 BLAKE2B 3d6f8974419ec2a24030ddfb9bbdcb83b8d408dbe74bfe6516762738d8b4bb115e648518b6130f3aec14ee327ebc10eb576fa964b02699c94d9a76f1e7ccfe8a SHA512 b866c1f585b5fe1ce3d014236a4b139b0d394de0b7eb2b15c2c0ce338a319cb5b0f344ef0c41d0f259f671f9537358b7b485d265830293778a3e3f5ae2f70f02 EBUILD mkvtoolnix-50.0.0.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505 -EBUILD mkvtoolnix-51.0.0.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505 -EBUILD mkvtoolnix-56.1.0.ebuild 2925 BLAKE2B d9584ae4c8c9fc2b15b8542d7d315711e92a683224c18069bf5383efb307ede48b5f233eae69184fe08ffed471fe2f6e6b79c9a311173ecc22e193a8bb15297e SHA512 f67f7cc9d7a1258fe2942a650047e5a1ffc061ef09379dcc98cfbae29fb93709dbc35ca4042fddc4ffd46be35d0439dba5477e0522a09141331e6037f309cce3 +EBUILD mkvtoolnix-51.0.0.ebuild 2921 BLAKE2B e71d3e988f14a21595f8666f57d5eee063088dc708d787c707bef93e2fe8d8c86614e8c81f2542eb7b8b91203927b04ae44b5d8c95f8710884acde992f0da6bd SHA512 76409b23ca27bd4c9528c153d016c72bb39778c80ee3c487dd6d9f23c228b475df80fbc10b2b37ce10e0f131d4d6a33e6af77117f25488218bf5a3c0057a8e2b +EBUILD mkvtoolnix-56.1.0.ebuild 2973 BLAKE2B d2c5a209bf16fac4b98a093e3cc5ac7b11f12707e648d5cabed8d90ea6431020cdbeac918a2b3c7d61ddebe6eca42499c038e3c6abfea2332cd4e952c1948370 SHA512 e64b0c432ebf47a4b40d201ff83ebec6723214d44d72d9ac8757ef176319579bfcbc841ba2e595bb8870735e8ef4f846fea8670e59498fc737dacdb0f362bd20 +EBUILD mkvtoolnix-57.0.0.ebuild 2973 BLAKE2B d2c5a209bf16fac4b98a093e3cc5ac7b11f12707e648d5cabed8d90ea6431020cdbeac918a2b3c7d61ddebe6eca42499c038e3c6abfea2332cd4e952c1948370 SHA512 e64b0c432ebf47a4b40d201ff83ebec6723214d44d72d9ac8757ef176319579bfcbc841ba2e595bb8870735e8ef4f846fea8670e59498fc737dacdb0f362bd20 EBUILD mkvtoolnix-9999.ebuild 2925 BLAKE2B 40784eb4cdade88c122707ee510523023b8542f7a816adbdcd5c7c682433c5b901cdfb699347ffbede8cc9b57e941f37f9dd297ee0e5ed08e5cafc7eaf6920b7 SHA512 26dc8823f158bf7eb5deba4b185645abf210db9b638ef7728e6be8966e8287d31fe202762c21ef31a42663fa0b91ca6da9277acff58912d763c662e9ae8d1505 MISC metadata.xml 255 BLAKE2B 84855d12acedab301e8e709820ef74f658689209ce914cad2c71d11f4248a7d3356109d93573ed675698031eca1e0b6e0372a61c2a43a9f09840e295f94b74ef SHA512 92b56f4d9c86ad69341e67e8cc74db0bd068e45afdf2f3d3f9ea410fc5e64f3476143b656f2cb3d26b97ae01a967d71766952eba22e2278aab907c20b00ae0e9 diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch new file mode 100644 index 000000000000..c0f91deed696 --- /dev/null +++ b/media-video/mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch @@ -0,0 +1,15 @@ +https://gitlab.com/mbunkus/mkvtoolnix/-/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a +https://bugs.gentoo.org/786978#c10 +diff --git a/Rakefile b/Rakefile +index 8c9487436ac627cc503e5f233d3f9c756f67fd86..ce564127eeb136b1c1784568ad68a4d593d0931a 100644 +--- a/Rakefile ++++ b/Rakefile +@@ -355,7 +355,7 @@ cxx_compiler = lambda do |*args| + # Even -O1 causes compilation time & memory usage to skyrocket, + # possibly exponentially, with the number of entries to + # emplace_back() into the vector. +- flags.gsub!(%r{ -O\d+ }, ' -O0 ') ++ flags.gsub!(%r{(^| )-O[^ ]*}, ' -O0') + end + + args = [ diff --git a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild index d84291b28039..d19aae2ddc83 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-51.0.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then inherit git-r3 else SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" - KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 ppc ppc64 x86" fi DESCRIPTION="Tools to create, alter, and inspect Matroska files" diff --git a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild index c093e341ab9e..dbc45d73af89 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild @@ -64,7 +64,8 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch ) +PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch + "${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.patch ) src_prepare() { xdg_src_prepare diff --git a/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild new file mode 100644 index 000000000000..dbc45d73af89 --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-57.0.0.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic toolchain-funcs 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 nls pch qt5 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-1.60:= + >=dev-libs/libebml-1.4.0:= + >=dev-libs/libfmt-6.1.0:= + dev-libs/libpcre2:= + dev-libs/pugixml:= + media-libs/flac:= + >=media-libs/libmatroska-1.6.3:= + media-libs/libogg:= + media-libs/libvorbis:= + sys-apps/file + sys-libs/zlib + dvd? ( media-libs/libdvdread:= ) + qt5? ( + dev-qt/qtcore: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 + dev-libs/utfcpp + 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-49.0.0-qt5dbus.patch + "${FILESDIR}"/mkvtoolnix-56.1.0-optlevel.patch ) + +src_prepare() { + xdg_src_prepare + if [[ ${PV} == *9999 ]]; then + ./autogen.sh || die + fi + + # https://bugs.gentoo.org/692018 + sed -e 's/pandoc/diSaBlEd/' -i 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) + $(use_enable qt5 qt) + $(use_with dvd dvdread) + $(use_with nls gettext) + $(usex nls "" --with-po4a-translate=false) + --disable-update-check + --disable-optimization + --with-boost="${ESYSROOT}"/usr + --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir) + ) + + if use qt5 ; then + # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600 + myeconfargs+=( + --with-moc=$(qt5_get_bindir)/moc + --with-uic=$(qt5_get_bindir)/uic + --with-rcc=$(qt5_get_bindir)/rcc + --with-qmake=$(qt5_get_bindir)/qmake + ) + fi + + 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 +} -- cgit v1.2.3