1 |
commit: e348623931fae62a954c2d852e1fb7966aa236dc |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 27 01:51:11 2015 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 01:51:11 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3486239 |
7 |
|
8 |
www-plugins/freshplayerplugin: Version bump |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
www-plugins/freshplayerplugin/Manifest | 1 + |
13 |
.../freshplayerplugin/files/0.3.4-cmake.patch | 70 +++++++++++++++++++ |
14 |
.../files/0.3.4-git-revision.patch | 11 +++ |
15 |
.../freshplayerplugin-0.3.4.ebuild | 80 ++++++++++++++++++++++ |
16 |
4 files changed, 162 insertions(+) |
17 |
|
18 |
diff --git a/www-plugins/freshplayerplugin/Manifest b/www-plugins/freshplayerplugin/Manifest |
19 |
index 2b411b8..097bfb4 100644 |
20 |
--- a/www-plugins/freshplayerplugin/Manifest |
21 |
+++ b/www-plugins/freshplayerplugin/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST freshplayerplugin-0.3.1.tar.gz 2711793 SHA256 4ed582896fff618d8025dd51bbf2fae0c5e36e2875065acc536b2c76befb593c SHA512 78e87548ecd758ad9ff0dab59b1b2f68b8b9a639ff19de08046a7090ab51d87f0e4c879b1b0075151ff17642d50ff937e199733c55c4a9cff94599fd98eae9de WHIRLPOOL d8be949cc9a2087d8f62fcfb4a1786d68574a5ec52dccc45da06df9838ee84e8dd4d7f3c3f86703e428df1b3f4d6d75c1e87d0809d3f78550a16ed278d51b211 |
24 |
DIST freshplayerplugin-0.3.2.tar.gz 2713241 SHA256 b3687b9d67ab88c64fea32b17f281f142bf861e33d9135b00da5d90d385d9ce5 SHA512 9c908ce1a168c0797dc3b0da8e98d722cc32d729acb1c4a8f38b7e95c23fe870baabe4b3f8790d021711578fdb9a61f44aba27cebb924fec9aabcf8cd91323e5 WHIRLPOOL 2e9b78bcc3605409ec6853caf31aab03658c044e0d05449a620b31261323856503db8db960db9992d6db4fd61df8f9feb05800124c2f4a450c4ff65b22fc7c34 |
25 |
DIST freshplayerplugin-0.3.3.tar.gz 2722467 SHA256 0dc20d6ca083b24225d8bbab88be1ed483034bde71eb360962de47cdb2e51f00 SHA512 ae85adb7e894adf8c1cd4228d15975c9d5fefdb6c6d3aa90e65d93865996c787f6378eb145f35ed348db67cec0adad794b78a0f77519236c28082630ad3756bc WHIRLPOOL 3e9694738d5e926b44588560b2a6bf50eeeefc35855722bda2494a9d08bd11c8ed844791cdd8a312592be0ef002d3ee6b1c7fc090bbd94ca438ccc8a148eac99 |
26 |
+DIST freshplayerplugin-0.3.4.tar.gz 768318 SHA256 6f0009e64c59caa5c674b63eabb709ba8da6c85fc7cd45a1d66392e3a24da9a5 SHA512 d64fa3e6e38b4e17bef04b09c529ff03e86bb4b348e1e6b9a05f7ff4ee98327e288becd1cc6727db687ddca9e9ed04243c80c5e95e927cafad49a273d9c0d216 WHIRLPOOL 8fe0d582c25042b233d11fba83c50bd5a54e111c7f84b27ed28ba6cfc83c2101095e0460c67d122a3598d020d061f44e8de8bc922a164a251aeb589ac805291d |
27 |
|
28 |
diff --git a/www-plugins/freshplayerplugin/files/0.3.4-cmake.patch b/www-plugins/freshplayerplugin/files/0.3.4-cmake.patch |
29 |
new file mode 100644 |
30 |
index 0000000..59a1a42 |
31 |
--- /dev/null |
32 |
+++ b/www-plugins/freshplayerplugin/files/0.3.4-cmake.patch |
33 |
@@ -0,0 +1,70 @@ |
34 |
+diff -uarN a/CMakeLists.txt b/CMakeLists.txt |
35 |
+--- a/CMakeLists.txt 2015-04-25 11:17:24.000000000 -0400 |
36 |
++++ b/CMakeLists.txt 2015-04-26 20:14:43.152014529 -0400 |
37 |
+@@ -61,35 +61,36 @@ |
38 |
+ # optional dependencies |
39 |
+ message(STATUS "checking for optional dependencies") |
40 |
+ |
41 |
+-pkg_check_modules(PULSEAUDIO QUIET libpulse) |
42 |
+-pkg_check_modules(JACK QUIET jack) |
43 |
+-pkg_check_modules(SOXR QUIET soxr) |
44 |
+ set(WITH_PULSEAUDIO TRUE CACHE STRING "enable PulseAudio support") |
45 |
+ set(WITH_JACK TRUE CACHE STRING "enable JACK Audio Connection Kit") |
46 |
+ |
47 |
+-if (PULSEAUDIO_FOUND AND WITH_PULSEAUDIO) |
48 |
++if (WITH_PULSEAUDIO) |
49 |
++ pkg_check_modules(PULSEAUDIO libpulse) |
50 |
++ if (NOT PULSEAUDIO_FOUND) |
51 |
++ message(FATAL_ERROR "PulseAudio requested but not found.") |
52 |
++ endif() |
53 |
+ add_definitions(-DHAVE_PULSEAUDIO=1) |
54 |
+- message(STATUS " found libpulse, version ${PULSEAUDIO_VERSION} (optional)") |
55 |
++ message(STATUS " found libpulse, version ${PULSEAUDIO_VERSION}") |
56 |
+ list(APPEND REQ_LIBRARY_DIRS ${PULSEAUDIO_LIBRARY_DIRS}) |
57 |
+ list(APPEND REQ_INCLUDE_DIRS ${PULSEAUDIO_INCLUDE_DIRS}) |
58 |
+ list(APPEND REQ_LIBRARIES ${PULSEAUDIO_LIBRARIES}) |
59 |
+-else() |
60 |
+- message(STATUS " no libpulse found (optional)") |
61 |
+ endif() |
62 |
+ |
63 |
+-if (JACK_FOUND AND WITH_JACK) |
64 |
+- message(STATUS " found jack, version ${JACK_VERSION} (optional)") |
65 |
+- if (SOXR_FOUND) |
66 |
+- message(STATUS " found soxr, version ${SOXR_VERSION}") |
67 |
+- add_definitions(-DHAVE_JACK=1) |
68 |
+- list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}") |
69 |
+- list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}") |
70 |
+- list(APPEND REQ_LIBRARIES "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}") |
71 |
+- else() |
72 |
+- message(STATUS " no soxr found, JACK output disabled") |
73 |
++if (WITH_JACK) |
74 |
++ pkg_check_modules(JACK QUIET jack) |
75 |
++ if (NOT JACK_FOUND) |
76 |
++ message(FATAL_ERROR "JACK support requested but not found.") |
77 |
++ endif() |
78 |
++ pkg_check_modules(SOXR QUIET soxr) |
79 |
++ if (NOT SOXR_FOUND) |
80 |
++ message(FATAL_ERROR "SOXR libray not found but needed for JACK support.") |
81 |
+ endif() |
82 |
+-else() |
83 |
+- message(STATUS " no jack found (optional)") |
84 |
++ message(STATUS " found jack, version ${JACK_VERSION}") |
85 |
++ message(STATUS " found soxr, version ${SOXR_VERSION}") |
86 |
++ add_definitions(-DHAVE_JACK=1) |
87 |
++ list(APPEND REQ_LIBRARY_DIRS "${JACK_LIBRARY_DIRS}" "${SOXR_LIBRARY_DIRS}") |
88 |
++ list(APPEND REQ_INCLUDE_DIRS "${JACK_INCLUDE_DIRS}" "${SOXR_INCLUDE_DIRS}") |
89 |
++ list(APPEND REQ_LIBRARIES "${JACK_LIBRARIES}" "${SOXR_LIBRARIES}") |
90 |
+ endif() |
91 |
+ |
92 |
+ list(APPEND REQ_LIBRARIES img-resources) |
93 |
+--- a/src/CMakeLists.txt 2015-12-20 08:38:33.000000000 -0500 |
94 |
++++ b/src/CMakeLists.txt 2015-12-26 20:45:07.000000000 -0500 |
95 |
+@@ -5,7 +5,7 @@ |
96 |
+ |
97 |
+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) |
98 |
+ |
99 |
+-set(MOZPLUGIN_INSTALL_DIR "lib${LIB_SUFFIX}/mozilla/plugins/" CACHE PATH "plugin install directory") |
100 |
++set(MOZPLUGIN_INSTALL_DIR "lib${LIB_SUFFIX}/nsbrowser/plugins/" CACHE PATH "plugin install directory") |
101 |
+ |
102 |
+ add_subdirectory(uri_parser) |
103 |
+ add_subdirectory(config_parser) |
104 |
|
105 |
diff --git a/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch b/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch |
106 |
new file mode 100644 |
107 |
index 0000000..96cfce9 |
108 |
--- /dev/null |
109 |
+++ b/www-plugins/freshplayerplugin/files/0.3.4-git-revision.patch |
110 |
@@ -0,0 +1,11 @@ |
111 |
+--- a/cmake/update-version-info.sh 2015-12-20 08:38:33.000000000 -0500 |
112 |
++++ b/cmake/update-version-info.sh 2015-12-26 20:14:00.000000000 -0500 |
113 |
+@@ -18,7 +18,7 @@ |
114 |
+ GIT_COMMAND_EXISTS=1 |
115 |
+ command -v git >/dev/null 2>&1 || GIT_COMMAND_EXISTS=0 |
116 |
+ |
117 |
+-if [ $GIT_COMMAND_EXISTS -eq 0 ]; then |
118 |
++if [ $GIT_COMMAND_EXISTS -eq 0 -o ! -d "${CMAKE_SOURCE_DIR}/.git" ]; then |
119 |
+ update_header "no vcs hash" |
120 |
+ exit 0 |
121 |
+ fi |
122 |
|
123 |
diff --git a/www-plugins/freshplayerplugin/freshplayerplugin-0.3.4.ebuild b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.4.ebuild |
124 |
new file mode 100644 |
125 |
index 0000000..3428e4c |
126 |
--- /dev/null |
127 |
+++ b/www-plugins/freshplayerplugin/freshplayerplugin-0.3.4.ebuild |
128 |
@@ -0,0 +1,80 @@ |
129 |
+# Copyright 1999-2015 Gentoo Foundation |
130 |
+# Distributed under the terms of the GNU General Public License v2 |
131 |
+# $Id$ |
132 |
+ |
133 |
+EAPI=5 |
134 |
+ |
135 |
+CMAKE_MIN_VERSION="2.8.8" |
136 |
+ |
137 |
+inherit cmake-utils multilib |
138 |
+ |
139 |
+LICENSE="MIT" |
140 |
+HOMEPAGE="https://github.com/i-rinat/freshplayerplugin" |
141 |
+DESCRIPTION="PPAPI-host NPAPI-plugin adapter for flashplayer in npapi based browsers" |
142 |
+SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
143 |
+SLOT=0 |
144 |
+IUSE="gtk3 jack libav libressl pulseaudio vaapi vdpau" |
145 |
+ |
146 |
+KEYWORDS="~amd64 ~x86" |
147 |
+ |
148 |
+HWDEC_DEPEND=" |
149 |
+ libav? ( media-video/libav:0=[vaapi?,vdpau?,x264] ) |
150 |
+ !libav? ( media-video/ffmpeg:0=[vaapi?,vdpau?,x264] ) |
151 |
+ x11-libs/libva |
152 |
+ x11-libs/libvdpau |
153 |
+" |
154 |
+ |
155 |
+COMMON_DEPEND=" |
156 |
+ dev-libs/glib:2= |
157 |
+ dev-libs/libevent:=[threads] |
158 |
+ media-libs/alsa-lib:= |
159 |
+ media-libs/freetype:2= |
160 |
+ media-libs/libv4l:0= |
161 |
+ media-libs/mesa:=[egl,gles2] |
162 |
+ x11-libs/libXrandr:= |
163 |
+ x11-libs/libXrender:= |
164 |
+ x11-libs/libdrm:= |
165 |
+ x11-libs/pango:=[X] |
166 |
+ jack? ( |
167 |
+ media-sound/jack-audio-connection-kit |
168 |
+ media-libs/soxr |
169 |
+ ) |
170 |
+ pulseaudio? ( media-sound/pulseaudio ) |
171 |
+ !gtk3? ( x11-libs/gtk+:2= ) |
172 |
+ gtk3? ( x11-libs/gtk+:3= ) |
173 |
+ libressl? ( dev-libs/libressl:0= ) |
174 |
+ !libressl? ( dev-libs/openssl:0= ) |
175 |
+ vaapi? ( ${HWDEC_DEPEND} ) |
176 |
+ vdpau? ( ${HWDEC_DEPEND} ) |
177 |
+" |
178 |
+ |
179 |
+DEPEND="${COMMON_DEPEND} |
180 |
+ dev-util/ragel |
181 |
+ virtual/pkgconfig |
182 |
+ " |
183 |
+RDEPEND="${COMMON_DEPEND} |
184 |
+ || ( |
185 |
+ www-plugins/chrome-binary-plugins[flash] |
186 |
+ www-client/google-chrome |
187 |
+ www-client/google-chrome-beta |
188 |
+ www-client/google-chrome-unstable |
189 |
+ ) |
190 |
+ " |
191 |
+ |
192 |
+PATCHES=( "${FILESDIR}/0.3.4-cmake.patch" "${FILESDIR}/0.3.4-git-revision.patch" ) |
193 |
+DOCS=( ChangeLog data/freshwrapper.conf.example README.md ) |
194 |
+ |
195 |
+src_configure() { |
196 |
+ mycmakeargs=( |
197 |
+ $(cmake-utils_use_with jack JACK) |
198 |
+ $(cmake-utils_use_with pulseaudio PULSEAUDIO) |
199 |
+ -DWITH_GTK=$(usex gtk3 3 2) |
200 |
+ -DCMAKE_SKIP_RPATH=1 |
201 |
+ ) |
202 |
+ if use vaapi || use vdpau ; then |
203 |
+ mycmakeargs+=( -DWITH_HWDEC=1 ) |
204 |
+ else |
205 |
+ mycmakeargs+=( -DWITH_HWDEC=0 ) |
206 |
+ fi |
207 |
+ cmake-utils_src_configure |
208 |
+} |