diff options
111 files changed, 793 insertions, 2543 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index 21ba5223f..26526dff9 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -66,6 +66,7 @@ ifeq (${HOST_CONFIG_STYLE},meson) meson setup --prefix $(STAGING_HOST_DIR)/usr \ --pkg-config-path $(STAGING_HOST_DIR)/usr/lib/pkgconfig \ --buildtype release $(HOST_MESON_FLAGS) \ + --wrap-mode=nodownload \ $(WRKSRC) $(WRKBUILD) $(MAKE_TRACE) endif ifeq (${HOST_CONFIG_STYLE},perl) @@ -87,7 +88,7 @@ host-build: ${_HOST_BUILD_COOKIE}: ${_HOST_CONFIGURE_COOKIE} @$(CMD_TRACE) "compiling.. " ifneq ($(filter meson,${HOST_STYLE}),) - PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) + PATH='$(HOST_PATH)' LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) else ifneq (${HOST_STYLE},manual) cd ${WRKBUILD} && env ${HOST_MAKE_ENV} ${MAKE} -j${ADK_MAKE_JOBS} -f ${MAKE_FILE} \ ${HOST_MAKE_FLAGS} ${HOST_ALL_TARGET} $(MAKE_TRACE) diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 3527f2564..c750a9fb0 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -16,10 +16,10 @@ KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_13),y) -KERNEL_FILE_VER:= 6.13.6 +KERNEL_FILE_VER:= 6.13.9 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= de0053cb413d408f20fd1d5788219951b8a4403e5dac1b1d9032090938acd199 +KERNEL_HASH:= 53e7a3f028b6119ba499245bde0fa10275752817408a4a36b5a34ad74a4727b2 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) KERNEL_FILE_VER:= 6.12.18 diff --git a/mk/pkg-bottom.mk b/mk/pkg-bottom.mk index abc1e1604..400a04019 100644 --- a/mk/pkg-bottom.mk +++ b/mk/pkg-bottom.mk @@ -140,7 +140,7 @@ ${_BUILD_COOKIE}: ${_CONFIGURE_COOKIE} @env ${MAKE_ENV} ${MAKE} pre-build $(MAKE_TRACE) @$(CMD_TRACE) "compiling.. " ifneq ($(filter meson,${BUILD_STYLE}),) - PATH='$(HOST_PATH)' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) + PATH='$(HOST_PATH)' LD_LIBRARY_PATH='$(STAGING_HOST_DIR)/usr/lib' ninja -v -C $(WRKBUILD) $(MAKE_TRACE) else ifneq ($(filter manual,${BUILD_STYLE}),) env ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} do-build $(MAKE_TRACE) else ifeq ($(strip ${BUILD_STYLE}),) diff --git a/package/ant/Makefile b/package/ant/Makefile deleted file mode 100644 index b9d989ac3..000000000 --- a/package/ant/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# 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:= ant -PKG_VERSION:= 1.8.4 -PKG_RELEASE:= 1 -PKG_HASH:= 5de65f7ba3f67e436ffffcdc0a73f591d1006e9fb41af8632c1f1f84d4a3e0b1 -PKG_DESCR:= java code build utility -PKG_SECTION:= dev/tools -HOST_BUILDDEP:= gcj-host -PKG_SITES:= http://archive.apache.org/dist/ant/source/ - -PKG_CFLINE_ANT:= depends on ADK_HOST_ONLY - -DISTFILES:= apache-$(PKG_NAME)-$(PKG_VERSION)-src.tar.bz2 -WRKDIST= $(WRKDIR)/apache-$(PKG_NAME)-$(PKG_VERSION) - -include $(ADK_TOPDIR)/mk/host.mk -include $(ADK_TOPDIR)/mk/package.mk - -$(eval $(call HOST_template,ANT,ant,$(PKG_VERSION)-${PKG_RELEASE})) - -HOST_STYLE:= manual - -host-build: - if [ ! -f $(WRKBUILD)/lib/optional/junit-4.9b2.jar ];then \ - cd $(WRKBUILD)/lib/optional; wget http://distfiles.openadk.org/junit-4.9b2.jar; \ - fi - cp $(DL_DIR)/ecj*.jar $(WRKBUILD)/lib/optional/ecj.jar - (cd ${WRKBUILD}; \ - export ANT_OPTS="-Xms256m -Xmx256m" ;\ - export JAVA_HOME=$(STAGING_HOST_DIR)/usr/lib/jvm ;\ - export CLASSPATH=$(STAGING_HOST_DIR)/usr/lib/jvm/lib/tools.jar ;\ - export JAVAC=$(STAGING_HOST_DIR)/usr/bin/ecj ;\ - export JAVACMD=$(STAGING_HOST_DIR)/usr/bin/gij ;\ - $(BASH) ./build.sh) - -ant-hostinstall: - cd $(WRKBUILD)/dist; \ - $(CP) bin/* $(STAGING_HOST_DIR)/usr/bin ; \ - $(CP) lib/* $(STAGING_HOST_DIR)/usr/lib - -include ${ADK_TOPDIR}/mk/host-bottom.mk -include ${ADK_TOPDIR}/mk/pkg-bottom.mk diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile index 5d9f10881..ced4fbacc 100644 --- a/package/asterisk/Makefile +++ b/package/asterisk/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= asterisk -PKG_VERSION:= 20.11.1 +PKG_VERSION:= 22.3.0 PKG_RELEASE:= 1 -PKG_HASH:= 5ad25c136c7772f0ad10ae02d59f19b32c0cf64027278e3de6a6314ee24d5ff9 +PKG_HASH:= 9cd9a29db5ebff861431f85b317a1f8263d49587f596886df1fcd298bd545593 PKG_DESCR:= open source pbx PKG_SECTION:= net/voip PKG_DEPENDS:= libncurses libcurl libopenssl libedit libuuid libjansson diff --git a/package/at-spi2-atk/Makefile b/package/at-spi2-atk/Makefile index fd87d5d70..41ca90494 100644 --- a/package/at-spi2-atk/Makefile +++ b/package/at-spi2-atk/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= at-spi2-atk -PKG_VERSION:= 2.15.3 -PKG_EXTRAVER:= 2.15 -PKG_RELEASE:= 2 -PKG_HASH:= eaef8fcf2775e35e1e054840940808775dfa9b71bcd7bda1dd6ecbdf5b1a9e18 +PKG_VERSION:= 2.38.0 +PKG_EXTRAVER:= 2.38 +PKG_RELEASE:= 1 +PKG_HASH:= cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f PKG_DESCR:= d-bus based accessibility framework PKG_SECTION:= libs/misc PKG_DEPENDS:= glib libxtst -PKG_BUILDDEP:= glib libXtst +PKG_BUILDDEP:= meson-host glib libXtst PKG_URL:= http://www.gnome.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=at-spi2-atk/$(PKG_EXTRAVER)/) PKG_OPTS:= dev @@ -20,6 +20,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AT_SPI2_ATK,at-spi2-atk,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + at-spi2-atk-install: $(INSTALL_DIR) $(IDIR_AT_SPI2_ATK)/usr/lib $(CP) $(WRKINST)/usr/lib/libat*.so* $(IDIR_AT_SPI2_ATK)/usr/lib diff --git a/package/at-spi2-core/Makefile b/package/at-spi2-core/Makefile index c6db623bf..29d2e40e9 100644 --- a/package/at-spi2-core/Makefile +++ b/package/at-spi2-core/Makefile @@ -4,14 +4,14 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= at-spi2-core -PKG_VERSION:= 2.15.3 -PKG_EXTRAVER:= 2.15 +PKG_VERSION:= 2.56.0 +PKG_EXTRAVER:= 2.56 PKG_RELEASE:= 1 -PKG_HASH:= bae426d13d4a1ae3a35c6dd444e7fdef2159fbc9170eb39b6ae3213a27042d92 +PKG_HASH:= 80d7e8ea0be924e045525367f909d6668dfdd3e87cd40792c6cfd08e6b58e95c PKG_DESCR:= d-bus based accessibility framework PKG_SECTION:= libs/misc PKG_DEPENDS:= glib libxtst -PKG_BUILDDEP:= glib libXtst libSM intltool-host +PKG_BUILDDEP:= meson-host glib libXtst libSM intltool-host PKG_NEEDS:= intl PKG_URL:= http://www.gnome.org/ PKG_SITES:= $(MASTER_SITE_GNOME:=at-spi2-core/$(PKG_EXTRAVER)/) @@ -21,6 +21,12 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,AT_SPI2_CORE,at-spi2-core,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + at-spi2-core-install: $(INSTALL_DIR) $(IDIR_AT_SPI2_CORE)/usr/lib $(CP) $(WRKINST)/usr/lib/libat*.so* $(IDIR_AT_SPI2_CORE)/usr/lib diff --git a/package/atk/Makefile b/package/atk/Makefile deleted file mode 100644 index ad6335f1b..000000000 --- a/package/atk/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# 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:= atk -PKG_VERSION:= 2.36.0 -PKG_EXTRAVER:= 2.36 -PKG_RELEASE:= 1 -PKG_HAS |