Skip to content

Commit 9ebd60e

Browse files
committed
Merge Official Source
Signed-off-by: Tianling Shen <[email protected]>
2 parents 37d0aaa + c6daef2 commit 9ebd60e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+445
-247
lines changed

lang/lua5.4/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=lua
11-
PKG_VERSION:=5.4.6
11+
PKG_VERSION:=5.4.7
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1515
PKG_SOURCE_URL:=https://www.lua.org/ftp/ \
1616
https://www.tecgraf.puc-rio.br/lua/ftp/
17-
PKG_HASH:=7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88
17+
PKG_HASH:=9fbf5e28ef86c69858f6d3d34eccc32e911c1a28b4120ff3e84aaa70cfbf1e30
1818
PKG_BUILD_PARALLEL:=1
1919

2020
PKG_MAINTAINER:=Christian Marangi <[email protected]>

lang/lua5.4/patches-host/001-include-version-number.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
3333

3434
# Lua version and release.
3535
V= 5.4
36-
@@ -52,7 +52,7 @@ R= $V.6
36+
@@ -52,7 +52,7 @@ R= $V.7
3737
all: $(PLAT)
3838

3939
$(PLATS) help test clean:

lang/lua5.4/patches/001-include-version-number.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Signed-off-by: Rafał Miłecki <[email protected]>
3333

3434
# Lua version and release.
3535
V= 5.4
36-
@@ -52,7 +52,7 @@ R= $V.6
36+
@@ -52,7 +52,7 @@ R= $V.7
3737
all: $(PLAT)
3838

3939
$(PLATS) help test clean:

lang/lua5.4/patches/020-shared_liblua.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
--- a/src/lundump.h
4545
+++ b/src/lundump.h
46-
@@ -30,7 +30,7 @@
46+
@@ -29,7 +29,7 @@
4747
LUAI_FUNC LClosure* luaU_undump (lua_State* L, ZIO* Z, const char* name);
4848

4949
/* dump one chunk; from ldump.c */

libs/libmbim/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=libmbim
11-
PKG_VERSION:=1.30.0
12-
PKG_RELEASE:=2
11+
PKG_VERSION:=1.32.0
12+
PKG_RELEASE:=1
1313

1414
PKG_SOURCE_PROTO:=git
1515
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libmbim.git
1616
PKG_SOURCE_VERSION:=$(PKG_VERSION)
17-
PKG_MIRROR_HASH:=0ff9212138eb68c2e33ad9220aa64df2e9a0da86f03dd02bf6d4cf02bcd95a68
17+
PKG_MIRROR_HASH:=75720195b8beb8bfaf75495dd54ef9b9674aa5152c749ae52ca426b315a5c191
1818

1919
PKG_BUILD_FLAGS:=gc-sections
2020

libs/libqmi/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=libqmi
11-
PKG_VERSION:=1.34.0
12-
PKG_RELEASE:=2
11+
PKG_VERSION:=1.36.0
12+
PKG_RELEASE:=1
1313

1414
PKG_SOURCE_PROTO:=git
1515
PKG_SOURCE_URL:=https://gitlab.freedesktop.org/mobile-broadband/libqmi.git
1616
PKG_SOURCE_VERSION:=$(PKG_VERSION)
17-
PKG_MIRROR_HASH:=65ee91b81c6f68d908cc94a0b5d670eefa29d550ecf8ef94cb836981fbfa4c2a
17+
PKG_MIRROR_HASH:=8745d3d116301a7197e95c924072170ba53a9ecf592217af4ba22ea79876ffab
1818

1919
PKG_BUILD_FLAGS:=gc-sections
2020

libs/libtorrent-rasterbar/Makefile

Lines changed: 55 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,90 @@
11
include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=libtorrent-rasterbar
4-
PKG_VERSION:=2.0.10
4+
PKG_VERSION:=2.0.11
55
PKG_RELEASE:=1
66

77
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
88
PKG_SOURCE_URL:=https://github.com/arvidn/libtorrent/releases/download/v$(PKG_VERSION)/
9-
PKG_HASH:=fc935b8c1daca5c0a4d304bff59e64e532be16bb877c012aea4bda73d9ca885d
9+
PKG_HASH:=f0db58580f4f29ade6cc40fa4ba80e2c9a70c90265cd77332d3cdec37ecf1e6d
1010

1111
PKG_MAINTAINER:=David Yang <[email protected]>
1212
PKG_LICENSE:=BSD-3-Clause
1313
PKG_LICENSE_FILES:=COPYING
1414

15+
PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_python3-libtorrent
16+
17+
CMAKE_INSTALL:=1
18+
PYTHON3_PKG_BUILD:=0
19+
PYTHON3_PKG_WHEEL_NAME:=libtorrent
20+
1521
include $(INCLUDE_DIR)/package.mk
1622
include $(INCLUDE_DIR)/cmake.mk
23+
include ../../lang/python/python3-package.mk
1724

1825
define Package/libtorrent-rasterbar/Default
19-
TITLE:=Rasterbar BitTorrent library
20-
URL:=https://libtorrent.org/
26+
TITLE:=Rasterbar BitTorrent library
27+
URL:=https://libtorrent.org/
2128
endef
2229

2330
define Package/libtorrent-rasterbar
24-
$(call Package/libtorrent-rasterbar/Default)
25-
SECTION:=libs
26-
CATEGORY:=Libraries
27-
DEPENDS:=+boost +boost-system +libopenssl +libatomic +libstdcpp
31+
$(call Package/libtorrent-rasterbar/Default)
32+
SECTION:=libs
33+
CATEGORY:=Libraries
34+
DEPENDS:=+boost-system +libopenssl +libatomic +libstdcpp
2835
endef
2936

30-
#define Package/python3-libtorrent
31-
# $(call Package/libtorrent-rasterbar/Default)
32-
# SECTION:=lang
33-
# CATEGORY:=Languages
34-
# SUBMENU:=Python
35-
# TITLE+= (Python 3)
36-
# DEPENDS:=+libtorrent-rasterbar +boost-python
37-
#endef
37+
define Package/python3-libtorrent
38+
$(call Package/libtorrent-rasterbar/Default)
39+
SECTION:=lang
40+
CATEGORY:=Languages
41+
SUBMENU:=Python
42+
TITLE+= (Python 3)
43+
DEPENDS:=+libtorrent-rasterbar +boost-python3
44+
endef
3845

3946
define Package/libtorrent-rasterbar/description
40-
Rasterbar libtorrent is a C++ library that aims to be a good alternative to
41-
all the other bittorrent implementations around.
47+
Rasterbar libtorrent is a C++ library that aims to be a good alternative to
48+
all the other bittorrent implementations around.
4249
endef
4350

44-
#define Package/python3-libtorrent/description
45-
# $(call Package/libtorrent-rasterbar/description)
46-
# This package contains Python 3 bindings for the libtorrent-rasterbar library.
47-
#endef
51+
define Package/python3-libtorrent/description
52+
$(call Package/libtorrent-rasterbar/description)
53+
This package contains Python 3 bindings for the libtorrent-rasterbar library.
54+
endef
4855

49-
#CMAKE_OPTIONS += \
50-
# -Dpython-bindings=ON \
51-
# -Dpython-egg-info=ON
56+
ifneq ($(CONFIG_PACKAGE_python3-libtorrent),)
57+
CMAKE_OPTIONS += \
58+
-Dpython-bindings=ON \
59+
-Dpython-egg-info=ON
60+
endif
5261

53-
define Build/InstallDev
54-
$(INSTALL_DIR) $(1)/usr/include
55-
$(CP) $(PKG_INSTALL_DIR)/usr/include/libtorrent $(1)/usr/include/
56-
$(INSTALL_DIR) $(1)/usr/lib
57-
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent-rasterbar.so* $(1)/usr/lib/
58-
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
59-
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libtorrent-rasterbar.pc $(1)/usr/lib/pkgconfig/
62+
define Build/Configure
63+
$(call Build/Configure/Default)
64+
ifneq ($(CONFIG_PACKAGE_python3-libtorrent),)
65+
$(call Py3Build/Configure)
66+
endif
67+
endef
68+
69+
define Build/Compile
70+
$(call Build/Compile/Default)
71+
ifneq ($(CONFIG_PACKAGE_python3-libtorrent),)
72+
$(call Py3Build/Compile)
73+
endif
74+
endef
75+
76+
define Build/Install
77+
$(call Build/Install/Default)
78+
ifneq ($(CONFIG_PACKAGE_python3-libtorrent),)
79+
$(call Py3Build/Install/Default)
80+
endif
6081
endef
6182

6283
define Package/libtorrent-rasterbar/install
6384
$(INSTALL_DIR) $(1)/usr/lib
6485
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtorrent-rasterbar.so.* $(1)/usr/lib/
6586
endef
6687

67-
#define Package/python3-libtorrent/install
68-
# $(INSTALL_DIR) $(1)/usr/lib/python2.7/site-packages
69-
# $(CP) $(PKG_INSTALL_DIR)/usr/lib/python2.7/site-packages/*.so* $(1)/usr/lib/python2.7/site-packages/
70-
#endef
71-
7288
$(eval $(call BuildPackage,libtorrent-rasterbar))
73-
#$(eval $(call BuildPackage,python3-libtorrent))
89+
$(eval $(call Py3Package,python3-libtorrent))
90+
$(eval $(call BuildPackage,python3-libtorrent))

libs/liburcu/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
include $(TOPDIR)/rules.mk
1010

1111
PKG_NAME:=liburcu
12-
PKG_VERSION:=0.15.1
12+
PKG_VERSION:=0.15.2
1313
PKG_RELEASE:=1
1414

1515
PKG_MAINTAINER:=Daniel Salzman <[email protected]>
@@ -18,7 +18,7 @@ PKG_LICENSE_FILES:=lgpl-2.1.txt gpl-2.0.txt lgpl-relicensing.txt
1818

1919
PKG_SOURCE:=userspace-rcu-$(PKG_VERSION).tar.bz2
2020
PKG_SOURCE_URL:=https://lttng.org/files/urcu/
21-
PKG_HASH:=98d66cc12f2c5881879b976f0c55d10d311401513be254e3bd28cf3811fb50c8
21+
PKG_HASH:=59f36f2b8bda1b7620a7eced2634f26c549444818a8313025a3bb09c0766a61d
2222
PKG_BUILD_DIR:=$(BUILD_DIR)/userspace-rcu-$(PKG_VERSION)
2323

2424
PKG_FIXUP:=autoreconf

libs/sqlite3/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
include $(TOPDIR)/rules.mk
99

1010
PKG_NAME:=sqlite
11-
PKG_VERSION:=3460100
11+
PKG_VERSION:=3470200
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz
1515
PKG_SOURCE_URL:=https://www.sqlite.org/2024/
16-
PKG_HASH:=67d3fe6d268e6eaddcae3727fce58fcc8e9c53869bdd07a0c61e38ddf2965071
16+
PKG_HASH:=f1b2ee412c28d7472bc95ba996368d6f0cdcf00362affdadb27ed286c179540b
1717

1818
PKG_CPE_ID:=cpe:/a:sqlite:sqlite
1919
PKG_LICENSE:=PUBLICDOMAIN

multimedia/yt-dlp/Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
include $(TOPDIR)/rules.mk
22

33
PKG_NAME:=yt-dlp
4-
PKG_VERSION:=2024.7.9
5-
PKG_RELEASE:=1
4+
PKG_VERSION:=2025.3.31
5+
PKG_RELEASE:=2
66

77
PYPI_NAME:=yt-dlp
8-
PKG_HASH:=e19f00f9e55e90bca1c94bcaf809aa33e51634be9f0de2df84a72d3206934f94
8+
PKG_HASH:=1bfe0e660d1a70a09e27b2d58f92e30b1e2e362cc487829f2f824346ae49fb91
99
PYPI_SOURCE_NAME:=yt_dlp
1010

11-
PKG_MAINTAINER:=Michal Vasilek <[email protected]>
11+
PKG_MAINTAINER:=George Sapkin <[email protected]>
1212
PKG_LICENSE:=Unlicense
1313
PKG_LICENSE_FILES:=LICENSE
14+
PKG_CPE_ID:=cpe:/a:yt-dlp_project:yt-dlp
1415

1516
PKG_BUILD_DEPENDS:=python-hatchling/host
1617

0 commit comments

Comments
 (0)