summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/.template/Makefile8
-rw-r--r--package/.templatelib/Makefile10
-rw-r--r--package/.templateprog/Makefile6
-rw-r--r--package/bison/Makefile28
-rw-r--r--package/bison/patches/patch-Makefile_in27
-rw-r--r--package/bison/patches/patch-doc_bison_help11
-rw-r--r--package/curl/Makefile18
-rw-r--r--package/cyassl/Makefile28
-rw-r--r--package/flex/Makefile34
-rw-r--r--package/flex/patches/patch-Makefile_in10
-rw-r--r--package/flex/patches/patch-conf_in20
-rw-r--r--package/gnutls/Makefile41
-rw-r--r--package/htpdate/Makefile18
-rw-r--r--package/htpdate/patches/patch-Makefile33
-rw-r--r--package/htpdate/patches/patch-htpdate_c6
-rw-r--r--package/kodi/Makefile4
-rw-r--r--package/libgcrypt/Makefile28
-rw-r--r--package/libjpeg-turbo/Makefile2
-rw-r--r--package/libressl/Makefile4
-rw-r--r--package/libtasn1/Makefile20
-rw-r--r--package/openjdk7/Makefile6
-rw-r--r--package/openjdk7/patches/openadk.patch1159
22 files changed, 1096 insertions, 425 deletions
diff --git a/package/.template/Makefile b/package/.template/Makefile
index 2536da873..f60be74bb 100644
--- a/package/.template/Makefile
+++ b/package/.template/Makefile
@@ -15,7 +15,7 @@ PKG_BUILDDEP:= add packages which need to be compiled
PKG_URL:= add project url
PKG_SITES:= add download url without package name
# alternatively use a pre-defined set of mirrors, see mk/mirrors.mk:
-#PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=sub/path/}
+#PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=sub/path/)
# if more than one binary package is created, add symbol names of all here
# leave variable empty, when no binary package is created. You can set it
@@ -53,11 +53,11 @@ PKG_SITES:= add download url without package name
#PKGCS_WITH_GNUTLS:= libgnutls
# if downloaded package is not ending with .tar.xz use following
-#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+#DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
#CONFIG_STYLE:= manual
# use following to add ./configure options
@@ -74,4 +74,4 @@ $(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPE
$(IDIR_@UPKG@)/usr/bin
# please remove ALL above comments, before commiting
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/.templatelib/Makefile b/package/.templatelib/Makefile
index e89b61bfa..0ba543c83 100644
--- a/package/.templatelib/Makefile
+++ b/package/.templatelib/Makefile
@@ -8,21 +8,21 @@ PKG_VERSION:= @VER@
PKG_RELEASE:= 1
PKG_HASH:= add sha256 checksum of package here
PKG_DESCR:= add short description
-PKG_SECTION:= libs
+PKG_SECTION:= libs/misc
PKG_URL:= add project url
PKG_SITES:= add download url without package name
PKG_OPTS:= dev
# if downloaded package is not ending with .tar.xz use following
-#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+#DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
@PKG@-install:
$(INSTALL_DIR) $(IDIR_@UPKG@)/usr/lib
- $(CP) $(WRKINST)/usr/lib/@PKG@*.so* \
+ $(CP) $(WRKINST)/usr/lib/lib@PKG@*.so* \
$(IDIR_@UPKG@)/usr/lib
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/.templateprog/Makefile b/package/.templateprog/Makefile
index cb58e77a9..919e85807 100644
--- a/package/.templateprog/Makefile
+++ b/package/.templateprog/Makefile
@@ -15,15 +15,15 @@ PKG_URL:= add project url
PKG_SITES:= add download url without package name
# if downloaded package is not ending with .tar.xz use following
-#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2
+#DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,@UPKG@,@PKG@,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
@PKG@-install:
$(INSTALL_DIR) $(IDIR_@UPKG@)/usr/bin
$(INSTALL_BIN) $(WRKINST)/usr/bin/@PKG@ \
$(IDIR_@UPKG@)/usr/bin
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/bison/Makefile b/package/bison/Makefile
index f548b25e2..ad07639cf 100644
--- a/package/bison/Makefile
+++ b/package/bison/Makefile
@@ -1,33 +1,33 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= bison
-PKG_VERSION:= 3.0.2
+PKG_VERSION:= 3.0.4
PKG_RELEASE:= 1
-PKG_HASH:= a2c3e8528bdb50567d6fa26deeb493dc5ccd7e277b865251608a9e43ac928f3c
+PKG_HASH:= a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1
PKG_DESCR:= parser generator
PKG_SECTION:= dev/tools
PKG_BUILDDEP:= m4-host flex-host bison-host
HOST_BUILDDEP:= m4-host flex-host
PKG_URL:= http://www.gnu.org/software/bison/
-PKG_SITES:= ${MASTER_SITE_GNU:=${PKG_NAME}/}
+PKG_SITES:= $(MASTER_SITE_GNU:=bison/)
-include ${ADK_TOPDIR}/mk/host.mk
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call HOST_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,BISON,bison,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call HOST_template,BISON,bison,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,BISON,bison,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
TARGET_LDFLAGS+= -lrt
XAKE_FLAGS+= M4=m4
bison-install:
- ${INSTALL_DIR} ${IDIR_BISON}/usr/bin ${IDIR_BISON}/usr/share/bison
- ${INSTALL_BIN} ${WRKINST}/usr/bin/bison ${IDIR_BISON}/usr/bin
- ${CP} ${WRKINST}/usr/share/bison/* ${IDIR_BISON}/usr/share/bison
- $(CP) ./files/yacc ${IDIR_BISON}/usr/bin
+ $(INSTALL_DIR) $(IDIR_BISON)/usr/bin $(IDIR_BISON)/usr/share/bison
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/bison $(IDIR_BISON)/usr/bin
+ $(INSTALL_BIN) ./files/yacc $(IDIR_BISON)/usr/bin
+ $(CP) $(WRKINST)/usr/share/bison/* $(IDIR_BISON)/usr/share/bison
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/bison/patches/patch-Makefile_in b/package/bison/patches/patch-Makefile_in
deleted file mode 100644
index cf6ade9c5..000000000
--- a/package/bison/patches/patch-Makefile_in
+++ /dev/null
@@ -1,27 +0,0 @@
---- bison-3.0.1.orig/Makefile.in 2013-11-12 14:57:09.000000000 +0100
-+++ bison-3.0.1/Makefile.in 2013-11-27 18:46:46.000000000 +0100
-@@ -5134,22 +5134,12 @@ $(CROSS_OPTIONS_TEXI): doc/bison.help $(
- doc/refcard.pdf: doc/refcard.tex
- $(AM_V_GEN) cd doc && pdftex $(abs_top_srcdir)/doc/refcard.tex
- $(top_srcdir)/doc/bison.help: src/bison$(EXEEXT)
-- $(AM_V_GEN)src/bison$(EXEEXT) --version >doc/bison.help.tmp
-- $(AM_V_at) src/bison$(EXEEXT) --help >>doc/bison.help.tmp
-+ echo "3.0.1" >doc/bison.help.tmp
-+ echo "no help" >>doc/bison.help.tmp
- $(AM_V_at)$(top_srcdir)/build-aux/move-if-change doc/bison.help.tmp $@
-
- # Depend on configure to get version number changes.
- $(top_srcdir)/doc/bison.1: doc/bison.help doc/bison.x $(top_srcdir)/configure
-- $(AM_V_GEN)$(HELP2MAN) \
-- --include=$(top_srcdir)/doc/bison.x \
-- --output=$@.t src/bison$(EXEEXT)
-- $(AM_V_at)if $(remove_time_stamp) $@ >$@a.t 2>/dev/null && \
-- $(remove_time_stamp) $@.t | cmp $@a.t - >/dev/null 2>&1; then \
-- touch $@; \
-- else \
-- mv $@.t $@; \
-- fi
-- $(AM_V_at)rm -f $@*.t
-
- .gv.eps:
- $(AM_V_GEN) $(MKDIR_P) `echo "./$@" | sed -e 's,/[^/]*$$,,'`
diff --git a/package/bison/patches/patch-doc_bison_help b/package/bison/patches/patch-doc_bison_help
deleted file mode 100644
index c2b452fdf..000000000
--- a/package/bison/patches/patch-doc_bison_help
+++ /dev/null
@@ -1,11 +0,0 @@
---- bison-3.0.1.orig/doc/bison.help 2013-11-12 14:57:56.000000000 +0100
-+++ bison-3.0.1/doc/bison.help 2013-11-27 18:41:48.000000000 +0100
-@@ -4,7 +4,7 @@ Written by Robert Corbett and Richard St
- Copyright (C) 2013 Free Software Foundation, Inc.
- This is free software; see the source for copying conditions. There is NO
- warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
--Usage: src/bison [OPTION]... FILE
-+Usage: bison [OPTION]... FILE
- Generate a deterministic LR or generalized LR (GLR) parser employing
- LALR(1), IELR(1), or canonical LR(1) parser tables. IELR(1) and
- canonical LR(1) support is experimental.
diff --git a/package/curl/Makefile b/package/curl/Makefile
index b80dd5f35..7f0cda615 100644
--- a/package/curl/Makefile
+++ b/package/curl/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= curl
-PKG_VERSION:= 7.39.0
+PKG_VERSION:= 7.40.0
PKG_RELEASE:= 1
-PKG_HASH:= a3a7c2b9e7416c728469eb4cb5b61e9161335df4278329e1d9cc3c194e25d795
+PKG_HASH:= c2e0705a13e53f8f924d1eaeb2ab94f59a9e162007c489b9ab0c96238bddf84b
PKG_DESCR:= client-side url transfer tool
PKG_SECTION:= net/http
PKG_DEPENDS:= libcurl
@@ -26,7 +26,7 @@ PKGSS_LIBCURL:= zlib
PKG_FLAVOURS_CURL:= WITH_IPV6
PKGFD_WITH_IPV6:= enable ipv6 support
-PKG_CHOICES_LIBCURL:= WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL
+PKG_CHOICES_LIBCURL:= WITHOUT_SSL WITH_GNUTLS WITH_OPENSSL WITH_CYASSL
PKGCD_WITHOUT_SSL:= use no ssl
PKGCD_WITH_OPENSSL:= use openssl for crypto
PKGCS_WITH_OPENSSL:= libopenssl ca-certificates libgmp
@@ -34,6 +34,9 @@ PKGCB_WITH_OPENSSL:= openssl
PKGCD_WITH_GNUTLS:= use gnutls for crypto
PKGCS_WITH_GNUTLS:= libgnutls ca-certificates libgmp
PKGCB_WITH_GNUTLS:= gnutls
+PKGCD_WITH_CYASSL:= use cyassl for crypto
+PKGCS_WITH_CYASSL:= cyassl ca-certificates
+PKGCB_WITH_CYASSL:= cyassl
include ${ADK_TOPDIR}/mk/package.mk
@@ -55,10 +58,15 @@ CONFIGURE_ARGS+= --with-gnutls="${STAGING_TARGET_DIR}/usr" \
--without-ssl \
--without-axtls
endif
+ifeq (${ADK_PACKAGE_LIBCURL_WITH_CYASSL},y)
+CONFIGURE_ARGS+= --with-cyassl="${STAGING_TARGET_DIR}/usr" \
+ --without-ssl \
+ --without-gnutls \
+ --without-axtls
+endif
CONFIGURE_ENV+= curl_typeof_curl_socklen_t=socklen_t
-CONFIGURE_ARGS+= --disable-thread \
- --enable-cookies \
+CONFIGURE_ARGS+= --enable-cookies \
--enable-crypto-auth \
--enable-nonblocking \
--enable-file \
diff --git a/package/cyassl/Makefile b/package/cyassl/Makefile
new file mode 100644
index 000000000..2db3b9584
--- /dev/null
+++ b/package/cyassl/Makefile
@@ -0,0 +1,28 @@
+# This file is part of the OpenADK project. OpenADK is copyrighted
+# material, please see the LICENCE file in the top-level directory.
+
+include $(ADK_TOPDIR)/rules.mk
+
+PKG_NAME:= cyassl
+PKG_VERSION:= 3.3.0
+PKG_RELEASE:= 1
+PKG_HASH:= 7ce5f704ec4ad72e4b955aeec732ad8a38e8dcd1f93bfc79dfda7c4bc894c67e
+PKG_DESCR:= portable embedded ssl library
+PKG_SECTION:= libs/crypto
+PKG_URL:= http://www.wolfssl.com
+PKG_SITES:= http://www.openadk.org/distfiles/
+PKG_OPTS:= dev
+
+include $(ADK_TOPDIR)/mk/package.mk
+
+$(eval $(call PKG_template,CYASSL,cyassl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+
+CONFIGURE_ARGS+= --disable-examples
+CONFIGURE_ENV+= C_EXTRA_FLAGS='$(TARGET_CFLAGS)'
+
+cyassl-install:
+ $(INSTALL_DIR) $(IDIR_CYASSL)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libcyassl*.so* \
+ $(IDIR_CYASSL)/usr/lib
+
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/flex/Makefile b/package/flex/Makefile
index 1bf505504..b5477a623 100644
--- a/package/flex/Makefile
+++ b/package/flex/Makefile
@@ -1,38 +1,36 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= flex
-PKG_VERSION:= 2.5.35
-PKG_RELEASE:= 3
-PKG_HASH:= a6fe3ac80b5f89769d833efde712f95bb0255bcf9089fa324636a9b8a005c717
+PKG_VERSION:= 2.5.39
+PKG_RELEASE:= 1
+PKG_HASH:= c988bb3ab340aaba16df5a54ab98bb4760599975375c8ac9388a078b7f27e9e8
PKG_DESCR:= fast lexical analyzer
PKG_SECTION:= dev/tools
PKG_BUILDDEP:= m4-host
HOST_BUILDDEP:= m4-host
PKG_URL:= http://flex.sourceforge.net/
-PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=${PKG_NAME}/}
+PKG_SITES:= $(MASTER_SITE_SOURCEFORGE:=flex/)
PKG_OPTS:= dev
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+include $(ADK_TOPDIR)/mk/host.mk
+include $(ADK_TOPDIR)/mk/package.mk
-include ${ADK_TOPDIR}/mk/host.mk
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call HOST_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE}))
-$(eval $(call PKG_template,FLEX,flex,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call HOST_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE)))
+$(eval $(call PKG_template,FLEX,flex,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
hostpost-install:
(cd $(STAGING_HOST_DIR)/usr/bin; ln -sf flex lex)
flex-install:
- ${INSTALL_DIR} ${IDIR_FLEX}/usr/bin
- ${INSTALL_BIN} ${WRKINST}/usr/bin/flex ${IDIR_FLEX}/usr/bin
+ $(INSTALL_DIR) $(IDIR_FLEX)/usr/bin
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/flex $(IDIR_FLEX)/usr/bin
# workaround for dev subpackage
- ${INSTALL_DIR} ${IDIR_FLEX_DEV}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libfl.a \
- ${IDIR_FLEX_DEV}/usr/lib
+ $(INSTALL_DIR) $(IDIR_FLEX_DEV)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libfl.a \
+ $(IDIR_FLEX_DEV)/usr/lib
-include ${ADK_TOPDIR}/mk/host-bottom.mk
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/host-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/flex/patches/patch-Makefile_in b/package/flex/patches/patch-Makefile_in
deleted file mode 100644
index 6c8103d00..000000000
--- a/package/flex/patches/patch-Makefile_in
+++ /dev/null
@@ -1,10 +0,0 @@
---- flex-2.5.35.orig/Makefile.in 2008-02-26 22:34:10.000000000 +0100
-+++ flex-2.5.35/Makefile.in 2010-10-04 23:21:19.000000000 +0200
-@@ -483,7 +483,6 @@ libfl.a: $(libfl_a_OBJECTS) $(libfl_a_DE
- libfl_pic.a: $(libfl_pic_a_OBJECTS) $(libfl_pic_a_DEPENDENCIES)
- -rm -f libfl_pic.a
- $(libfl_pic_a_AR) libfl_pic.a $(libfl_pic_a_OBJECTS) $(libfl_pic_a_LIBADD)
-- $(RANLIB) libfl_pic.a
- install-binPROGRAMS: $(bin_PROGRAMS)
- @$(NORMAL_INSTALL)
- test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
diff --git a/package/flex/patches/patch-conf_in b/package/flex/patches/patch-conf_in
deleted file mode 100644
index b0391feb7..000000000
--- a/package/flex/patches/patch-conf_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- flex-2.5.35.orig/conf.in 2008-02-26 22:34:02.000000000 +0100
-+++ flex-2.5.35/conf.in 2010-10-04 23:18:48.000000000 +0200
-@@ -162,7 +162,7 @@
-
- /* If using the C implementation of alloca, define if you know the
- direction of stack growth for your system; otherwise it will be
-- automatically deduced at run-time.
-+ automatically deduced at runtime.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown */
-@@ -190,7 +190,7 @@
- /* Define to rpl_realloc if the replacement function should be used. */
- #undef realloc
-
--/* Define to `unsigned' if <sys/types.h> does not define. */
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
- #undef size_t
-
- /* Define as `fork' if `vfork' does not work. */
diff --git a/package/gnutls/Makefile b/package/gnutls/Makefile
index 2b57275a8..8510913eb 100644
--- a/package/gnutls/Makefile
+++ b/package/gnutls/Makefile
@@ -1,12 +1,12 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= gnutls
-PKG_VERSION:= 3.3.10
+PKG_VERSION:= 3.3.12
PKG_RELEASE:= 1
-PKG_HASH:= e27553981d48d9211a7e5e94f6e78c575205202a181c2345a1c8466ebf1d2219
+PKG_HASH:= 67ab3e92c5d48f3323b897d7c1aa0bb2af6f3a84f5bd9931cda163a7ff32299b
PKG_DESCR:= transport layer security library
PKG_SECTION:= libs/crypto
PKG_DEPENDS:= libgcrypt libtasn1 zlib libnettle libgmp
@@ -18,6 +18,7 @@ PKG_LIBNAME:= libgnutls
PKG_OPTS:= dev
PKG_BUILDDEP_UCLIBC:= libiconv-tiny
+PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny
PKG_SUBPKGS:= LIBGNUTLS GNUTLS_UTILS LIBGNUTLS_EXTRA LIBGNUTLS_OPENSSL
PKGSD_GNUTLS_UTILS:= transport layer security utilities
@@ -31,12 +32,12 @@ PKG_FLAVOURS_LIBGNUTLS:= WITH_CRYPTODEV
PKGFD_WITH_CRYPTODEV:= enable support for cryptodev-linux
PKGFB_WITH_CRYPTODEV:= cryptodev-linux
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBGNUTLS,libgnutls,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS},${PKG_OPTS}))
-$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,${PKG_VERSION}-${PKG_RELEASE},${PKGSS_GNUTLS_UTILS},${PKGSD_GNUTLS_UTILS},${PKGSC_GNUTLS_UTILS}))
-$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_EXTRA}))
-$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKGSC_LIBGNUTLS_OPENSSL}))
+$(eval $(call PKG_template,LIBGNUTLS,libgnutls,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS),$(PKG_OPTS)))
+$(eval $(call PKG_template,GNUTLS_UTILS,gnutls-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_GNUTLS_UTILS),$(PKGSD_GNUTLS_UTILS),$(PKGSC_GNUTLS_UTILS)))
+$(eval $(call PKG_template,LIBGNUTLS_EXTRA,libgnutls-extra,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS_EXTRA)))
+$(eval $(call PKG_template,LIBGNUTLS_OPENSSL,libgnutls-openssl,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKGSC_LIBGNUTLS_OPENSSL)))
ifneq ($(ADK_PACKAGE_LIBGNUTLS_WITH_CRYPTODEV),)
CONFIGURE_ARGS+= --enable-cryptodev
@@ -49,22 +50,22 @@ CONFIGURE_ARGS+= --disable-rpath \
CONFIGURE_ENV+= ac_cv_prog_AR='$(TARGET_CROSS)ar'
libgnutls-install:
- ${INSTALL_DIR} ${IDIR_LIBGNUTLS}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgnutls.so* ${IDIR_LIBGNUTLS}/usr/lib
+ $(INSTALL_DIR) $(IDIR_LIBGNUTLS)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libgnutls.so* $(IDIR_LIBGNUTLS)/usr/lib
libgnutls-extra-install:
- ${INSTALL_DIR} ${IDIR_LIBGNUTLS_EXTRA}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgnutlsxx.so* \
- ${IDIR_LIBGNUTLS_EXTRA}/usr/lib
+ $(INSTALL_DIR) $(IDIR_LIBGNUTLS_EXTRA)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libgnutlsxx.so* \
+ $(IDIR_LIBGNUTLS_EXTRA)/usr/lib
libgnutls-openssl-install:
- ${INSTALL_DIR} ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgnutls-openssl.so* \
- ${IDIR_LIBGNUTLS_OPENSSL}/usr/lib
+ $(INSTALL_DIR) $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libgnutls-openssl.so* \
+ $(IDIR_LIBGNUTLS_OPENSSL)/usr/lib
gnutls-utils-install:
- ${INSTALL_DIR} ${IDIR_GNUTLS_UTILS}/usr/bin
- ${CP} ${WRKINST}/usr/bin/{{cert,srp,psk}tool,gnutls-{cli,serv}} \
- ${IDIR_GNUTLS_UTILS}/usr/bin
+ $(INSTALL_DIR) $(IDIR_GNUTLS_UTILS)/usr/bin
+ $(CP) $(WRKINST)/usr/bin/((cert,srp,psk)tool,gnutls-{cli,serv}) \
+ $(IDIR_GNUTLS_UTILS)/usr/bin
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/htpdate/Makefile b/package/htpdate/Makefile
index 3a64b566d..a51790985 100644
--- a/package/htpdate/Makefile
+++ b/package/htpdate/Makefile
@@ -1,27 +1,25 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= htpdate
-PKG_VERSION:= 1.0.5
+PKG_VERSION:= 1.1.1
PKG_RELEASE:= 1
-PKG_HASH:= f465059495eae91437eb5eec7af92f1374eb3836f50926e8e5718818abf91e9a
+PKG_HASH:= 0d75f91cb61f8869c8298d198fa52b9a139ae505b366e9d4d331af8bc1c04880
PKG_DESCR:= hypertext time protocol implementation
PKG_SECTION:= net/ntp
PKG_URL:= http://www.vervest.org/htp/
PKG_SITES:= http://www.vervest.org/htp/archive/c/
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+include $(ADK_TOPDIR)/mk/package.mk
-include ${ADK_TOPDIR}/mk/package.mk
-
-$(eval $(call PKG_template,HTPDATE,htpdate,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,HTPDATE,htpdate,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
CONFIG_STYLE:= manual
htpdate-install:
- ${INSTALL_DIR} ${IDIR_HTPDATE}/usr/sbin
- ${INSTALL_BIN} ${WRKBUILD}/htpdate ${IDIR_HTPDATE}/usr/sbin/
+ $(INSTALL_DIR) $(IDIR_HTPDATE)/usr/sbin
+ $(INSTALL_BIN) $(WRKBUILD)/htpdate $(IDIR_HTPDATE)/usr/sbin/
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/htpdate/patches/patch-Makefile b/package/htpdate/patches/patch-Makefile
index 9afe7bc70..b7b80f427 100644
--- a/package/htpdate/patches/patch-Makefile
+++ b/package/htpdate/patches/patch-Makefile
@@ -1,35 +1,34 @@
---- htpdate-1.0.4.orig/Makefile 2008-10-13 21:04:08.000000000 +0200
-+++ htpdate-1.0.4/Makefile 2010-02-05 22:49:58.954334284 +0100
-@@ -2,8 +2,8 @@ prefix = /usr
+--- htpdate-1.1.1.orig/Makefile 2014-02-07 09:55:26.000000000 +0100
++++ htpdate-1.1.1/Makefile 2015-02-03 06:09:46.000000000 +0100
+@@ -2,12 +2,10 @@ prefix = $(DESTDIR)/usr
bindir = ${prefix}/bin
mandir = ${prefix}/share/man
-CC = gcc
-CFLAGS += -Wall -O2
+-#CFLAGS += -Wall -pedantic -ansi -O2
+CC ?= gcc
-+CFLAGS ?= -Wall -O2
- #CFLAGS += -Wall -pedantic -ansi -O2
++CFLAGS ?=
INSTALL = /usr/bin/install -c
-@@ -15,15 +15,14 @@ htpdate: htpdate.c
- $(CC) $(CFLAGS) -o htpdate htpdate.c
+-STRIP = /usr/bin/strip -s
+
+ all: htpdate
+
+@@ -15,16 +13,11 @@ htpdate: htpdate.c
+ $(CC) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) -o htpdate htpdate.c
install: all
- $(STRIP) htpdate
-- mkdir -p $(bindir)
-- $(INSTALL) -m 755 htpdate $(bindir)/htpdate
+ mkdir -p $(bindir)
+ $(INSTALL) -m 755 htpdate $(bindir)/htpdate
- mkdir -p $(mandir)/man8
-- $(INSTALL) -m 644 htpdate.8.gz $(mandir)/man8/htpdate.8.gz
-+ mkdir -p $(DESTDIR)$(bindir)
-+ $(INSTALL) -m 755 htpdate $(DESTDIR)$(bindir)/htpdate
-+ mkdir -p $(DESTDIR)$(mandir)/man8
-+ $(INSTALL) -m 644 htpdate.8.gz $(DESTDIR)$(mandir)/man8/htpdate.8.gz
+- $(INSTALL) -m 644 htpdate.8 $(mandir)/man8/htpdate.8
+- gzip -f -9 $(mandir)/man8/htpdate.8
clean:
rm -rf htpdate
uninstall:
-- rm -rf $(bindir)/htpdate
+ rm -rf $(bindir)/htpdate
- rm -rf $(mandir)/man8/htpdate.8.gz
-+ rm -rf $(DESTDIR)$(bindir)/htpdate
-+ rm -rf $(DESTDIR)$(mandir)/man8/htpdate.8.gz
diff --git a/package/htpdate/patches/patch-htpdate_c b/package/htpdate/patches/patch-htpdate_c
index c8294b11c..ce7ad41c3 100644
--- a/package/htpdate/patches/patch-htpdate_c
+++ b/package/htpdate/patches/patch-htpdate_c
@@ -1,5 +1,5 @@
---- htpdate-1.0.4.orig/htpdate.c 2008-10-13 21:04:08.000000000 +0200
-+++ htpdate-1.0.4/htpdate.c 2010-02-05 22:48:28.624323989 +0100
+--- htpdate-1.1.1.orig/htpdate.c 2014-10-28 21:29:36.000000000 +0100
++++ htpdate-1.1.1/htpdate.c 2015-02-03 06:07:38.000000000 +0100
@@ -353,6 +353,7 @@ static int setclock( double timedelta, i
}
@@ -17,7 +17,7 @@
static void showhelp() {
puts("htpdate version "VERSION"\n\
-@@ -406,7 +407,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid
+@@ -406,7 +407,6 @@ Usage: htpdate [-046abdhlqstxD] [-i pid
-s set time\n\
-t turn off sanity time check\n\
-u run daemon as user\n\
diff --git a/package/kodi/Makefile b/package/kodi/Makefile
index a8a6836f5..7e90ba9ed 100644
--- a/package/kodi/Makefile
+++ b/package/kodi/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= kodi
PKG_VERSION:= 14.0
-PKG_RELEASE:= 3
+PKG_RELEASE:= 4
PKG_HASH:= 11746d95cc59361f36ce6ea9d0d36bbd9ec3376e991f5ec1720f8ff740b91192
PKG_DESCR:= software media player
PKG_SECTION:= mm/video
@@ -119,7 +119,6 @@ CONFIGURE_ARGS+= --disable-optical-drive \
--disable-mid \
--disable-debug \
--enable-alsa \
- --enable-libvorbisenc \
--enable-texturepacker \
--enable-udev \
--with-ffmpeg=shared
@@ -181,7 +180,6 @@ ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y)
CONFIGURE_ARGS+= --disable-x11 \
--disable-sdl \
--enable-gles \
- --enable-neon \
--enable-codec=imxvpu
endif
diff --git a/package/libgcrypt/Makefile b/package/libgcrypt/Makefile
index c27485875..d308952fa 100644
--- a/package/libgcrypt/Makefile
+++ b/package/libgcrypt/Makefile
@@ -1,12 +1,12 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libgcrypt
-PKG_VERSION:= 1.6.1
+PKG_VERSION:= 1.6.2
PKG_RELEASE:= 1
-PKG_HASH:= 7c1007197bef49c3b8740cf6af8b4eb4eb74c7a69796ebcf555d928c287255de
+PKG_HASH:= 936921644b9c81e2395e18a554a9a5f9252aae3976f8afc3e4229ee9d785e627
PKG_DESCR:= crypto library
PKG_SECTION:= libs/crypto
PKG_DEPENDS:= libgpg-error
@@ -15,24 +15,24 @@ PKG_URL:= http://directory.fsf.org/project/libgcrypt
PKG_SITES:= ftp://ftp.gnupg.org/gcrypt/libgcrypt/
PKG_OPTS:= dev
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBGCRYPT,libgcrypt,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
CONFIGURE_ARGS+= --disable-asm \
- --with-gpg-error-prefix="${STAGING_TARGET_DIR}/usr"
+ --with-gpg-error-prefix="$(STAGING_TARGET_DIR)/usr"
post-install:
# provides own automake macros
- ${INSTALL_DIR} ${STAGING_HOST_DIR}/usr/share/aclocal
- ${CP} ${WRKINST}/usr/share/aclocal/libgcrypt.m4 \
- ${STAGING_HOST_DIR}/usr/share/aclocal
+ $(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal
+ $(CP) $(WRKINST)/usr/share/aclocal/libgcrypt.m4 \
+ $(STAGING_HOST_DIR)/usr/share/aclocal
libgcrypt-install:
- ${INSTALL_DIR} ${IDIR_LIBGCRYPT}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libgcrypt.so* \
- ${IDIR_LIBGCRYPT}/usr/lib
+ $(INSTALL_DIR) $(IDIR_LIBGCRYPT)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libgcrypt.so* \
+ $(IDIR_LIBGCRYPT)/usr/lib
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/libjpeg-turbo/Makefile b/package/libjpeg-turbo/Makefile
index 63f01f594..99e4512cf 100644
--- a/package/libjpeg-turbo/Makefile
+++ b/package/libjpeg-turbo/Makefile
@@ -9,6 +9,8 @@ PKG_RELEASE:= 1
PKG_HASH:= c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9
PKG_DESCR:= jpeg image library
PKG_SECTION:= libs/image
+PKG_BUILDDEP_IBM_X40:= yasm-host
+PKG_BUILDDEP_QEMU_X86:= yasm-host
PKG_URL:= http://libjpeg-turbo.virtualgl.org/
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=libjpeg-turbo/}
PKG_OPTS:= dev
diff --git a/package/libressl/Makefile b/package/libressl/Makefile
index dc799370c..943f804b1 100644
--- a/package/libressl/Makefile
+++ b/package/libressl/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libressl
-PKG_VERSION:= 2.1.2
+PKG_VERSION:= 2.1.3
PKG_RELEASE:= 1
-PKG_HASH:= 07c05f12e5d49dbfcf82dd23b6b4877b7cdb1c8e4c8dd27cb4d9e5758a6caf52
+PKG_HASH:= eb2f370971408fb10af6453e556465c8eee728ac333bf1eb47ec1a5112304f7c
PKG_DESCR:= ssl library
PKG_SECTION:= libs/crypto
PKG_URL:= http://www.libressl.org
diff --git a/package/libtasn1/Makefile b/package/libtasn1/Makefile
index 3b825b131..a19045b1e 100644
--- a/package/libtasn1/Makefile
+++ b/package/libtasn1/Makefile
@@ -1,28 +1,28 @@
# This file is part of the OpenADK project. OpenADK is copyrighted
# material, please see the LICENCE file in the top-level directory.
-include ${ADK_TOPDIR}/rules.mk
+include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libtasn1
-PKG_VERSION:= 4.0
+PKG_VERSION:= 4.2
PKG_RELEASE:= 1
-PKG_HASH:= 41d044f7644bdd1c4f8a5c15ac1885ca1fcbf32f5f6dd4760a19278b979857fe
+PKG_HASH:= 693b41cb36c2ac02d5990180b0712a79a591168e93d85f7fcbb75a0a0be4cdbb
PKG_DESCR:= asn.1 and der structures manipulation library
PKG_SECTION:= libs/crypto
PKG_URL:= http://www.gnupg.org/
-PKG_SITES:= ${MASTER_SITE_GNU:=libtasn1/}
+PKG_SITES:= $(MASTER_SITE_GNU:=libtasn1/)
PKG_OPTS:= dev
-DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz
-include ${ADK_TOPDIR}/mk/package.mk
+include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,LIBTASN1,libtasn1,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,LIBTASN1,libtasn1,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
CONFIGURE_ARGS+= --disable-gtk-doc-html
libtasn1-install:
- ${INSTALL_DIR} ${IDIR_LIBTASN1}/usr/lib
- ${CP} ${WRKINST}/usr/lib/libtasn1.so* ${IDIR_LIBTASN1}/usr/lib
+ $(INSTALL_DIR) $(IDIR_LIBTASN1)/usr/lib
+ $(CP) $(WRKINST)/usr/lib/libtasn1.so* $(IDIR_LIBTASN1)/usr/lib
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/openjdk7/Makefile b/package/openjdk7/Makefile
index e8fa299a3..893c3c62b 100644
--- a/package/openjdk7/Makefile
+++ b/package/openjdk7/Makefile
@@ -4,9 +4,9 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= openjdk7
-PKG_VERSION:= 2.4.7
-PKG_RELEASE:= 9
-PKG_HASH:= b66973bef7808f8fb03be64e44d312ea2d13590a68a6a4e6690dbcdd1947459d
+PKG_VERSION:= 2.5.3
+PKG_RELEASE:= 1
+PKG_HASH:= f4f2922cfec262496e935f81c1d39af66a789f69aa12d1ceee51bcca8934f1f0
PKG_DESCR:= java virtual machine
PKG_SECTION:= dev/lang
PKG_BUILDDEP:= openjdk7-host alsa-lib xproto libjpeg-turbo zlib giflib libpng freetype cups
diff --git a/package/openjdk7/patches/openadk.patch b/package/openjdk7/patches/openadk.patch
index e6a83cc7b..22b7ea2c4 100644
--- a/package/openjdk7/patches/openadk.patch
+++ b/package/openjdk7/patches/openadk.patch
@@ -1,16 +1,16 @@
-diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in
---- icedtea-2.4.7.orig/Makefile.in 2014-04-15 23:20:44.689988653 -0500
-+++ icedtea-2.4.7/Makefile.in 2015-01-15 20:05:28.339161934 -0600
-@@ -712,7 +712,7 @@
+diff -Nur icedtea-2.5.3.orig/Makefile.in icedtea-2.5.3/Makefile.in
+--- icedtea-2.5.3.orig/Makefile.in 2014-10-14 22:58:02.003534712 -0500
++++ icedtea-2.5.3/Makefile.in 2015-01-17 23:31:24.893466195 -0600
+@@ -692,7 +692,7 @@
$(am__append_14) $(am__append_15) $(DISTRIBUTION_PATCHES)
# Bootstrapping patches
-ICEDTEA_BOOT_PATCHES = patches/boot/javafiles.patch \
+ICEDTEA_BOOT_PATCHES = patches/openadk.patch patches/boot/javafiles.patch \
- patches/boot/ant-javac.patch patches/boot/corba-idlj.patch \
- patches/boot/corba-no-gen.patch patches/boot/corba-orb.patch \
- patches/boot/demos.patch patches/boot/fphexconstants.patch \
-@@ -2720,7 +2720,7 @@
+ patches/boot/corba-idlj.patch patches/boot/corba-no-gen.patch \
+ patches/boot/corba-orb.patch patches/boot/demos.patch \
+ patches/boot/fphexconstants.patch \
+@@ -2585,7 +2585,7 @@
stamps/jamvm.stamp: $(OPENJDK_TREE) stamps/rt.stamp
@BUILD_JAMVM_TRUE@ cd jamvm/jamvm && \
@BUILD_JAMVM_TRUE@ ./autogen.sh --with-java-runtime-library=openjdk7 \
@@ -19,13 +19,13 @@ diff -Nur icedtea-2.4.7.orig/Makefile.in icedtea-2.4.7/Makefile.in
@BUILD_JAMVM_TRUE@ $(MAKE) ; \
@BUILD_JAMVM_TRUE@ $(MAKE) install
@BUILD_JAMVM_TRUE@ mkdir -p $(abs_top_builddir)/jamvm/install/hotspot/