Merge pull request #7378 from thess/ffmpeg-custom
authorTed Hess <thess@kitschensync.net>
Tue, 13 Nov 2018 16:56:36 +0000 (11:56 -0500)
committerGitHub <noreply@github.com>
Tue, 13 Nov 2018 16:56:36 +0000 (11:56 -0500)
ffmpeg: Add choices to libffmpeg-custom to select and build CLI programs

17 files changed:
.circleci/config.yml
lang/python/pillow/Makefile
lang/python/pillow/patches/010-fix-paths.patch
lang/python/pytz/Makefile
libs/libopusenc/Makefile [new file with mode: 0644]
libs/opusfile/Makefile [new file with mode: 0644]
net/apache/Makefile
net/mosquitto/Makefile
net/nft-qos/Makefile
net/nft-qos/files/lib/dynamic.sh
net/nft-qos/files/lib/monitor.sh
net/shadowsocks-libev/Makefile
net/sysrepo/Makefile
sound/opus-tools/Makefile
utils/nano/Makefile
utils/nano/patches/001-upstream-fix-for-3.1-tiny-compilation.patch [deleted file]
utils/temperusb/Makefile [new file with mode: 0644]

index ff0abc05215a3c6dc110a9734b69ca3c189932e6..31682621e923c77d29f86c26e1be29820f0433a2 100644 (file)
@@ -4,7 +4,7 @@ jobs:
     docker:
       - image: champtar/openwrtpackagesci@sha256:d46da22bc628f4b369147eebfa1b032e4066510da42a073b22acbf6b6595b77f
     environment:
-      - SDK_BASE_URL: "https://downloads.lede-project.org/snapshots/targets/ar71xx/generic"
+      - SDK_BASE_URL: "https://downloads.openwrt.org/snapshots/targets/ar71xx/generic"
       - SDK_FILE: "openwrt-sdk-ar71xx-generic_gcc-7.3.0_musl.Linux-x86_64.tar.xz"
       - BRANCH: "master"
     steps:
@@ -27,7 +27,7 @@ jobs:
           command: |
              tar Jxf ~/sdk/$SDK_FILE --strip=1
              cat > feeds.conf <<EOF
-             src-git base https://github.com/lede-project/source.git
+             src-git base https://github.com/openwrt/openwrt.git
              src-link packages $HOME/openwrt_packages
              src-git luci https://github.com/openwrt/luci.git
              EOF
index c1618e2f7d90858793789dcd6a6a8971c7dbf835..831ba8b5f0e1ab028312bb62dce4f29dd0826704 100644 (file)
@@ -7,18 +7,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pillow
-PKG_VERSION:=3.3.1
-PKG_RELEASE=1
+PKG_VERSION:=5.3.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=Pillow-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/P/Pillow
+PKG_HASH:=2ea3517cd5779843de8a759c2349a3cd8d3893e03ab47053b66d5ec6f8bc4f93
+PKG_BUILD_DIR:=$(BUILD_DIR)/Pillow-$(PKG_VERSION)
+
 PKG_LICENSE:=CUSTOM
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/python-pillow/Pillow.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=aab33141f381d5577cdef9033b7fdff79122a10c
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=e7c36bcf89614337d9abc4d07780da0b346a745be7a9aa55b398fa427549273c
-
 include $(INCLUDE_DIR)/package.mk
 include ../python-package.mk
 
@@ -42,12 +41,9 @@ endef
 
 define Package/pillow/install
        $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-       $(INSTALL_DIR) $(1)/usr/bin
        $(CP) \
                $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
                $(1)$(PYTHON_PKG_DIR)/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin
-       $(CP) $(PKG_BUILD_DIR)/LICENSE $(1)$(PYTHON_PKG_DIR)/PIL/
 endef
 
 $(eval $(call BuildPackage,pillow))
index a6b86bfe63cd498ac2e71397902c812202e5fc48..ca5b2e57dcf5f1afc0c91bd99cb32c80dbfd705c 100644 (file)
@@ -1,32 +1,34 @@
-diff -rupN pillow-3.3.1.orig/setup.py pillow-3.3.1/setup.py
---- pillow-3.3.1.orig/setup.py 2016-08-22 17:45:05.000000000 +0200
-+++ pillow-3.3.1/setup.py      2016-08-22 18:09:51.947745155 +0200
-@@ -111,12 +111,12 @@ except (ImportError, OSError):
+diff --git a/setup.py b/setup.py
+index 15d81e4..ee6dba6 100755
+--- a/setup.py
++++ b/setup.py
+@@ -136,12 +136,12 @@ except (ImportError, OSError):
  
  NAME = 'Pillow'
- PILLOW_VERSION = '3.3.1'
+ PILLOW_VERSION = get_version()
 -JPEG_ROOT = None
-+JPEG_ROOT = _lib_include(os.environ['STAGING_DIR'] + "/usr")
++JPEG_ROOT = os.path.join(os.environ['STAGING_DIR'], "/usr/lib")
  JPEG2K_ROOT = None
 -ZLIB_ROOT = None
-+ZLIB_ROOT = _lib_include(os.environ['STAGING_DIR'] + "/usr")
++ZLIB_ROOT = os.path.join(os.environ['STAGING_DIR'], "/usr/lib")
  IMAGEQUANT_ROOT = None
 -TIFF_ROOT = None
 -FREETYPE_ROOT = None
-+TIFF_ROOT = _lib_include(os.environ['STAGING_DIR'] + "/usr")
-+FREETYPE_ROOT = _lib_include(os.environ['STAGING_DIR'] + "/usr")
++TIFF_ROOT = os.path.join(os.environ['STAGING_DIR'], "/usr/lib")
++FREETYPE_ROOT = os.path.join(os.environ['STAGING_DIR'], "/usr/lib")
  LCMS_ROOT = None
  
  
-@@ -221,161 +221,6 @@ class pil_build_ext(build_ext):
+@@ -289,159 +289,6 @@ class pil_build_ext(build_ext):
+             _add_directory(library_dirs, os.path.join(prefix, "lib"))
              _add_directory(include_dirs, os.path.join(prefix, "include"))
  
-         #
+-        #
 -        # add platform directories
 -
 -        if self.disable_platform_guessing:
 -            pass
--        
+-
 -        elif sys.platform == "cygwin":
 -            # pythonX.Y.dll.a is in the /usr/lib/pythonX.Y/config directory
 -            _add_directory(library_dirs,
@@ -48,7 +50,7 @@ diff -rupN pillow-3.3.1.orig/setup.py pillow-3.3.1/setup.py
 -            try:
 -                prefix = subprocess.check_output(['brew', '--prefix']).strip(
 -                ).decode('latin1')
--            except:
+-            except Exception:
 -                # Homebrew not installed
 -                prefix = None
 -
@@ -73,61 +75,59 @@ diff -rupN pillow-3.3.1.orig/setup.py pillow-3.3.1/setup.py
 -
 -        elif sys.platform.startswith("linux"):
 -            arch_tp = (plat.processor(), plat.architecture()[0])
--            if arch_tp == ("x86_64", "32bit"):
--                # 32-bit build on 64-bit machine.
+-            # This should be correct on debian derivatives.
+-            if os.path.exists('/etc/debian_version'):
+-                # If this doesn't work, don't just silently patch
+-                # downstream because it's going to break when people
+-                # try to build pillow from source instead of
+-                # installing from the system packages.
+-                self.add_multiarch_paths()
+-
+-            elif arch_tp == ("x86_64", "32bit"):
+-                # Special Case: 32-bit build on 64-bit machine.
 -                _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
 -            else:
--                for platform_ in arch_tp:
+-                libdirs = {
+-                    'x86_64':  ["/lib64", "/usr/lib64",
+-                                "/usr/lib/x86_64-linux-gnu"],
+-                    '64bit':   ["/lib64", "/usr/lib64",
+-                                "/usr/lib/x86_64-linux-gnu"],
+-                    'i386':    ["/usr/lib/i386-linux-gnu"],
+-                    'i686':    ["/usr/lib/i386-linux-gnu"],
+-                    '32bit':   ["/usr/lib/i386-linux-gnu"],
+-                    'aarch64': ["/usr/lib64", "/usr/lib/aarch64-linux-gnu"],
+-                    'arm':     ["/usr/lib/arm-linux-gnueabi"],
+-                    'armv71':  ["/usr/lib/arm-linux-gnueabi"],
+-                    'armv7l':  ["/usr/lib"],
+-                    'ppc64':   ["/usr/lib64", "/usr/lib/ppc64-linux-gnu",
+-                                "/usr/lib/powerpc64-linux-gnu"],
+-                    'ppc64le':   ["/usr/lib64"],
+-                    'ppc':     ["/usr/lib/ppc-linux-gnu",
+-                                "/usr/lib/powerpc-linux-gnu"],
+-                    's390x':   ["/usr/lib64", "/usr/lib/s390x-linux-gnu"],
+-                    's390':    ["/usr/lib/s390-linux-gnu"],
+-                    }
 -
--                    if not platform_:
+-                for platform_ in arch_tp:
+-                    dirs = libdirs.get(platform_, None)
+-                    if not dirs:
 -                        continue
+-                    for path in dirs:
+-                        _add_directory(library_dirs, path)
+-                    break
 -
--                    if platform_ in ["x86_64", "64bit"]:
--                        _add_directory(library_dirs, "/lib64")
--                        _add_directory(library_dirs, "/usr/lib64")
--                        _add_directory(library_dirs,
--                                       "/usr/lib/x86_64-linux-gnu")
--                        break
--                    elif platform_ in ["i386", "i686", "32bit"]:
--                        _add_directory(library_dirs, "/usr/lib/i386-linux-gnu")
--                        break
--                    elif platform_ in ["aarch64"]:
--                        _add_directory(library_dirs, "/usr/lib64")
--                        _add_directory(library_dirs,
--                                       "/usr/lib/aarch64-linux-gnu")
--                        break
--                    elif platform_ in ["arm", "armv7l"]:
--                        _add_directory(library_dirs,
--                                       "/usr/lib/arm-linux-gnueabi")
--                        break
--                    elif platform_ in ["ppc64"]:
--                        _add_directory(library_dirs, "/usr/lib64")
--                        _add_directory(library_dirs,
--                                       "/usr/lib/ppc64-linux-gnu")
--                        _add_directory(library_dirs,
--                                       "/usr/lib/powerpc64-linux-gnu")
--                        break
--                    elif platform_ in ["ppc"]:
--                        _add_directory(library_dirs, "/usr/lib/ppc-linux-gnu")
--                        _add_directory(library_dirs,
--                                       "/usr/lib/powerpc-linux-gnu")
--                        break
--                    elif platform_ in ["s390x"]:
--                        _add_directory(library_dirs, "/usr/lib64")
--                        _add_directory(library_dirs,
--                                       "/usr/lib/s390x-linux-gnu")
--                        break
--                    elif platform_ in ["s390"]:
--                        _add_directory(library_dirs, "/usr/lib/s390-linux-gnu")
--                        break
 -                else:
 -                    raise ValueError(
 -                        "Unable to identify Linux platform: `%s`" % platform_)
 -
--                # XXX Kludge. Above /\ we brute force support multiarch. Here we
--                # try Barry's more general approach. Afterward, something should
--                # work ;-)
--                self.add_multiarch_paths()
+-                # termux support for android.
+-                # system libraries (zlib) are installed in /system/lib
+-                # headers are at $PREFIX/include
+-                # user libs are at $PREFIX/lib
+-                if os.environ.get('ANDROID_ROOT', None):
+-                    _add_directory(library_dirs,
+-                                   os.path.join(os.environ['ANDROID_ROOT'],
+-                                                'lib'))
 -
 -        elif sys.platform.startswith("gnu"):
 -            self.add_multiarch_paths()
@@ -164,8 +164,8 @@ diff -rupN pillow-3.3.1.orig/setup.py pillow-3.3.1/setup.py
 -            best_path = None
 -            for name in os.listdir(program_files):
 -                if name.startswith('OpenJPEG '):
--                    version = tuple([int(x) for x in name[9:].strip().split(
--                        '.')])
+-                    version = tuple(int(x) for x in
+-                                    name[9:].strip().split('.'))
 -                    if version > best_version:
 -                        best_version = version
 -                        best_path = os.path.join(program_files, name)
@@ -176,7 +176,6 @@ diff -rupN pillow-3.3.1.orig/setup.py pillow-3.3.1/setup.py
 -                _add_directory(include_dirs,
 -                               os.path.join(best_path, 'include'))
 -
--        #
+         #
          # insert new dirs *before* default libs, to avoid conflicts
          # between Python PYD stub libs and real libraries
index fc51478f002bd6ef3ccc5fc186da3b79d3e11338..9cdb69ec6f8099bb615057d615e4d0e35a69c75e 100644 (file)
@@ -8,14 +8,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pytz
-PKG_VERSION:=2018.6
+PKG_VERSION:=2018.7
 PKG_RELEASE:=1
 PKG_LICENSE:=MIT
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://files.pythonhosted.org/packages/source/p/pytz
-PKG_HASH:=642253af8eae734d1509fc6ac9c1aee5e5b69d76392660889979b9870610a46b
+PKG_HASH:=31cb35c89bd7d333cd32c5f278fca91b523b0834369e757f4c5641ea252236ca
 
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 include ../python-package.mk
 
@@ -37,13 +38,12 @@ define Build/Compile
        $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR))
 endef
 
-define Package/pytz/InstallDev
-       $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
-       $(CP) \
-           $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \
-           $(1)$(PYTHON_PKG_DIR)
+define Host/Compile
+       $(call Build/Compile/HostPyMod,,install --prefix="" --root="$(STAGING_DIR_HOSTPKG)")
 endef
 
+Host/Install:=
+
 define Package/pytz/install
        $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)
        $(CP) \
@@ -51,4 +51,5 @@ define Package/pytz/install
            $(1)$(PYTHON_PKG_DIR)
 endef
 
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,pytz))
diff --git a/libs/libopusenc/Makefile b/libs/libopusenc/Makefile
new file mode 100644 (file)
index 0000000..3f0dba5
--- /dev/null
@@ -0,0 +1,51 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libopusenc
+PKG_VERSION:=0.2.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://archive.mozilla.org/pub/opus
+PKG_HASH:=8298db61a8d3d63e41c1a80705baa8ce9ff3f50452ea7ec1c19a564fe106cbb9
+
+PKG_MAINTAINER:=Eduardo Abinader <eduardoabinader@gmail.com>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=COPYING
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libopusenc
+  SECTION:=libs
+  CATEGORY:=Libraries
+  DEPENDS:=+libopus
+  TITLE:=OPUS Audio stream files
+  URL:=https://opus-codec.org
+endef
+
+define Package/libopusenc/descriptiion
+ Libopusenc provides a high-level API for creating .opus files and streams.
+endef
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libopusenc.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libopusenc/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libopusenc))
diff --git a/libs/opusfile/Makefile b/libs/opusfile/Makefile
new file mode 100644 (file)
index 0000000..eb8475c
--- /dev/null
@@ -0,0 +1,54 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=opusfile
+PKG_VERSION:=0.11
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://downloads.xiph.org/releases/opus/
+PKG_HASH:=74ce9b6cf4da103133e7b5c95df810ceb7195471e1162ed57af415fabf5603bf
+
+PKG_LICENSE:=BSD-2-Clause
+PKG_LICENSE_FILES:=COPYING
+PKG_MAINTAINER:=Eduardo Abinader <eduardoabinader@gmail.com>
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libopusfile
+   SECTION:=libs
+   CATEGORY:=Libraries
+   DEPENDS:=+libogg +libopus +libopenssl
+   TITLE:=OPUS file library
+   URL:=http://opus-codec.org/
+endef
+
+define Package/libopusfile/description
+ The opusfile library provides seeking, decode, and playback of Opus streams in the Ogg container (.opus files)
+endef
+
+CONFIGURE_ARGS += \
+       --without-flac \
+
+define Build/InstallDev
+       $(INSTALL_DIR) $(1)/usr/include
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
+       $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/opusfile.pc $(1)/usr/lib/pkgconfig/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/opusurl.pc $(1)/usr/lib/pkgconfig/
+endef
+
+define Package/libopusfile/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libopusfile))
index 900f866f2d1c05dcf8c7e5511220cf54c3b24882..1dd22bdb87518f9a2ffcf626aafb258953b7b5a2 100644 (file)
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=apache
 PKG_VERSION:=2.4.37
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_SOURCE_NAME:=httpd
 
 PKG_SOURCE:=$(PKG_SOURCE_NAME)-$(PKG_VERSION).tar.bz2
@@ -121,6 +121,7 @@ define Build/Configure
                --with-openssl="$(STAGING_DIR)/usr" \
                --enable-ssl \
                --enable-proxy \
+               --disable-md \
                --disable-disk-cache \
                --enable-maintainer-mode \
                --with-mpm=prefork \
index ff43595d65737e1b5526af69b8e33327433fcf2f..37daddc41441403f0e03e6d7258aca837dfa774f 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mosquitto
 PKG_VERSION:=1.5.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE.txt
 PKG_CPE_ID:=cpe:/a:eclipse:mosquitto
@@ -193,6 +193,8 @@ define Build/InstallDev
        $(INSTALL_DIR) $(1)/usr/include
        $(CP) $(PKG_BUILD_DIR)/lib/mosquitto.h $(1)/usr/include
        $(CP) $(PKG_BUILD_DIR)/lib/cpp/mosquittopp.h $(1)/usr/include
+       $(CP) $(PKG_BUILD_DIR)/src/mosquitto_plugin.h $(1)/usr/include
+       $(CP) $(PKG_BUILD_DIR)/src/mosquitto_broker.h $(1)/usr/include
        $(INSTALL_DIR) $(1)/usr/lib
        $(CP) $(PKG_BUILD_DIR)/lib/libmosquitto.so.1 $(1)/usr/lib/
        $(CP) $(PKG_BUILD_DIR)/lib/cpp/libmosquittopp.so.1 $(1)/usr/lib/
index 6e0627d891abd61bcbf64c8ee65e71b6de8b9bf9..3ec2b56011c60c51181f04ba29deb41f6365eca6 100644 (file)
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nft-qos
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-2.0
 
index 960ca528292dfcdcb5e9cf8810678f31afedf169..a3032086f51b1f7cf84ea926b0fd9352d7d72fdd 100644 (file)
@@ -56,7 +56,7 @@ qosdef_flush_dynamic() {
 # init dynamic qos
 qosdef_init_dynamic() {
        local dynamic_bw_up dynamic_bw_down limit_enable limit_type
-       local hook_ul="input" hook_dl="postrouting"
+       local hook_ul="prerouting" hook_dl="postrouting"
 
        uci_validate_section nft-qos default default \
                'limit_enable:bool:0' \
@@ -79,7 +79,7 @@ qosdef_init_dynamic() {
 
        [ -z "$NFT_QOS_HAS_BRIDGE" ] && {
                hook_ul="postrouting"
-               hook_dl="input"
+               hook_dl="prerouting"
        }
 
        qosdef_appendx "table $NFT_QOS_INET_FAMILY nft-qos-dynamic {\n"
index d05943ae2a8594355ddd2b098967ca22182b75f9..54de88eb3681e90a79e0b6780863c8e0f516f230 100644 (file)
@@ -26,11 +26,11 @@ qosdef_monitor_del() { # <mac> <ip> <hostname>
 
 # init qos monitor
 qosdef_init_monitor() {
-       local hook_ul="input" hook_dl="postrouting"
+       local hook_ul="prerouting" hook_dl="postrouting"
 
        [ -z "$NFT_QOS_HAS_BRIDGE" ] && {
                hook_ul="postrouting"
-               hook_dl="input"
+               hook_dl="prerouting"
        }
 
        nft add table $NFT_QOS_INET_FAMILY nft-qos-monitor
index 9c18a5871586d7b1984f273f68c1a002a0f30f6b..c19de43c3cb70714d20c9a6d43ace41ffb3c8209 100644 (file)
@@ -13,12 +13,12 @@ include $(TOPDIR)/rules.mk
 # - check if default mode has changed from being tcp_only
 #
 PKG_NAME:=shadowsocks-libev
-PKG_VERSION:=3.2.0
+PKG_VERSION:=3.2.1
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/shadowsocks/shadowsocks-libev/releases/download/v$(PKG_VERSION)
-PKG_HASH:=5521cf623a07fd1e393528516a83acd2b66c5d4bb4535a52662806a6a060c606
+PKG_HASH:=988fc151474d0d2fb7a6005621949656e7a7f79400b4514624e09fd4b22969f6
 
 PKG_MAINTAINER:=Yousong Zhou <yszhou4tech@gmail.com>
 
index acc4fa2ee28da29548e113ca25d327b3e65bd175..443ab6dd05df26111cffd03644048f2ecff14791 100644 (file)
@@ -11,12 +11,12 @@ PKG_LICENSE:=ASL-2.0
 PKG_MAINTAINER:=Mislav Novakovic <mislav.novakovic@sartura.hr>
 
 PKG_NAME:=sysrepo
-PKG_VERSION:=0.7.5
+PKG_VERSION:=0.7.6
 PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/sysrepo/sysrepo/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=3ef20e1e005fd22f13d1996231ccfc72241f3f76c5700397ad59dda0f9b29f72
+PKG_HASH:=44389df29618f0056192a1b7659a64c9d3b3f88fd87cea395b3a9cd8d224032b
 
 CMAKE_INSTALL:=1
 
index 1b5b9a1065608092df9f08c270436437498b5cf3..4e4d0b6382f95d8c2319e9ef7891aab45bf0b46a 100644 (file)
@@ -6,17 +6,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=opus-tools
-PKG_VERSION:=0.1.10
+PKG_VERSION:=0.2
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.xiph.org/releases/opus/
-PKG_HASH:=a2357532d19471b70666e0e0ec17d514246d8b3cb2eb168f68bb0f6fd372b28c
+PKG_HASH:=b4e56cb00d3e509acfba9a9b627ffd8273b876b4e2408642259f6da28fa0ff86
 
 PKG_LICENSE:=BSD-2-Clause
 PKG_LICENSE_FILES:=COPYING
-PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
-               Nicolas Thill <nico@openwrt.org>
+PKG_MAINTAINER:=Eduardo Abinader <eduardoabinader@gmail.com>
 
 PKG_INSTALL:=1
 
@@ -25,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/opus-tools
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libogg +libopus
+  DEPENDS:=+libogg +libopus +libopusfile +libopusenc
   TITLE:=OPUS Codec tools
   URL:=http://opus-codec.org/
 endef
index c52e5803ab9b752c36513cc179610afbae6142e6..a8f2b7b712129a8ebe5b20e29abafe15062702ed 100644 (file)
@@ -8,14 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nano
-PKG_VERSION:=3.1
+PKG_VERSION:=3.2
 PKG_RELEASE:=1
 PKG_LICENSE:=GPL-3.0+
 PKG_LICENSE_FILES:=COPYING
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNU/nano
-PKG_HASH:=14c02ca40a5bc61c580ce2f9cb7f9fc72d5ccc9da17ad044f78f6fb3fdb7719e
+PKG_HASH:=d12773af3589994b2e4982c5792b07c6240da5b86c5aef2103ab13b401fe6349
 
 PKG_INSTALL:=1
 PKG_BUILD_PARALLEL:=1
diff --git a/utils/nano/patches/001-upstream-fix-for-3.1-tiny-compilation.patch b/utils/nano/patches/001-upstream-fix-for-3.1-tiny-compilation.patch
deleted file mode 100644 (file)
index 58fe198..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-From 368ec04870a366b19f1c5801a6868786547968b0 Mon Sep 17 00:00:00 2001
-From: Benno Schulenberg <bensberg@telfort.nl>
-Date: Wed, 19 Sep 2018 20:36:39 +0200
-Subject: build: fix compilation again when configured with --enable-tiny
-
-Reported-by: Jordi Mallach <jordi@mallach.net>
----
- src/nano.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/nano.c b/src/nano.c
-index ebb1f11..01f92a1 100644
---- a/src/nano.c
-+++ b/src/nano.c
-@@ -1756,7 +1756,10 @@ int do_input(bool allow_funcs)
-       if (shortcut == NULL)
-               pletion_line = NULL;
-       else {
--              if (ISSET(VIEW_MODE) && shortcut->func != do_toggle_void &&
-+              if (ISSET(VIEW_MODE) &&
-+#ifndef NANO_TINY
-+                                                              shortcut->func != do_toggle_void &&
-+#endif
-                                                               !okay_for_view(shortcut)) {
-                       print_view_warning();
-                       return ERR;
--- 
-cgit v1.0-41-gc330
-
diff --git a/utils/temperusb/Makefile b/utils/temperusb/Makefile
new file mode 100644 (file)
index 0000000..6bb60b4
--- /dev/null
@@ -0,0 +1,42 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=temperusb
+PKG_VERSION:=2.0
+PKG_RELEASE:=1
+PKG_CONFIG_DEPENDS:=libusb
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/temperv14-$(PKG_VERSION)
+PKG_SOURCE_URL:=https://codeload.github.com/Arduous/temperv14/tar.gz/v${PKG_VERSION}?
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_HASH:=a8f4ef76a2def5a2e3ec351828a042ce8f7a0963eaa6d9d8ce0c8313e2b54526
+PKG_LICENSE:=BSD-1-Clause
+PKG_LICENSE_FILES:=temperv14.c
+
+PKG_MAINTAINER := Samuel Progin <samuel.progin@gmail.com>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/temperusb
+  SECTION:=utils
+  CATEGORY:=Utilities
+  DEPENDS:=+libusb-1.0
+  TITLE:=USB Thermometer RDing TEMPer v1.4 reader
+endef
+
+define Package/temperusb/description
+  RDing TEMPer v1.4 USB thermometer are cheap devices that can be sourced everywhere on
+  the Internet. This package allow to operate them from user space.
+endef
+
+define Package/temperusb/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/temperv14 $(1)/usr/bin
+endef
+
+$(eval $(call BuildPackage,temperusb))
+