Version bump wrt bug 554216; Drop old

(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 0xD1F781EFF9F4A3B6)

3 files changed, 25 insertions, 33 deletions

diff --git a/www-plugins/freshplayerplugin/ChangeLog b/www-plugins/freshplayerplugin/ChangeLog
index 6c8a8e179fc2..7f557d8ca926 100644
--- a/www-plugins/freshplayerplugin/ChangeLog
+++ b/www-plugins/freshplayerplugin/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-plugins/freshplayerplugin
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/freshplayerplugin/ChangeLog,v 1.3 2015/06/17 02:58:15 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/freshplayerplugin/ChangeLog,v 1.4 2015/07/14 23:57:18 grknight Exp $
+
+*freshplayerplugin-0.3.1 (14 Jul 2015)
+
+  14 Jul 2015; Brian Evans <grknight@gentoo.org>
+  +freshplayerplugin-0.3.1.ebuild, -files/with-pulseaudio-cmake.patch,
+  -freshplayerplugin-0.2.3.ebuild:
+  Version bump wrt bug 554216; Drop old
 
 *freshplayerplugin-0.3.0 (17 Jun 2015)
 
diff --git a/www-plugins/freshplayerplugin/files/with-pulseaudio-cmake.patch b/www-plugins/freshplayerplugin/files/with-pulseaudio-cmake.patch
deleted file mode 100644
index 22bad5728292..000000000000
--- a/www-plugins/freshplayerplugin/files/with-pulseaudio-cmake.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -aurN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2015-02-15 17:05:40.000000000 -0500
-+++ b/CMakeLists.txt	2015-03-10 19:33:48.519110012 -0400
-@@ -45,12 +45,18 @@
-     openssl
-     REQUIRED)
- 
--pkg_check_modules(PULSEAUDIO libpulse)
-+OPTION(WITH_PULSEAUDIO "Enable pulseaudio support" ON)
- 
--if (${PULSEAUDIO_FOUND})
--    add_definitions(-DHAVE_PULSEAUDIO=1)
--    set(HAVE_PULSEAUDIO 1)
--endif()
-+IF(WITH_PULSEAUDIO)
-+    pkg_check_modules(PULSEAUDIO libpulse)
-+
-+    if (${PULSEAUDIO_FOUND})
-+        add_definitions(-DHAVE_PULSEAUDIO=1)
-+        set(HAVE_PULSEAUDIO 1)
-+    else()
-+        MESSAGE(FATAL_ERROR "PulseAudio not found")
-+    endif()
-+ENDIF(WITH_PULSEAUDIO)
- 
- include_directories(${REQ_INCLUDE_DIRS})
- add_definitions(${REQ_CFLAGS_OTHER})
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.2.3.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.1.ebuild
index f3ddc5e8fdbd..d13aae06cc69 100644
--- a/www-plugins/freshplayerplugin/freshplayerplugin-0.2.3.ebuild
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.1.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/www-plugins/freshplayerplugin/freshplayerplugin-0.2.3.ebuild,v 1.1 2015/03/11 01:13:44 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/freshplayerplugin/freshplayerplugin-0.3.1.ebuild,v 1.1 2015/07/14 23:57:18 grknight Exp $
 
 EAPI=5
 
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
 DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
 SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 SLOT=0
-IUSE="pulseaudio"
+IUSE="gtk3 jack pulseaudio vaapi"
 
 KEYWORDS="~amd64 ~x86"
 
@@ -24,12 +24,18 @@ CDEPEND="
 	dev-libs/openssl:0=
 	media-libs/alsa-lib:=
 	media-libs/freetype:2=
+	media-libs/libv4l:0=
 	media-libs/mesa:=[egl,gles2]
-	x11-libs/gtk+:2=
 	x11-libs/libXrandr:=
 	x11-libs/libXrender:=
 	x11-libs/pango:=[X]
+	jack? ( media-sound/jack )
 	pulseaudio? ( media-sound/pulseaudio )
+	!gtk3? ( x11-libs/gtk+:2= )
+	gtk3? ( x11-libs/gtk+:3= )
+	vaapi? ( x11-libs/libva
+		x11-libs/libvdpau
+	)
 "
 
 DEPEND="${CDEPEND}
@@ -45,10 +51,16 @@ RDEPEND="${CDEPEND}
 	)
 	"
 
-PATCHES=( "${FILESDIR}/with-pulseaudio-cmake.patch" )
+PATCHES=( "${FILESDIR}/0.2.4-cmake.patch" )
 
 src_configure() {
-	mycmakeargs=( $(cmake-utils_use_with pulseaudio PULSEAUDIO)  )
+	mycmakeargs=(
+		$(cmake-utils_use_with jack JACK)
+		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
+		-DWITH_GTK=$(usex gtk3 3 2)
+		-DCMAKE_SKIP_RPATH=1
+		-DWITH_HWDEC=$(usex vaapi 1 0)
+	)
 	cmake-utils_src_configure
 }