| 1 |
commit: bb35d1ccc29329753aa594642be4cfba175cf9f9 |
| 2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Dec 29 20:49:23 2018 +0000 |
| 4 |
Commit: Tim Harder <radhermit <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Dec 29 20:59:08 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb35d1cc |
| 7 |
|
| 8 |
media-video/mkvtoolnix: use system libs for libfmt, utfcpp, and nlohmann_json |
| 9 |
|
| 10 |
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> |
| 11 |
|
| 12 |
.../{mkvtoolnix-9999.ebuild => mkvtoolnix-29.0.0-r1.ebuild} | 7 ++++--- |
| 13 |
media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 5 +++-- |
| 14 |
2 files changed, 7 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-29.0.0-r1.ebuild |
| 17 |
similarity index 95% |
| 18 |
copy from media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 19 |
copy to media-video/mkvtoolnix/mkvtoolnix-29.0.0-r1.ebuild |
| 20 |
index 865f816c46c..b47988527a7 100644 |
| 21 |
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 22 |
+++ b/media-video/mkvtoolnix/mkvtoolnix-29.0.0-r1.ebuild |
| 23 |
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then |
| 24 |
inherit git-r3 |
| 25 |
else |
| 26 |
SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" |
| 27 |
- KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" |
| 28 |
+ KEYWORDS="~amd64 ~x86" |
| 29 |
fi |
| 30 |
|
| 31 |
DESCRIPTION="Tools to create, alter, and inspect Matroska files" |
| 32 |
@@ -21,11 +21,10 @@ IUSE="debug nls pch test qt5" |
| 33 |
|
| 34 |
# check NEWS.md for build system changes entries for boost/libebml/libmatroska |
| 35 |
# version requirement updates and other packaging info |
| 36 |
-# TODO: package fmt (http://fmtlib.net/) |
| 37 |
RDEPEND=" |
| 38 |
+ dev-libs/libfmt:= |
| 39 |
>=dev-libs/boost-1.49.0:= |
| 40 |
>=dev-libs/libebml-1.3.5:= |
| 41 |
- dev-libs/jsoncpp:= |
| 42 |
dev-libs/pugixml |
| 43 |
media-libs/flac |
| 44 |
>=media-libs/libmatroska-1.4.8:= |
| 45 |
@@ -45,6 +44,8 @@ RDEPEND=" |
| 46 |
) |
| 47 |
" |
| 48 |
DEPEND="${RDEPEND} |
| 49 |
+ dev-cpp/nlohmann_json |
| 50 |
+ dev-libs/utfcpp |
| 51 |
dev-ruby/rake |
| 52 |
virtual/pkgconfig |
| 53 |
dev-libs/libxslt |
| 54 |
|
| 55 |
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 56 |
index 865f816c46c..3036925897d 100644 |
| 57 |
--- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 58 |
+++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild |
| 59 |
@@ -21,11 +21,10 @@ IUSE="debug nls pch test qt5" |
| 60 |
|
| 61 |
# check NEWS.md for build system changes entries for boost/libebml/libmatroska |
| 62 |
# version requirement updates and other packaging info |
| 63 |
-# TODO: package fmt (http://fmtlib.net/) |
| 64 |
RDEPEND=" |
| 65 |
+ dev-libs/libfmt:= |
| 66 |
>=dev-libs/boost-1.49.0:= |
| 67 |
>=dev-libs/libebml-1.3.5:= |
| 68 |
- dev-libs/jsoncpp:= |
| 69 |
dev-libs/pugixml |
| 70 |
media-libs/flac |
| 71 |
>=media-libs/libmatroska-1.4.8:= |
| 72 |
@@ -45,6 +44,8 @@ RDEPEND=" |
| 73 |
) |
| 74 |
" |
| 75 |
DEPEND="${RDEPEND} |
| 76 |
+ dev-cpp/nlohmann_json |
| 77 |
+ dev-libs/utfcpp |
| 78 |
dev-ruby/rake |
| 79 |
virtual/pkgconfig |
| 80 |
dev-libs/libxslt |
Archives