Skip to content

Commit

Permalink
Merge Official Source
Browse files Browse the repository at this point in the history
Signed-off-by: Tianling Shen <[email protected]>
  • Loading branch information
1715173329 committed Sep 19, 2024
2 parents 7fa34f8 + d5752d2 commit 9cb7ca7
Show file tree
Hide file tree
Showing 20 changed files with 151 additions and 838 deletions.
12 changes: 6 additions & 6 deletions libs/boost/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=boost
PKG_VERSION:=1.85.0
PKG_SOURCE_VERSION:=1_85_0
PKG_VERSION:=1.86.0
PKG_SOURCE_VERSION:=1_86_0
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)_$(PKG_SOURCE_VERSION).tar.bz2
PKG_SOURCE_URL:=@SF/$(PKG_NAME)/$(PKG_NAME)/$(PKG_VERSION) https://boostorg.jfrog.io/artifactory/main/release/$(PKG_VERSION)/source/
PKG_HASH:=7009fe1faa1697476bdc7027703a2badb84e849b7b0baad5086b087b971f8617
PKG_HASH:=1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b

PKG_MAINTAINER:=Carlos M. Ferreira <[email protected]>
PKG_LICENSE:=BSL-1.0
Expand All @@ -42,12 +42,12 @@ define Package/boost/Default
endef

define Package/boost/description
This package provides the Boost v1.85.0 libraries.
This package provides the Boost v1.86.0 libraries.
Boost is a set of free, peer-reviewed, portable C++ source libraries.

This package provides the following run-time libraries:
- atomic
- charconv (new)
- charconv
- chrono
- cobalt
- container
Expand Down Expand Up @@ -80,7 +80,7 @@ This package provides the following run-time libraries:
- wave

There are many more header-only libraries supported by Boost.
See more at http://www.boost.org/doc/libs/1_85_0/
See more at http://www.boost.org/doc/libs/1_86_0/
endef

PKG_BUILD_DEPENDS:=boost/host
Expand Down
8 changes: 4 additions & 4 deletions libs/glib2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=glib2
PKG_VERSION:=2.80.3
PKG_VERSION:=2.82.0
PKG_RELEASE:=1

PKG_SOURCE:=glib-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@GNOME/glib/$(basename $(PKG_VERSION))
PKG_HASH:=3947a0eaddd0f3613d0230bb246d0c69e46142c19022f5c4b1b2e3cba236d417
PKG_HASH:=f4c82ada51366bddace49d7ba54b33b4e4d6067afa3008e4847f41cb9b5c38d3

PKG_MAINTAINER:=Peter Wagner <[email protected]>
PKG_LICENSE:=LGPL-2.1-or-later
Expand Down Expand Up @@ -68,8 +68,8 @@ COMP_ARGS+=-Dintrospection=disabled
# set runtime dir to /var/run
COMP_ARGS+=-Druntime_dir=/var/run

MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Ddefault_library=static -Dnls=disabled
MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Ddefault_library=both -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled
MESON_HOST_ARGS += $(COMP_ARGS) -Dxattr=false -Dnls=disabled
MESON_ARGS += $(COMP_ARGS) -Dxattr=true -Db_lto=true -Dnls=$(if $(CONFIG_BUILD_NLS),en,dis)abled

define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/bin
Expand Down
2 changes: 1 addition & 1 deletion libs/glib2/patches/006-c99.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/meson.build
+++ b/meson.build
@@ -1160,7 +1160,7 @@ if host_system == 'windows' and (cc.get_
@@ -1189,7 +1189,7 @@ if host_system == 'windows' and (cc.get_
glib_conf.set('HAVE_C99_SNPRINTF', false)
glib_conf.set('HAVE_C99_VSNPRINTF', false)
glib_conf.set('HAVE_UNIX98_PRINTF', false)
Expand Down
Loading

0 comments on commit 9cb7ca7

Please sign in to comment.