]>
Commit | Line | Data |
---|---|---|
b2fbd8e8 WF |
1 | --- netsurf-3.4/framebuffer/Makefile.target.orig 2016-02-27 16:48:23.588244698 +0100 |
2 | +++ netsurf-3.4/framebuffer/Makefile.target 2016-02-27 16:54:49.101350399 +0100 | |
3 | @@ -4,13 +4,16 @@ | |
17158ae4 JB |
4 | |
5 | # define additional CFLAGS and LDFLAGS requirements for pkg-configed libs here | |
6 | NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG | |
7 | +NETSURF_FEATURE_NSSVG_CFLAGS := -DWITH_NS_SVG | |
8 | NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE | |
9 | NETSURF_FEATURE_HUBBUB_CFLAGS := -DWITH_HUBBUB | |
b2fbd8e8 | 10 | NETSURF_FEATURE_PNG_CFLAGS := -DWITH_PNG |
17158ae4 JB |
11 | NETSURF_FEATURE_BMP_CFLAGS := -DWITH_BMP |
12 | NETSURF_FEATURE_GIF_CFLAGS := -DWITH_GIF | |
13 | +NETSURF_FEATURE_WEBP_CFLAGS := -DWITH_WEBP | |
14 | NETSURF_FEATURE_JS_CFLAGS := -DWITH_JS -DJS_HAS_FILE_OBJECT=0 | |
15 | NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_MOZJS -DJS_HAS_FILE_OBJECT=0 | |
16 | +NETSURF_FEATURE_VIDEO_CFLAGS := -DWITH_VIDEO | |
17 | ||
18 | CFLAGS += -Dnsframebuffer | |
19 | ||
b2fbd8e8 | 20 | @@ -63,8 +66,12 @@ $(eval $(call pkg_config_find_and_add_en |
17158ae4 JB |
21 | $(eval $(call pkg_config_find_and_add_enabled,ROSPRITE,librosprite,Sprite)) |
22 | $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) | |
23 | $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) | |
b2fbd8e8 | 24 | -$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) |
17158ae4 JB |
25 | +$(eval $(call pkg_config_find_and_add_enabled,RSVG,librsvg-2.0,SVG)) |
26 | +$(eval $(call pkg_config_find_and_add_enabled,NSSVG,libsvgtiny,SVG)) | |
27 | +$(eval $(call feature_enabled,WEBP,-DWITH_WEBP,-lwebp,WebP (libwebp))) | |
0b77bda8 | 28 | +$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs187,JavaScript)) |
17158ae4 JB |
29 | $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) |
30 | +$(eval $(call pkg_config_find_and_add_enabled,VIDEO,gstreamer-0.10,Video)) | |
31 | ||
b2fbd8e8 WF |
32 | |
33 | # ---------------------------------------------------------------------------- | |
34 | --- netsurf-3.4/monkey/Makefile.target.orig 2016-02-16 14:30:38.000000000 +0100 | |
35 | +++ netsurf-3.4/monkey/Makefile.target 2016-02-27 16:55:46.374649928 +0100 | |
36 | @@ -40,7 +40,7 @@ $(eval $(call pkg_config_find_and_add_en | |
37 | $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) | |
38 | $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) | |
39 | $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) | |
94e17ef1 JR |
40 | -$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) |
41 | +$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs187,JavaScript)) | |
42 | $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) | |
94e17ef1 | 43 | |
b2fbd8e8 WF |
44 | # --------------------------------------------------------------------------- |
45 | --- netsurf-3.4/riscos/Makefile.target.orig 2016-02-16 14:30:38.000000000 +0100 | |
46 | +++ netsurf-3.4/riscos/Makefile.target 2016-02-27 16:56:44.121296264 +0100 | |
47 | @@ -28,7 +28,7 @@ NETSURF_FEATURE_MOZJS_CFLAGS := -DWITH_M | |
94e17ef1 JR |
48 | $(eval $(call pkg_config_find_and_add_enabled,BMP,libnsbmp,BMP)) |
49 | $(eval $(call pkg_config_find_and_add_enabled,GIF,libnsgif,GIF)) | |
50 | $(eval $(call pkg_config_find_and_add_enabled,PNG,libpng,PNG )) | |
51 | -$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs185,JavaScript)) | |
52 | +$(eval $(call pkg_config_find_and_add_enabled,MOZJS,mozjs187,JavaScript)) | |
53 | $(eval $(call pkg_config_find_and_add_enabled,JS,mozilla-js,JavaScript)) | |
54 | ||
94e17ef1 | 55 |