* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/, media-video/mkvtoolnix/files/
@ 2017-07-22 18:47 Steve Dibb
0 siblings, 0 replies; 8+ messages in thread
From: Steve Dibb @ 2017-07-22 18:47 UTC (permalink / raw
To: gentoo-commits
commit: d5b761aba683b18f4c8360fc18d82ab9ebc66c80
Author: Steve Dibb <beandog <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 22 18:46:30 2017 +0000
Commit: Steve Dibb <beandog <AT> gentoo <DOT> org>
CommitDate: Sat Jul 22 18:46:30 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5b761ab
media-video/mkvtoolnix:
bug 625936 - fix docbook configure on dash
Package-Manager: Portage-2.3.0, Repoman-2.3.1
.../mkvtoolnix/files/mkvtoolnix-13.0.0-ac-docbook.patch | 11 +++++++++++
.../{mkvtoolnix-13.0.0.ebuild => mkvtoolnix-13.0.0-r1.ebuild} | 4 ++++
2 files changed, 15 insertions(+)
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-13.0.0-ac-docbook.patch b/media-video/mkvtoolnix/files/mkvtoolnix-13.0.0-ac-docbook.patch
new file mode 100644
index 00000000000..506c77ceb0f
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-13.0.0-ac-docbook.patch
@@ -0,0 +1,11 @@
+--- mkvtoolnix-13.0.0/ac/ax_docbook.m4.orig 2017-07-22 12:35:22.680493773 -0600
++++ mkvtoolnix-13.0.0/ac/ax_docbook.m4 2017-07-22 12:36:03.293495236 -0600
+@@ -8,7 +8,7 @@
+
+ else
+ AC_MSG_CHECKING([for DocBook XSL root directory])
+- for i in /usr/share/xml/docbook/stylesheet/xsl/nwalsh /usr/share/xml/docbook/stylesheet/nwalsh `ls -d /usr/share/{sg,x}ml/docbook/xsl-stylesheets* 2> /dev/null`; do
++ for i in /usr/share/xml/docbook/stylesheet/xsl/nwalsh /usr/share/xml/docbook/stylesheet/nwalsh `ls -d /usr/share/sgml/docbook/xsl-stylesheets* /usr/share/xml/docbook/xsl-stylesheets* 2> /dev/null`; do
+ if test -f "$i/manpages/docbook.xsl"; then
+ DOCBOOK_ROOT="$i"
+ break
diff --git a/media-video/mkvtoolnix/mkvtoolnix-13.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-13.0.0-r1.ebuild
similarity index 97%
rename from media-video/mkvtoolnix/mkvtoolnix-13.0.0.ebuild
rename to media-video/mkvtoolnix/mkvtoolnix-13.0.0-r1.ebuild
index 210330dc6f2..d7ce7ee0c8c 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-13.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-13.0.0-r1.ebuild
@@ -43,6 +43,10 @@ DEPEND="${RDEPEND}
test? ( dev-cpp/gtest )
"
+PATCHES=(
+ "${FILESDIR}/${P}-ac-docbook.patch"
+)
+
pkg_pretend() {
# https://bugs.gentoo.org/419257
local ver=4.6
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/, media-video/mkvtoolnix/files/
@ 2017-08-23 12:49 Tim Harder
0 siblings, 0 replies; 8+ messages in thread
From: Tim Harder @ 2017-08-23 12:49 UTC (permalink / raw
To: gentoo-commits
commit: 6853b0e92c13936afbe304bcbe81333d62e9d6ec
Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 23 12:26:37 2017 +0000
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Wed Aug 23 12:48:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6853b0e9
media-video/mkvtoolnix: remove old
media-video/mkvtoolnix/Manifest | 3 -
.../files/mkvtoolnix-13.0.0-ac-docbook.patch | 11 ---
media-video/mkvtoolnix/mkvtoolnix-12.0.0.ebuild | 99 --------------------
media-video/mkvtoolnix/mkvtoolnix-13.0.0-r1.ebuild | 103 ---------------------
media-video/mkvtoolnix/mkvtoolnix-14.0.0.ebuild | 101 --------------------
media-video/mkvtoolnix/mkvtoolnix-15.0.0.ebuild | 101 --------------------
6 files changed, 418 deletions(-)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 798b73361ab..ccedc8fe42e 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,5 +1,2 @@
-DIST mkvtoolnix-12.0.0.tar.xz 4480308 SHA256 5c2401d1cc36d8a2d57cb791a5a22f3cda69cb0824c6cee35326b35e7f94b536 SHA512 ccb9c0e368f7fb9cfb2bebaa9f4ef248ccb1aca78136b4e653d32a4319316281d4dd63cfd935c6aa18f1294a17493f61462d13f0552d257b058245019cfe6935 WHIRLPOOL 81616f93eb0a123958628386023bb4aa358d2b8620efa3af6ed6239794b1d5d0d3c9216a59d6b7403ccee0054a4bd81abc39e552634c283d7e2caeb5be3e3f2b
-DIST mkvtoolnix-13.0.0.tar.xz 4486156 SHA256 855e4ea7b0d5a7066dc8db6f8f54a1d9da8ed5616d9c1cea8bc198d4adb57642 SHA512 acf61c9bdb8665678930d820546b0d158cf171c55facecc6cd41b07bb8c70750c26d67b3dfe96fe34020ea9e1917a98498c875b84811fd25a4027bfae70458a7 WHIRLPOOL 2120e10aad78388cf557f88695315e802567c81c113bd891b8ca5af90002ca3afe74542051c994a4440f1afc57129ffc60cf5586d2a9d0c9e81027ceae1cd471
-DIST mkvtoolnix-14.0.0.tar.xz 4529948 SHA256 86aa96acb26f7ef9d7afb4d0c1fa1a086b398d563b77372c436044c3c6bba78c SHA512 636c8b149f61548abc53d3cfdbb0ab32cc88853ae23d010a35151ea1e12011e93a9350fc0b2d7a0367effb63d86bc6dffe26c2826df1f867bdb4f7939f81c295 WHIRLPOOL 891089dd287504aec3de96419bc9b9d2dbc28c4a636e3dd21e77777eb0aaf211052a421283ac2df37f1fdbd98a439e16b1c6914053333612783d89b37a18af99
DIST mkvtoolnix-15.0.0.tar.xz 4552588 SHA256 73dc3b6f0a7147e28c06f44427fa0e824d0a4129e40c942d7642d9f451a51195 SHA512 5cef57dce4e6ca3d036142e42e302e8a315782ded11fb4c5982b406d389c8709bc7cf2a86d605b7c02797dc7b907dc3895db515e9d3e40976ab14198d9f400c6 WHIRLPOOL ee4bb153c4773535526bcb7352c13eab84a8b7fa28e66862f5bdc931a89e5ba3fc0d4c621f6784a9bd8b3a35c95cd1c1fdae9cfbb85640077b81b0914dc96fa5
DIST mkvtoolnix-9.6.0.tar.xz 3810216 SHA256 ebab8dcc59533d248b127d375286eb47880a222ef68ff7a10e1c87d49dbd86bb SHA512 5f469215a10dc865e51f77c43961705d70b1b0e38d70b930e5065d8d89b8379734d9826a63e2cb7ae9cb6723ed8a1d16793df35bad6244cedaa19bc4df49b436 WHIRLPOOL f90056b595402315651754bf4428762a99a665f8ce78d7eb8d6d5ad3bb8bc95e19b130c154c52c2d1281028ebf78c5834abedf068601382a3fcca9ea2c37aa2a
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-13.0.0-ac-docbook.patch b/media-video/mkvtoolnix/files/mkvtoolnix-13.0.0-ac-docbook.patch
deleted file mode 100644
index 506c77ceb0f..00000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-13.0.0-ac-docbook.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- mkvtoolnix-13.0.0/ac/ax_docbook.m4.orig 2017-07-22 12:35:22.680493773 -0600
-+++ mkvtoolnix-13.0.0/ac/ax_docbook.m4 2017-07-22 12:36:03.293495236 -0600
-@@ -8,7 +8,7 @@
-
- else
- AC_MSG_CHECKING([for DocBook XSL root directory])
-- for i in /usr/share/xml/docbook/stylesheet/xsl/nwalsh /usr/share/xml/docbook/stylesheet/nwalsh `ls -d /usr/share/{sg,x}ml/docbook/xsl-stylesheets* 2> /dev/null`; do
-+ for i in /usr/share/xml/docbook/stylesheet/xsl/nwalsh /usr/share/xml/docbook/stylesheet/nwalsh `ls -d /usr/share/sgml/docbook/xsl-stylesheets* /usr/share/xml/docbook/xsl-stylesheets* 2> /dev/null`; do
- if test -f "$i/manpages/docbook.xsl"; then
- DOCBOOK_ROOT="$i"
- break
diff --git a/media-video/mkvtoolnix/mkvtoolnix-12.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-12.0.0.ebuild
deleted file mode 100644
index 1ca0a49d53d..00000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-12.0.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/"
-SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch test qt5"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.3:=
- dev-libs/jsoncpp:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.4:=
- media-libs/libogg
- media-libs/libvorbis
- sys-apps/file
- sys-libs/zlib
- 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
- )
-"
-DEPEND="${RDEPEND}
- dev-ruby/rake
- sys-devel/gettext
- virtual/pkgconfig
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- app-text/po4a
- test? ( dev-cpp/gtest )
-"
-
-pkg_pretend() {
- # https://bugs.gentoo.org/419257
- local ver=4.6
- local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
- if ! version_is_at_least ${ver} $(gcc-version); then
- eerror ${msg}
- die ${msg}
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- --with-qmake=/usr/$(get_libdir)/qt5/bin/qmake
- )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-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
-
- dodoc AUTHORS ChangeLog README.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-13.0.0-r1.ebuild b/media-video/mkvtoolnix/mkvtoolnix-13.0.0-r1.ebuild
deleted file mode 100644
index 8b6cb6ba4df..00000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-13.0.0-r1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/"
-SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch test qt5"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.3:=
- dev-libs/jsoncpp:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.4:=
- media-libs/libogg
- media-libs/libvorbis
- sys-apps/file
- sys-libs/zlib
- 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
- )
-"
-DEPEND="${RDEPEND}
- dev-ruby/rake
- sys-devel/gettext
- virtual/pkgconfig
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- app-text/po4a
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-ac-docbook.patch"
-)
-
-pkg_pretend() {
- # https://bugs.gentoo.org/419257
- local ver=4.6
- local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
- if ! version_is_at_least ${ver} $(gcc-version); then
- eerror ${msg}
- die ${msg}
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- --with-qmake=/usr/$(get_libdir)/qt5/bin/qmake
- )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-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
-
- dodoc AUTHORS ChangeLog README.md
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-14.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-14.0.0.ebuild
deleted file mode 100644
index 34344f8ac94..00000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-14.0.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/"
-SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch test qt5"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.3:=
- dev-libs/jsoncpp:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.4:=
- media-libs/libogg
- media-libs/libvorbis
- sys-apps/file
- sys-libs/zlib
- 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
- )
-"
-DEPEND="${RDEPEND}
- dev-ruby/rake
- sys-devel/gettext
- virtual/pkgconfig
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- app-text/po4a
- test? ( dev-cpp/gtest )
-"
-
-DOCS="AUTHORS ChangeLog README.md"
-
-pkg_pretend() {
- # https://bugs.gentoo.org/419257
- local ver=4.6
- local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
- if ! version_is_at_least ${ver} $(gcc-version); then
- eerror ${msg}
- die ${msg}
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- --with-qmake=/usr/$(get_libdir)/qt5/bin/qmake
- )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-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
- doman doc/man/*.1
-}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-15.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-15.0.0.ebuild
deleted file mode 100644
index 11eb924084f..00000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-15.0.0.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs versionator multiprocessing autotools
-
-DESCRIPTION="Tools to create, alter, and inspect Matroska files"
-HOMEPAGE="https://mkvtoolnix.download/"
-SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="debug pch test qt5"
-
-RDEPEND="
- >=dev-libs/boost-1.46.0:=
- >=dev-libs/libebml-1.3.3:=
- dev-libs/jsoncpp:=
- dev-libs/pugixml
- media-libs/flac
- >=media-libs/libmatroska-1.4.4:=
- media-libs/libogg
- media-libs/libvorbis
- sys-apps/file
- sys-libs/zlib
- 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
- )
-"
-DEPEND="${RDEPEND}
- dev-ruby/rake
- sys-devel/gettext
- virtual/pkgconfig
- dev-libs/libxslt
- app-text/docbook-xsl-stylesheets
- app-text/po4a
- test? ( dev-cpp/gtest )
-"
-
-DOCS="AUTHORS NEWS.md README.md"
-
-pkg_pretend() {
- # https://bugs.gentoo.org/419257
- local ver=4.6
- local msg="You need at least GCC ${ver}.x for C++11 range-based 'for' and nullptr support."
- if ! version_is_at_least ${ver} $(gcc-version); then
- eerror ${msg}
- die ${msg}
- fi
-}
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- local myconf
-
- if use qt5 ; then
- # ac/qt5.m4 finds default Qt version set by qtchooser, bug #532600
- myconf+=(
- --with-moc=/usr/$(get_libdir)/qt5/bin/moc
- --with-uic=/usr/$(get_libdir)/qt5/bin/uic
- --with-rcc=/usr/$(get_libdir)/qt5/bin/rcc
- --with-qmake=/usr/$(get_libdir)/qt5/bin/qmake
- )
- fi
-
- econf \
- $(use_enable debug) \
- $(use_enable qt5 qt) \
- $(usex pch "" --disable-precompiled-headers) \
- "${myconf[@]}" \
- --disable-optimization \
- --docdir="${EPREFIX}"/usr/share/doc/${PF} \
- --with-boost="${EPREFIX}"/usr \
- --with-boost-libdir="${EPREFIX}"/usr/$(get_libdir)
-}
-
-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
- doman doc/man/*.1
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/, media-video/mkvtoolnix/files/
@ 2020-08-20 19:03 Thomas Deutschmann
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Deutschmann @ 2020-08-20 19:03 UTC (permalink / raw
To: gentoo-commits
commit: f78a96cb4bcaab84cb31ea3bd69753f6bf8fc68f
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Aug 15 13:59:09 2020 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Aug 20 19:02:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f78a96cb
media-video/mkvtoolnix: bump to 49.0.0
Also introduce USE flag to make dbus support optional.
Bug: https://bugs.gentoo.org/737252
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/17132
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
media-video/mkvtoolnix/Manifest | 1 +
.../files/mkvtoolnix-49.0.0-qt5dbus.patch | 32 ++++++++++++++++++++++
...oolnix-9999.ebuild => mkvtoolnix-49.0.0.ebuild} | 13 ++++++---
media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 13 ++++++---
4 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 6504d272652..d97e8224243 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,3 +1,4 @@
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
+DIST mkvtoolnix-49.0.0.tar.xz 7493996 BLAKE2B 2f1266a3c4117b8369b361e92728d0b19a64f3ebcbbb1fae144af33098711196b44820a9eae61d3cd22351ff4b48e7c056697d1653ba702d13dabfe43e869018 SHA512 087638abea16639d4c452639617d0a183b58bf0496b1c150a46b80a50c15c4a4e9926437dfe002e7f574bd2b72b1e0cf810838c476dd7816bad86ed026e5f4c7
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch
new file mode 100644
index 00000000000..1c59b2c3827
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-49.0.0-qt5dbus.patch
@@ -0,0 +1,32 @@
+--- a/ac/qt5.m4 2020-07-31 11:25:31.371508129 -0500
++++ b/ac/qt5.m4 2020-07-31 11:30:14.967322450 -0500
+@@ -14,6 +14,11 @@
+ AC_ARG_WITH([qt_pkg_config],
+ AC_HELP_STRING([--without-qt-pkg-config], [do not use pkg-config for detecting Qt; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]),
+ [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ])
++AC_ARG_ENABLE([dbus],
++ AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]),
++ [],[enable_dbus=yes])
++
++
+
+ if test x"$enable_qt" = "xyes" -a \
+ '(' x"$enable_gui" = x"yes" -o x"$enable_gui" = "x" ')'; then
+@@ -169,11 +174,13 @@
+ AC_MSG_RESULT(no: not found by pkg-config)
+ fi
+
+- if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
+- PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
+- if test x"$dbus_found" = xyes; then
+- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
+- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
++ if test x"$enable_dbus" = xyes; then
++ if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
++ PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
++ if test x"$dbus_found" = xyes; then
++ with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
++ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
++ fi
+ fi
+ fi
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
similarity index 90%
copy from media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
copy to media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
index 4f1a6f2c045..7456a1ad02d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-49.0.0.ebuild
@@ -3,12 +3,12 @@
EAPI=7
-inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+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 autotools git-r3
+ inherit git-r3
else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
@@ -19,7 +19,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug dvd nls pch test qt5"
+IUSE="dbus debug dvd nls pch qt5 test"
RESTRICT="!test? ( test )"
# check NEWS.md for build system changes entries for boost/libebml/libmatroska
@@ -38,13 +38,13 @@ RDEPEND="
dvd? ( media-libs/libdvdread:= )
qt5? (
dev-qt/qtcore:5
- dev-qt/qtdbus: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}
@@ -63,12 +63,16 @@ BDEPEND="
)
"
+PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch )
+
src_prepare() {
xdg_src_prepare
if [[ ${PV} == *9999 ]]; then
./autogen.sh || die
fi
+ eautoreconf
+
# remove bundled libs
rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
}
@@ -80,6 +84,7 @@ src_configure() {
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)
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
index 4f1a6f2c045..7456a1ad02d 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild
@@ -3,12 +3,12 @@
EAPI=7
-inherit flag-o-matic toolchain-funcs multiprocessing qmake-utils xdg
+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 autotools git-r3
+ inherit git-r3
else
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
@@ -19,7 +19,7 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix"
LICENSE="GPL-2"
SLOT="0"
-IUSE="debug dvd nls pch test qt5"
+IUSE="dbus debug dvd nls pch qt5 test"
RESTRICT="!test? ( test )"
# check NEWS.md for build system changes entries for boost/libebml/libmatroska
@@ -38,13 +38,13 @@ RDEPEND="
dvd? ( media-libs/libdvdread:= )
qt5? (
dev-qt/qtcore:5
- dev-qt/qtdbus: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}
@@ -63,12 +63,16 @@ BDEPEND="
)
"
+PATCHES=( "${FILESDIR}"/mkvtoolnix-49.0.0-qt5dbus.patch )
+
src_prepare() {
xdg_src_prepare
if [[ ${PV} == *9999 ]]; then
./autogen.sh || die
fi
+ eautoreconf
+
# remove bundled libs
rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die
}
@@ -80,6 +84,7 @@ src_configure() {
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)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/, media-video/mkvtoolnix/files/
@ 2021-05-23 7:23 Andrew Savchenko
0 siblings, 0 replies; 8+ messages in thread
From: Andrew Savchenko @ 2021-05-23 7:23 UTC (permalink / raw
To: gentoo-commits
commit: bae380256f345d9a79a0941b6259b8fb700fbf5e
Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
AuthorDate: Sun May 23 07:16:28 2021 +0000
Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
CommitDate: Sun May 23 07:23:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae38025
media-video/mkvtoolnix: fix OOM during build
Apply upstream patch[1] to drop iso639_language_list.cpp
optimization level to 0 due to special nature of this source file.
[1] https://gitlab.com/mbunkus/mkvtoolnix/-
/commit/ba6db89e24aa84316372d59e6bba4ac88145b32a
Closes: https://bugs.gentoo.org/786978
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
.../mkvtoolnix/files/mkvtoolnix-56.1.0-optlevel.patch | 15 +++++++++++++++
media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild | 3 ++-
2 files changed, 17 insertions(+), 1 deletion(-)
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 00000000000..c0f91deed69
--- /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-56.1.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-56.1.0.ebuild
index c093e341ab9..dbc45d73af8 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
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/, media-video/mkvtoolnix/files/
@ 2021-08-03 7:35 Alexis Ballier
0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2021-08-03 7:35 UTC (permalink / raw
To: gentoo-commits
commit: a4fbc8aab5bc4e5575f125a184331ca6112175e8
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 3 06:41:41 2021 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Aug 3 07:35:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4fbc8aa
media-video/mkvtoolnix: bump to 60.0.0
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
media-video/mkvtoolnix/Manifest | 1 +
.../files/mkvtoolnix-58.0.0-qt5dbus.patch | 37 ++++++
media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild | 130 +++++++++++++++++++++
3 files changed, 168 insertions(+)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 409aac68cdd..86f40e12905 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,2 +1,3 @@
DIST mkvtoolnix-51.0.0.tar.xz 7569264 BLAKE2B c2af73c278e794739ccb7a8eb560c23e0f54643a67259c15d2e25346ac8d2b6ba65563ec6df7f7d5716be7bbee2d2c540e667b4aff7d7e6fed662c1bba54bf69 SHA512 2e91b039dbcab9afbad29c6c8e66ac305b2518319f68301a34a909fdffb02305025106368d4338abf148be5af4adfebab2eb1b5ccf0c9c0b0cef8f9e6e58a26e
DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99
+DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch
new file mode 100644
index 00000000000..fb94686d27e
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-58.0.0-qt5dbus.patch
@@ -0,0 +1,37 @@
+Index: mkvtoolnix-58.0.0/ac/qt5.m4
+===================================================================
+--- mkvtoolnix-58.0.0.orig/ac/qt5.m4
++++ mkvtoolnix-58.0.0/ac/qt5.m4
+@@ -98,12 +98,14 @@ check_qt5() {
+ return
+ fi
+
+- if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
+- PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
+- if test x"$dbus_found" = xyes; then
+- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
+- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
+- fi
++ if test x"$enable_dbus" = xyes; then
++ if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
++ PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
++ if test x"$dbus_found" = xyes; then
++ with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
++ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
++ fi
++ fi
+ fi
+
+ with_qt_pkg_config_modules="`echo "$with_qt_pkg_config_modules" | sed -e 's/,/ /g'`"
+@@ -244,6 +246,11 @@ AC_ARG_WITH([qt_pkg_config_modules],
+ AC_ARG_WITH([qt_pkg_config],
+ AC_HELP_STRING([--without-qt-pkg-config], [do not use pkg-config for detecting Qt 5; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]),
+ [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ])
++AC_ARG_ENABLE([dbus],
++ AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]),
++ [],[enable_dbus=yes])
++
++
+
+ have_qt5=no
+
diff --git a/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
new file mode 100644
index 00000000000..5f25e814916
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-60.0.0.ebuild
@@ -0,0 +1,130 @@
+# 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.66:=
+ >=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-58.0.0-qt5dbus.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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/, media-video/mkvtoolnix/files/
@ 2022-07-08 7:41 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2022-07-08 7:41 UTC (permalink / raw
To: gentoo-commits
commit: f540e45e45c69b1ea77737aaeae82338c7cae4b6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 8 07:27:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jul 8 07:41:46 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f540e45e
media-video/mkvtoolnix: fix build with newer fmt; add missing qtsvg dep
Closes: https://bugs.gentoo.org/856700
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch | 293 +++++++++++++++++++++
...x-68.0.0.ebuild => mkvtoolnix-68.0.0-r1.ebuild} | 2 +
2 files changed, 295 insertions(+)
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch b/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch
new file mode 100644
index 000000000000..a0e3c1780db9
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-68.0.0-fmt-9.patch
@@ -0,0 +1,293 @@
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/1e1076e43fe8f38e33246fff3ce8651a93c371d9
+https://bugs.gentoo.org/856700
+
+From: Moritz Bunkus <mo@bunkus.online>
+Date: Thu, 7 Jul 2022 13:11:34 +0200
+Subject: [PATCH] fix compilation with fmt v9.0.0
+
+Prior to v9 all types that were outputtable via `operator<<` to
+`std::ostream` could be formatted. v9 changed that to require explicit
+tagging of those types that should work this way. This commit adds
+those tags for the types that are currently formatted via fmt.
+
+Fixes #3366.
+--- a/src/common/aac.h
++++ b/src/common/aac.h
+@@ -221,3 +221,7 @@ protected:
+ using parser_cptr = std::shared_ptr<parser_c>;
+
+ } // namespace mtx::aac
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<mtx::aac::header_c> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/common/bcp47.h
++++ b/src/common/bcp47.h
+@@ -176,3 +176,8 @@ struct hash<mtx::bcp47::language_c> {
+ };
+
+ } // namespace mtx::bcp47
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<mtx::bcp47::language_c::extension_t> : ostream_formatter {};
++template <> struct fmt::formatter<mtx::bcp47::language_c> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/common/bluray/track_chapter_names.cpp
++++ b/src/common/bluray/track_chapter_names.cpp
+@@ -18,6 +18,7 @@
+ #include "common/bluray/track_chapter_names.h"
+ #include "common/bluray/util.h"
+ #include "common/debugging.h"
++#include "common/path.h"
+ #include "common/qt.h"
+ #include "common/xml/xml.h"
+
+--- a/src/common/error.h
++++ b/src/common/error.h
+@@ -45,3 +45,7 @@ operator <<(std::ostream &out,
+ }
+
+ }
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<mtx::exception> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/common/fourcc.h
++++ b/src/common/fourcc.h
+@@ -83,3 +83,7 @@ operator <<(std::ostream &out,
+ out << fourcc.str();
+ return out;
+ }
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<fourcc_c> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/common/kax_analyzer.h
++++ b/src/common/kax_analyzer.h
+@@ -239,3 +239,7 @@ public:
+ virtual void debug_abort_process();
+ };
+ using console_kax_analyzer_cptr = std::shared_ptr<console_kax_analyzer_c>;
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<mtx::kax_analyzer_x> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/common/math_fwd.h
++++ b/src/common/math_fwd.h
+@@ -18,6 +18,11 @@
+ using mtx_mp_rational_t = boost::multiprecision::number<boost::multiprecision::backends::gmp_rational, boost::multiprecision::et_off>;
+ using mtx_mp_int_t = boost::multiprecision::number<boost::multiprecision::backends::gmp_int, boost::multiprecision::et_off>;
+
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<mtx_mp_rational_t> : ostream_formatter {};
++template <> struct fmt::formatter<mtx_mp_int_t> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
++
+ namespace mtx {
+
+ // This conversion function exists to work around incomplete
+--- a/src/common/mm_io_x.h
++++ b/src/common/mm_io_x.h
+@@ -155,3 +155,16 @@ operator <<(std::ostream &out,
+ }
+
+ }}
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<mtx::mm_io::exception> : ostream_formatter {};
++template <> struct fmt::formatter<mtx::mm_io::end_of_file_x> : ostream_formatter {};
++template <> struct fmt::formatter<mtx::mm_io::seek_x> : ostream_formatter {};
++template <> struct fmt::formatter<mtx::mm_io::read_write_x> : ostream_formatter {};
++template <> struct fmt::formatter<mtx::mm_io::open_x> : ostream_formatter {};
++template <> struct fmt::formatter<mtx::mm_io::wrong_read_write_access_x>: ostream_formatter {};
++template <> struct fmt::formatter<mtx::mm_io::insufficient_space_x> : ostream_formatter {};
++template <> struct fmt::formatter<mtx::mm_io::create_directory_x> : ostream_formatter {};
++template <> struct fmt::formatter<mtx::mm_io::text::exception> : ostream_formatter {};
++template <> struct fmt::formatter<mtx::mm_io::text::invalid_utf8_char_x>: ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/common/opus.h
++++ b/src/common/opus.h
+@@ -91,3 +91,9 @@ operator <<(std::ostream &out,
+ }
+
+ }
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<mtx::opus::decode_error> : ostream_formatter {};
++template <> struct fmt::formatter<mtx::opus::id_header_t> : ostream_formatter {};
++template <> struct fmt::formatter<mtx::opus::toc_t> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/common/path.h
++++ b/src/common/path.h
+@@ -36,3 +36,7 @@ std::filesystem::path absolute(std::filesystem::path const &p);
+ void create_directories(std::filesystem::path const &path, std::error_code &error_code);
+
+ } // namespace mtx::fs
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<std::filesystem::path> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/common/qt.h
++++ b/src/common/qt.h
+@@ -102,3 +102,7 @@ operator <<(std::wostream &out,
+ out << string.toStdWString();
+ return out;
+ }
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<QString> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/common/strings/formatting.h
++++ b/src/common/strings/formatting.h
+@@ -129,3 +129,7 @@ operator <<(std::ostream &out,
+ out << mtx::string::format_timestamp(timestamp);
+ return out;
+ }
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<basic_timestamp_c<int64_t>> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/common/translation.h
++++ b/src/common/translation.h
+@@ -80,4 +80,8 @@ operator <<(std::ostream &out,
+ return out;
+ }
+
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<translatable_string_c> : ostream_formatter {};
++#endif
++
+ void init_locales(std::string locale = "");
+--- a/src/input/r_flac.cpp
++++ b/src/input/r_flac.cpp
+@@ -240,7 +240,7 @@ flac_reader_c::handle_picture_metadata(FLAC__StreamMetadata const *metadata) {
+ mxdebug_if(m_debug, fmt::format("flac_reader: MIME type: {0}\n", attachment->mime_type));
+ mxdebug_if(m_debug, fmt::format("flac_reader: data length: {0}\n", picture.data_length));
+ mxdebug_if(m_debug, fmt::format("flac_reader: ID: {0}\n", m_attachment_id));
+- mxdebug_if(m_debug, fmt::format("flac_reader: mode: {0}\n", attach_mode));
++ mxdebug_if(m_debug, fmt::format("flac_reader: mode: {0}\n", static_cast<unsigned int>(attach_mode)));
+
+ if (attachment->mime_type.empty() || attachment->name.empty())
+ return;
+@@ -276,7 +276,7 @@ flac_reader_c::flac_metadata_cb(const FLAC__StreamMetadata *metadata) {
+ : metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT"
+ : metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET"
+ : "UNDEFINED",
+- metadata->type, metadata->length));
++ static_cast<unsigned int>(metadata->type), metadata->length));
+ break;
+ }
+ }
+--- a/src/input/r_flv.h
++++ b/src/input/r_flv.h
+@@ -173,3 +173,8 @@ protected:
+
+ unsigned int add_track(char type);
+ };
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<flv_header_t> : ostream_formatter {};
++template <> struct fmt::formatter<flv_tag_c> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/input/r_mpeg_ps.h
++++ b/src/input/r_mpeg_ps.h
+@@ -244,3 +244,8 @@ private:
+ void sort_tracks();
+ void calculate_global_timestamp_offset();
+ };
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<mpeg_ps_id_t> : ostream_formatter {};
++template <> struct fmt::formatter<mpeg_ps_packet_c> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/input/r_ogm_flac.cpp
++++ b/src/input/r_ogm_flac.cpp
+@@ -104,7 +104,7 @@ fhe_metadata_cb(const FLAC__StreamDecoder *,
+ : metadata->type == FLAC__METADATA_TYPE_VORBIS_COMMENT ? "VORBIS COMMENT"
+ : metadata->type == FLAC__METADATA_TYPE_CUESHEET ? "CUESHEET"
+ : "UNDEFINED",
+- metadata->type, metadata->length));
++ static_cast<unsigned int>(metadata->type), metadata->length));
+ break;
+ }
+ }
+--- a/src/input/r_qtmp4.h
++++ b/src/input/r_qtmp4.h
+@@ -590,3 +590,7 @@ protected:
+
+ virtual void process_atom(qt_atom_t const &parent, int level, std::function<void(qt_atom_t const &)> const &handler);
+ };
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<qt_atom_t> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/merge/item_selector.h
++++ b/src/merge/item_selector.h
+@@ -139,3 +139,7 @@ operator <<(std::ostream &out,
+
+ return out;
+ }
++
++#if FMT_VERSION >= 90000
++template <typename T> struct fmt::formatter<item_selector_c<T>> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/propedit/attachment_target.cpp
++++ b/src/propedit/attachment_target.cpp
+@@ -83,14 +83,14 @@ attachment_target_c::dump_info()
+ " selector_num_arg: {6}\n"
+ " selector_string_arg: {7}\n",
+ m_file_name,
+- m_command,
++ static_cast<unsigned int>(m_command),
+ ac_add == m_command ? "add"
+ : ac_delete == m_command ? "delete"
+ : ac_replace == m_command ? "replace"
+ : ac_update == m_command ? "update"
+ : "unknown",
+ m_options,
+- m_selector_type,
++ static_cast<unsigned int>(m_selector_type),
+ st_id == m_selector_type ? "ID"
+ : st_uid == m_selector_type ? "UID"
+ : st_name == m_selector_type ? "name"
+--- a/src/propedit/attachment_target.h
++++ b/src/propedit/attachment_target.h
+@@ -130,3 +130,7 @@ operator <<(std::ostream &out,
+
+ return out;
+ }
++
++#if FMT_VERSION >= 90000
++template <> struct fmt::formatter<attachment_target_c::options_t> : ostream_formatter {};
++#endif // FMT_VERSION >= 90000
+--- a/src/propedit/tag_target.cpp
++++ b/src/propedit/tag_target.cpp
+@@ -104,10 +104,10 @@ tag_target_c::dump_info()
+ " selection_track_type: {3}\n"
+ " track_uid: {4}\n"
+ " file_name: {5}\n",
+- static_cast<int>(m_operation_mode),
+- static_cast<int>(m_selection_mode),
++ static_cast<unsigned int>(m_operation_mode),
++ static_cast<unsigned int>(m_selection_mode),
+ m_selection_param,
+- m_selection_track_type,
++ static_cast<unsigned int>(m_selection_track_type),
+ m_track_uid,
+ m_file_name));
+
+--- a/src/propedit/track_target.cpp
++++ b/src/propedit/track_target.cpp
+@@ -78,9 +78,9 @@ track_target_c::dump_info()
+ " selection_track_type: {2}\n"
+ " track_uid: {3}\n"
+ " file_name: {4}\n",
+- static_cast<int>(m_selection_mode),
++ static_cast<unsigned int>(m_selection_mode),
+ m_selection_param,
+- m_selection_track_type,
++ static_cast<unsigned int>(m_selection_track_type),
+ m_track_uid,
+ m_file_name));
+
+GitLab
diff --git a/media-video/mkvtoolnix/mkvtoolnix-68.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r1.ebuild
similarity index 98%
rename from media-video/mkvtoolnix/mkvtoolnix-68.0.0.ebuild
rename to media-video/mkvtoolnix/mkvtoolnix-68.0.0-r1.ebuild
index cc6409014b5c..1f997ac7d980 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-68.0.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-68.0.0-r1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
sys-libs/zlib
dvd? ( media-libs/libdvdread:= )
dev-qt/qtcore:5
+ dev-qt/qtsvg:5
gui? (
dev-qt/qtgui:5
dev-qt/qtnetwork:5
@@ -67,6 +68,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch
"${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch
+ "${FILESDIR}"/${P}-fmt-9.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/, media-video/mkvtoolnix/files/
@ 2024-08-17 19:15 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2024-08-17 19:15 UTC (permalink / raw
To: gentoo-commits
commit: f096231a4cc4201dd2036bcee25b5f4610becde0
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Mon Jun 10 19:24:31 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 19:15:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f096231a
media-video/mkvtoolnix: add 86.0
Backport patch for libfmt-11 compatibility.
Closes: https://bugs.gentoo.org/938105
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-video/mkvtoolnix/Manifest | 2 +
.../files/mkvtoolnix-86.0-libfmt-11-fix.patch | 25 ++++
media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild | 142 +++++++++++++++++++++
3 files changed, 169 insertions(+)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index 27593459ae9f..a212124cf9fa 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -4,3 +4,5 @@ DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B f57b398c747d90021f2a13e58df23655e89
DIST mkvtoolnix-83.0.tar.xz.sig 833 BLAKE2B 3eddaa4941d84937a7b771bea66be52979437abb54cd178eb6d24b30628db3ee0ad72f23bea7419a7bc13cfd4f84d6d004b46ad63bad0eeeef8fd05f37bcaf4f SHA512 6d3ac46a40139fff67da61c77a802df243764d8c26c55e3b951d407fd3147bcf985f8a62c21b18c12fabe0afdc535a3449a6bfff3f15a5779b2aed1f94fe0ab7
DIST mkvtoolnix-84.0.tar.xz 11325260 BLAKE2B 147878e796c3ce9b3dc03e026eaeb45c21946d0a80ff76d090a8a11a22e1e02fddfe158192df264c5a006ad9007a73d68ddd5c79f0ccd1d103e827e4d0123974 SHA512 3a73bb2497a227fd2e0a65d58e72bf479662828a7b4201b37b7bfdd7f88d294a6690aee024661d8b5615036f64a4ce1c2ba64d7b24ebd352f8f5ce3ffdac543a
DIST mkvtoolnix-84.0.tar.xz.sig 833 BLAKE2B 903530d5968d9409a9b0fe1f236c254386a33ce1224b36d4e6f33d603851eec2ed27aac2923d59a3f2e729a48bd7724d8b697cbdff5213bec338417f1632ef29 SHA512 2338a226e0df776e1b3c78f93793900e62c391fd7fd4e56c317840f3d00fccc20d6ede3118ad47266b6772459d1959a221f2e475a4b96bd9c2d58caab3dae184
+DIST mkvtoolnix-86.0.tar.xz 11369476 BLAKE2B a18ed1534f693f98924bc5c4bb1d3acedd154dacede17691a88b1d1a14c99d5ba4bc5483060d67624e682058e8af1a91ea0f77b095f35af340dea84a441dedc1 SHA512 ca1009439d662f32c75ee915f89ed1ccf1475f84782a5da977521e1ab1a558400d844d689ba37d3e5bcc2cb0ec70d3fac5db5594d0088668dd0ba3ac759819c6
+DIST mkvtoolnix-86.0.tar.xz.sig 833 BLAKE2B d53e8f8198f5ce5faec0b6c991ecf64a43f42395182aa7ead970f17e56b01c986392922b052cc2ac5e380983b937345838a96cde84e575d72bfcff2dd3084b09 SHA512 19901f9f61e108b8c4db0dab833e0998ab2bdc227130fe6d1aea6b9f495e66aa796bd4d3f70f14dadc906226884f03aaca90e710233e58fb604f66b28fb4abee
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-86.0-libfmt-11-fix.patch b/media-video/mkvtoolnix/files/mkvtoolnix-86.0-libfmt-11-fix.patch
new file mode 100644
index 000000000000..3b4b1b9fca52
--- /dev/null
+++ b/media-video/mkvtoolnix/files/mkvtoolnix-86.0-libfmt-11-fix.patch
@@ -0,0 +1,25 @@
+https://gitlab.com/mbunkus/mkvtoolnix/-/merge_requests/2259
+https://gitlab.com/mbunkus/mkvtoolnix/-/commit/b57dde69dc80b151844e0762a2ae6bca3ba86d95
+
+From b57dde69dc80b151844e0762a2ae6bca3ba86d95 Mon Sep 17 00:00:00 2001
+From: Kefu Chai <tchaikov@gmail.com>
+Date: Mon, 15 Jul 2024 11:10:09 +0800
+Subject: [PATCH] fix build with fmt v11
+
+fmt::join() was moved into fmt/ranges.h since fmt 11, so let's
+include this header for using it.
+
+Signed-off-by: Kefu Chai <tchaikov@gmail.com>
+--- a/src/common/common.h
++++ b/src/common/common.h
+@@ -35,6 +35,7 @@
+
+ #include <fmt/format.h>
+ #include <fmt/ostream.h>
++#include <fmt/ranges.h>
+
+ #include <boost/algorithm/string.hpp>
+ #include <boost/multiprecision/cpp_int.hpp>
+--
+GitLab
+
diff --git a/media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild
new file mode 100644
index 000000000000..b44d36acb42f
--- /dev/null
+++ b/media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic multiprocessing prefix qmake-utils xdg
+
+if [[ ${PV} == *9999 ]] ; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
+ EGIT_SUBMODULES=()
+else
+ inherit verify-sig
+
+ SRC_URI="
+ https://mkvtoolnix.download/sources/${P}.tar.xz
+ verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
+ "
+ KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+ VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
+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="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.5:=
+ >=dev-libs/libfmt-8.0.1:=
+ >=dev-libs/pugixml-1.11
+ >=dev-qt/qtbase-6.2:6[dbus]
+ media-libs/flac:=
+ >=media-libs/libmatroska-1.7.1:=
+ media-libs/libogg
+ media-libs/libvorbis
+ sys-libs/zlib
+ dvd? ( media-libs/libdvdread:= )
+ gui? (
+ app-text/cmark:0=
+ >=dev-qt/qtbase-6.2:6[concurrent,gui,network,widgets]
+ >=dev-qt/qtmultimedia-6.2:6
+ >=dev-qt/qtsvg-6.2:6
+ media-libs/libglvnd
+ )
+"
+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
+ )
+"
+
+if [[ ${PV} != *9999 ]] ; then
+ BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
+fi
+
+PATCHES=(
+ "${FILESDIR}"/mkvtoolnix-86.0-libfmt-11-fix.patch
+)
+
+src_prepare() {
+ default
+
+ if [[ ${PV} == *9999 ]]; then
+ ./autogen.sh || die
+ fi
+
+ # bug #692018
+ sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die
+
+ # bug #928463
+ hprefixify "${S}/ac/ax_docbook.m4"
+
+ 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 gui)
+ $(use_with dvd dvdread)
+ $(use_with nls gettext)
+ #$(use_with nls po4a)
+ --disable-update-check
+ --disable-optimization
+ --with-boost="${ESYSROOT}"/usr
+ --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
+
+ # 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.
+ --with-qmake6="$(qt6_get_bindir)"/qmake
+ )
+
+ # Work around bug #904710.
+ use nls || export ac_cv_path_PO4A=
+
+ 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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/, media-video/mkvtoolnix/files/
@ 2024-08-17 19:15 Michał Górny
0 siblings, 0 replies; 8+ messages in thread
From: Michał Górny @ 2024-08-17 19:15 UTC (permalink / raw
To: gentoo-commits
commit: b1d0ca2dbfe43ca8571963f6c2e3355c76f4389f
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Thu Aug 8 20:03:38 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Aug 17 19:15:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1d0ca2d
media-video/mkvtoolnix: drop 81.0
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37114
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-video/mkvtoolnix/Manifest | 2 -
.../files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch | 29 ----
.../files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch | 31 ----
.../files/mkvtoolnix-80.0.0-optional-qtdbus.patch | 70 ---------
media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild | 167 ---------------------
5 files changed, 299 deletions(-)
diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest
index a212124cf9fa..6f92e2e55130 100644
--- a/media-video/mkvtoolnix/Manifest
+++ b/media-video/mkvtoolnix/Manifest
@@ -1,5 +1,3 @@
-DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0 SHA512 d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7
-DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5 SHA512 3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb
DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B f57b398c747d90021f2a13e58df23655e898a0bb68ad7f050f7a3fe0018866570fb81780f2d68a8c9ed06b66882578b5a9144c3be1bb9b79bc5f79e13f06bde5 SHA512 e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d
DIST mkvtoolnix-83.0.tar.xz.sig 833 BLAKE2B 3eddaa4941d84937a7b771bea66be52979437abb54cd178eb6d24b30628db3ee0ad72f23bea7419a7bc13cfd4f84d6d004b46ad63bad0eeeef8fd05f37bcaf4f SHA512 6d3ac46a40139fff67da61c77a802df243764d8c26c55e3b951d407fd3147bcf985f8a62c21b18c12fabe0afdc535a3449a6bfff3f15a5779b2aed1f94fe0ab7
DIST mkvtoolnix-84.0.tar.xz 11325260 BLAKE2B 147878e796c3ce9b3dc03e026eaeb45c21946d0a80ff76d090a8a11a22e1e02fddfe158192df264c5a006ad9007a73d68ddd5c79f0ccd1d103e827e4d0123974 SHA512 3a73bb2497a227fd2e0a65d58e72bf479662828a7b4201b37b7bfdd7f88d294a6690aee024661d8b5615036f64a4ce1c2ba64d7b24ebd352f8f5ce3ffdac543a
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
deleted file mode 100644
index d31731a266f8..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 246f824a6a0d2bc93ec4ad2ebfde7c92b42c879a Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Tue, 21 Nov 2023 01:10:23 +0200
-Subject: [PATCH] Fix detection of QtDBus and QtMultimedia
-
-* Sometimes you may have qtdbus and qtmultimedia present at the same
- time.
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/ac/qt6.m4
-+++ b/ac/qt6.m4
-@@ -95,10 +95,12 @@ EOT
-
- if test $result2 != 0; then
- continue
-- elif test $qt_module = dbus; then
-+ fi
-+ if test $qt_module = dbus; then
- qmake_qt_ui="$qmake_qt_ui dbus"
- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-- elif test $qt_module = multimedia; then
-+ fi
-+ if test $qt_module = multimedia; then
- qmake_qt_ui="$qmake_qt_ui multimedia"
- fi
- done
---
-2.43.0
-
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
deleted file mode 100644
index 203721aedcff..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 196e704d9bd44a5bb7655d8a85b6f270b2165b3c Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Mon, 20 Nov 2023 23:41:06 +0200
-Subject: [PATCH] Only check for uic in qt5 if gui is enabled
-
-We should only check for UIC (provided by qtwidgets) if we're building the GUI.
-
-Qt (just qtcore) itself is *always* needed to build mkvtoolnix (it's used
-for e.g. MIME type detection since 59.0.0), but the rest of Qt
-(like qtwidgets) is only needed for the GUI build.
-
-The build system incorrectly unconditionally checks for UIC. We fix it here
-to only check for it when doing a GUI build.
-
-https://bugs.gentoo.org/844097
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/ac/qt5.m4
-+++ b/ac/qt5.m4
-@@ -63,7 +63,7 @@ check_qt5() {
- AC_MSG_RESULT(no: could not find the rcc executable)
- return
-
-- elif test x"$UIC" = x; then
-+ elif test x"$UIC" = x && test x"$enable_gui" = xyes; then
- AC_MSG_CHECKING(for Qt 5)
- AC_MSG_RESULT(no: could not find the uic executable)
- return
---
-2.43.0
-
diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch
deleted file mode 100644
index deb8d59fa6c4..000000000000
--- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 998cd9baa8edbbc0a02509728c7ff21ddaaaad51 Mon Sep 17 00:00:00 2001
-From: Alfred Wingate <parona@protonmail.com>
-Date: Mon, 20 Nov 2023 23:18:56 +0200
-Subject: [PATCH] Add an option for qtdbus support
-
-Signed-off-by: Alfred Wingate <parona@protonmail.com>
---- a/ac/qt5.m4
-+++ b/ac/qt5.m4
-@@ -103,11 +103,13 @@ check_qt5() {
- return
- fi
-
-- if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
-- PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
-- if test x"$dbus_found" = xyes; then
-- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
-- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+ if test x"$enable_dbus" = xyes; then
-+ if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then
-+ PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no])
-+ if test x"$dbus_found" = xyes; then
-+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus"
-+ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+ fi
- fi
- fi
-
-@@ -254,6 +256,11 @@ AC_ARG_WITH([qt_pkg_config_modules],
- AC_ARG_WITH([qt_pkg_config],
- AS_HELP_STRING([--without-qt-pkg-config],[do not use pkg-config for detecting Qt 5; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]),
- [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ])
-+AC_ARG_ENABLE([dbus],
-+ AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]),
-+ [],[enable_dbus=yes])
-+
-+
-
- have_qt5=no
-
---- a/ac/qt6.m4
-+++ b/ac/qt6.m4
-@@ -96,9 +96,12 @@ EOT
- if test $result2 != 0; then
- continue
- fi
-- if test $qt_module = dbus; then
-- qmake_qt_ui="$qmake_qt_ui dbus"
-- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+ if test x"$enable_dbus" = xyes; then
-+ PKG_CHECK_EXISTS([Qt6DBus],[dbus_found=yes],[dbus_found=no])
-+ if test x"$dbus_found" = xyes; then
-+ qmake_qt_ui="$qmake_qt_ui dbus"
-+ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present])
-+ fi
- fi
- if test $qt_module = multimedia; then
- qmake_qt_ui="$qmake_qt_ui multimedia"
-@@ -272,6 +275,9 @@ AC_ARG_ENABLE([gui],
- AC_ARG_ENABLE([qt6],
- AS_HELP_STRING([--enable-qt6],[compile with Qt 6 (yes)]),
- [],[enable_qt6=yes])
-+AC_ARG_ENABLE([dbus],
-+ AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]),
-+ [],[enable_dbus=yes])
-
- have_qt6=no
-
---
-2.43.0
-
diff --git a/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild
deleted file mode 100644
index 077c325ecc46..000000000000
--- a/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 1999-2024 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
- inherit git-r3
-
- EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git"
- EGIT_SUBMODULES=()
-else
- inherit verify-sig
-
- SRC_URI="
- https://mkvtoolnix.download/sources/${P}.tar.xz
- verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig )
- "
- KEYWORDS="amd64 ppc ppc64 x86"
-
- VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc"
-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 qt6 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="
- app-text/cmark:0=
- 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:= )
- !qt6? (
- dev-qt/qtcore:5
- dbus? ( dev-qt/qtdbus: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
- )
- )
- qt6? (
- dev-qt/qtbase:6[dbus?]
- gui? (
- dev-qt/qtbase:6[concurrent,gui,network,widgets]
- dev-qt/qtmultimedia:6
- dev-qt/qtsvg:6
- )
- )
-"
-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
- )
-"
-
-if [[ ${PV} != *9999 ]] ; then
- BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-mkvtoolnix )"
-fi
-
-PATCHES=(
- "${FILESDIR}"/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch
- "${FILESDIR}"/mkvtoolnix-80.0.0-fix-qtmultimedia.patch
- "${FILESDIR}"/mkvtoolnix-80.0.0-optional-qtdbus.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)
- $(use_enable gui)
- $(use_with dvd dvdread)
- $(use_with nls gettext)
- #$(use_with nls po4a)
- --disable-update-check
- --disable-optimization
- --with-boost="${ESYSROOT}"/usr
- --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir)
- )
-
- # 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.
- if use qt6; then
- myeconfargs+=(
- --enable-qt6
- --disable-qt5
- --with-qmake6="$(qt6_get_bindir)"/qmake
- )
- else
- myeconfargs+=(
- --disable-qt6
- --enable-qt5
- --with-qmake="$(qt5_get_bindir)"/qmake
- )
- fi
-
- # Work around bug #904710.
- use nls || export ac_cv_path_PO4A=
-
- 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
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2024-08-17 19:15 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-08-17 19:15 [gentoo-commits] repo/gentoo:master commit in: media-video/mkvtoolnix/, media-video/mkvtoolnix/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-08-17 19:15 Michał Górny
2022-07-08 7:41 Sam James
2021-08-03 7:35 Alexis Ballier
2021-05-23 7:23 Andrew Savchenko
2020-08-20 19:03 Thomas Deutschmann
2017-08-23 12:49 Tim Harder
2017-07-22 18:47 Steve Dibb
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox