summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-12-11 08:53:45 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-12-11 08:53:45 +0100
commit0331ae86340af1da061f5e8fd6c1ca63b3829ca4 (patch)
tree86170ff1a5218bb3b0c3cc1ed71783b67112c35a
parentbc9dc099c43977e18bc650a47bef15008c84886e (diff)
links: update to 2.14
-rw-r--r--package/links/Makefile33
1 files changed, 23 insertions, 10 deletions
diff --git a/package/links/Makefile b/package/links/Makefile
index 62aaf4edb..6d8a6fa1a 100644
--- a/package/links/Makefile
+++ b/package/links/Makefile
@@ -4,10 +4,10 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= links
-PKG_VERSION:= 2.13
+PKG_VERSION:= 2.14
PKG_RELEASE:= 1
-PKG_HASH:= bcd068b5b47f604f91091c541d469df2afb6bd6604cddd6f059a17ec9ceb74ae
-PKG_DESCR:= web browser with graphic support
+PKG_HASH:= 22fa8dcb5a60b8ffd611de31ebd4c79edce472637a3554bab401795da91d4387
+PKG_DESCR:= web browser for console
PKG_SECTION:= app/browser
PKG_DEPENDS:= libpng libjpeg-turbo libtiff gpm
PKG_BUILDDEP:= libpng libjpeg-turbo gpm
@@ -22,21 +22,22 @@ PKGCB_WITH_LIBRESSL:= libressl
PKGCS_WITH_LIBRESSL:= libressl
PKGCD_WITHOUT_SSL:= use no ssl
-PKG_FLAVOURS_LINKS:= WITH_DIRECTFB
+PKG_FLAVOURS_LINKS:= WITH_FB WITH_DIRECTFB WITH_X
PKGFD_WITH_DIRECTFB:= enable DirectFB video output support
PKGFS_WITH_DIRECTFB:= directfb
PKGFB_WITH_DIRECTFB:= DirectFB
+PKGFD_WITH_FB:= enable framebuffer video output support
+PKGFD_WITH_X:= enable xorg video output support
+PKGFS_WITH_X:= libx11
+PKGFB_WITH_X:= libX11
include ${ADK_TOPDIR}/mk/package.mk
$(eval $(call PKG_template,LINKS,links,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-CONFIGURE_ARGS+= --enable-graphics \
- --with-fb \
- --without-libevent \
+CONFIGURE_ARGS+= --without-libevent \
--without-svgalib \
--without-libtiff \
- --without-x \
--without-pmshell \
--without-atheos
@@ -46,10 +47,22 @@ else
CONFIGURE_ARGS+= --with-ssl
endif
+ifeq (${ADK_PACKAGE_LINKS_WITH_FB},y)
+CONFIGURE_ARGS+= --with-fb --enable-graphics
+else
+CONFIGURE_ARGS+= --without-fb --disable-graphics
+endif
+
ifeq (${ADK_PACKAGE_LINKS_WITH_DIRECTFB},y)
-CONFIGURE_ARGS+= --with-directfb
+CONFIGURE_ARGS+= --with-directfb --enable-graphics
+else
+CONFIGURE_ARGS+= --without-directfb --disable-graphics
+endif
+
+ifeq (${ADK_PACKAGE_LINKS_WITH_X},y)
+CONFIGURE_ARGS+= --with-x --enable-graphics
else
-CONFIGURE_ARGS+= --without-directfb
+CONFIGURE_ARGS+= --without-x --disable-graphics
endif
links-install: