Attachment #442062 for bug #581228

View | Details | Raw Unified | Return to bug 581228
Collapse All | Expand All

Line 1 Link Here

(-)a/www-plugins/freshplayerplugin/Manifest (+1 lines)
1	DIST freshplayerplugin-0.3.4.tar.gz 768318 SHA256 6f0009e64c59caa5c674b63eabb709ba8da6c85fc7cd45a1d66392e3a24da9a5 SHA512 d64fa3e6e38b4e17bef04b09c529ff03e86bb4b348e1e6b9a05f7ff4ee98327e288becd1cc6727db687ddca9e9ed04243c80c5e95e927cafad49a273d9c0d216 WHIRLPOOL 8fe0d582c25042b233d11fba83c50bd5a54e111c7f84b27ed28ba6cfc83c2101095e0460c67d122a3598d020d061f44e8de8bc922a164a251aeb589ac805291d	1	DIST freshplayerplugin-0.3.4.tar.gz 768318 SHA256 6f0009e64c59caa5c674b63eabb709ba8da6c85fc7cd45a1d66392e3a24da9a5 SHA512 d64fa3e6e38b4e17bef04b09c529ff03e86bb4b348e1e6b9a05f7ff4ee98327e288becd1cc6727db687ddca9e9ed04243c80c5e95e927cafad49a273d9c0d216 WHIRLPOOL 8fe0d582c25042b233d11fba83c50bd5a54e111c7f84b27ed28ba6cfc83c2101095e0460c67d122a3598d020d061f44e8de8bc922a164a251aeb589ac805291d
		2	DIST freshplayerplugin-0.3.5.tar.gz 781003 SHA256 b08f7c6690de13b1e358fef4cab41cb303b9e80b3504678e94c9646f44dd7104 SHA512 dd447db4cbfdb80b89ff42894099971c100023d19fe5fbad023d5ac1afa827fdc5a169a03f4702ffda3cf6e0dd9c63217b68d97d047ac43afc22f488020a0ba0 WHIRLPOOL cf22758e0ed947db27e8e6e053f17bafc425beebebd9314008eef105e828a0a51f73fd42f2d0c00e12e56f817e2b9078baeb55bd54a6c6a55e8ebd00d2e27ccc




diff --git a/CMakeLists.txt b/CMakeLists.txt
index 975ca71..eb588ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -103,29 +103,33 @@ 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()
-else()
-    message(STATUS "  no jack found (optional)")
+    pkg_check_modules(SOXR QUIET soxr)
+    if (NOT SOXR_FOUND)
+        message(FATAL_ERROR "SOXR libray not found but needed for JACK support.")
+    endif()
+    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()
 
 # hw accelerated decoding
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 90d80f2..c3f983d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,7 +5,7 @@ endif()
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
-set(MOZPLUGIN_INSTALL_DIR "lib${LIB_SUFFIX}/mozilla/plugins/" CACHE STRING "plugin install directory")
+set(MOZPLUGIN_INSTALL_DIR "lib${LIB_SUFFIX}/nsbrowser/plugins/" CACHE STRING "plugin install directory")
 
 add_subdirectory(uri_parser)
 add_subdirectory(config_parser)




# Copyright 1999-2016 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="gles2 gtk3 jack libav libressl pulseaudio v4l vaapi vdpau"

KEYWORDS="~amd64"

HWDEC_DEPEND="
	libav? ( media-video/libav:0=[vaapi?,vdpau?] )
	!libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] )
	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/mesa:=[egl,gles2?]
	x11-libs/cairo:=[X]
	x11-libs/libXcursor:=
	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= )
	v4l? ( media-libs/libv4l: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.5-cmake.patch" "${FILESDIR}/0.3.4-git-revision.patch" )
DOCS=( ChangeLog data/freshwrapper.conf.example README.md )

src_configure() {
	mycmakeargs=(
		-DWITH_JACK=$(usex jack)
		-DWITH_PULSEAUDIO=$(usex pulseaudio)
		-DWITH_GTK=$(usex gtk3 3 2)
		-DWITH_GLES2=$(usex gles2)
		-DWITH_LIBV4L2=$(usex v4l)
		-DCMAKE_SKIP_RPATH=1
	)
	if use vaapi || use vdpau ; then
		mycmakeargs+=( -DWITH_HWDEC=1 )
	else
		mycmakeargs+=( -DWITH_HWDEC=0 )
	fi
	cmake-utils_src_configure
}

Return to bug 581228

Line 0 Link Here

(-)a/www-plugins/freshplayerplugin/files/0.3.5-cmake.patch (+67 lines)
		1	diff --git a/CMakeLists.txt b/CMakeLists.txt
		2	index 975ca71..eb588ca 100644
		3	--- a/CMakeLists.txt
		4	+++ b/CMakeLists.txt
		5	@@ -103,29 +103,33 @@ pkg_check_modules(SOXR QUIET soxr)
		6	set(WITH_PULSEAUDIO TRUE CACHE STRING "enable PulseAudio support")
		7	set(WITH_JACK TRUE CACHE STRING "enable JACK Audio Connection Kit")
		8
		9	-if (PULSEAUDIO_FOUND AND WITH_PULSEAUDIO)
		10	+if (WITH_PULSEAUDIO)
		11	+ pkg_check_modules(PULSEAUDIO libpulse)
		12	+ if (NOT PULSEAUDIO_FOUND)
		13	+ message(FATAL_ERROR "PulseAudio requested but not found.")
		14	+ endif()
		15	add_definitions(-DHAVE_PULSEAUDIO=1)
		16	- message(STATUS " found libpulse, version ${PULSEAUDIO_VERSION} (optional)")
		17	+ message(STATUS " found libpulse, version ${PULSEAUDIO_VERSION}")
		18	list(APPEND REQ_LIBRARY_DIRS ${PULSEAUDIO_LIBRARY_DIRS})
		19	list(APPEND REQ_INCLUDE_DIRS ${PULSEAUDIO_INCLUDE_DIRS})
		20	list(APPEND REQ_LIBRARIES ${PULSEAUDIO_LIBRARIES})
		21	-else()
		22	- message(STATUS " no libpulse found (optional)")
		23	endif()
		24
		25	-if (JACK_FOUND AND WITH_JACK)
		26	- message(STATUS " found jack, version ${JACK_VERSION} (optional)")
		27	- if (SOXR_FOUND)
		28	- message(STATUS " found soxr, version ${SOXR_VERSION}")
		29	- add_definitions(-DHAVE_JACK=1)
		30	- list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}")
		31	- list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}")
		32	- list(APPEND REQ_LIBRARIES "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}")
		33	- else()
		34	- message(STATUS " no soxr found, JACK output disabled")
		35	+if (WITH_JACK)
		36	+ pkg_check_modules(JACK QUIET jack)
		37	+ if (NOT JACK_FOUND)
		38	+ message(FATAL_ERROR "JACK support requested but not found.")
		39	endif()
		40	-else()
		41	- message(STATUS " no jack found (optional)")
		42	+ pkg_check_modules(SOXR QUIET soxr)
		43	+ if (NOT SOXR_FOUND)
		44	+ message(FATAL_ERROR "SOXR libray not found but needed for JACK support.")
		45	+ endif()
		46	+ message(STATUS " found jack, version ${JACK_VERSION}")
		47	+ message(STATUS " found soxr, version ${SOXR_VERSION}")
		48	+ add_definitions(-DHAVE_JACK=1)
		49	+ list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}")
		50	+ list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}")
		51	+ list(APPEND REQ_LIBRARIES "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}")
		52	endif()
		53
		54	# hw accelerated decoding
		55	diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
		56	index 90d80f2..c3f983d 100644
		57	--- a/src/CMakeLists.txt
		58	+++ b/src/CMakeLists.txt
		59	@@ -5,7 +5,7 @@ endif()
		60
		61	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
		62
		63	-set(MOZPLUGIN_INSTALL_DIR "lib${LIB_SUFFIX}/mozilla/plugins/" CACHE STRING "plugin install directory")
		64	+set(MOZPLUGIN_INSTALL_DIR "lib${LIB_SUFFIX}/nsbrowser/plugins/" CACHE STRING "plugin install directory")
65
66	add_subdirectory(uri_parser)
67	add_subdirectory(config_parser)

Line 0 Link Here

(-)a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.5.ebuild (-1 / +84 lines)
0	-	1	# Copyright 1999-2016 Gentoo Foundation
		2	# Distributed under the terms of the GNU General Public License v2
		3	# $Id$
		4
		5	EAPI=5
		6
		7	CMAKE_MIN_VERSION="2.8.8"
		8
		9	inherit cmake-utils multilib
		10
		11	LICENSE="MIT"
		12	HOMEPAGE="https://github.com/i-rinat/freshplayerplugin"
		13	DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers"
		14	SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
		15	SLOT=0
		16	IUSE="gles2 gtk3 jack libav libressl pulseaudio v4l vaapi vdpau"
		17
		18	KEYWORDS="~amd64"
		19
		20	HWDEC_DEPEND="
		21	libav? ( media-video/libav:0=[vaapi?,vdpau?] )
		22	!libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?] )
		23	x11-libs/libva
		24	x11-libs/libvdpau
		25	"
		26
		27	COMMON_DEPEND="
		28	dev-libs/glib:2=
		29	dev-libs/libevent:=[threads]
		30	media-libs/alsa-lib:=
		31	media-libs/freetype:2=
		32	media-libs/mesa:=[egl,gles2?]
		33	x11-libs/cairo:=[X]
		34	x11-libs/libXcursor:=
		35	x11-libs/libXrandr:=
		36	x11-libs/libXrender:=
		37	x11-libs/libdrm:=
		38	x11-libs/pango:=[X]
		39	jack? (
		40	media-sound/jack-audio-connection-kit
		41	media-libs/soxr
		42	)
		43	pulseaudio? ( media-sound/pulseaudio )
		44	!gtk3? ( x11-libs/gtk+:2= )
		45	gtk3? ( x11-libs/gtk+:3= )
		46	libressl? ( dev-libs/libressl:0= )
		47	!libressl? ( dev-libs/openssl:0= )
		48	v4l? ( media-libs/libv4l:0= )
		49	vaapi? ( ${HWDEC_DEPEND} )
		50	vdpau? ( ${HWDEC_DEPEND} )
		51	"
		52
		53	DEPEND="${COMMON_DEPEND}
		54	dev-util/ragel
		55	virtual/pkgconfig
		56	"
		57	RDEPEND="${COMMON_DEPEND}
		58	\|\| (
		59	www-plugins/chrome-binary-plugins[flash]
		60	www-client/google-chrome
		61	www-client/google-chrome-beta
		62	www-client/google-chrome-unstable
		63	)
		64	"
		65
66	PATCHES=( "${FILESDIR}/0.3.5-cmake.patch" "${FILESDIR}/0.3.4-git-revision.patch" )
67	DOCS=( ChangeLog data/freshwrapper.conf.example README.md )
68
69	src_configure() {
70	mycmakeargs=(
71	-DWITH_JACK=$(usex jack)
72	-DWITH_PULSEAUDIO=$(usex pulseaudio)
73	-DWITH_GTK=$(usex gtk3 3 2)
74	-DWITH_GLES2=$(usex gles2)
75	-DWITH_LIBV4L2=$(usex v4l)
76	-DCMAKE_SKIP_RPATH=1
77	)
78	if use vaapi \|\| use vdpau ; then
79	mycmakeargs+=( -DWITH_HWDEC=1 )
80	else
81	mycmakeargs+=( -DWITH_HWDEC=0 )
82	fi
83	cmake-utils_src_configure
84	}