Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/assimp/assimp-3.1.1.ebuild2
-rw-r--r--media-libs/harfbuzz/harfbuzz-0.9.41.ebuild2
-rw-r--r--media-libs/libbsb/libbsb-0.0.7.ebuild2
-rw-r--r--media-libs/libchamplain/Manifest1
-rw-r--r--media-libs/libchamplain/libchamplain-0.12.11.ebuild64
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.8.ebuild2
-rw-r--r--media-libs/libmpd/libmpd-11.8.17.ebuild37
-rw-r--r--media-libs/mesa/Manifest3
-rw-r--r--media-libs/mesa/mesa-10.6.8.ebuild (renamed from media-libs/mesa/mesa-10.6.5.ebuild)0
-rw-r--r--media-libs/mesa/mesa-11.0.0_rc3.ebuild466
-rw-r--r--media-libs/mutagen/Manifest1
-rw-r--r--media-libs/mutagen/mutagen-1.22.ebuild4
-rw-r--r--media-libs/mutagen/mutagen-1.27.ebuild2
-rw-r--r--media-libs/mutagen/mutagen-1.29.ebuild2
-rw-r--r--media-libs/mutagen/mutagen-1.30.ebuild2
-rw-r--r--media-libs/mutagen/mutagen-1.31.ebuild44
-rw-r--r--media-libs/nas/nas-1.9.4-r1.ebuild2
-rw-r--r--media-libs/wxsvg/wxsvg-1.4.2.ebuild2
18 files changed, 122 insertions, 516 deletions
diff --git a/media-libs/assimp/assimp-3.1.1.ebuild b/media-libs/assimp/assimp-3.1.1.ebuild
index 005324fc82b2..83ef19fd02ed 100644
--- a/media-libs/assimp/assimp-3.1.1.ebuild
+++ b/media-libs/assimp/assimp-3.1.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://assimp.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
LICENSE="BSD"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
IUSE="+boost samples static tools"
SLOT="0"
diff --git a/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
index 0fd48e6a37d5..6c3a08a068ad 100644
--- a/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-0.9.41.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/HarfBuzz"
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
[[ ${PV} == 9999 ]] || \
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
IUSE="+cairo fontconfig +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/libbsb/libbsb-0.0.7.ebuild b/media-libs/libbsb/libbsb-0.0.7.ebuild
index fe995612946b..f07e057aeff2 100644
--- a/media-libs/libbsb/libbsb-0.0.7.ebuild
+++ b/media-libs/libbsb/libbsb-0.0.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="media-libs/libpng
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index 079b6acd5577..8d692f2ef7d3 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,2 +1,3 @@
DIST libchamplain-0.12.10.tar.xz 597476 SHA256 bf53ceb2405d4e23a14596a53ecc2a821b003f8c69de4a7de3a39d6e99462b05 SHA512 e9ac75f3fb785c8c124a4ac3e0d3ea7a0c1b2115342a8f18c77cd912f7d0e3946dd9000459cb91cf7fe90c6e6459da038cee7a3726734fb8013d8beb5e778496 WHIRLPOOL 06232727d43ae8fcefaa140d7f752a564bbff8f584cd49da4599118dcd2d8179df024093f65afa879bed34242b691273be951efa28f341eaf5343b5f29c4613b
+DIST libchamplain-0.12.11.tar.xz 600264 SHA256 851e24888d967c10acb8fd878df1292a84b8180eb4c48fc5bfbf1a48896d4aa5 SHA512 d93fe3f1b0f86c627c9ccff76df4f7c701f861c99113697ea4cd682ee666782d05987c99403aa88e3ec83673bd56cc724cc3f592b41ec1da9c80ed36d2f95ad7 WHIRLPOOL 7797ea8870fffee89c1b9ffc7c1c91f36bc7655ff129cf6f830d55b02aaadb137ddad9bc305755870c6de204e2f496e09ce05f7797f58d43cfc47ec786e99ead
DIST libchamplain-0.12.9.tar.xz 594280 SHA256 b25ce832334976c07bf9564bf7f31e628881c69cf871a256cf4530cb277917e3 SHA512 3aa67e7038667c4be3b2120baefb1526f10542af1b6727b70d9f63da6bc85fccf1e146a743c01193a045fbbda662e1da65fe5bc64ea2d776c5af793d54b32def WHIRLPOOL 33c58e34cb75260a4af6c6689b6f011bbd37204a03a508ff22517cfbf9a68d7933d1e94e5dad4ed071f9cf467cc60c9c44f3bb21fb304973872c4a03719d6ca4
diff --git a/media-libs/libchamplain/libchamplain-0.12.11.ebuild b/media-libs/libchamplain/libchamplain-0.12.11.ebuild
new file mode 100644
index 000000000000..47ad94f5e9e3
--- /dev/null
+++ b/media-libs/libchamplain/libchamplain-0.12.11.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG=no
+VALA_USE_DEPEND=vapigen
+
+inherit gnome2 vala
+
+DESCRIPTION="Clutter based world map renderer"
+HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
+
+SLOT="0.12"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="debug +gtk +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-libs/glib:2
+ >=media-libs/clutter-1.12:1.0[introspection?]
+ media-libs/cogl:=
+ >=net-libs/libsoup-2.34:2.4
+ x11-libs/cairo
+ gtk? (
+ x11-libs/gtk+:3[introspection?]
+ media-libs/clutter-gtk:1.0 )
+ introspection? ( dev-libs/gobject-introspection:= )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ # Fix documentation slotability
+ sed \
+ -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \
+ -i docs/reference/Makefile.{am,in} || die "sed (1) failed"
+ sed \
+ -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-gtk-${SLOT}/" \
+ -i docs/reference-gtk/Makefile.{am,in} || die "sed (2) failed"
+ mv "${S}"/docs/reference/${PN}{,-${SLOT}}-docs.sgml || die "mv (1) failed"
+ mv "${S}"/docs/reference-gtk/${PN}-gtk{,-${SLOT}}-docs.sgml || die "mv (2) failed"
+
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Vala demos are only built, so just disable them
+ gnome2_src_configure \
+ --disable-maemo \
+ --disable-memphis \
+ --disable-static \
+ --disable-vala-demos \
+ $(use_enable debug) \
+ $(use_enable gtk) \
+ $(use_enable introspection)
+}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild
index d1359fec9761..0404e0fe88e3 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.8.ebuild
@@ -19,7 +19,7 @@ LICENSE="GPL-2"
# FIXME: should we also bump for libgphoto2_port.so soname version?
SLOT="0/6" # libgphoto2.so soname version
-KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux"
IUSE="doc examples exif gd jpeg nls serial"
# By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libmpd/libmpd-11.8.17.ebuild b/media-libs/libmpd/libmpd-11.8.17.ebuild
deleted file mode 100644
index 8dba3c0f5eaa..000000000000
--- a/media-libs/libmpd/libmpd-11.8.17.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-DESCRIPTION="A library handling connections to a MPD server"
-HOMEPAGE="http://gmpc.wikia.com/wiki/Libmpd"
-SRC_URI="http://download.sarine.nl/Programs/gmpc/11.8/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND=">=dev-libs/glib-2.16:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- --docdir="${EPREFIX}"/usr/share/doc/${PF}
-}
-
-src_compile() {
- emake
- use doc && emake -C doc doc
-}
-
-src_install() {
- default
- use doc && dohtml -r doc/html/*
- find "${ED}" -name "*.la" -exec rm -rf {} + || die
- rm "${ED}"/usr/share/doc/${PF}/{README,ChangeLog} || die
-}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 62cd2365476b..c74fdb7a8ccb 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,8 +3,7 @@ DIST MesaLib-10.3.7.tar.bz2 7287153 SHA256 43c6ced15e237cbb21b3082d7c0b42777c50c
DIST MesaLib-10.4.6.tar.bz2 7520024 SHA256 d8baedd20e79ccd98a5a7b05e23d59a30892e68de1fcc057ca6873dafca02735 SHA512 1a379de8471f9154aa1348c15d24a56788e42b666094d63aa5dc8bffd1ed87c1ab50fb95adac010a92d832be4ec1be60b712179ad1ec99869ee653ccb576f50e WHIRLPOOL 45ff4f46a9c165c2cd3f49696f9d972216fdbc27051287d4eea4210f25631fb1faca517a714cc50229c463be1628dfbf71ba689d02ed3b3d52bfc71683fe667e
DIST MesaLib-7.10.3.tar.bz2 6056837 SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0 SHA512 aa1f5f068b305fae5519e11cad2db9c6dc647d3122252bbcb210f13ac6ef1b667ae750344898bca7c5bfae94934db05eff915cb7417a59590e6d3ba230817aa8 WHIRLPOOL 5c2adda647936ed4163a4e4d5afad8344eb576712f9432f697aa0fc22ca17d7aaf0aeb6ad2d4e7e0825dc27cae570660332450778f8091e9b27aad2865c9b5fc
DIST mesa-10.5.8.tar.xz 6993084 SHA256 2866b855c5299a4aed066338c77ff6467c389b2c30ada7647be8758663da2b54 SHA512 d7fc441b4cdad8a2905f03091af26ca7b01573bf4d0d928e950270981e4c6e7d20dba6aa97a60500b9a335a3c5cabc7f388a5338d43d391eed3f09dea60b77b2 WHIRLPOOL 68cc3d8490da9759b9d790053c70429be4c529c63b114f65f411112f76cd4daccc3490120a85a84d01cdcb989c0a0e58016b4d80f2238f2320b1caff797f3390
-DIST mesa-10.6.5.tar.xz 7037400 SHA256 fb6fac3c85bcfa9d06b8dd439169f23f0c0924a88e44362e738b99b1feff762f SHA512 46be6bd683d286bdf9ab8b4c1b1b32f89c95701b8c48cee49b060f5beaacea4540a69b99b4fde0f80acdd8e725552bef17dbd4251b9e977caeb5fd9d0ba56595 WHIRLPOOL dee48a0c680aae01cc39dc9157ea7c4c353b7ffdf543ab1cde8e76612a462ff3e3cb33433abff6d88f6800b71a02cd8cfcc23be98218d3cc4f85f424f3d12474
DIST mesa-10.6.6.tar.xz 7040744 SHA256 570f2154b7340ff5db61ff103bc6e85165b8958798b78a50fa2df488e98e5778 SHA512 a251dc258ccf2fbeccbff3447a23c0f417722244322c8887fe4a50b0013d3da3705ffbfe412b61717d2c3370cb6a88bec51b91e1b77a5b987d6fbf0fdbfe4a5e WHIRLPOOL 6f441a5b19b496d14b659b1ba3b70d2ead685ab1eb7d77b77c24d69127bd69ce6453feed1e042840bdb6cf47f68caa61c73c07ec2259a697acc3393e42111be6
-DIST mesa-11.0.0-rc3.tar.xz 7256736 SHA256 6188679020894140d923eff3c62485a1ee942a8c1c3a2fe617addfca607f916f SHA512 ae0563369d7f0508f4701cabe505701f81dcdbd4797dbc99aa24014bd29f7b7c6d84e7460ffe8d8a7d424b7e59fedae49aacc28e51a01939f0d07af105d57599 WHIRLPOOL 870e4361d15ebb19525f3b4a1e60be172b73ba0b9aa2b469e015f2c79b63c8a0afec2808de13d4fe699edad33f91e49ee896fc5efeeb90ce9ca1be999984c8e2
+DIST mesa-10.6.8.tar.xz 7042260 SHA256 e36ee5ceeadb3966fb5ce5b4cf18322dbb76a4f075558ae49c3bba94f57d58fd SHA512 ebb2daff1afcc5f6808c5c9948814014c0570b18fb91481c9d09b2c28776ce6e4fd8bba650e559ac5d87d30fe06b38032c78828c13b95d5f9a0338d44b75f61e WHIRLPOOL e94395c0954875c9b1eaa6692385593a24242c3915012dcf8fcfa7b0d16cff33fc80421234dccdfafa4ecb9b82a176f177cf7ec622f6b80eac6de4cfcb5c7552
DIST mesa-11.0.0.tar.xz 7257112 SHA256 e095a3eb2eca9dfde7efca8946527c8ae20a0cc938a8c78debc7f158ad44af32 SHA512 9938010f3d5e72bb8dea371e3502622e2ff6eae14e0265011df8fc81ec915d632abda9be7e772828adb8f0c7c12c830d89dce42e196ca18489fb1386a766220f WHIRLPOOL 454466396fac029450b619c842fa1e34906e5c529a67a575e9096f9e9b1584ad5b00f9ada2656e0469d5cf6d94e966709d4e0253484eb03d32f93e3e7d521f78
DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
diff --git a/media-libs/mesa/mesa-10.6.5.ebuild b/media-libs/mesa/mesa-10.6.8.ebuild
index 4386f87e2577..4386f87e2577 100644
--- a/media-libs/mesa/mesa-10.6.5.ebuild
+++ b/media-libs/mesa/mesa-10.6.8.ebuild
diff --git a/media-libs/mesa/mesa-11.0.0_rc3.ebuild b/media-libs/mesa/mesa-11.0.0_rc3.ebuild
deleted file mode 100644
index 309e8824f24f..000000000000
--- a/media-libs/mesa/mesa-11.0.0_rc3.ebuild
+++ /dev/null
@@ -1,466 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
- EXPERIMENTAL="true"
-fi
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
-
-OPENGL_DIR="xorg-x11"
-
-MY_P="${P/_/-}"
-FOLDER="${PV/_rc*/}"
-
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-
-if [[ $PV == 9999* ]]; then
- SRC_URI=""
-else
- SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_P}.tar.xz"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
-RESTRICT="!bindist? ( bindist )"
-
-INTEL_CARDS="i915 i965 ilo intel"
-RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
-VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} freedreno nouveau vmware"
-for card in ${VIDEO_CARDS}; do
- IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS}
- bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm
- +nptl opencl osmesa pax_kernel openmax pic selinux +udev vaapi vdpau
- wayland xvmc xa kernel_FreeBSD"
-
-REQUIRED_USE="
- d3d9? ( dri3 gallium )
- llvm? ( gallium )
- opencl? ( gallium llvm )
- openmax? ( gallium )
- gles1? ( egl )
- gles2? ( egl )
- vaapi? ( gallium )
- vdpau? ( gallium )
- wayland? ( egl gbm )
- xa? ( gallium )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_ilo? ( gallium )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium llvm )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vmware? ( gallium )
- ${PYTHON_REQUIRED_USE}
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.64"
-# keep correct libdrm and dri2proto dep
-# keep blocks in rdepend for binpkg
-RDEPEND="
- !<x11-base/xorg-server-1.7
- !<=x11-proto/xf86driproto-2.0.3
- abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
- classic? ( app-eselect/eselect-mesa )
- gallium? ( app-eselect/eselect-mesa )
- >=app-eselect/eselect-opengl-1.3.0
- udev? ( kernel_linux? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] ) )
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- gbm? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- dri3? ( >=virtual/libudev-215:=[${MULTILIB_USEDEP}] )
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- llvm? (
- video_cards_radeonsi? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- !video_cards_r600? (
- video_cards_radeon? ( || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- ) )
- )
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- )
- opencl? (
- app-eselect/eselect-opencl
- dev-libs/libclc
- || (
- >=dev-libs/elfutils-0.155-r1:=[${MULTILIB_USEDEP}]
- >=dev-libs/libelf-0.8.13-r2:=[${MULTILIB_USEDEP}]
- )
- )
- openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
- vaapi? ( >=x11-libs/libva-0.35.0:=[${MULTILIB_USEDEP}] )
- vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
- wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] )
- xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
-"
-for card in ${INTEL_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
- "
-done
-
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-DEPEND="${RDEPEND}
- llvm? (
- video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
- )
- opencl? (
- >=sys-devel/llvm-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/clang-3.4.2:=[${MULTILIB_USEDEP}]
- >=sys-devel/gcc-4.6
- )
- sys-devel/gettext
- virtual/pkgconfig
- >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
- dri3? (
- >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
- >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
- )
- >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
- >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
-"
-[[ ${PV} == "9999" ]] && DEPEND+="
- sys-devel/bison
- sys-devel/flex
- ${PYTHON_DEPS}
- $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
-"
-
-S="${WORKDIR}/${MY_P}"
-EGIT_CHECKOUT_DIR=${S}
-
-QA_WX_LOAD="
-x86? (
- !pic? (
- usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.1.0
- usr/lib*/libGLESv2.so.2.0.0
- usr/lib*/libGL.so.1.2.0
- usr/lib*/libOSMesa.so.8.0.0
- )
-)"
-
-pkg_setup() {
- # warning message for bug 459306
- if use llvm && has_version sys-devel/llvm[!debug=]; then
- ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
- ewarn "detected! This can cause problems. For details, see bug 459306."
- fi
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- # fix for hardened pax_kernel, bug 240956
- [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
-
- if use classic; then
- # Configurable DRI drivers
- driver_enable swrast
-
- # Intel code
- driver_enable video_cards_i915 i915
- driver_enable video_cards_i965 i965
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- driver_enable video_cards_intel i915 i965
- fi
-
- # Nouveau code
- driver_enable video_cards_nouveau nouveau
-
- # ATI code
- driver_enable video_cards_r100 radeon
- driver_enable video_cards_r200 r200
- if ! use video_cards_r100 && \
- ! use video_cards_r200; then
- driver_enable video_cards_radeon radeon r200
- fi
- fi
-
- if use egl; then
- myconf+="--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") "
- fi
-
- if use gallium; then
- myconf+="
- $(use_enable d3d9 nine)
- $(use_enable llvm gallium-llvm)
- $(use_enable openmax omx)
- $(use_enable vaapi va)
- $(use_enable vdpau)
- $(use_enable xa)
- $(use_enable xvmc)
- "
- use vaapi && myconf+="--with-va-libdir=/usr/$(get_libdir)/va/drivers"
-
- gallium_enable swrast
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_i915 i915
- gallium_enable video_cards_ilo ilo
- if ! use video_cards_i915 && \
- ! use video_cards_i965; then
- gallium_enable video_cards_intel i915
- fi
-
- gallium_enable video_cards_r300 r300
- gallium_enable video_cards_r600 r600
- gallium_enable video_cards_radeonsi radeonsi
- if ! use video_cards_r300 && \
- ! use video_cards_r600; then
- gallium_enable video_cards_radeon r300 r600
- fi
-
- gallium_enable video_cards_freedreno freedreno
- # opencl stuff
- if use opencl; then
- myconf+="
- $(use_enable opencl)
- --with-clang-libdir="${EPREFIX}/usr/lib"
- "
- fi
- fi
-
- # x86 hardened pax_kernel needs glx-rts, bug 240956
- if use pax_kernel; then
- myconf+="
- $(use_enable x86 glx-rts)
- "
- fi
-
- # on abi_x86_32 hardened we need to have asm disable
- if [[ ${ABI} == x86* ]] && use pic; then
- myconf+=" --disable-asm"
- fi
-
- # build fails with BSD indent, bug #428112
- use userland_GNU || export INDENT=cat
-
- ECONF_SOURCE="${S}" \
- econf \
- --enable-dri \
- --enable-glx \
- --enable-shared-glapi \
- $(use_enable !bindist texture-float) \
- $(use_enable d3d9 nine) \
- $(use_enable debug) \
- $(use_enable dri3) \
- $(use_enable egl) \
- $(use_enable gbm) \
- $(use_enable gles1) \
- $(use_enable gles2) \
- $(use_enable nptl glx-tls) \
- $(use_enable osmesa) \
- $(use_enable !udev sysfs) \
- --enable-llvm-shared-libs \
- --with-dri-drivers=${DRI_DRIVERS} \
- --with-gallium-drivers=${GALLIUM_DRIVERS} \
- PYTHON2="${PYTHON}" \
- ${myconf}
-}
-
-multilib_src_install() {
- emake install DESTDIR="${D}"
-
- if use classic || use gallium; then
- ebegin "Moving DRI/Gallium drivers for dynamic switching"
- local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
- keepdir /usr/$(get_libdir)/dri
- dodir /usr/$(get_libdir)/mesa
- for x in ${gallium_drivers[@]}; do
- if [ -f "$(get_libdir)/gallium/${x}" ]; then
- mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
- || die "Failed to move ${x}"
- fi
- done
- if use classic; then
- emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install
- fi
- for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
- if [ -f ${x} -o -L ${x} ]; then
- mv -f "${x}" "${x/dri/mesa}" \
- || die "Failed to move ${x}"
- fi
- done
- pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
- ln -s ../mesa/*.so . || die "Creating symlink failed"
- # remove symlinks to drivers known to eselect
- for x in ${gallium_drivers[@]}; do
- if [ -f ${x} -o -L ${x} ]; then
- rm "${x}" || die "Failed to remove ${x}"
- fi
- done
- popd
- eend $?
- fi
- if use opencl; then
- ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching"
- local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
- dodir ${cl_dir}/{lib,include}
- if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
- mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
- "${ED}"${cl_dir}
- fi
- if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
- mv -f "${ED}"/usr/include/CL \
- "${ED}"${cl_dir}/include
- fi
- eend $?
- fi
-
- if use openmax; then
- echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx"
- doenvd "${T}"/99mesaxdgomx
- keepdir /usr/share/mesa/xdg
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --all
- einstalldocs
-
- if use !bindist; then
- dodoc docs/patents.txt
- fi
-
- # Install config file for eselect mesa
- insinto /usr/share/mesa
- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
-}
-
-multilib_src_test() {
- if use llvm; then
- local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf'
- pushd src/gallium/drivers/llvmpipe >/dev/null || die
- emake ${llvm_tests}
- pax-mark m ${llvm_tests}
- popd >/dev/null || die
- fi
- emake check
-}
-
-pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
-
- # Select classic/gallium drivers
- if use classic || use gallium; then
- eselect mesa set --auto
- fi
-
- # Switch to mesa opencl
- if use opencl; then
- eselect opencl set --use-old ${PN}
- fi
-
- # run omxregister-bellagio to make the OpenMAX drivers known system-wide
- if use openmax; then
- ebegin "Registering OpenMAX drivers"
- BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
- OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
- omxregister-bellagio
- eend $?
- fi
-
- # warn about patent encumbered texture-float
- if use !bindist; then
- elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
- elog "enabled. Please see patents.txt for an explanation."
- fi
-
- if ! has_version media-libs/libtxc_dxtn; then
- elog "Note that in order to have full S3TC support, it is necessary to install"
- elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
- elog "textures in some apps, and some others even require this to run."
- fi
-}
-
-pkg_prerm() {
- if use openmax; then
- rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
- fi
-}
-
-# $1 - VIDEO_CARDS flag
-# other args - names of DRI drivers to enable
-# TODO: avoid code duplication for a more elegant implementation
-driver_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- DRI_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- DRI_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
-
-gallium_enable() {
- case $# in
- # for enabling unconditionally
- 1)
- GALLIUM_DRIVERS+=",$1"
- ;;
- *)
- if use $1; then
- shift
- for i in $@; do
- GALLIUM_DRIVERS+=",${i}"
- done
- fi
- ;;
- esac
-}
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 63c6ae62fcff..fb1dbe04d68f 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -2,3 +2,4 @@ DIST mutagen-1.22.tar.gz 813763 SHA256 ddf2907bcaf4827b044a3d70b2fb3c1b58954497d
DIST mutagen-1.27.tar.gz 875720 SHA256 cc884fe1e20fe220be7ce7c3b269f4cadc69a8310150a3a41162fba1ca9c88bd SHA512 ae15fb3f5d77025a60e25a2ed25e23f7d21160d4e63c49fe7d01508440ff1f6b673cf34d8f4facc834824825ad6f4d3ed9830133db5aba339ac1eae46f7f50d5 WHIRLPOOL ecd44cc7fde15f87a2a31be84b428a49e97d67ce26c700382b4e2ba7cdb995223ea6dfda101dd7039d4c7ce23a2314d7e523b9849f19189a6ed7bcdb18bbd52e
DIST mutagen-1.29.tar.gz 879767 SHA256 dbad61c8db882f849f25183448f21e440f5eceaf614dd8c2c5ae9392f33f599f SHA512 cd04bc79f1de1ad5ce0cd52e08d21918815d9d797370891431781fa99cb854eb98d20ed11a562afde71d4ea78c0468e831a3ed0eae67bbb30e629300753ff44e WHIRLPOOL bc9b539be281753c46bd363e3d88c429f5c254c3f8d276fa124db00098fd51831f64b585bf7f20a3a349cd27c532fa3ad3024f04f0f54ed40b23ab1eb64c2fa1
DIST mutagen-1.30.tar.gz 890493 SHA256 cdbf40642a4423fed0a2408b32e589d79b5e40e4a7f6caf5023cc8f5ad7c624f SHA512 be04890e6121a3525f6574ec9c54d00f5388415dabfaee8c62330592e623b83e6de4910daf9efd6a75115ea323c3d72b70da8e2d5dc670ef4c19879ec5ceb026 WHIRLPOOL ab5fa9af475b2181ededa2c91c244fb8ef2eecc7d635537492a9f6cdd16a98746deef05a8354273b1c5e67aecb47cad232c0e7a2781f09f04491aeb176913906
+DIST mutagen-1.31.tar.gz 897785 SHA256 0aa011707785fe30935d8655380052a20ba8b972aa738d4f144c457b35b4d699 SHA512 d603afa049e2223dc1050ee26101add4150f8ca57fcee1bbbfd1233276b15fda5972d58e8472135396e54f2778219462619fbec8dddb97c35a7fb7638fec0c23 WHIRLPOOL afe4977ba2da8d8adbcf1b333105eab9f2c79b6a31eeed6199a33c4ac8c4f23b62e2b45a6322c4058d77c3c8ea5ac8581c18dc9ff29b0368aa07713c5694b8ef
diff --git a/media-libs/mutagen/mutagen-1.22.ebuild b/media-libs/mutagen/mutagen-1.22.ebuild
index 9bbfe99b2c88..61f12804c49b 100644
--- a/media-libs/mutagen/mutagen-1.22.ebuild
+++ b/media-libs/mutagen/mutagen-1.22.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1
-DESCRIPTION="Mutagen is an audio metadata tag reader and writer implemented in pure Python"
+DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
HOMEPAGE="https://code.google.com/p/mutagen https://pypi.python.org/pypi/mutagen"
SRC_URI="https://bitbucket.org/lazka/${PN}/downloads/${P}.tar.gz"
diff --git a/media-libs/mutagen/mutagen-1.27.ebuild b/media-libs/mutagen/mutagen-1.27.ebuild
index 79c8a75f9240..dcfc273d5e08 100644
--- a/media-libs/mutagen/mutagen-1.27.ebuild
+++ b/media-libs/mutagen/mutagen-1.27.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit distutils-r1
-DESCRIPTION="Mutagen is an audio metadata tag reader and writer implemented in pure Python"
+DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
HOMEPAGE="https://code.google.com/p/mutagen https://pypi.python.org/pypi/mutagen"
SRC_URI="https://bitbucket.org/lazka/${PN}/downloads/${P}.tar.gz"
diff --git a/media-libs/mutagen/mutagen-1.29.ebuild b/media-libs/mutagen/mutagen-1.29.ebuild
index 5829838e5c70..2da63aff7120 100644
--- a/media-libs/mutagen/mutagen-1.29.ebuild
+++ b/media-libs/mutagen/mutagen-1.29.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit distutils-r1
-DESCRIPTION="Mutagen is an audio metadata tag reader and writer implemented in pure Python"
+DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
HOMEPAGE="https://code.google.com/p/mutagen https://pypi.python.org/pypi/mutagen"
SRC_URI="https://bitbucket.org/lazka/${PN}/downloads/${P}.tar.gz"
diff --git a/media-libs/mutagen/mutagen-1.30.ebuild b/media-libs/mutagen/mutagen-1.30.ebuild
index 2fbcefcda5ac..621947a93e66 100644
--- a/media-libs/mutagen/mutagen-1.30.ebuild
+++ b/media-libs/mutagen/mutagen-1.30.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit distutils-r1
-DESCRIPTION="Mutagen is an audio metadata tag reader and writer implemented in pure Python"
+DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
HOMEPAGE="https://bitbucket.org/lazka/mutagen https://pypi.python.org/pypi/mutagen"
SRC_URI="https://bitbucket.org/lazka/${PN}/downloads/${P}.tar.gz"
diff --git a/media-libs/mutagen/mutagen-1.31.ebuild b/media-libs/mutagen/mutagen-1.31.ebuild
new file mode 100644
index 000000000000..621947a93e66
--- /dev/null
+++ b/media-libs/mutagen/mutagen-1.31.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit distutils-r1
+
+DESCRIPTION="Audio metadata tag reader and writer implemented in pure Python"
+HOMEPAGE="https://bitbucket.org/lazka/mutagen https://pypi.python.org/pypi/mutagen"
+SRC_URI="https://bitbucket.org/lazka/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+# TODO: Missing support for >=dev-python/eyeD3-0.7 API
+# test? ( >=dev-python/eyeD3-0.7 )
+DEPEND="
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+python_compile_all() {
+ use doc && emake -C docs
+}
+
+src_test() {
+ # tests/test_flac.py uses temp files with a constant path.
+ # If we had multiple python implementations, we would hit a race.
+ distutils-r1_src_test
+}
+
+python_test() {
+ esetup.py test
+}
+
+python_install_all() {
+ local DOCS=( NEWS README.rst )
+ use doc && local HTML_DOCS=( docs/_build/. )
+ distutils-r1_python_install_all
+}
diff --git a/media-libs/nas/nas-1.9.4-r1.ebuild b/media-libs/nas/nas-1.9.4-r1.ebuild
index 5b124f5f99f8..a3e7db00f185 100644
--- a/media-libs/nas/nas-1.9.4-r1.ebuild
+++ b/media-libs/nas/nas-1.9.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.src.tar.gz"
LICENSE="HPND MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE="doc static-libs"
RDEPEND="x11-libs/libICE
diff --git a/media-libs/wxsvg/wxsvg-1.4.2.ebuild b/media-libs/wxsvg/wxsvg-1.4.2.ebuild
index 3db6713ae600..21d62d9c8f9e 100644
--- a/media-libs/wxsvg/wxsvg-1.4.2.ebuild
+++ b/media-libs/wxsvg/wxsvg-1.4.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="wxWinLL-3"
SLOT="0/2" # based on SONAME of libwxsvg.so
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="static-libs"
RDEPEND=">=dev-libs/expat-2:=