| 1 |
commit: 5eaa2e2b3465597a97aee855fbf5c97e3209d0f8 |
| 2 |
Author: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 31 00:47:10 2017 +0000 |
| 4 |
Commit: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 31 00:47:25 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eaa2e2b |
| 7 |
|
| 8 |
www-client/netsurf: Fix USE=gstreamer (bug 607650, thanks ernsteiswuerfel), limit NETSURF_USE_VIDEO to gtk/gtk3 versions. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
.../netsurf/files/netsurf-3.6-gstreamer.patch | 31 ++++++++++++++++++++++ |
| 13 |
www-client/netsurf/netsurf-3.6.ebuild | 11 ++++++-- |
| 14 |
2 files changed, 40 insertions(+), 2 deletions(-) |
| 15 |
|
| 16 |
diff --git a/www-client/netsurf/files/netsurf-3.6-gstreamer.patch b/www-client/netsurf/files/netsurf-3.6-gstreamer.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000..6aca4f6 |
| 19 |
--- /dev/null |
| 20 |
+++ b/www-client/netsurf/files/netsurf-3.6-gstreamer.patch |
| 21 |
@@ -0,0 +1,31 @@ |
| 22 |
+--- netsurf-3.6/frontends/gtk/Makefile |
| 23 |
++++ netsurf-3.6/frontends/gtk/Makefile |
| 24 |
+@@ -16,7 +16,6 @@ |
| 25 |
+ |
| 26 |
+ # GTK and GLIB flags to disable depricated usage |
| 27 |
+ GTKDEPFLAGS := -DG_DISABLE_SINGLE_INCLUDES \ |
| 28 |
+- -DG_DISABLE_DEPRECATED \ |
| 29 |
+ -DGTK_DISABLE_SINGLE_INCLUDES \ |
| 30 |
+ -DGTK_MULTIHEAD_SAFE \ |
| 31 |
+ -DPANGO_DISABLE_DEPRECATED |
| 32 |
+--- netsurf-3.6/content/handlers/image/video.c |
| 33 |
++++ netsurf-3.6/content/handlers/image/video.c |
| 34 |
+@@ -22,6 +22,8 @@ |
| 35 |
+ #include "content/content_protected.h" |
| 36 |
+ |
| 37 |
+ #include "image/video.h" |
| 38 |
++#include "utils/http/parameter.h" |
| 39 |
++#include "content/llcache.h" |
| 40 |
+ |
| 41 |
+ typedef struct nsvideo_content { |
| 42 |
+ struct content base; |
| 43 |
+--- netsurf-3.6/content/content_factory.h |
| 44 |
++++ netsurf-3.6/content/content_factory.h |
| 45 |
+@@ -25,6 +25,7 @@ |
| 46 |
+ |
| 47 |
+ #include "netsurf/content_type.h" |
| 48 |
+ #include "utils/errors.h" |
| 49 |
++#include "utils/utils.h" |
| 50 |
+ |
| 51 |
+ #define CONTENT_FACTORY_REGISTER_TYPES(HNAME, HTYPELIST, HHANDLER) \ |
| 52 |
+ \ |
| 53 |
|
| 54 |
diff --git a/www-client/netsurf/netsurf-3.6.ebuild b/www-client/netsurf/netsurf-3.6.ebuild |
| 55 |
index 8de3bdb..5d075be 100644 |
| 56 |
--- a/www-client/netsurf/netsurf-3.6.ebuild |
| 57 |
+++ b/www-client/netsurf/netsurf-3.6.ebuild |
| 58 |
@@ -64,7 +64,8 @@ DEPEND="${RDEPEND} |
| 59 |
|
| 60 |
PATCHES=( "${FILESDIR}"/${PN}-3.6-CFLAGS.patch |
| 61 |
"${FILESDIR}"/${PN}-3.6-conditionally-include-image-headers.patch |
| 62 |
- "${FILESDIR}"/${PN}-3.6-pdf-writer.patch ) |
| 63 |
+ "${FILESDIR}"/${PN}-3.6-pdf-writer.patch |
| 64 |
+ "${FILESDIR}"/${PN}-3.6-gstreamer.patch ) |
| 65 |
DOCS=( fb.modes README Docs/USING-Framebuffer |
| 66 |
Docs/ideas/{cache,css-engine,render-library}.txt ) |
| 67 |
|
| 68 |
@@ -87,7 +88,6 @@ src_configure() { |
| 69 |
NETSURF_USE_NSPSL=$(usex psl YES NO) |
| 70 |
NETSURF_USE_MNG=$(usex mng YES NO) |
| 71 |
NETSURF_USE_WEBP=$(usex webp YES NO) |
| 72 |
- NETSURF_USE_VIDEO=$(usex gstreamer YES NO) |
| 73 |
NETSURF_USE_MOZJS=$(usex javascript $(usex duktape NO YES) NO) |
| 74 |
NETSURF_USE_JS=NO |
| 75 |
NETSURF_USE_DUKTAPE=$(usex javascript $(usex duktape YES NO) NO) |
| 76 |
@@ -104,20 +104,24 @@ src_configure() { |
| 77 |
NETSURF_FB_FONTLIB=$(usex truetype freetype internal) |
| 78 |
NETSURF_FB_FONTPATH=${EROOT}usr/share/fonts/dejavu |
| 79 |
TARGET=dummy |
| 80 |
+ NETSURF_USE_VIDEO=dummy |
| 81 |
) |
| 82 |
} |
| 83 |
|
| 84 |
src_compile() { |
| 85 |
if use fbcon ; then |
| 86 |
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" ) |
| 87 |
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" ) |
| 88 |
netsurf_src_compile |
| 89 |
fi |
| 90 |
if use gtk2 ; then |
| 91 |
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" ) |
| 92 |
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" ) |
| 93 |
netsurf_src_compile |
| 94 |
fi |
| 95 |
if use gtk3 || use gtk ; then |
| 96 |
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" ) |
| 97 |
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" ) |
| 98 |
netsurf_src_compile |
| 99 |
fi |
| 100 |
} |
| 101 |
@@ -128,6 +132,7 @@ src_install() { |
| 102 |
|
| 103 |
if use fbcon ; then |
| 104 |
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=framebuffer}" ) |
| 105 |
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=NO}" ) |
| 106 |
netsurf_src_install |
| 107 |
elog "framebuffer binary has been installed as netsurf-fb" |
| 108 |
make_desktop_entry "${EROOT}"usr/bin/netsurf-fb NetSurf-framebuffer netsurf "Network;WebBrowser" |
| 109 |
@@ -138,12 +143,14 @@ src_install() { |
| 110 |
fi |
| 111 |
if use gtk2 ; then |
| 112 |
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk}" ) |
| 113 |
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" ) |
| 114 |
netsurf_src_install |
| 115 |
elog "netsurf gtk2 version has been installed as netsurf-gtk" |
| 116 |
make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk NetSurf-gtk netsurf "Network;WebBrowser" |
| 117 |
fi |
| 118 |
if use gtk3 || use gtk ; then |
| 119 |
netsurf_makeconf=( "${netsurf_makeconf[@]/TARGET=*/TARGET=gtk3}" ) |
| 120 |
+ netsurf_makeconf=( "${netsurf_makeconf[@]/NETSURF_USE_VIDEO=*/NETSURF_USE_VIDEO=$(usex gstreamer YES NO)}" ) |
| 121 |
netsurf_src_install |
| 122 |
elog "netsurf gtk3 version has been installed as netsurf-gtk3" |
| 123 |
make_desktop_entry "${EROOT}"usr/bin/netsurf-gtk3 NetSurf-gtk3 netsurf "Network;WebBrowser" |
Archives