[gentoo-commits] repo/gentoo:master commit in: www-plugins/freshplayerplugin/files/, www-plugins/freshplayerplugin/

["Brian Evans" <grknight@gentoo.org>]

commit:     e348623931fae62a954c2d852e1fb7966aa236dc
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 01:51:11 2015 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 01:51:11 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3486239

www-plugins/freshplayerplugin: Version bump

Package-Manager: portage-2.2.26

 www-plugins/freshplayerplugin/Manifest             |  1 +
 .../freshplayerplugin/files/0.3.4-cmake.patch      | 70 +++++++++++++++++++
 .../files/0.3.4-git-revision.patch                 | 11 +++
 .../freshplayerplugin-0.3.4.ebuild                 | 80 ++++++++++++++++++++++
 4 files changed, 162 insertions(+)

diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest
index 2b411b8..097bfb4 100644
--- a/www-plugins/freshplayerplugin/Manifest
+++ b/www-plugins/freshplayerplugin/Manifest
@@ -1,3 +1,4 @@
 DIST freshplayerplugin-0.3.1.tar.gz 2711793 SHA256 4ed582896fff618d8025dd51bbf2fae0c5e36e2875065acc536b2c76befb593c SHA512 78e87548ecd758ad9ff0dab59b1b2f68b8b9a639ff19de08046a7090ab51d87f0e4c879b1b0075151ff17642d50ff937e199733c55c4a9cff94599fd98eae9de WHIRLPOOL d8be949cc9a2087d8f62fcfb4a1786d68574a5ec52dccc45da06df9838ee84e8dd4d7f3c3f86703e428df1b3f4d6d75c1e87d0809d3f78550a16ed278d51b211
 DIST freshplayerplugin-0.3.2.tar.gz 2713241 SHA256 b3687b9d67ab88c64fea32b17f281f142bf861e33d9135b00da5d90d385d9ce5 SHA512 9c908ce1a168c0797dc3b0da8e98d722cc32d729acb1c4a8f38b7e95c23fe870baabe4b3f8790d021711578fdb9a61f44aba27cebb924fec9aabcf8cd91323e5 WHIRLPOOL 2e9b78bcc3605409ec6853caf31aab03658c044e0d05449a620b31261323856503db8db960db9992d6db4fd61df8f9feb05800124c2f4a450c4ff65b22fc7c34
 DIST freshplayerplugin-0.3.3.tar.gz 2722467 SHA256 0dc20d6ca083b24225d8bbab88be1ed483034bde71eb360962de47cdb2e51f00 SHA512 ae85adb7e894adf8c1cd4228d15975c9d5fefdb6c6d3aa90e65d93865996c787f6378eb145f35ed348db67cec0adad794b78a0f77519236c28082630ad3756bc WHIRLPOOL 3e9694738d5e926b44588560b2a6bf50eeeefc35855722bda2494a9d08bd11c8ed844791cdd8a312592be0ef002d3ee6b1c7fc090bbd94ca438ccc8a148eac99
+DIST freshplayerplugin-0.3.4.tar.gz 768318 SHA256 6f0009e64c59caa5c674b63eabb709ba8da6c85fc7cd45a1d66392e3a24da9a5 SHA512 d64fa3e6e38b4e17bef04b09c529ff03e86bb4b348e1e6b9a05f7ff4ee98327e288becd1cc6727db687ddca9e9ed04243c80c5e95e927cafad49a273d9c0d216 WHIRLPOOL 8fe0d582c25042b233d11fba83c50bd5a54e111c7f84b27ed28ba6cfc83c2101095e0460c67d122a3598d020d061f44e8de8bc922a164a251aeb589ac805291d

diff --git a/www-plugins/freshplayerplugin/files/0.3.4-cmake.patch b/www-plugins/freshplayerplugin/files/0.3.4-cmake.patch
new file mode 100644
index 0000000..59a1a42
--- /dev/null
+++ b/www-plugins/freshplayerplugin/files/0.3.4-cmake.patch
@@ -0,0 +1,70 @@
+diff -uarN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2015-04-25 11:17:24.000000000 -0400
++++ b/CMakeLists.txt	2015-04-26 20:14:43.152014529 -0400
+@@ -61,35 +61,36 @@
+ # optional dependencies
+ message(STATUS "checking for optional dependencies")
+ 
+-pkg_check_modules(PULSEAUDIO QUIET libpulse)
+-pkg_check_modules(JACK QUIET jack)
+-pkg_check_modules(SOXR QUIET soxr)
+ set(WITH_PULSEAUDIO TRUE CACHE STRING "enable PulseAudio support")
+ set(WITH_JACK TRUE CACHE STRING "enable JACK Audio Connection Kit")
+ 
+-if (PULSEAUDIO_FOUND AND WITH_PULSEAUDIO)
++if (WITH_PULSEAUDIO)
++    pkg_check_modules(PULSEAUDIO libpulse)
++    if (NOT PULSEAUDIO_FOUND)
++        message(FATAL_ERROR "PulseAudio requested but not found.")
++    endif()
+     add_definitions(-DHAVE_PULSEAUDIO=1)
+-    message(STATUS "  found libpulse, version ${PULSEAUDIO_VERSION} (optional)")
++    message(STATUS "  found libpulse, version ${PULSEAUDIO_VERSION}")
+     list(APPEND REQ_LIBRARY_DIRS ${PULSEAUDIO_LIBRARY_DIRS})
+     list(APPEND REQ_INCLUDE_DIRS ${PULSEAUDIO_INCLUDE_DIRS})
+     list(APPEND REQ_LIBRARIES    ${PULSEAUDIO_LIBRARIES})
+-else()
+-    message(STATUS "  no libpulse found (optional)")
+ endif()
+ 
+-if (JACK_FOUND AND WITH_JACK)
+-    message(STATUS "  found jack, version ${JACK_VERSION} (optional)")
+-    if (SOXR_FOUND)
+-        message(STATUS "  found soxr, version ${SOXR_VERSION}")
+-        add_definitions(-DHAVE_JACK=1)
+-        list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}")
+-        list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}")
+-        list(APPEND REQ_LIBRARIES    "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}")
+-    else()
+-        message(STATUS "  no soxr found, JACK output disabled")
++if (WITH_JACK)
++    pkg_check_modules(JACK QUIET jack)
++    if (NOT JACK_FOUND)
++        message(FATAL_ERROR "JACK support requested but not found.")
++    endif()
++    pkg_check_modules(SOXR QUIET soxr)
++    if (NOT SOXR_FOUND)
++        message(FATAL_ERROR "SOXR libray not found but needed for JACK support.")
+     endif()
+-else()
+-    message(STATUS "  no jack found (optional)")
++    message(STATUS "  found jack, version ${JACK_VERSION}")
++    message(STATUS "  found soxr, version ${SOXR_VERSION}")
++    add_definitions(-DHAVE_JACK=1)
++    list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}")
++    list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}")
++    list(APPEND REQ_LIBRARIES    "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}")
+ endif()
+ 
+ list(APPEND REQ_LIBRARIES img-resources)
+--- a/src/CMakeLists.txt	2015-12-20 08:38:33.000000000 -0500
++++ b/src/CMakeLists.txt	2015-12-26 20:45:07.000000000 -0500
+@@ -5,7 +5,7 @@
+ 
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+ 
+-set(MOZPLUGIN_INSTALL_DIR "lib${LIB_SUFFIX}/mozilla/plugins/" CACHE PATH "plugin install directory")
++set(MOZPLUGIN_INSTALL_DIR "lib${LIB_SUFFIX}/nsbrowser/plugins/" CACHE PATH "plugin install directory")
+ 
+ add_subdirectory(uri_parser)
+ add_subdirectory(config_parser)

diff --git a/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch b/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch
new file mode 100644
index 0000000..96cfce9
--- /dev/null
+++ b/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch
@@ -0,0 +1,11 @@
+--- a/cmake/update-version-info.sh	2015-12-20 08:38:33.000000000 -0500
++++ b/cmake/update-version-info.sh	2015-12-26 20:14:00.000000000 -0500
+@@ -18,7 +18,7 @@
+ GIT_COMMAND_EXISTS=1
+ command -v git >/dev/null 2>&1 || GIT_COMMAND_EXISTS=0
+ 
+-if [ $GIT_COMMAND_EXISTS -eq 0 ]; then
++if [ $GIT_COMMAND_EXISTS -eq 0 -o ! -d "${CMAKE_SOURCE_DIR}/.git" ]; then
+     update_header "no vcs hash"
+     exit 0
+ fi

diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.4.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.4.ebuild
new file mode 100644
index 0000000..3428e4c
--- /dev/null
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+CMAKE_MIN_VERSION="2.8.8"
+
+inherit cmake-utils multilib
+
+LICENSE="MIT"
+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="gtk3 jack libav libressl pulseaudio vaapi vdpau"
+
+KEYWORDS="~amd64 ~x86"
+
+HWDEC_DEPEND="
+	libav? ( media-video/libav:0=[vaapi?,vdpau?,x264] )
+	!libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?,x264] )
+	x11-libs/libva
+	x11-libs/libvdpau
+"
+
+COMMON_DEPEND="
+	dev-libs/glib:2=
+	dev-libs/libevent:=[threads]
+	media-libs/alsa-lib:=
+	media-libs/freetype:2=
+	media-libs/libv4l:0=
+	media-libs/mesa:=[egl,gles2]
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libdrm:=
+	x11-libs/pango:=[X]
+	jack? (
+		media-sound/jack-audio-connection-kit
+		media-libs/soxr
+	)
+	pulseaudio? ( media-sound/pulseaudio )
+	!gtk3? ( x11-libs/gtk+:2= )
+	gtk3? ( x11-libs/gtk+:3= )
+	libressl? ( dev-libs/libressl:0= )
+	!libressl? ( dev-libs/openssl:0= )
+	vaapi? ( ${HWDEC_DEPEND} )
+	vdpau? ( ${HWDEC_DEPEND} )
+"
+
+DEPEND="${COMMON_DEPEND}
+	dev-util/ragel
+	virtual/pkgconfig
+	"
+RDEPEND="${COMMON_DEPEND}
+	|| (
+		www-plugins/chrome-binary-plugins[flash]
+		www-client/google-chrome
+		www-client/google-chrome-beta
+		www-client/google-chrome-unstable
+	)
+	"
+
+PATCHES=( "${FILESDIR}/0.3.4-cmake.patch" "${FILESDIR}/0.3.4-git-revision.patch" )
+DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use_with jack JACK)
+		$(cmake-utils_use_with pulseaudio PULSEAUDIO)
+		-DWITH_GTK=$(usex gtk3 3 2)
+		-DCMAKE_SKIP_RPATH=1
+	)
+	if use vaapi || use vdpau ; then
+		mycmakeargs+=( -DWITH_HWDEC=1 )
+	else
+		mycmakeargs+=( -DWITH_HWDEC=0 )
+	fi
+	cmake-utils_src_configure
+}