summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--games-emulation/dolphin/ChangeLog9
-rw-r--r--games-emulation/dolphin/dolphin-4.0.2-r5.ebuild (renamed from games-emulation/dolphin/dolphin-4.0.2-r4.ebuild)9
-rw-r--r--games-emulation/dolphin/dolphin-9999.ebuild7
3 files changed, 17 insertions, 8 deletions
diff --git a/games-emulation/dolphin/ChangeLog b/games-emulation/dolphin/ChangeLog
index cef09a62f8b2..602e98b7edd8 100644
--- a/games-emulation/dolphin/ChangeLog
+++ b/games-emulation/dolphin/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for games-emulation/dolphin
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.33 2015/04/18 12:47:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/ChangeLog,v 1.34 2015/04/26 19:36:46 twitch153 Exp $
+
+*dolphin-4.0.2-r5 (26 Apr 2015)
+
+ 26 Apr 2015; Devan Franchini <twitch153@gentoo.org> +dolphin-4.0.2-r5.ebuild,
+ -dolphin-4.0.2-r4.ebuild, dolphin-9999.ebuild:
+ Adds webkit USE flag dependency for wxGTK and check to ensure \!>=media-
+ video/libav-10 bug #546602
18 Apr 2015; Sven Wegener <swegener@gentoo.org> dolphin-3.5-r1.ebuild,
dolphin-4.0-r1.ebuild, dolphin-4.0.2-r4.ebuild:
diff --git a/games-emulation/dolphin/dolphin-4.0.2-r4.ebuild b/games-emulation/dolphin/dolphin-4.0.2-r5.ebuild
index 9bb35a675fa1..c9d8f359fa3f 100644
--- a/games-emulation/dolphin/dolphin-4.0.2-r4.ebuild
+++ b/games-emulation/dolphin/dolphin-4.0.2-r5.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2-r4.ebuild,v 1.2 2015/04/18 12:47:01 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-4.0.2-r5.ebuild,v 1.1 2015/04/26 19:36:46 twitch153 Exp $
EAPI=5
-WX_GTK_VER="2.9"
+WX_GTK_VER="3.0"
inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets games
@@ -30,7 +30,8 @@ RDEPEND=">=media-libs/glew-1.6
alsa? ( media-libs/alsa-lib )
ao? ( media-libs/libao )
bluetooth? ( net-wireless/bluez )
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( virtual/ffmpeg
+ !!>=media-video/libav-10 )
lzo? ( dev-libs/lzo )
openal? ( media-libs/openal )
opengl? ( virtual/opengl )
@@ -43,7 +44,7 @@ DEPEND="${RDEPEND}
media-libs/freetype
media-libs/libsoundtouch
>=sys-devel/gcc-4.6.0
- x11-libs/wxGTK:2.9
+ x11-libs/wxGTK:${WX_GTK_VER}[webkit]
"
pkg_pretend() {
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index 8160c88679a7..da09b8a08abc 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild,v 1.23 2015/03/09 21:07:44 twitch153 Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild,v 1.24 2015/04/26 19:36:46 twitch153 Exp $
EAPI=5
@@ -36,7 +36,8 @@ RDEPEND=">=media-libs/glew-1.10
alsa? ( media-libs/alsa-lib )
ao? ( media-libs/libao )
bluetooth? ( net-wireless/bluez )
- ffmpeg? ( virtual/ffmpeg )
+ ffmpeg? ( virtual/ffmpeg
+ !!>=media-video/libav-10 )
lzo? ( dev-libs/lzo )
openal? ( media-libs/openal )
opengl? ( virtual/opengl )
@@ -49,7 +50,7 @@ DEPEND="${RDEPEND}
media-libs/freetype
media-libs/libsoundtouch
>=sys-devel/gcc-4.6.0
- x11-libs/wxGTK:${WX_GTK_VER}
+ x11-libs/wxGTK:${WX_GTK_VER}[webkit]
"
pkg_pretend() {