Merge branch 'openwrt:master' into master
This commit is contained in:
GitHub
commit
4a059a1f16
53 changed files with 553 additions and 693 deletions
|
|
@ -11,7 +11,7 @@ include perlver.mk
|
|||
|
||||
PKG_NAME:=perl
|
||||
PKG_VERSION:=$(PERL_VERSION)
|
||||
PKG_RELEASE:=8
|
||||
PKG_RELEASE:=9
|
||||
|
||||
PKG_SOURCE_URL:=\
|
||||
https://cpan.metacpan.org/src/5.0 \
|
||||
|
|
|
|||
|
|
@ -209,7 +209,7 @@ endef
|
|||
|
||||
define Package/perlbase-bignum/install
|
||||
$(call perlmod/Install,$(1),bignum.pm bigrat.pm,)
|
||||
$(call perlmod/InstallBaseTests,$(1),dist/bignum/t)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/bignum/t)
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,perlbase-bignum))
|
||||
|
|
@ -306,7 +306,7 @@ endef
|
|||
define Package/perlbase-cpan/install
|
||||
$(call perlmod/Install,$(1),CPAN CPAN.pm Parse/CPAN/Meta.pm,CPAN/FirstTime.pm)
|
||||
$(call perlmod/Install/NoStrip,$(1),CPAN/FirstTime.pm,)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/CPAN-Meta-Requirements/t cpan/CPAN-Meta-YAML/t cpan/CPAN-Meta/t cpan/CPAN/t cpan/Parse-CPAN-Meta/t)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/CPAN-Meta-Requirements/t cpan/CPAN-Meta-YAML/t cpan/CPAN-Meta/t cpan/CPAN/t)
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,perlbase-cpan))
|
||||
|
|
@ -390,7 +390,7 @@ endef
|
|||
define Package/perlbase-devel/install
|
||||
$(call perlmod/Install,$(1),Devel auto/Devel,Devel/PPPort.pm)
|
||||
$(call perlmod/Install/NoStrip,$(1),Devel/PPPort.pm,)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/Devel-PPPort/t dist/Devel-SelfStubber/t ext/Devel-Peek/t)
|
||||
$(call perlmod/InstallBaseTests,$(1),dist/Devel-PPPort/t dist/Devel-SelfStubber/t ext/Devel-Peek/t)
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,perlbase-devel))
|
||||
|
|
@ -502,7 +502,7 @@ endef
|
|||
|
||||
define Package/perlbase-encoding/install
|
||||
$(call perlmod/Install,$(1),encoding encoding.pm,)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/encoding-warnings/t)
|
||||
$(call perlmod/InstallBaseTests,$(1),dist/encoding-warnings/t)
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,perlbase-encoding))
|
||||
|
|
@ -588,7 +588,7 @@ endef
|
|||
define Package/perlbase-extutils/install
|
||||
$(call perlmod/Install,$(1),ExtUtils,ExtUtils/MakeMaker/FAQ.pod ExtUtils/MakeMaker/Tutorial.pod ExtUtils/ParseXS.pm ExtUtils/ParseXS/Utilities.pm)
|
||||
$(call perlmod/Install/NoStrip,$(1),ExtUtils/ParseXS.pm ExtUtils/ParseXS/Utilities.pm,)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/ExtUtils-Command/t cpan/ExtUtils-Constant/t cpan/ExtUtils-Install/t cpan/ExtUtils-MakeMaker/t cpan/ExtUtils-Manifest/t dist/ExtUtils-CBuilder/t dist/ExtUtils-ParseXS/t lib/ExtUtils/t lib/h2ph.t lib/h2xs.t utils/h2ph utils/h2xs)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/ExtUtils-Constant/t cpan/ExtUtils-Install/t cpan/ExtUtils-MakeMaker/t cpan/ExtUtils-Manifest/t dist/ExtUtils-CBuilder/t dist/ExtUtils-ParseXS/t lib/ExtUtils/t lib/h2ph.t lib/h2xs.t utils/h2ph utils/h2xs)
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,perlbase-extutils))
|
||||
|
|
@ -919,7 +919,7 @@ endef
|
|||
|
||||
define Package/perlbase-math/install
|
||||
$(call perlmod/Install,$(1),Math auto/Math,)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/Math-Complex/t dist/Math-BigInt-FastCalc/t dist/Math-BigInt/t dist/Math-BigRat/t)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/Math-Complex/t cpan/Math-BigInt-FastCalc/t cpan/Math-BigInt/t cpan/Math-BigRat/t)
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,perlbase-math))
|
||||
|
|
@ -1384,7 +1384,7 @@ endef
|
|||
define Package/perlbase-test/install
|
||||
$(call perlmod/Install,$(1),Test Test.pm ok.pm,Test/Builder.pm Test/Harness/TAP.pod Test/More.pm Test/Tutorial.pod)
|
||||
$(call perlmod/Install/NoStrip,$(1),Test/Builder.pm Test/More.pm,)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/Test-Harness/t cpan/Test-Simple/t cpan/Test/t)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/Test-Harness/t cpan/Test-Simple/t dist/Test/t)
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/prove $(1)/usr/bin
|
||||
endef
|
||||
|
|
@ -1456,7 +1456,7 @@ endef
|
|||
|
||||
define Package/perlbase-time/install
|
||||
$(call perlmod/Install,$(1),Time auto/Time,)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/Time-HiRes/t cpan/Time-Local/t cpan/Time-Piece/t lib/Time/gmtime.t lib/Time/localtime.t)
|
||||
$(call perlmod/InstallBaseTests,$(1),dist/Time-HiRes/t cpan/Time-Local/t cpan/Time-Piece/t lib/Time/gmtime.t lib/Time/localtime.t)
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,perlbase-time))
|
||||
|
|
@ -1470,7 +1470,7 @@ endef
|
|||
|
||||
define Package/perlbase-unicode/install
|
||||
$(call perlmod/Install,$(1),Unicode auto/Unicode,)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/Unicode-Collate/t cpan/Unicode-Normalize/t lib/Unicode/UCD.t)
|
||||
$(call perlmod/InstallBaseTests,$(1),cpan/Unicode-Collate/t dist/Unicode-Normalize/t lib/Unicode/UCD.t)
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,perlbase-unicode))
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-flit-core
|
||||
PKG_VERSION:=3.8.0
|
||||
PKG_VERSION:=3.9.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=flit-core
|
||||
PYPI_SOURCE_NAME:=flit_core
|
||||
PKG_HASH:=b305b30c99526df5e63d6022dd2310a0a941a187bd3884f4c8ef0418df6c39f3
|
||||
PKG_HASH:=72ad266176c4a3fcfab5f2930d76896059851240570ce9a98733b658cb786eba
|
||||
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=python-poetry-core
|
||||
PKG_VERSION:=1.5.2
|
||||
PKG_VERSION:=1.6.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=poetry-core
|
||||
PYPI_SOURCE_NAME:=poetry_core
|
||||
PKG_HASH:=c6556c3b1ec5b8668e6ef5a4494726bc41d31907339425e194e78a6178436c14
|
||||
PKG_HASH:=a9c7296a12d6c8e4f8aa50a66ef3c967b2b50fba634da144d358e676fad9989f
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
|
|
|
|||
|
|
@ -7,13 +7,13 @@
|
|||
|
||||
# Note: keep in sync with setuptools & pip
|
||||
PYTHON3_VERSION_MAJOR:=3
|
||||
PYTHON3_VERSION_MINOR:=10
|
||||
PYTHON3_VERSION_MICRO:=7
|
||||
PYTHON3_VERSION_MINOR:=11
|
||||
PYTHON3_VERSION_MICRO:=3
|
||||
|
||||
PYTHON3_VERSION:=$(PYTHON3_VERSION_MAJOR).$(PYTHON3_VERSION_MINOR)
|
||||
|
||||
PYTHON3_SETUPTOOLS_PKG_RELEASE:=1
|
||||
PYTHON3_PIP_PKG_RELEASE:=1
|
||||
|
||||
PYTHON3_SETUPTOOLS_VERSION:=63.2.0
|
||||
PYTHON3_PIP_VERSION:=22.2.2
|
||||
PYTHON3_SETUPTOOLS_VERSION:=65.5.0
|
||||
PYTHON3_PIP_VERSION:=22.3.1
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@ include $(TOPDIR)/rules.mk
|
|||
include ../python3-version.mk
|
||||
|
||||
PKG_NAME:=python3
|
||||
PKG_RELEASE:=4
|
||||
PKG_RELEASE:=1
|
||||
PKG_VERSION:=$(PYTHON3_VERSION).$(PYTHON3_VERSION_MICRO)
|
||||
|
||||
PKG_SOURCE:=Python-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://www.python.org/ftp/python/$(PKG_VERSION)
|
||||
PKG_HASH:=6eed8415b7516fb2f260906db5d48dd4c06acc0cb24a7d6cc15296a604dcdc48
|
||||
PKG_HASH:=8a5db99c961a7ecf27c75956189c9602c968751f11dbeae2b900dbff1c085b5e
|
||||
|
||||
PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
|
||||
PKG_LICENSE:=PSF-2.0
|
||||
|
|
@ -71,7 +71,7 @@ endef
|
|||
define Package/libpython3
|
||||
$(call Package/python3/Default)
|
||||
TITLE:=Python $(PYTHON3_VERSION) core library
|
||||
DEPENDS:=+libpthread +zlib
|
||||
DEPENDS:=+libpthread
|
||||
ABI_VERSION:=$(PYTHON3_VERSION)
|
||||
endef
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ endef
|
|||
define Package/python3-base
|
||||
$(call Package/python3/Default)
|
||||
TITLE:=Python $(PYTHON3_VERSION) interpreter
|
||||
DEPENDS:=+libpthread +zlib +libpython3
|
||||
DEPENDS:=+libpython3
|
||||
endef
|
||||
|
||||
define Package/python3-base/description
|
||||
|
|
@ -93,7 +93,7 @@ endef
|
|||
define Package/python3-light
|
||||
$(call Package/python3/Default)
|
||||
TITLE:=Python $(PYTHON3_VERSION) light installation
|
||||
DEPENDS:=+python3-base +libffi +libbz2
|
||||
DEPENDS:=+python3-base +libbz2 +zlib
|
||||
endef
|
||||
|
||||
define Package/python3-light/config
|
||||
|
|
@ -138,10 +138,32 @@ define Package/python3/description
|
|||
It's python3-light + all other packages.
|
||||
endef
|
||||
|
||||
# Set READELF here so that the exact same readelf program name can be
|
||||
# replaced in _sysconfigdata.py (in Py3Package/python3-base/install)
|
||||
TARGET_CONFIGURE_OPTS+= \
|
||||
READELF="$(TARGET_CROSS)readelf"
|
||||
|
||||
EXTRA_LDFLAGS+= \
|
||||
-L$(PKG_BUILD_DIR) \
|
||||
-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib
|
||||
|
||||
# Bypass configure tests for cross compilation
|
||||
CONFIGURE_VARS += \
|
||||
ac_cv_buggy_getaddrinfo=no \
|
||||
ac_cv_file__dev_ptc=no \
|
||||
ac_cv_file__dev_ptmx=yes
|
||||
|
||||
# Do not link with libbsd for flock
|
||||
# https://github.com/openwrt/packages/issues/21161
|
||||
CONFIGURE_VARS += \
|
||||
ac_cv_lib_bsd_flock=no
|
||||
|
||||
# Disable stdlib modules
|
||||
# Check for a better way in the future: https://github.com/python/cpython/issues/98558
|
||||
CONFIGURE_VARS += \
|
||||
py_cv_module__tkinter=n/a \
|
||||
py_cv_module_nis=n/a
|
||||
|
||||
# Workaround for hardfloat mips
|
||||
# https://bugs.python.org/issue46265
|
||||
ifneq ($(findstring mips,$(CONFIG_ARCH)),)
|
||||
|
|
@ -154,23 +176,16 @@ endif
|
|||
MAKE_VARS += \
|
||||
PYTHONSTRICTEXTENSIONBUILD=1
|
||||
|
||||
CONFIGURE_ARGS+= \
|
||||
CONFIGURE_ARGS += \
|
||||
--enable-optimizations \
|
||||
--enable-shared \
|
||||
--disable-test-modules \
|
||||
--with-build-python \
|
||||
--with-system-ffi \
|
||||
--without-cxx-main \
|
||||
--without-ensurepip \
|
||||
--without-pymalloc \
|
||||
--disable-test-modules \
|
||||
$(if $(CONFIG_IPV6),--enable-ipv6) \
|
||||
$(if $(findstring mips,$(CONFIG_ARCH)),,--with-lto) \
|
||||
CONFIG_SITE="$(PKG_BUILD_DIR)/config.site" \
|
||||
OPT="$(TARGET_CFLAGS)"
|
||||
|
||||
define Build/Prepare
|
||||
$(call Build/Prepare/Default)
|
||||
$(CP) ./files/config.site $(PKG_BUILD_DIR)/config.site
|
||||
endef
|
||||
$(if $(findstring mips,$(CONFIG_ARCH)),,--with-lto)
|
||||
|
||||
ifdef CONFIG_PACKAGE_python3-setuptools
|
||||
PYTHON3_SETUPTOOLS_BUILD:=1
|
||||
|
|
@ -310,6 +325,13 @@ define Py3Package/python3/filespec
|
|||
-|$(PYTHON3_PKG_DIR)
|
||||
endef
|
||||
|
||||
# libuuid is provided by e2fsprogs and uuid/uuid.h is moved into
|
||||
# $(STAGING_DIR_HOST)/include/e2fsprogs
|
||||
HOST_CFLAGS += \
|
||||
-I$(STAGING_DIR_HOST)/include/e2fsprogs
|
||||
HOST_CPPFLAGS += \
|
||||
-I$(STAGING_DIR_HOST)/include/e2fsprogs
|
||||
|
||||
HOST_LDFLAGS += \
|
||||
-Wl$(comma)-rpath$(comma)$(STAGING_DIR_HOSTPKG)/lib
|
||||
|
||||
|
|
@ -322,6 +344,10 @@ endif
|
|||
# HOST_MAKE_VARS += \
|
||||
# PYTHONSTRICTEXTENSIONBUILD=1
|
||||
|
||||
# Bypass configure test
|
||||
HOST_CONFIGURE_VARS += \
|
||||
ac_cv_working_openssl_hashlib=yes
|
||||
|
||||
ifeq ($(HOST_OS),Darwin)
|
||||
HOST_CONFIGURE_VARS += \
|
||||
ac_cv_header_libintl_h=no
|
||||
|
|
@ -329,26 +355,19 @@ HOST_MAKE_VARS += \
|
|||
USE_PYTHON_CONFIG_PY=1
|
||||
endif
|
||||
|
||||
HOST_CONFIGURE_ARGS+= \
|
||||
HOST_CONFIGURE_ARGS += \
|
||||
--enable-optimizations \
|
||||
--with-ensurepip=upgrade \
|
||||
--with-system-expat=$(STAGING_DIR_HOST) \
|
||||
--with-ssl-default-suites=openssl \
|
||||
--without-cxx-main \
|
||||
--without-pymalloc \
|
||||
--disable-test-modules \
|
||||
CONFIG_SITE=
|
||||
--with-ensurepip=upgrade \
|
||||
--with-ssl-default-suites=openssl \
|
||||
--with-system-expat \
|
||||
--without-cxx-main
|
||||
|
||||
define Host/Configure
|
||||
$(SED) 's/^ENABLE_USER_SITE = None$$$$/ENABLE_USER_SITE = False/' $(HOST_BUILD_DIR)/Lib/site.py
|
||||
$(call Host/Configure/Default)
|
||||
endef
|
||||
|
||||
define Host/Compile
|
||||
$(call Host/Compile/Default,python)
|
||||
$(call Host/Compile/Default,sharedmods)
|
||||
endef
|
||||
|
||||
define Host/Install
|
||||
$(if $(wildcard $(HOST_PYTHON3_PKG_DIR)/.setuptools_installed_$(PYTHON3_SETUPTOOLS_VERSION)-$(PYTHON3_SETUPTOOLS_PKG_RELEASE)),,
|
||||
rm -rf \
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
#! /bin/sh
|
||||
#
|
||||
# Copyright (C) 2007-2014 OpenWrt.org
|
||||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
# See /LICENSE for more information.
|
||||
#
|
||||
|
||||
ac_cv_file__dev_ptmx=yes
|
||||
ac_cv_file__dev_ptc=no
|
||||
ac_cv_buggy_getaddrinfo=no
|
||||
ac_cv_header_uuid_h=yes
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
define Package/python3-ctypes
|
||||
$(call Package/python3/Default)
|
||||
TITLE:=Python $(PYTHON3_VERSION) ctypes module
|
||||
DEPENDS:=+python3-light
|
||||
DEPENDS:=+python3-light +libffi
|
||||
endef
|
||||
|
||||
$(eval $(call Py3BasePackage,python3-ctypes, \
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
define Package/python3-readline
|
||||
$(call Package/python3/Default)
|
||||
TITLE:=Python $(PYTHON3_VERSION) readline module
|
||||
DEPENDS:=+python3-light +libreadline +libncursesw
|
||||
DEPENDS:=+python3-light +libreadline
|
||||
endef
|
||||
|
||||
$(eval $(call Py3BasePackage,python3-readline, \
|
||||
|
|
|
|||
|
|
@ -1,16 +1,25 @@
|
|||
diff --git a/pip/_vendor/pep517/in_process/__init__.py b/pip/_vendor/pep517/in_process/__init__.py
|
||||
index c932313..a01143b 100644
|
||||
index 281a356cfe26..77acbfc2670b 100644
|
||||
--- a/pip/_vendor/pep517/in_process/__init__.py
|
||||
+++ b/pip/_vendor/pep517/in_process/__init__.py
|
||||
@@ -10,8 +10,13 @@ try:
|
||||
import importlib.resources as resources
|
||||
|
||||
def _in_proc_script_path():
|
||||
- return resources.path(__package__, '_in_process.py')
|
||||
+ if resources.is_resource(__package__, '_in_process.py'):
|
||||
+ return resources.path(__package__, '_in_process.py')
|
||||
+ return resources.path(__package__, '_in_process.pyc')
|
||||
@@ -14,13 +14,21 @@ try:
|
||||
except AttributeError:
|
||||
# Python 3.8 compatibility
|
||||
def _in_proc_script_path():
|
||||
- return resources.path(__package__, '_in_process.py')
|
||||
+ if resources.is_resource(__package__, '_in_process.py'):
|
||||
+ return resources.path(__package__, '_in_process.py')
|
||||
+ return resources.path(__package__, '_in_process.pyc')
|
||||
else:
|
||||
def _in_proc_script_path():
|
||||
+ if resources.files(__package__).joinpath('_in_process.py').is_file():
|
||||
+ return resources.as_file(
|
||||
+ resources.files(__package__).joinpath('_in_process.py'))
|
||||
return resources.as_file(
|
||||
- resources.files(__package__).joinpath('_in_process.py'))
|
||||
+ resources.files(__package__).joinpath('_in_process.pyc'))
|
||||
except ImportError:
|
||||
# Python 3.6 compatibility
|
||||
@contextmanager
|
||||
def _in_proc_script_path():
|
||||
- yield pjoin(dirname(abspath(__file__)), '_in_process.py')
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- a/Modules/Setup
|
||||
+++ b/Modules/Setup
|
||||
@@ -343,7 +343,7 @@ _symtable symtablemodule.c
|
||||
# Andrew Kuchling's zlib module.
|
||||
# This require zlib 1.1.3 (or later).
|
||||
# See http://www.gzip.org/zlib/
|
||||
-#zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
|
||||
+zlib zlibmodule.c -lz
|
||||
|
||||
# Interface to the Expat XML parser
|
||||
# More information on Expat can be found at www.libexpat.org.
|
||||
18
lang/python/python3/patches/003-do-not-run-compileall.patch
Normal file
18
lang/python/python3/patches/003-do-not-run-compileall.patch
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -2084,6 +2084,7 @@ libinstall: all $(srcdir)/Modules/xxmodu
|
||||
$(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \
|
||||
$(DESTDIR)$(LIBDEST)/distutils/tests ; \
|
||||
fi
|
||||
+ifeq (1,)
|
||||
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
$(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
|
||||
-j0 -d $(LIBDEST) -f \
|
||||
@@ -2111,6 +2112,7 @@ libinstall: all $(srcdir)/Modules/xxmodu
|
||||
$(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \
|
||||
-j0 -d $(LIBDEST)/site-packages -f \
|
||||
-x badsyntax $(DESTDIR)$(LIBDEST)/site-packages
|
||||
+endif
|
||||
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
$(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt
|
||||
-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Python/initconfig.c
|
||||
+++ b/Python/initconfig.c
|
||||
@@ -163,7 +163,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo
|
||||
@@ -198,7 +198,7 @@ int Py_NoSiteFlag = 0; /* Suppress 'impo
|
||||
int Py_BytesWarningFlag = 0; /* Warn on str(bytes) and str(buffer) */
|
||||
int Py_FrozenFlag = 0; /* Needed by getpath.c */
|
||||
int Py_IgnoreEnvironmentFlag = 0; /* e.g. PYTHONPATH, PYTHONHOME */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -843,16 +843,9 @@ class PyBuildExt(build_ext):
|
||||
add_dir_to_list(dir_list, directory)
|
||||
|
||||
def configure_compiler(self):
|
||||
- # Ensure that /usr/local is always used, but the local build
|
||||
- # directories (i.e. '.' and 'Include') must be first. See issue
|
||||
- # 10520.
|
||||
- if not CROSS_COMPILING:
|
||||
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
||||
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
||||
# only change this for cross builds for 3.3, issues on Mageia
|
||||
if CROSS_COMPILING:
|
||||
self.add_cross_compiling_paths()
|
||||
- self.add_multiarch_paths()
|
||||
self.add_ldflags_cppflags()
|
||||
|
||||
def init_inc_lib_dirs(self):
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
--- a/setup.py
|
||||
+++ b/setup.py
|
||||
@@ -831,7 +831,8 @@ class PyBuildExt(build_ext):
|
||||
# only change this for cross builds for 3.3, issues on Mageia
|
||||
if CROSS_COMPILING:
|
||||
self.add_cross_compiling_paths()
|
||||
- self.add_multiarch_paths()
|
||||
+ else:
|
||||
+ self.add_multiarch_paths()
|
||||
self.add_ldflags_cppflags()
|
||||
|
||||
def init_inc_lib_dirs(self):
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
--- a/Lib/distutils/command/build_scripts.py
|
||||
+++ b/Lib/distutils/command/build_scripts.py
|
||||
@@ -91,6 +91,7 @@ class build_scripts(Command):
|
||||
adjust = True
|
||||
post_interp = match.group(1) or b''
|
||||
|
||||
+ adjust = 0
|
||||
if adjust:
|
||||
log.info("copying and adjusting %s -> %s", script,
|
||||
self.build_dir)
|
||||
|
|
@ -36,7 +36,7 @@ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
|||
self.library_dirs.append('.')
|
||||
--- a/Lib/sysconfig.py
|
||||
+++ b/Lib/sysconfig.py
|
||||
@@ -123,10 +123,17 @@ _SCHEME_KEYS = ('stdlib', 'platstdlib',
|
||||
@@ -168,10 +168,17 @@ _SCHEME_KEYS = ('stdlib', 'platstdlib',
|
||||
_PY_VERSION = sys.version.split()[0]
|
||||
_PY_VERSION_SHORT = f'{sys.version_info[0]}.{sys.version_info[1]}'
|
||||
_PY_VERSION_SHORT_NO_DOT = f'{sys.version_info[0]}{sys.version_info[1]}'
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -15616,7 +15616,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
|
||||
@@ -20712,7 +20712,7 @@ $as_echo_n "checking ABIFLAGS... " >&6;
|
||||
$as_echo "$ABIFLAGS" >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking SOABI" >&5
|
||||
$as_echo_n "checking SOABI... " >&6; }
|
||||
|
|
@ -11,7 +11,7 @@
|
|||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -4824,7 +4824,7 @@ AC_SUBST(SOABI)
|
||||
@@ -5684,7 +5684,7 @@ AC_SUBST(SOABI)
|
||||
AC_MSG_CHECKING(ABIFLAGS)
|
||||
AC_MSG_RESULT($ABIFLAGS)
|
||||
AC_MSG_CHECKING(SOABI)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Lib/sysconfig.py
|
||||
+++ b/Lib/sysconfig.py
|
||||
@@ -407,6 +407,7 @@ def get_makefile_filename():
|
||||
@@ -461,6 +461,7 @@ def get_makefile_filename():
|
||||
|
||||
|
||||
def _get_sysconfigdata_name():
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
'_PYTHON_SYSCONFIGDATA_NAME',
|
||||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1593,7 +1593,7 @@ libinstall: build_all $(srcdir)/Modules/
|
||||
@@ -2077,7 +2077,7 @@ libinstall: all $(srcdir)/Modules/xxmodu
|
||||
esac; \
|
||||
done; \
|
||||
done
|
||||
|
|
@ -19,7 +19,7 @@
|
|||
$(DESTDIR)$(LIBDEST); \
|
||||
$(INSTALL_DATA) $(srcdir)/LICENSE $(DESTDIR)$(LIBDEST)/LICENSE.txt
|
||||
if test -d $(DESTDIR)$(LIBDEST)/distutils/tests; then \
|
||||
@@ -1751,7 +1751,7 @@ sharedinstall: sharedmods
|
||||
@@ -2239,7 +2239,7 @@ sharedinstall: all
|
||||
--install-scripts=$(BINDIR) \
|
||||
--install-platlib=$(DESTSHARED) \
|
||||
--root=$(DESTDIR)/
|
||||
|
|
@ -30,16 +30,16 @@
|
|||
# Here are a couple of targets for MacOSX again, to install a full
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -3019,7 +3019,7 @@ $as_echo_n "checking for python interpre
|
||||
fi
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $interp" >&5
|
||||
$as_echo "$interp" >&6; }
|
||||
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
|
||||
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$interp
|
||||
@@ -3262,7 +3262,7 @@ fi
|
||||
fi
|
||||
elif test "$cross_compiling" = maybe; then
|
||||
as_fn_error $? "Cross compiling required --host=HOST-TUPLE and --build=ARCH" "$LINENO" 5
|
||||
@@ -15686,7 +15686,7 @@ fi
|
||||
ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python
|
||||
PYTHON_FOR_FREEZE="$with_build_python"
|
||||
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python
|
||||
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$with_build_python
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_build_python" >&5
|
||||
$as_echo "$with_build_python" >&6; }
|
||||
|
||||
@@ -20782,7 +20782,7 @@ fi
|
||||
|
||||
|
||||
|
||||
|
|
@ -50,16 +50,16 @@
|
|||
LIBPL='$(prefix)'"/${PLATLIBDIR}/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}"
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -82,7 +82,7 @@ if test "$cross_compiling" = yes; then
|
||||
AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found])
|
||||
fi
|
||||
AC_MSG_RESULT($interp)
|
||||
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$interp
|
||||
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$interp
|
||||
fi
|
||||
elif test "$cross_compiling" = maybe; then
|
||||
AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH])
|
||||
@@ -4882,7 +4882,7 @@ fi],
|
||||
@@ -162,7 +162,7 @@ AC_ARG_WITH(
|
||||
dnl Build Python interpreter is used for regeneration and freezing.
|
||||
ac_cv_prog_PYTHON_FOR_REGEN=$with_build_python
|
||||
PYTHON_FOR_FREEZE="$with_build_python"
|
||||
- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_$(ABIFLAGS)_$(MACHDEP)_$(MULTIARCH) '$with_build_python
|
||||
+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata '$with_build_python
|
||||
AC_MSG_RESULT([$with_build_python])
|
||||
], [
|
||||
AS_VAR_IF([cross_compiling], [yes],
|
||||
@@ -5742,7 +5742,7 @@ fi],
|
||||
|
||||
dnl define LIBPL after ABIFLAGS and LDVERSION is defined.
|
||||
AC_SUBST(PY_ENABLE_SHARED)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1643,7 +1643,7 @@ python-config: $(srcdir)/Misc/python-con
|
||||
@@ -2129,7 +2129,7 @@ python-config: $(srcdir)/Misc/python-con
|
||||
@ # On Darwin, always use the python version of the script, the shell
|
||||
@ # version doesn't use the compiler customizations that are provided
|
||||
@ # in python (_osx_support.py).
|
||||
|
|
|
|||
65
lang/python/python3/patches/026-openssl-feature-flags.patch
Normal file
65
lang/python/python3/patches/026-openssl-feature-flags.patch
Normal file
|
|
@ -0,0 +1,65 @@
|
|||
--- a/Modules/_hashopenssl.c
|
||||
+++ b/Modules/_hashopenssl.c
|
||||
@@ -45,10 +45,18 @@
|
||||
|
||||
#define MUNCH_SIZE INT_MAX
|
||||
|
||||
+#ifdef NID_id_scrypt
|
||||
#define PY_OPENSSL_HAS_SCRYPT 1
|
||||
+#endif
|
||||
+#ifdef NID_sha3_256
|
||||
#define PY_OPENSSL_HAS_SHA3 1
|
||||
+#endif
|
||||
+#ifdef NID_shake256
|
||||
#define PY_OPENSSL_HAS_SHAKE 1
|
||||
+#endif
|
||||
+#ifdef NID_blake2s256
|
||||
#define PY_OPENSSL_HAS_BLAKE2 1
|
||||
+#endif
|
||||
|
||||
#if OPENSSL_VERSION_NUMBER >= 0x30000000L
|
||||
#define PY_EVP_MD EVP_MD
|
||||
@@ -120,19 +128,27 @@ static const py_hashentry_t py_hashes[]
|
||||
PY_HASH_ENTRY(Py_hash_sha384, "SHA384", SN_sha384, NID_sha384),
|
||||
PY_HASH_ENTRY(Py_hash_sha512, "SHA512", SN_sha512, NID_sha512),
|
||||
/* truncated sha2 */
|
||||
+#ifdef NID_sha512_256
|
||||
PY_HASH_ENTRY(Py_hash_sha512_224, "SHA512_224", SN_sha512_224, NID_sha512_224),
|
||||
PY_HASH_ENTRY(Py_hash_sha512_256, "SHA512_256", SN_sha512_256, NID_sha512_256),
|
||||
+#endif
|
||||
/* sha3 */
|
||||
+#ifdef PY_OPENSSL_HAS_SHA3
|
||||
PY_HASH_ENTRY(Py_hash_sha3_224, NULL, SN_sha3_224, NID_sha3_224),
|
||||
PY_HASH_ENTRY(Py_hash_sha3_256, NULL, SN_sha3_256, NID_sha3_256),
|
||||
PY_HASH_ENTRY(Py_hash_sha3_384, NULL, SN_sha3_384, NID_sha3_384),
|
||||
PY_HASH_ENTRY(Py_hash_sha3_512, NULL, SN_sha3_512, NID_sha3_512),
|
||||
+#endif
|
||||
/* sha3 shake */
|
||||
+#ifdef PY_OPENSSL_HAS_SHAKE
|
||||
PY_HASH_ENTRY(Py_hash_shake_128, NULL, SN_shake128, NID_shake128),
|
||||
PY_HASH_ENTRY(Py_hash_shake_256, NULL, SN_shake256, NID_shake256),
|
||||
+#endif
|
||||
/* blake2 digest */
|
||||
+#ifdef PY_OPENSSL_HAS_BLAKE2
|
||||
PY_HASH_ENTRY(Py_hash_blake2s, "blake2s256", SN_blake2s256, NID_blake2s256),
|
||||
PY_HASH_ENTRY(Py_hash_blake2b, "blake2b512", SN_blake2b512, NID_blake2b512),
|
||||
+#endif
|
||||
PY_HASH_ENTRY(NULL, NULL, NULL, 0),
|
||||
};
|
||||
|
||||
@@ -873,11 +889,15 @@ py_evp_fromname(PyObject *module, const
|
||||
goto exit;
|
||||
}
|
||||
|
||||
+#ifndef EVP_MD_FLAG_XOF
|
||||
+ type = get_hashlib_state(module)->EVPtype;
|
||||
+#else
|
||||
if ((EVP_MD_flags(digest) & EVP_MD_FLAG_XOF) == EVP_MD_FLAG_XOF) {
|
||||
type = get_hashlib_state(module)->EVPXOFtype;
|
||||
} else {
|
||||
type = get_hashlib_state(module)->EVPtype;
|
||||
}
|
||||
+#endif
|
||||
|
||||
self = newEVPobject(type);
|
||||
if (self == NULL) {
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
--- a/Makefile.pre.in
|
||||
+++ b/Makefile.pre.in
|
||||
@@ -1839,7 +1839,7 @@ altbininstall: $(BUILDPYTHON) @FRAMEWORK
|
||||
$(DESTDIR)$(BINDIR)/python$(VERSION)$(EXE); \
|
||||
fi
|
||||
|
||||
-bininstall: altbininstall
|
||||
+bininstall: commoninstall altbininstall
|
||||
if test ! -d $(DESTDIR)$(LIBPC); then \
|
||||
echo "Creating directory $(LIBPC)"; \
|
||||
$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \
|
||||
|
|
@ -1,75 +0,0 @@
|
|||
From 3f79de7b8411c76a1fcd1ca850ea62500be7a881 Mon Sep 17 00:00:00 2001
|
||||
From: Natanael Copa <ncopa@alpinelinux.org>
|
||||
Date: Sat, 29 Jan 2022 00:02:54 +0100
|
||||
Subject: [PATCH 1/2] bpo-43112: detect musl as a separate SOABI (GH-24502)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
musl libc and gnu libc are not ABI compatible so we need set different
|
||||
SOABI for musl and not simply assume that all linux is linux-gnu.
|
||||
|
||||
Replace linux-gnu with the detected os for the build from config.guess
|
||||
for linux-musl*.
|
||||
|
||||
(cherry picked from commit 1f036ede59e2c4befc07714cf76603c591d5c972)
|
||||
Signed-off-by: Šimon Bořek <simon.borek@nic.cz>
|
||||
---
|
||||
Lib/test/test_sysconfig.py | 8 ++++----
|
||||
.../next/Build/2021-02-10-17-54-04.bpo-43112.H5Lat6.rst | 1 +
|
||||
configure | 5 +++++
|
||||
configure.ac | 5 +++++
|
||||
4 files changed, 15 insertions(+), 4 deletions(-)
|
||||
create mode 100644 Misc/NEWS.d/next/Build/2021-02-10-17-54-04.bpo-43112.H5Lat6.rst
|
||||
|
||||
--- a/Lib/test/test_sysconfig.py
|
||||
+++ b/Lib/test/test_sysconfig.py
|
||||
@@ -425,11 +425,11 @@ class TestSysConfig(unittest.TestCase):
|
||||
self.assertTrue('linux' in suffix, suffix)
|
||||
if re.match('(i[3-6]86|x86_64)$', machine):
|
||||
if ctypes.sizeof(ctypes.c_char_p()) == 4:
|
||||
- self.assertTrue(suffix.endswith('i386-linux-gnu.so') or
|
||||
- suffix.endswith('x86_64-linux-gnux32.so'),
|
||||
- suffix)
|
||||
+ expected_suffixes = 'i386-linux-gnu.so', 'x86_64-linux-gnux32.so', 'i386-linux-musl.so'
|
||||
else: # 8 byte pointer size
|
||||
- self.assertTrue(suffix.endswith('x86_64-linux-gnu.so'), suffix)
|
||||
+ expected_suffixes = 'x86_64-linux-gnu.so', 'x86_64-linux-musl.so'
|
||||
+ self.assertTrue(suffix.endswith(expected_suffixes),
|
||||
+ f'unexpected suffix {suffix!r}')
|
||||
|
||||
@unittest.skipUnless(sys.platform == 'darwin', 'OS X-specific test')
|
||||
def test_osx_ext_suffix(self):
|
||||
--- /dev/null
|
||||
+++ b/Misc/NEWS.d/next/Build/2021-02-10-17-54-04.bpo-43112.H5Lat6.rst
|
||||
@@ -0,0 +1 @@
|
||||
+Detect musl libc as a separate SOABI (tagged as ``linux-musl``).
|
||||
\ No newline at end of file
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5376,6 +5376,11 @@ EOF
|
||||
|
||||
if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
|
||||
PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '`
|
||||
+ case "$build_os" in
|
||||
+ linux-musl*)
|
||||
+ PLATFORM_TRIPLET=`echo "$PLATFORM_TRIPLET" | sed 's/linux-gnu/linux-musl/'`
|
||||
+ ;;
|
||||
+ esac
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $PLATFORM_TRIPLET" >&5
|
||||
$as_echo "$PLATFORM_TRIPLET" >&6; }
|
||||
else
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -866,6 +866,11 @@ EOF
|
||||
|
||||
if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
|
||||
PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '`
|
||||
+ case "$build_os" in
|
||||
+ linux-musl*)
|
||||
+ PLATFORM_TRIPLET=`echo "$PLATFORM_TRIPLET" | sed 's/linux-gnu/linux-musl/'`
|
||||
+ ;;
|
||||
+ esac
|
||||
AC_MSG_RESULT([$PLATFORM_TRIPLET])
|
||||
else
|
||||
AC_MSG_RESULT([none])
|
||||
|
|
@ -27,7 +27,7 @@ Signed-off-by: Šimon Bořek <simon.borek@nic.cz>
|
|||
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -5376,7 +5376,7 @@ EOF
|
||||
@@ -6186,7 +6186,7 @@ EOF
|
||||
|
||||
if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
|
||||
PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '`
|
||||
|
|
@ -38,7 +38,7 @@ Signed-off-by: Šimon Bořek <simon.borek@nic.cz>
|
|||
;;
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -866,7 +866,7 @@ EOF
|
||||
@@ -1081,7 +1081,7 @@ EOF
|
||||
|
||||
if $CPP $CPPFLAGS conftest.c >conftest.out 2>/dev/null; then
|
||||
PLATFORM_TRIPLET=`grep -v '^#' conftest.out | grep -v '^ *$' | tr -d ' '`
|
||||
|
|
|
|||
75
libs/inih/Makefile
Normal file
75
libs/inih/Makefile
Normal file
|
|
@ -0,0 +1,75 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=inih
|
||||
PKG_VERSION:=r56
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/benhoyt/inih/tar.gz/$(PKG_VERSION)?
|
||||
PKG_HASH:=4f2ba6bd122d30281a8c7a4d5723b7af90b56aa828c0e88256d7fceda03a491a
|
||||
|
||||
PKG_MAINTAINER:=Tianling Shen <cnsztl@immortalwrt.org>
|
||||
PKG_LICENSE:=BSD-3-Clause
|
||||
PKG_LICENSE_FILES:=LICENSE.txt
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/meson.mk
|
||||
|
||||
define Package/libinih/Default
|
||||
SECTION:=libs
|
||||
CATEGORY:=Libraries
|
||||
URL:=https://github.com/benhoyt/inih
|
||||
endef
|
||||
|
||||
define Package/libinih
|
||||
$(call Package/libinih/Default)
|
||||
TITLE:=Simple .INI file parser in C
|
||||
endef
|
||||
|
||||
define Package/libinireader
|
||||
$(call Package/libinih/Default)
|
||||
TITLE:=C++ library and API for inih
|
||||
DEPENDS:=+libinih +libstdcpp
|
||||
endef
|
||||
|
||||
define Package/libinih/description
|
||||
inih (INI Not Invented Here) is a simple .INI file parser written
|
||||
in C. It's only a couple of pages of code, and it was designed to
|
||||
be small and simple, so it's good for embedded systems. It's also
|
||||
more or less compatible with Python's ConfigParser style of .INI
|
||||
files, including RFC 822-style multi-line syntax and name: value
|
||||
entries.
|
||||
endef
|
||||
|
||||
Package/libinireader/description = $(Package/libinih/description)
|
||||
|
||||
MESON_ARGS += \
|
||||
-Ddefault_library=both \
|
||||
-Ddistro_install=true \
|
||||
-Dwith_INIReader=true \
|
||||
-Dmulti-line_entries=true \
|
||||
-Dutf-8_bom=true \
|
||||
-Dinline_comments=true \
|
||||
-Duse_heap=false
|
||||
|
||||
define Build/InstallDev
|
||||
$(INSTALL_DIR) $(1)/usr/include
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/include/{ini,INIReader}.h $(1)/usr/include
|
||||
$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/{inih,INIReader}.pc $(1)/usr/lib/pkgconfig
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{inih,INIReader}.a $(1)/usr/lib/
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{inih,INIReader}.so* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
define Package/libinih/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libinih.so* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
define Package/libinireader/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libINIReader.so* $(1)/usr/lib/
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,libinih))
|
||||
$(eval $(call BuildPackage,libinireader))
|
||||
|
|
@ -1,81 +0,0 @@
|
|||
#
|
||||
# This is free software, licensed under the GNU General Public License v2.
|
||||
#
|
||||
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=ipfs-http-client
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/vasild/cpp-ipfs-http-client.git
|
||||
PKG_SOURCE_DATE:=2021-03-01
|
||||
PKG_SOURCE_VERSION:=27f6439303f7afb5b8b2e4154f4269ba296059c7
|
||||
PKG_MIRROR_HASH:=61814d666bbd927750a0af7d350ad8ba27c2a78e0b5f5196ec4e0b5049ef2690
|
||||
|
||||
PKG_MAINTAINER:=Leonid Esman <leonid.esman@gmail.com>
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=LICENSE.MIT
|
||||
|
||||
PKG_BUILD_DEPENDS:=nlohmannjson
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include $(INCLUDE_DIR)/cmake.mk
|
||||
|
||||
define Package/ipfs-http-client/Default/description
|
||||
IPFS (the InterPlanetary File System) is the Distributed Web.
|
||||
Specs, docs, sources, links: https://ipfs.io/ and https://github.com/ipfs.
|
||||
This is Vasil Dimov's C++ IPFS HTTP API client library.
|
||||
endef
|
||||
|
||||
define Package/libipfs-http-client
|
||||
SECTION:=libs
|
||||
CATEGORY:=Libraries
|
||||
TITLE:=IPFS client library
|
||||
URL:=https://github.com/vasild/cpp-ipfs-http-client
|
||||
DEPENDS:= +libcurl +libstdcpp +libatomic
|
||||
endef
|
||||
|
||||
define Package/libipfs-http-client/description
|
||||
$(call Package/ipfs-http-client/Default/description)
|
||||
This package contains shared library.
|
||||
endef
|
||||
|
||||
define Package/ipfs-http-client-tests
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
TITLE:=IPFS client library tests
|
||||
URL:=https://github.com/vasild/cpp-ipfs-http-client
|
||||
DEPENDS:=+libipfs-http-client +libcurl
|
||||
endef
|
||||
|
||||
define Package/ipfs-http-client-tests/description
|
||||
$(call Package/ipfs-http-client/Default/description)
|
||||
This package contains library tests.
|
||||
endef
|
||||
|
||||
CMAKE_OPTIONS += \
|
||||
-DBUILD_SHARED_LIBS=ON \
|
||||
-DBUILD_TESTING=ON
|
||||
|
||||
define Package/libipfs-http-client/install
|
||||
$(INSTALL_DIR) $(1)/usr/lib
|
||||
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipfs-http-client.so* $(1)/usr/lib
|
||||
endef
|
||||
|
||||
define Package/ipfs-http-client-tests/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_block $(1)/usr/bin/ipfs-block
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_config $(1)/usr/bin/ipfs-config
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_dht $(1)/usr/bin/ipfs-dht
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_files $(1)/usr/bin/ipfs-files
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_generic $(1)/usr/bin/ipfs-generic
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_key $(1)/usr/bin/ipfs-key
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_name $(1)/usr/bin/ipfs-name
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_object $(1)/usr/bin/ipfs-object
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_pin $(1)/usr/bin/ipfs-pin
|
||||
$(INSTALL_BIN) $(PKG_BUILD_DIR)/test/test_swarm $(1)/usr/bin/ipfs-swarm
|
||||
endef
|
||||
|
||||
$(eval $(call BuildPackage,libipfs-http-client))
|
||||
$(eval $(call BuildPackage,ipfs-http-client-tests))
|
||||
|
|
@ -1,251 +0,0 @@
|
|||
--- a/test/test_block.cc
|
||||
+++ b/test/test_block.cc
|
||||
@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
|
||||
#include <sstream>
|
||||
#include <stdexcept>
|
||||
|
||||
-int main(int, char**) {
|
||||
+int main(int argc, char** argv) {
|
||||
+ char addr127001[]="127.0.0.1";
|
||||
+ char *srvaddr;
|
||||
+ if (argc<2)
|
||||
+ srvaddr=addr127001;
|
||||
+ else
|
||||
+ srvaddr=argv[1];
|
||||
+
|
||||
try {
|
||||
- ipfs::Client client("localhost", 5001);
|
||||
+ ipfs::Client client(srvaddr, 5001);
|
||||
|
||||
/** [ipfs::Client::BlockPut] */
|
||||
ipfs::Json block;
|
||||
--- a/test/test_config.cc
|
||||
+++ b/test/test_config.cc
|
||||
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
|
||||
-int main(int, char**) {
|
||||
+int main(int argc, char** argv) {
|
||||
+ char addr127001[]="127.0.0.1";
|
||||
+ char *srvaddr;
|
||||
+ if (argc<2)
|
||||
+ srvaddr=addr127001;
|
||||
+ else
|
||||
+ srvaddr=argv[1];
|
||||
+
|
||||
try {
|
||||
- ipfs::Client client("localhost", 5001);
|
||||
+ ipfs::Client client(srvaddr, 5001);
|
||||
|
||||
/** [ipfs::Client::ConfigSet] */
|
||||
client.ConfigSet("Datastore.StorageMax", "20GB");
|
||||
--- a/test/test_dht.cc
|
||||
+++ b/test/test_dht.cc
|
||||
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
|
||||
#include <iostream>
|
||||
#include <stdexcept>
|
||||
|
||||
-int main(int, char**) {
|
||||
+int main(int argc, char** argv) {
|
||||
+ char addr127001[]="127.0.0.1";
|
||||
+ char *srvaddr;
|
||||
+ if (argc<2)
|
||||
+ srvaddr=addr127001;
|
||||
+ else
|
||||
+ srvaddr=argv[1];
|
||||
+
|
||||
try {
|
||||
- ipfs::Client client("localhost", 5001);
|
||||
+ ipfs::Client client(srvaddr, 5001);
|
||||
|
||||
ipfs::Json add_result;
|
||||
client.FilesAdd(
|
||||
--- a/test/test_error.cc
|
||||
+++ b/test/test_error.cc
|
||||
@@ -35,16 +35,23 @@ extern std::string replace_body;
|
||||
}
|
||||
} // namespace ipfs
|
||||
|
||||
-int main(int, char**) {
|
||||
+int main(int argc, char** argv) {
|
||||
+ char addr127001[]="127.0.0.1";
|
||||
+ char *srvaddr;
|
||||
+ if (argc<2)
|
||||
+ srvaddr=addr127001;
|
||||
+ else
|
||||
+ srvaddr=argv[1];
|
||||
+
|
||||
try {
|
||||
- ipfs::Client client_cant_connect("localhost", 57);
|
||||
+ ipfs::Client client_cant_connect(srvaddr, 57);
|
||||
|
||||
ipfs::test::must_fail("client.Version()", [&client_cant_connect]() {
|
||||
ipfs::Json version;
|
||||
client_cant_connect.Version(&version);
|
||||
});
|
||||
|
||||
- ipfs::Client client("localhost", 5001);
|
||||
+ ipfs::Client client(srvaddr, 5001);
|
||||
|
||||
std::string object_id;
|
||||
client.ObjectNew(&object_id);
|
||||
--- a/test/test_files.cc
|
||||
+++ b/test/test_files.cc
|
||||
@@ -24,10 +24,17 @@ CONNECTION WITH THE SOFTWARE OR THE USE
|
||||
#include <sstream>
|
||||
#include <stdexcept>
|
||||
|
||||
-int main(int, char**) {
|
||||
+int main(int argc, char** argv) {
|
||||
+ char addr127001[]="127.0.0.1";
|
||||
+ char *srvaddr;
|
||||
+ if (argc<2)
|
||||
+ srvaddr=addr127001;
|
||||
+ else
|
||||
+ srvaddr=argv[1];
|
||||
+
|
||||
try {
|
||||
// Try Files API tests with time-out setting of 20 seconds
|
||||
- ipfs::Client client("localhost", 5001, "20s");
|
||||
+ ipfs::Client client(srvaddr, 5001, "20s");
|
||||
|
||||
/** [ipfs::Client::FilesGet] */
|
||||
std::stringstream contents;
|
||||
--- a/test/test_generic.cc
|
||||
+++ b/test/test_generic.cc
|
||||
@@ -24,11 +24,18 @@ CONNECTION WITH THE SOFTWARE OR THE USE
|
||||
#include <stdexcept>
|
||||
#include <utility>
|
||||
|
||||
-int main(int, char**) {
|
||||
+int main(int argc, char** argv) {
|
||||
+ char addr127001[]="127.0.0.1";
|
||||
+ char *srvaddr;
|
||||
+ if (argc<2)
|
||||
+ srvaddr=addr127001;
|
||||
+ else
|
||||
+ srvaddr=argv[1];
|
||||
+
|
||||
try {
|
||||
// Test client constructor
|
||||
/** [ipfs::Client::Client] */
|
||||
- ipfs::Client client("localhost", 5001);
|
||||
+ ipfs::Client client(srvaddr, 5001);
|
||||
/** [ipfs::Client::Client] */
|
||||
|
||||
// Test client constructor with additional parameters
|
||||
@@ -38,7 +45,7 @@ int main(int, char**) {
|
||||
ipfs::Client clientA(client);
|
||||
clientA = client;
|
||||
ipfs::Client clientB(std::move(clientA));
|
||||
- ipfs::Client clientC("localhost", 5001);
|
||||
+ ipfs::Client clientC(srvaddr, 5001);
|
||||
clientC = std::move(clientB);
|
||||
|
||||
#pragma GCC diagnostic push
|
||||
--- a/test/test_key.cc
|
||||
+++ b/test/test_key.cc
|
||||
@@ -26,9 +26,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
|
||||
|
||||
using Json = nlohmann::json;
|
||||
|
||||
-int main(int, char**) {
|
||||
+int main(int argc, char** argv) {
|
||||
+ char addr127001[]="127.0.0.1";
|
||||
+ char *srvaddr;
|
||||
+ if (argc<2)
|
||||
+ srvaddr=addr127001;
|
||||
+ else
|
||||
+ srvaddr=argv[1];
|
||||
+
|
||||
try {
|
||||
- ipfs::Client client("localhost", 5001);
|
||||
+ ipfs::Client client(srvaddr, 5001);
|
||||
|
||||
/** [ipfs::Client::KeyGen] */
|
||||
std::string key_id;
|
||||
--- a/test/test_name.cc
|
||||
+++ b/test/test_name.cc
|
||||
@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
|
||||
#include <sstream>
|
||||
#include <stdexcept>
|
||||
|
||||
-int main(int, char**) {
|
||||
+int main(int argc, char** argv) {
|
||||
+ char addr127001[]="127.0.0.1";
|
||||
+ char *srvaddr;
|
||||
+ if (argc<2)
|
||||
+ srvaddr=addr127001;
|
||||
+ else
|
||||
+ srvaddr=argv[1];
|
||||
+
|
||||
try {
|
||||
- ipfs::Client client("localhost", 5001);
|
||||
+ ipfs::Client client(srvaddr, 5001);
|
||||
|
||||
// We need a key here, so as not to clobber the "self" key.
|
||||
std::string key_id;
|
||||
--- a/test/test_object.cc
|
||||
+++ b/test/test_object.cc
|
||||
@@ -24,9 +24,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
||||
-int main(int, char**) {
|
||||
+int main(int argc, char** argv) {
|
||||
+ char addr127001[]="127.0.0.1";
|
||||
+ char *srvaddr;
|
||||
+ if (argc<2)
|
||||
+ srvaddr=addr127001;
|
||||
+ else
|
||||
+ srvaddr=argv[1];
|
||||
+
|
||||
try {
|
||||
- ipfs::Client client("localhost", 5001);
|
||||
+ ipfs::Client client(srvaddr, 5001);
|
||||
|
||||
/** [ipfs::Client::ObjectNew] */
|
||||
std::string object_id;
|
||||
--- a/test/test_pin.cc
|
||||
+++ b/test/test_pin.cc
|
||||
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
||||
-int main(int, char**) {
|
||||
+int main(int argc, char** argv) {
|
||||
+ char addr127001[]="127.0.0.1";
|
||||
+ char *srvaddr;
|
||||
+ if (argc<2)
|
||||
+ srvaddr=addr127001;
|
||||
+ else
|
||||
+ srvaddr=argv[1];
|
||||
+
|
||||
try {
|
||||
- ipfs::Client client("localhost", 5001);
|
||||
+ ipfs::Client client(srvaddr, 5001);
|
||||
|
||||
std::string object_id;
|
||||
|
||||
--- a/test/test_swarm.cc
|
||||
+++ b/test/test_swarm.cc
|
||||
@@ -23,9 +23,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE
|
||||
#include <stdexcept>
|
||||
#include <string>
|
||||
|
||||
-int main(int, char**) {
|
||||
+int main(int argc, char** argv) {
|
||||
+ char addr127001[]="127.0.0.1";
|
||||
+ char *srvaddr;
|
||||
+ if (argc<2)
|
||||
+ srvaddr=addr127001;
|
||||
+ else
|
||||
+ srvaddr=argv[1];
|
||||
+
|
||||
try {
|
||||
- ipfs::Client client("localhost", 5001);
|
||||
+ ipfs::Client client(srvaddr, 5001);
|
||||
|
||||
/** [ipfs::Client::SwarmAddrs] */
|
||||
ipfs::Json addresses;
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=postgresql
|
||||
PKG_VERSION:=15.1
|
||||
PKG_VERSION:=15.2
|
||||
PKG_RELEASE:=1
|
||||
PKG_MAINTAINER:=Daniel Golle <daniel@makrotopia.org>
|
||||
PKG_LICENSE:=PostgreSQL
|
||||
|
|
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=\
|
|||
http://ftp.postgresql.org/pub/source/v$(PKG_VERSION) \
|
||||
ftp://ftp.postgresql.org/pub/source/v$(PKG_VERSION)
|
||||
|
||||
PKG_HASH:=64fdf23d734afad0dfe4077daca96ac51dcd697e68ae2d3d4ca6c45cb14e21ae
|
||||
PKG_HASH:=99a2171fc3d6b5b5f56b757a7a3cb85d509a38e4273805def23941ed2b8468c7
|
||||
|
||||
PKG_BUILD_FLAGS:=no-mips16
|
||||
PKG_FIXUP:=autoreconf
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=gst1-libav
|
||||
PKG_VERSION:=1.20.5
|
||||
PKG_VERSION:=1.22.3
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=gst-libav-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-libav
|
||||
PKG_HASH:=b152e3cc49d014899f53c39d8a6224a44e1399b4cf76aa5f9a903fdf9793c3cc
|
||||
PKG_HASH:=2ec5c805808b4371a7e32b1da0202a1c8a6b36b6ce905080bf5c34097d12a923
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-libav-$(PKG_VERSION)
|
||||
|
||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=gst1-plugins-bad
|
||||
PKG_VERSION:=1.20.5
|
||||
PKG_VERSION:=1.22.3
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=gst-plugins-bad-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-bad/
|
||||
PKG_HASH:=f431214b0754d7037adcde93c3195106196588973e5b32dcb24938805f866363
|
||||
PKG_HASH:=e1798fee2d86127f0637481c607f983293bf0fd81aad70a5c7b47205af3621d8
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-bad-$(PKG_VERSION)
|
||||
|
||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||
|
|
@ -374,7 +374,7 @@ $(eval $(call GstBuildPlugin,interlace,interlace support,,,))
|
|||
$(eval $(call GstBuildPlugin,ivfparse,ivfparse support,,,))
|
||||
$(eval $(call GstBuildPlugin,ivtc,ivtc support,,,))
|
||||
$(eval $(call GstBuildPlugin,jp2kdecimator,jp2kdecimator support,,,))
|
||||
$(eval $(call GstBuildPlugin,jpegformat,jpegformat support,tag,,))
|
||||
$(eval $(call GstBuildPlugin,jpegformat,jpegformat support,tag codecparsers,,))
|
||||
$(eval $(call GstBuildPlugin,legacyrawparse,rawparse support,audio video,,))
|
||||
$(eval $(call GstBuildPlugin,midi,midi support,audio,,))
|
||||
$(eval $(call GstBuildPlugin,mpegpsdemux,mpegpsdemux support,pbutils,,))
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -467,7 +467,7 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H
|
||||
@@ -501,7 +501,7 @@ gst_plugins_bad_args = ['-DHAVE_CONFIG_H
|
||||
configinc = include_directories('.')
|
||||
libsinc = include_directories('gst-libs')
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=gst1-plugins-base
|
||||
PKG_VERSION:=1.20.5
|
||||
PKG_VERSION:=1.22.3
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=gst-plugins-base-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-base
|
||||
PKG_HASH:=11f911ef65f3095d7cf698a1ad1fc5242ac3ad6c9270465fb5c9e7f4f9c19b35
|
||||
PKG_HASH:=1c596289a0d4207380233eba8c36a932c4d1aceba19932937d9b57c24cef89f3
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-base-$(PKG_VERSION)
|
||||
|
||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||
|
|
@ -40,9 +40,8 @@ PKG_CONFIG_DEPENDS:= \
|
|||
CONFIG_PACKAGE_gst1-mod-tcp \
|
||||
CONFIG_PACKAGE_gst1-mod-theora \
|
||||
CONFIG_PACKAGE_gst1-mod-typefind \
|
||||
CONFIG_PACKAGE_gst1-mod-videoconvert \
|
||||
CONFIG_PACKAGE_gst1-mod-videoconvertscale \
|
||||
CONFIG_PACKAGE_gst1-mod-videorate \
|
||||
CONFIG_PACKAGE_gst1-mod-videoscale \
|
||||
CONFIG_PACKAGE_gst1-mod-videotestsrc \
|
||||
CONFIG_PACKAGE_gst1-mod-volume \
|
||||
CONFIG_PACKAGE_gst1-mod-vorbis \
|
||||
|
|
@ -138,9 +137,8 @@ MESON_ARGS += \
|
|||
$(call GST_COND_SELECT,subparse) \
|
||||
$(call GST_COND_SELECT,tcp) \
|
||||
-Dtypefind=$(if $(CONFIG_PACKAGE_gst1-mod-typefindfunctions),en,dis)abled \
|
||||
$(call GST_COND_SELECT,videoconvert) \
|
||||
$(call GST_COND_SELECT,videoconvertscale) \
|
||||
$(call GST_COND_SELECT,videorate) \
|
||||
$(call GST_COND_SELECT,videoscale) \
|
||||
$(call GST_COND_SELECT,videotestsrc) \
|
||||
$(call GST_COND_SELECT,volume) \
|
||||
\
|
||||
|
|
@ -302,9 +300,8 @@ $(eval $(call GstBuildPlugin,subparse,subparse,video,,))
|
|||
$(eval $(call GstBuildPlugin,rawparse,parse raw media,audio video,,))
|
||||
$(eval $(call GstBuildPlugin,tcp,TCP,net,,))
|
||||
$(eval $(call GstBuildPlugin,typefindfunctions,'typefind' functions,audio pbutils tag video,,))
|
||||
$(eval $(call GstBuildPlugin,videoconvert,video format conversion,video,,))
|
||||
$(eval $(call GstBuildPlugin,videoconvertscale,video format conversion and scaling,video,,))
|
||||
$(eval $(call GstBuildPlugin,videorate,Adjusts video frames,video,,))
|
||||
$(eval $(call GstBuildPlugin,videoscale,Resizes video,video,,))
|
||||
$(eval $(call GstBuildPlugin,videotestsrc,video test,video,,))
|
||||
$(eval $(call GstBuildPlugin,volume,volume,audio controller,,))
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -452,7 +452,7 @@ pkgconfig_subdirs = ['gstreamer-1.0']
|
||||
@@ -464,7 +464,7 @@ pkgconfig_subdirs = ['gstreamer-1.0']
|
||||
|
||||
meson_pkg_config_file_fixup_script = find_program('scripts/meson-pkg-config-file-fixup.py')
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=gst1-plugins-good
|
||||
PKG_VERSION:=1.20.5
|
||||
PKG_VERSION:=1.22.3
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=gst-plugins-good-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-good/
|
||||
PKG_HASH:=e83ab4d12ca24959489bbb0ec4fac9b90e32f741d49cda357cb554b2cb8b97f9
|
||||
PKG_HASH:=af81154b3a2ef3f4d2feba395f25696feea6fd13ec62c92d3c7a973470710273
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-good-$(PKG_VERSION)
|
||||
|
||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -434,7 +434,7 @@ endif
|
||||
@@ -461,7 +461,7 @@ endif
|
||||
|
||||
presetdir = join_paths(get_option('datadir'), 'gstreamer-' + api_version, 'presets')
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=gst1-plugins-ugly
|
||||
PKG_VERSION:=1.20.5
|
||||
PKG_VERSION:=1.22.3
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=gst-plugins-ugly-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gst-plugins-ugly
|
||||
PKG_HASH:=af67d8ba7cab230f64d0594352112c2c443e2aa36a87c35f9f98a43d11430b87
|
||||
PKG_HASH:=3dc98ed5c2293368b3c4e6ce55d89be834a0a62e9bf88ef17928cf03b7d5a360
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/gst-plugins-ugly-$(PKG_VERSION)
|
||||
|
||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||
|
|
@ -95,7 +95,6 @@ MESON_ARGS += \
|
|||
-Ddvdlpcmdec=disabled \
|
||||
-Ddvdsub=disabled \
|
||||
-Drealmedia=disabled \
|
||||
-Dxingmux=disabled \
|
||||
\
|
||||
-Da52dec=disabled \
|
||||
-Damrnb=disabled \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -278,7 +278,7 @@ endif
|
||||
@@ -305,7 +305,7 @@ endif
|
||||
|
||||
gpl_allowed = get_option('gpl').allowed()
|
||||
|
||||
|
|
|
|||
|
|
@ -8,12 +8,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=gstreamer1
|
||||
PKG_VERSION:=1.20.5
|
||||
PKG_VERSION:=1.22.3
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=gstreamer-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://gstreamer.freedesktop.org/src/gstreamer
|
||||
PKG_HASH:=5a19083faaf361d21fc391124f78ba6d609be55845a82fa8f658230e5fa03dff
|
||||
PKG_HASH:=9ffeab95053f9f6995eb3b3da225e88f21c129cd60da002d3f795db70d6d5974
|
||||
PKG_BUILD_DIR:=$(BUILD_DIR)/gstreamer-$(PKG_VERSION)
|
||||
|
||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org> \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -537,7 +537,7 @@ if get_option('default_library') == 'sta
|
||||
@@ -572,7 +572,7 @@ if get_option('default_library') == 'sta
|
||||
endif
|
||||
|
||||
# Used in gst/parse/meson.build and below
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
include $(INCLUDE_DIR)/nls.mk
|
||||
|
||||
PKG_NAME:=curl
|
||||
PKG_VERSION:=8.0.1
|
||||
PKG_VERSION:=8.1.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
|
|
@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://github.com/curl/curl/releases/download/curl-$(subst .,_,
|
|||
https://dl.uxnr.de/mirror/curl/ \
|
||||
https://curl.askapache.com/download/ \
|
||||
https://curl.se/download/
|
||||
PKG_HASH:=0a381cd82f4d00a9a334438b8ca239afea5bfefcfa9a1025f2bf118e79e0b5f0
|
||||
PKG_HASH:=6bd80ad4f07187015911216ee7185b90d285ac5162aed1bded144f9f93232a3c
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
PKG_LICENSE_FILES:=COPYING
|
||||
|
|
@ -26,7 +26,6 @@ PKG_CPE_ID:=cpe:/a:haxx:libcurl
|
|||
PKG_FIXUP:=autoreconf
|
||||
PKG_INSTALL:=1
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_BUILD_FLAGS:=gc-sections
|
||||
|
||||
PKG_CONFIG_DEPENDS:= \
|
||||
CONFIG_IPV6 \
|
||||
|
|
@ -108,6 +107,7 @@ endef
|
|||
|
||||
TARGET_CFLAGS += $(FPIC)
|
||||
TARGET_CPPFLAGS += $(if $(CONFIG_LIBCURL_NTLM),,-DCURL_DISABLE_NTLM)
|
||||
TARGET_LDFLAGS += -Wl,--gc-sections
|
||||
|
||||
CONFIGURE_ARGS += \
|
||||
--disable-debug \
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -158,7 +158,7 @@ CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_S
|
||||
@@ -159,7 +159,7 @@ CLEANFILES = $(VC10_LIBVCXPROJ) $(VC10_S
|
||||
bin_SCRIPTS = curl-config
|
||||
|
||||
SUBDIRS = lib src
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libcurl.pc
|
||||
@@ -272,8 +272,6 @@ cygwinbin:
|
||||
@@ -273,8 +273,6 @@ cygwinbin:
|
||||
# We extend the standard install with a custom hook:
|
||||
install-data-hook:
|
||||
(cd include && $(MAKE) install)
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=openvpn-easy-rsa
|
||||
|
||||
PKG_VERSION:=3.0.8
|
||||
PKG_RELEASE:=4
|
||||
PKG_VERSION:=3.1.3
|
||||
PKG_RELEASE:=1
|
||||
PKG_SOURCE_URL:=https://codeload.github.com/OpenVPN/easy-rsa/tar.gz/v$(PKG_VERSION)?
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
|
||||
PKG_HASH:=fd6b67d867c3b8afd53efa2ca015477f6658a02323e1799432083472ac0dd200
|
||||
PKG_HASH:=f2967aa598cb603dd20791002e767d0ce58e300b04c9cff1b6d6b14fedae6a80
|
||||
|
||||
# For git snapshots
|
||||
#PKG_SOURCE_PROTO:=git
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
|
|||
|
||||
--- a/build/build-dist.sh
|
||||
+++ b/build/build-dist.sh
|
||||
@@ -80,7 +80,7 @@ stage_unix() {
|
||||
|
||||
@@ -86,7 +86,7 @@ stage_unix() {
|
||||
|
||||
# FreeBSD does not accept -i without argument in a way also acceptable by GNU sed
|
||||
sed -i.tmp -e "s/~VER~/$VERSION/" \
|
||||
- -e "s/~DATE~/$(date)/" \
|
||||
|
|
@ -19,9 +19,9 @@ Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
|
|||
-e "s/~HOST~/$(hostname -s)/" \
|
||||
-e "s/~GITHEAD~/$(git rev-parse HEAD)/" \
|
||||
"$DIST_ROOT/unix/$PV/easyrsa" || die "Cannot update easyrsa version data"
|
||||
@@ -122,7 +122,7 @@ stage_win() {
|
||||
@@ -128,7 +128,7 @@ stage_win() {
|
||||
done
|
||||
|
||||
|
||||
sed -i.tmp -e "s/~VER~/$VERSION/" \
|
||||
- -e "s/~DATE~/$(date)/" \
|
||||
+ -e "s/~DATE~/$(SOURCE_DATE_EPOCH)/" \
|
||||
|
|
|
|||
|
|
@ -6,12 +6,12 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=snort3
|
||||
PKG_VERSION:=3.1.61.0
|
||||
PKG_VERSION:=3.1.62.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_VERSION).tar.gz
|
||||
PKG_SOURCE_URL:=https://github.com/snort3/snort3/archive/refs/tags/
|
||||
PKG_HASH:=207963ece2eddd3c85ad90c9e2dabe33dc67eaa485ba9576e2b244f7ac45fc5d
|
||||
PKG_HASH:=1f18936da65d52702f75e5b9ffe2cfbc9c9373201801ad275f6e636451f7e06f
|
||||
|
||||
PKG_MAINTAINER:=W. Michael Petullo <mike@flyn.org>
|
||||
PKG_LICENSE:=GPL-2.0-only
|
||||
|
|
|
|||
|
|
@ -1,18 +1,27 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=uwsgi
|
||||
PKG_VERSION:=2.0.20
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=2.0.21
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PYPI_NAME:=uwsgi
|
||||
PKG_HASH:=88ab9867d8973d8ae84719cf233b7dafc54326fcaec89683c3f9f77c002cdff9
|
||||
PKG_BUILD_DEPENDS:=python3/host
|
||||
PYTHON3_PKG_BUILD:=0
|
||||
PYPI_NAME:=uWSGI
|
||||
PYPI_SOURCE_NAME:=uwsgi
|
||||
PKG_HASH:=35a30d83791329429bc04fe44183ce4ab512fcf6968070a7bfba42fc5a0552a9
|
||||
|
||||
PKG_LICENSE:=GPL-2.0-or-later
|
||||
PKG_LICENSE_FILES:=LICENSE
|
||||
PKG_MAINTAINER:=Ansuel Smith <ansuelsmth@gmail.com>
|
||||
|
||||
PKG_BUILD_DEPENDS:=python3/host
|
||||
PYTHON3_PKG_BUILD:=0
|
||||
|
||||
PKG_CONFIG_DEPENDS:= \
|
||||
CONFIG_PACKAGE_uwsgi-logfile-plugin \
|
||||
CONFIG_PACKAGE_uwsgi-syslog-plugin \
|
||||
CONFIG_PACKAGE_uwsgi-cgi-plugin \
|
||||
CONFIG_PACKAGE_uwsgi-python3-plugin \
|
||||
CONFIG_PACKAGE_uwsgi-luci-support
|
||||
|
||||
include ../../lang/python/pypi.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include ../../lang/python/python3-package.mk
|
||||
|
|
@ -26,7 +35,6 @@ define Package/uwsgi
|
|||
TITLE:=The uWSGI server
|
||||
URL:=https://uwsgi-docs.readthedocs.io/en/latest/
|
||||
DEPENDS:=+libpcre +libcap +libuuid
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
define Package/uwsgi-logfile-plugin
|
||||
|
|
@ -35,7 +43,6 @@ define Package/uwsgi-logfile-plugin
|
|||
SUBMENU:=Web Servers/Proxies
|
||||
TITLE:=The Logfile plugin for the uWSGI server
|
||||
DEPENDS:=uwsgi
|
||||
MDEPENDS:=uwsgi
|
||||
endef
|
||||
|
||||
define Package/uwsgi-syslog-plugin
|
||||
|
|
@ -44,7 +51,6 @@ define Package/uwsgi-syslog-plugin
|
|||
SUBMENU:=Web Servers/Proxies
|
||||
TITLE:=The Syslog plugin for the uWSGI server
|
||||
DEPENDS:=uwsgi
|
||||
MDEPENDS:=uwsgi
|
||||
endef
|
||||
|
||||
define Package/uwsgi-cgi-plugin
|
||||
|
|
@ -53,7 +59,6 @@ define Package/uwsgi-cgi-plugin
|
|||
SUBMENU:=Web Servers/Proxies
|
||||
TITLE:=The CGI plugin for the uWSGI server
|
||||
DEPENDS:=uwsgi
|
||||
MDEPENDS:=uwsgi
|
||||
endef
|
||||
|
||||
define Package/uwsgi-python3-plugin
|
||||
|
|
@ -62,7 +67,6 @@ define Package/uwsgi-python3-plugin
|
|||
SUBMENU:=Web Servers/Proxies
|
||||
TITLE:=The Python3 plugin for the uWSGI server
|
||||
DEPENDS:=uwsgi +python3-light
|
||||
MDEPENDS:=uwsgi
|
||||
endef
|
||||
|
||||
define Package/uwsgi-luci-support
|
||||
|
|
@ -71,7 +75,6 @@ define Package/uwsgi-luci-support
|
|||
SUBMENU:=Web Servers/Proxies
|
||||
TITLE:=Support files for LuCI on Nginx
|
||||
DEPENDS:=uwsgi +uwsgi-syslog-plugin +uwsgi-cgi-plugin
|
||||
MDEPENDS:=uwsgi
|
||||
endef
|
||||
|
||||
define Package/uwsgi/description
|
||||
|
|
@ -98,23 +101,35 @@ define Package/uwsgi-luci-support/description
|
|||
Support files for LuCI on Nginx
|
||||
endef
|
||||
|
||||
MAKE_VARS+=\
|
||||
MAKE_VARS+= \
|
||||
CPP=$(TARGET_CROSS)cpp \
|
||||
PYTHON=$(STAGING_DIR_HOSTPKG)/bin/python3 \
|
||||
LINUX_UNAME_VERSION=$(LINUX_UNAME_VERSION)
|
||||
|
||||
MAKE_FLAGS+= PROFILE=openwrt
|
||||
|
||||
define Build/Compile
|
||||
$(call Build/Compile/Default,PROFILE=openwrt)
|
||||
$(call Build/Compile/Default,plugin.logfile PROFILE=openwrt)
|
||||
$(call Build/Compile/Default,plugin.syslog PROFILE=openwrt)
|
||||
$(call Build/Compile/Default,plugin.cgi PROFILE=openwrt)
|
||||
$(call Build/Compile/Default)
|
||||
|
||||
ifneq ($(CONFIG_PACKAGE_uwsgi-logfile-plugin),)
|
||||
$(call Build/Compile/Default,plugin.logfile)
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_PACKAGE_uwsgi-syslog-plugin),)
|
||||
$(call Build/Compile/Default,plugin.syslog)
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_PACKAGE_uwsgi-cgi-plugin),)
|
||||
$(call Build/Compile/Default,plugin.cgi)
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_PACKAGE_uwsgi-python3-plugin),)
|
||||
$(call Python3/Run, \
|
||||
$(PKG_BUILD_DIR), \
|
||||
uwsgiconfig.py --plugin plugins/python openwrt, \
|
||||
CPP="$(TARGET_CROSS)cpp" \
|
||||
LINUX_UNAME_VERSION=$(LINUX_UNAME_VERSION) \
|
||||
$(MAKE_VARS) \
|
||||
CFLAGS="$(TARGET_CPPFLAGS) -I$(PYTHON3_INC_DIR) $(TARGET_CFLAGS)" \
|
||||
)
|
||||
endif
|
||||
endef
|
||||
|
||||
define Package/uwsgi/install
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/uwsgiconfig.py
|
||||
+++ b/uwsgiconfig.py
|
||||
@@ -5,9 +5,9 @@ uwsgi_version = '2.0.20'
|
||||
@@ -5,9 +5,9 @@ uwsgi_version = '2.0.21'
|
||||
import os
|
||||
import re
|
||||
import time
|
||||
|
|
|
|||
|
|
@ -6,18 +6,19 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=squeezelite
|
||||
PKG_VERSION:=1.9.9-1415
|
||||
PKG_RELEASE:=1
|
||||
PKG_VERSION:=1.9.9-1432
|
||||
PKG_RELEASE:=2
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/ralph-irving/squeezelite
|
||||
PKG_SOURCE_VERSION:=5361789c8df37d87a22cc2253ff746557044931a
|
||||
PKG_MIRROR_HASH:=c6cabb4041c1197881d9f5e9ea8293ece2d409356ccf56d4a8948743b49b13ca
|
||||
PKG_SOURCE_VERSION:=575b59398dd19945d2038474062240fc527407fb
|
||||
PKG_MIRROR_HASH:=1f1ae2514b7e9da81cf4881a79a810bfe4768a16209ccc903edd434aef8f96d6
|
||||
|
||||
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
|
||||
PKG_LICENSE:=GPL-3.0-or-later
|
||||
PKG_LICENSE_FILES:=LICENSE.txt
|
||||
|
||||
PKG_BUILD_DEPENDS:=faad2 ffmpeg flac libsoxr libvorbis openssl opusfile
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
|
@ -28,104 +29,183 @@ define Package/squeezelite/default
|
|||
TITLE:=Headless squeezebox emulator
|
||||
PROVIDES:=squeezelite
|
||||
URL:=https://github.com/ralph-irving/squeezelite
|
||||
DEPENDS:= +alsa-lib +SQUEEZELITE_RESAMPLE:libsoxr
|
||||
MENU:=1
|
||||
DEPENDS:=+alsa-lib
|
||||
endef
|
||||
|
||||
define Package/squeezelite-full
|
||||
$(call Package/squeezelite/default)
|
||||
TITLE+= (full)
|
||||
DEPENDS+= +libflac +libvorbis +libmpg123 +libfaad2 \
|
||||
+SQUEEZELITE_OPUS:libopusfile \
|
||||
+SQUEEZELITE_SSL:libopenssl \
|
||||
+SQUEEZELITE_WMA:libffmpeg-audio-dec
|
||||
VARIANT:=full
|
||||
DEPENDS+= +libfaad2 +libffmpeg-audio-dec +libflac +libmpg123 \
|
||||
+libopenssl +libopusfile +libsoxr +libvorbis
|
||||
endef
|
||||
|
||||
define Package/squeezelite-mini
|
||||
define Package/squeezelite-dynamic
|
||||
$(call Package/squeezelite/default)
|
||||
TITLE+= (minimal)
|
||||
VARIANT:=mini
|
||||
TITLE+= (dynamic)
|
||||
VARIANT:=dynamic
|
||||
DEPENDS+= +libmpg123
|
||||
endef
|
||||
|
||||
define Package/squeezelite/config/default
|
||||
|
||||
config SQUEEZELITE_WMA
|
||||
bool "WMA/ALAC decode support"
|
||||
depends on BUILD_PATENTED
|
||||
help
|
||||
Include WMA and ALAC decoding using ffmpeg
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_RESAMPLE
|
||||
bool "Resample support"
|
||||
help
|
||||
Include support for resampling using libsoxr
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_DSD
|
||||
bool "DSD playback over PCM (DoP)"
|
||||
help
|
||||
Include support for DSD over PCM for compatible DAC
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_SSL
|
||||
bool "SSL/TLS support"
|
||||
help
|
||||
Include SSL/TLS support for use with e.g. https media URLs
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_OPUS
|
||||
bool "Opus codec support"
|
||||
help
|
||||
Include Opus codec support
|
||||
default n
|
||||
define Package/squeezelite-custom
|
||||
$(call Package/squeezelite/default)
|
||||
TITLE+= (custom)
|
||||
VARIANT:=custom
|
||||
DEPENDS+= @!ALL \
|
||||
+SQUEEZELITE_AAC:libfaad2 \
|
||||
+SQUEEZELITE_FLAC:libflac \
|
||||
+SQUEEZELITE_MP3_MAD:libmad \
|
||||
+SQUEEZELITE_MP3_MPG123:libmpg123 \
|
||||
+SQUEEZELITE_OPUS:libopusfile \
|
||||
+SQUEEZELITE_RESAMPLE:libsoxr \
|
||||
+SQUEEZELITE_SSL:libopenssl \
|
||||
+SQUEEZELITE_VORBIS:libvorbis \
|
||||
+SQUEEZELITE_VORBIS_TREMOR:libvorbisidec \
|
||||
+SQUEEZELITE_WMA_ALAC:libffmpeg-audio-dec
|
||||
MENU:=1
|
||||
endef
|
||||
|
||||
define Package/squeezelite-full/config
|
||||
if PACKAGE_squeezelite-full
|
||||
$(call Package/squeezelite/config/default)
|
||||
endif
|
||||
endef
|
||||
define Package/squeezelite-custom/config
|
||||
if PACKAGE_squeezelite-custom
|
||||
config SQUEEZELITE_AAC
|
||||
bool "AAC codec support"
|
||||
help
|
||||
AAC codec support
|
||||
default n
|
||||
|
||||
define Package/squeezelite-mini/config
|
||||
if PACKAGE_squeezelite-mini
|
||||
$(call Package/squeezelite/config/default)
|
||||
endif
|
||||
config SQUEEZELITE_DSD
|
||||
bool "DSD playback over PCM (DoP)"
|
||||
help
|
||||
Include support for DSD over PCM for compatible DAC
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_FLAC
|
||||
bool "FLAC codec support"
|
||||
help
|
||||
FLAC codec support
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_MP3_MAD
|
||||
bool "MP3 codec support (libmad)"
|
||||
help
|
||||
MP3 codec support (libmad)
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_MP3_MPG123
|
||||
bool "MP3 codec support (libmpg123)"
|
||||
help
|
||||
MP3 codec support (libmpg123)
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_OPUS
|
||||
bool "Opus codec support"
|
||||
help
|
||||
Opus codec support
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_RESAMPLE
|
||||
bool "Resample support"
|
||||
help
|
||||
Include support for resampling using libsoxr
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_SSL
|
||||
bool "SSL/TLS support"
|
||||
help
|
||||
Include SSL/TLS support for use with e.g. https media URLs
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_VORBIS
|
||||
bool "Vorbis codec support"
|
||||
help
|
||||
Vorbis codec support
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_VORBIS_TREMOR
|
||||
bool "Vorbis codec support (Tremor)"
|
||||
help
|
||||
Vorbis codec support (Tremor (libvorbisidec))
|
||||
default n
|
||||
|
||||
config SQUEEZELITE_WMA_ALAC
|
||||
bool "WMA/ALAC decode support"
|
||||
help
|
||||
WMA and ALAC codec support
|
||||
default n
|
||||
endif
|
||||
endef
|
||||
|
||||
define Package/squeezelite/description/default
|
||||
Squeezelite is a small headless squeezebox emulator for linux using alsa audio output
|
||||
|
||||
It is aimed at supporting high quality audio at multiple sample rates including
|
||||
44.1/48/88.2/96/176.4/192k/352.8/384kHz
|
||||
Supported codecs: mp3, flac, ogg, aac, (wma and alac via ffmpeg), opus (optional)
|
||||
Native support for PCM builtin
|
||||
Optional support of DSD playback via PCM for DoP capable DAC
|
||||
Optional resampling to match sound device
|
||||
44.1/48/88.2/96/176.4/192/352.8/384 kHz
|
||||
endef
|
||||
|
||||
define Package/squeezelite-full/description
|
||||
$(call Package/squeezelite/description/default)
|
||||
This package includes all features and codecs.
|
||||
|
||||
This package has all the audio codecs compiled in.
|
||||
Supported codecs: AAC, AIFF, ALAC, FLAC, MP3, Ogg, Opus, PCM and WMA
|
||||
Features:
|
||||
* Resampling to match sound device
|
||||
* DSD playback via PCM for DoP capable DAC
|
||||
endef
|
||||
|
||||
define Package/squeezelite-mini/description
|
||||
define Package/squeezelite-dynamic/description
|
||||
$(call Package/squeezelite/description/default)
|
||||
This package includes some basic functionality, and it's possible to
|
||||
add more features and codecs by manually installing additional libraries.
|
||||
|
||||
This package will dynamically load installed codecs.
|
||||
Built in codec support: AIFF, MP3, PCM
|
||||
|
||||
The following features and codecs can be enabled by installing additional
|
||||
libraries (library package name in parentheses):
|
||||
* Resampling (libsoxr)
|
||||
* Codecs:
|
||||
* AAC (libfaad2)
|
||||
* FLAC (libflac)
|
||||
* Ogg (libvorbis or libvorbisidec)
|
||||
* Opus (libopusfile)
|
||||
* WMA and ALAC (libffmpeg-audio-dec)
|
||||
endef
|
||||
|
||||
opts+= -DNO_MAD
|
||||
define Package/squeezelite-custom/description
|
||||
$(call Package/squeezelite/description/default)
|
||||
This package allows for customizing squeezelite with specific codecs and features.
|
||||
endef
|
||||
|
||||
ifeq ($(CONFIG_SQUEEZELITE_WMA),y)
|
||||
opts+= -DFFMPEG
|
||||
ifeq ($(BUILD_VARIANT),full)
|
||||
opts+= -DLINKALL
|
||||
opts+= -DDSD -DFFMPEG -DOPUS -DRESAMPLE -DUSE_SSL
|
||||
opts+= -DNO_MAD
|
||||
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/opus
|
||||
else ifeq ($(BUILD_VARIANT),dynamic)
|
||||
opts+= -DFFMPEG -DOPUS -DRESAMPLE -DUSE_SSL
|
||||
opts+= -DNO_MAD
|
||||
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/opus
|
||||
else ifeq ($(BUILD_VARIANT),custom)
|
||||
ifneq ($(CONFIG_SQUEEZELITE_AAC),y)
|
||||
opts+= -DNO_FAAD
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_SQUEEZELITE_DSD),y)
|
||||
opts+= -DDSD
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_SQUEEZELITE_MP3_MAD),y)
|
||||
opts+= -DNO_MAD
|
||||
endif
|
||||
|
||||
ifneq ($(CONFIG_SQUEEZELITE_MP3_MPG123),y)
|
||||
opts+= -DNO_MPG123
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_SQUEEZELITE_OPUS),y)
|
||||
opts+= -DOPUS
|
||||
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/opus
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_SQUEEZELITE_RESAMPLE),y)
|
||||
opts+= -DRESAMPLE
|
||||
endif
|
||||
|
|
@ -134,13 +214,10 @@ ifeq ($(CONFIG_SQUEEZELITE_SSL),y)
|
|||
opts+= -DUSE_SSL
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_SQUEEZELITE_OPUS),y)
|
||||
opts+= -DOPUS
|
||||
TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/opus
|
||||
ifeq ($(CONFIG_SQUEEZELITE_WMA_ALAC),y)
|
||||
opts+= -DFFMPEG
|
||||
endif
|
||||
|
||||
ifeq ($(BUILD_VARIANT),full)
|
||||
opts+= -DLINKALL
|
||||
endif
|
||||
|
||||
MAKE_FLAGS+=OPTS="$(opts)"
|
||||
|
|
@ -149,8 +226,9 @@ define Package/squeezelite/conffiles
|
|||
/etc/config/squeezelite
|
||||
endef
|
||||
|
||||
Package/squeezelite-mini/conffiles = $(Package/squeezelite/conffiles)
|
||||
Package/squeezelite-full/conffiles = $(Package/squeezelite/conffiles)
|
||||
Package/squeezelite-dynamic/conffiles = $(Package/squeezelite/conffiles)
|
||||
Package/squeezelite-custom/conffiles = $(Package/squeezelite/conffiles)
|
||||
|
||||
define Package/squeezelite/install
|
||||
$(INSTALL_DIR) $(1)/usr/bin
|
||||
|
|
@ -161,8 +239,10 @@ define Package/squeezelite/install
|
|||
$(INSTALL_CONF) ./files/squeezelite.conf $(1)/etc/config/squeezelite
|
||||
endef
|
||||
|
||||
Package/squeezelite-mini/install=$(Package/squeezelite/install)
|
||||
Package/squeezelite-full/install=$(Package/squeezelite/install)
|
||||
Package/squeezelite-dynamic/install=$(Package/squeezelite/install)
|
||||
Package/squeezelite-custom/install=$(Package/squeezelite/install)
|
||||
|
||||
$(eval $(call BuildPackage,squeezelite-mini))
|
||||
$(eval $(call BuildPackage,squeezelite-full))
|
||||
$(eval $(call BuildPackage,squeezelite-dynamic))
|
||||
$(eval $(call BuildPackage,squeezelite-custom))
|
||||
|
|
|
|||
|
|
@ -132,16 +132,16 @@
|
|||
} else {
|
||||
--- a/squeezelite.h
|
||||
+++ b/squeezelite.h
|
||||
@@ -458,7 +458,7 @@ char* strcasestr(const char *haystack, c
|
||||
@@ -463,7 +463,7 @@ char* strcasestr(const char *haystack, c
|
||||
|
||||
char *next_param(char *src, char c);
|
||||
u32_t gettime_ms(void);
|
||||
-void get_mac(u8_t *mac);
|
||||
+in_addr_t get_iface_info(log_level level, char *iface, u8_t *mac);
|
||||
void set_nonblock(sockfd s);
|
||||
void set_recvbufsize(sockfd s);
|
||||
int connect_timeout(sockfd sock, const struct sockaddr *addr, socklen_t addrlen, int timeout);
|
||||
void server_addr(char *server, in_addr_t *ip_ptr, unsigned *port_ptr);
|
||||
@@ -515,7 +515,7 @@ void buf_init(struct buffer *buf, size_t
|
||||
@@ -521,7 +521,7 @@ void buf_init(struct buffer *buf, size_t
|
||||
void buf_destroy(struct buffer *buf);
|
||||
|
||||
// slimproto.c
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=borgbackup
|
||||
PKG_VERSION:=1.2.4
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PYPI_NAME:=borgbackup
|
||||
PKG_HASH:=a4bd54e9469e81b7a30a6711423115abc818d9cd844ecb1ca0e6104bc5374da8
|
||||
|
|
@ -18,15 +18,14 @@ PKG_LICENSE:=BSD-3-Clause
|
|||
PKG_LICENSE_FILES:=LICENSE
|
||||
PKG_MAINTAINER:=Julien Malik <julien.malik@paraiso.me>
|
||||
|
||||
include ../pypi.mk
|
||||
include ../../lang/python/pypi.mk
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
include ../python3-package.mk
|
||||
include ../../lang/python/python3-package.mk
|
||||
|
||||
# see #20462 and #12942: email and urllib shall come with python3-light
|
||||
define Package/borgbackup
|
||||
SECTION:=lang
|
||||
CATEGORY:=Languages
|
||||
SUBMENU:=Python
|
||||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
TITLE:=Deduplicated, encrypted, authenticated and compressed backups
|
||||
URL:=https://github.com/borgbackup/borg
|
||||
DEPENDS:= \
|
||||
|
|
@ -76,9 +76,9 @@ config LCD4LINUX_CUSTOM_DRIVER_D4D
|
|||
prompt "D4D"
|
||||
select LCD4LINUX_CUSTOM_NEEDS_libgd
|
||||
|
||||
config LCD4LINUX_CUSTOM_DRIVER_dpf
|
||||
config LCD4LINUX_CUSTOM_DRIVER_DPF
|
||||
bool
|
||||
prompt "dpf"
|
||||
prompt "DPF"
|
||||
select LCD4LINUX_CUSTOM_NEEDS_libusb
|
||||
select LCD4LINUX_CUSTOM_NEEDS_libgd
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=lcd4linux
|
||||
PKG_RELEASE:=8
|
||||
PKG_RELEASE:=10
|
||||
|
||||
PKG_SOURCE_PROTO:=git
|
||||
PKG_SOURCE_URL:=https://github.com/feckert/lcd4linux
|
||||
|
|
@ -195,6 +195,10 @@ $(call Package/lcd4linux/Default/description)
|
|||
endef
|
||||
|
||||
|
||||
CONFIGURE_VARS+= \
|
||||
ANSICXX_TRUE=yes \
|
||||
am__fastdepCXX_TRUE=yes
|
||||
|
||||
CONFIGURE_ARGS+= \
|
||||
--disable-rpath
|
||||
|
||||
|
|
|
|||
|
|
@ -8,20 +8,22 @@
|
|||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=xfsprogs
|
||||
PKG_VERSION:=5.9.0
|
||||
PKG_RELEASE:=3
|
||||
PKG_VERSION:=6.2.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=@KERNEL/linux/utils/fs/xfs/xfsprogs
|
||||
PKG_HASH:=bc5c805596bc609a18dc1f1b4ed6a2821dba9f47408ec00e7799ceea1b2097f1
|
||||
PKG_HASH:=d67dcba5a28e0904b60886b6e5f752bc7c9c3a5c7096153855b5adca9db86c51
|
||||
|
||||
PKG_MAINTAINER:=
|
||||
PKG_LICENSE:=GPL-2.0-only
|
||||
PKG_LICENSE_FILES:=LICENSES/GPL-2.0
|
||||
PKG_CPE_ID:=cpe:/a:sgi:xfsprogs
|
||||
|
||||
PKG_INSTALL:=1
|
||||
PKG_BUILD_DEPENDS:=inih
|
||||
PKG_BUILD_FLAGS:=no-mips16
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_INSTALL:=1
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
|
|
@ -29,7 +31,7 @@ define Package/xfsprogs/default
|
|||
SECTION:=utils
|
||||
CATEGORY:=Utilities
|
||||
SUBMENU:=Filesystem
|
||||
DEPENDS:=+libuuid +libpthread
|
||||
DEPENDS:=+liburcu +libuuid +libpthread
|
||||
URL:=https://xfs.org/
|
||||
endef
|
||||
|
||||
|
|
@ -41,6 +43,7 @@ endef
|
|||
define Package/xfs-mkfs
|
||||
$(call Package/xfsprogs/default)
|
||||
TITLE:=Utility for creating XFS filesystems
|
||||
DEPENDS+=+libinih
|
||||
endef
|
||||
|
||||
define Package/xfs-fsck
|
||||
|
|
@ -67,7 +70,7 @@ CONFIGURE_ARGS += \
|
|||
--disable-scrub \
|
||||
--disable-libicu
|
||||
|
||||
TARGET_CFLAGS += -DHAVE_MAP_SYNC $(if (CONFIG_USE_MUSL),-D_LARGEFILE64_SOURCE)
|
||||
TARGET_CFLAGS += -DHAVE_MAP_SYNC $(if $(CONFIG_USE_MUSL),-D_LARGEFILE64_SOURCE)
|
||||
TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
|
||||
|
||||
define Package/xfs-admin/install
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
--- a/libxfs/libxfs_priv.h
|
||||
+++ b/libxfs/libxfs_priv.h
|
||||
@@ -87,9 +87,6 @@ struct iomap;
|
||||
@@ -89,9 +89,6 @@ struct iomap;
|
||||
/* for all the support code that uses progname in error messages */
|
||||
extern char *progname;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue