summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss@sss.chaoslab.ru>2017-11-02 12:13:23 +0300
committerGluzskiy Alexandr <sss@sss.chaoslab.ru>2017-11-02 12:13:23 +0300
commit3a77ea54c06c18b9cb0f80fbb249bdbfe17dfd9a (patch)
tree5f5a390bac148eefed7b8e5a73fa2b5935c42cfc
parent1e23cc6cdc9bd7198c229d312d03f9fa60ce87cb (diff)
mpv: build fix
cantata,easytag: deps fix libcrossguid: build fix
-rw-r--r--dev-libs/libcrossguid/libcrossguid-scm.ebuild21
-rw-r--r--media-sound/cantata/cantata-scm.ebuild2
-rw-r--r--media-sound/easytag/easytag-scm.ebuild1
-rw-r--r--media-video/mpv/mpv-scm.ebuild4
4 files changed, 11 insertions, 17 deletions
diff --git a/dev-libs/libcrossguid/libcrossguid-scm.ebuild b/dev-libs/libcrossguid/libcrossguid-scm.ebuild
index e1042b5..5f07e68 100644
--- a/dev-libs/libcrossguid/libcrossguid-scm.ebuild
+++ b/dev-libs/libcrossguid/libcrossguid-scm.ebuild
@@ -1,8 +1,8 @@
#copypast from https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=libcrossguid-git
-EAPI=5
+EAPI=6
-inherit base eutils git-r3
+inherit eutils git-r3 cmake-utils
DESCRIPTION="Lightweight cross platform C++ GUID/UUID library"
HOMEPAGE="https://github.com/graeme-hill/crossguid"
@@ -17,16 +17,13 @@ src_unpack() {
git-r3_src_unpack
}
-src_compile() {
- cd "${S}"
- g++ -c guid.cpp -o guid.o -std=c++11 -DGUID_LIBUUID
- ar rvs libcrossguid.a guid.o
-}
+#src_compile() {
+#
+#}
src_install() {
-#TODO: multilib
- mkdir -p "${D}/usr/lib"
- cp "${S}/libcrossguid.a" "${D}/usr/lib"
- mkdir -p "${D}/usr/include/"
- cp "${S}/guid.h" "${D}/usr/include/"
+ mkdir -p "${D}/usr/include"
+ cp "${S}/Guid.hpp" "${D}/usr/include"
+ mkdir -p "${D}/usr/lib"
+ cp "${BUILD_DIR}/libxg.a" "${D}/usr/lib"
}
diff --git a/media-sound/cantata/cantata-scm.ebuild b/media-sound/cantata/cantata-scm.ebuild
index 8760d15..d8ebd7c 100644
--- a/media-sound/cantata/cantata-scm.ebuild
+++ b/media-sound/cantata/cantata-scm.ebuild
@@ -61,8 +61,6 @@ RDEPEND="
virtual/ffmpeg
)
taglib? (
- media-libs/taglib[asf,mp4]
- media-libs/taglib-extras
!kde? ( udisks? ( sys-fs/udisks:2 ) )
)
"
diff --git a/media-sound/easytag/easytag-scm.ebuild b/media-sound/easytag/easytag-scm.ebuild
index ced0632..e996fe9 100644
--- a/media-sound/easytag/easytag-scm.ebuild
+++ b/media-sound/easytag/easytag-scm.ebuild
@@ -27,7 +27,6 @@ RDEPEND=">=dev-libs/glib-2.38:2
>=media-libs/id3lib-3.8.3-r8
>=media-libs/libid3tag-0.15.1b-r4
)
- mp4? ( >=media-libs/taglib-1.9.1[mp4] )
opus? (
>=media-libs/opus-1.1
>=media-libs/opusfile-0.4
diff --git a/media-video/mpv/mpv-scm.ebuild b/media-video/mpv/mpv-scm.ebuild
index b52dbe3..9977839 100644
--- a/media-video/mpv/mpv-scm.ebuild
+++ b/media-video/mpv/mpv-scm.ebuild
@@ -226,8 +226,8 @@ src_configure() {
# HWaccels:
# Automagic Video Toolbox HW acceleration. See Gentoo bug 577332.
- $(use_enable vaapi vaapi-hwaccel)
- $(use_enable vdpau vdpau-hwaccel)
+ # $(use_enable vaapi vaapi-hwaccel)
+# $(use_enable vdpau vdpau-hwaccel)
$(use_enable cuda cuda-hwaccel)
# TV features: