From patchwork Sun Oct 4 21:08:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 1376542 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ULQr0JEW; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4C4GYc2Mmbz9sSn for ; Mon, 5 Oct 2020 08:08:50 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E87E92001E; Sun, 4 Oct 2020 21:08:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XDWZhoHjgb2U; Sun, 4 Oct 2020 21:08:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 5729C20031; Sun, 4 Oct 2020 21:08:40 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A229E1BF4E4 for ; Sun, 4 Oct 2020 21:08:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9906886F93 for ; Sun, 4 Oct 2020 21:08:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gv47lvXaXsaO for ; Sun, 4 Oct 2020 21:08:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id D7F9D86F90 for ; Sun, 4 Oct 2020 21:08:35 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id z22so534411wmi.0 for ; Sun, 04 Oct 2020 14:08:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=h3ea7Cu3runKVlyS2WyhYKfbCmQnUaARPB/LOkabbcM=; b=ULQr0JEW6ZcH0gOLPkJ7yjjgnFjFqQ9Jqvo3WEhCvjx73KzxMxEPR7JSr2zsHBpNSx aKAUOv5LmYOBrwZEy6bjFGc2TNOSXLxJDOojMtRUhAnHlhxGWv9vVU885HSokQSD1xL3 Wlr9GT++NLvJNwhZ6ZFBXI6l0dvxBbVPbjca5+xfhl7/hggU07tp0tuBaLtvXaKV6tD3 aq8k/8GCpE8apEy8uQ+aWzROguwfsIF5MGdIZVdYLp0Xjp6gtnh+LAZ2C10SlIjEIND3 v78pC3cBQim76iws7dePhr5JOJHCVq/t6Mcia4LRfWlvwoOdUu1II4OkBNfnYJs7R95E T1tA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=h3ea7Cu3runKVlyS2WyhYKfbCmQnUaARPB/LOkabbcM=; b=CZzN1ILlf1mgLPwCUX+txGCqsrnrRYd4Bx8Qmqjv/7T4azb6YiPs6XFG+uIQ4rtSDy E3bIulLmqkfwvIalszHqajOQgIi7qhI/QnHW7OpL+5aqTSaikjexe5GJYt64YIwr2I6A SNwrfMNOXwVMYGjLlWEBvYEet8cy5B0RronWKfBqNv+nmzfZi+2sjuoZf/vM7hh3AgBo feo5/mYstxhnQ/E6e7JaIXDOL0AcaVE5pyAgVspfT+sdXvi7k1FqnodLQVqL2ymITZKR EQfkb0rN+qLdnC037gWHt/ZheNmXYA+6Zk4Z8RYyQ9tSTA7ovd8xVmRJxlnBZzjRXsTw 361Q== X-Gm-Message-State: AOAM531fwvEciohfhEXgAmkES+bj4pnVM1NLrTH7iEDnpWZvzQFiqQUn ViZEVS0oA97FM3crg3Xr5ObG2GXZ8tuKsg== X-Google-Smtp-Source: ABdhPJyXW4hfASJCWq06ON8qIBzojHUsvQhjaeytgQF/EDwOaYICgc26AXi7rkOYwCQhAg5YxlIxSw== X-Received: by 2002:a7b:c8cc:: with SMTP id f12mr13024207wml.169.1601845713724; Sun, 04 Oct 2020 14:08:33 -0700 (PDT) Received: from kali.home (2a01cb0881b76d00c2afd0dfa851d2b9.ipv6.abo.wanadoo.fr. [2a01:cb08:81b7:6d00:c2af:d0df:a851:d2b9]) by smtp.gmail.com with ESMTPSA id u66sm10344304wme.12.2020.10.04.14.08.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 04 Oct 2020 14:08:32 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Sun, 4 Oct 2020 23:08:07 +0200 Message-Id: <20201004210807.2084836-1-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 Subject: [Buildroot] [PATCH 1/1] package/motion: bump to version 4.3.1 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" - Drop patch (already in version) - Call gettextsize and add a non upstreamable patch to remove po/Makefile.in: https://github.com/Motion-Project/motion/issues/1028 - --with-mysql-{include,lib} and --with-pgsql-{include,lib} have been dropped since version 4.3.0 and https://github.com/Motion-Project/motion/commit/0dc2ae9372cfd2705110ef25c8c85b246adb2dc6 - Update indentation in hash file (two spaces) Signed-off-by: Fabrice Fontaine --- .../motion/0001-Fix-build-with-GCC-10.patch | 53 ------------------- ...1-configure.ac-remove-po-Makefile.in.patch | 29 ++++++++++ package/motion/motion.hash | 4 +- package/motion/motion.mk | 19 +++---- 4 files changed, 38 insertions(+), 67 deletions(-) delete mode 100644 package/motion/0001-Fix-build-with-GCC-10.patch create mode 100644 package/motion/0001-configure.ac-remove-po-Makefile.in.patch diff --git a/package/motion/0001-Fix-build-with-GCC-10.patch b/package/motion/0001-Fix-build-with-GCC-10.patch deleted file mode 100644 index a5684db965..0000000000 --- a/package/motion/0001-Fix-build-with-GCC-10.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a4a48baf86b18b792fb5e53648b4efd02b3db7b7 Mon Sep 17 00:00:00 2001 -From: Vasiliy Glazov -Date: Sun, 8 Mar 2020 03:00:21 +0300 -Subject: [PATCH] Fix build with GCC 10. - -[Retrieved (and backported) from: -https://github.com/Motion-Project/motion/commit/a4a48baf86b18b792fb5e53648b4efd02b3db7b7] -Signed-off-by: Fabrice Fontaine ---- - src/netcam.h | 2 +- - src/translate.c | 2 ++ - src/translate.h | 2 +- - 3 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/netcam.h b/netcam.h -index 2951d917..4ee0e1c8 100644 ---- a/netcam.h -+++ b/netcam.h -@@ -113,7 +113,7 @@ typedef struct netcam_image_buff { - } netcam_buff; - typedef netcam_buff *netcam_buff_ptr; - --struct netcam_caps { /* netcam capabilities: */ -+extern struct netcam_caps { /* netcam capabilities: */ - unsigned char streaming; /* See the NCS_* defines */ - unsigned char content_length; /* 0 - unsupported */ - } caps; -diff --git a/translate.c b/translate.c -index 0c9f1105..a212d9de 100644 ---- a/translate.c -+++ b/translate.c -@@ -10,6 +10,8 @@ - #include "motion.h" - #include "translate.h" - -+int nls_enabled; -+ - void translate_locale_chg(const char *langcd){ - #ifdef HAVE_GETTEXT - /* This routine is for development testing only. It is not used for -diff --git a/translate.h b/translate.h -index 0832ffd8..eeba3745 100644 ---- a/translate.h -+++ b/translate.h -@@ -10,7 +10,7 @@ - #ifndef _INCLUDE_TRANSLATE_H_ - #define _INCLUDE_TRANSLATE_H_ - --int nls_enabled; -+extern int nls_enabled; - - #ifdef HAVE_GETTEXT - # include diff --git a/package/motion/0001-configure.ac-remove-po-Makefile.in.patch b/package/motion/0001-configure.ac-remove-po-Makefile.in.patch new file mode 100644 index 0000000000..9b514bafcd --- /dev/null +++ b/package/motion/0001-configure.ac-remove-po-Makefile.in.patch @@ -0,0 +1,29 @@ +From 0e05d4116678de3a7d913177a8fc63f10e58ad24 Mon Sep 17 00:00:00 2001 +From: Fabrice Fontaine +Date: Sat, 18 Jan 2020 00:00:21 +0100 +Subject: [PATCH] configure.ac: remove po/Makefile.in + +The file po/Makefile.in is automatically added to AC_OUTPUT while using +gettexize + +Signed-off-by: Fabrice Fontaine +[Upstream status: not upstreamable] +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3876adb..221dacf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -471,7 +471,6 @@ LDFLAGS="$TEMP_LDFLAGS" + AC_CONFIG_FILES([ + Makefile + src/Makefile +- po/Makefile.in + man/Makefile + data/camera1-dist.conf + data/camera2-dist.conf +-- +2.24.1 + diff --git a/package/motion/motion.hash b/package/motion/motion.hash index 2b25d0a52c..6e8dd699e1 100644 --- a/package/motion/motion.hash +++ b/package/motion/motion.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 c8d40976b41da8eb9f9f7128599403a312fc26b7226bf3787d75f78cb5a6cc6e motion-4.2.2.tar.gz -sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad COPYING +sha256 545712b10fc4a0134e994b7d8a3773c1c22f0bf4bd7afea7d7ffff357aca9ea5 motion-4.3.1.tar.gz +sha256 91df39d1816bfb17a4dda2d3d2c83b1f6f2d38d53e53e41e8f97ad5ac46a0cad doc/COPYING diff --git a/package/motion/motion.mk b/package/motion/motion.mk index ae58c54935..17a48d42ac 100644 --- a/package/motion/motion.mk +++ b/package/motion/motion.mk @@ -4,13 +4,14 @@ # ################################################################################ -MOTION_VERSION = 4.2.2 +MOTION_VERSION = 4.3.1 MOTION_SITE = $(call github,Motion-Project,motion,release-$(MOTION_VERSION)) MOTION_LICENSE = GPL-2.0 -MOTION_LICENSE_FILES = COPYING +MOTION_LICENSE_FILES = doc/COPYING MOTION_DEPENDENCIES = host-pkgconf jpeg libmicrohttpd $(TARGET_NLS_DEPENDENCIES) # From git MOTION_AUTORECONF = YES +MOTION_GETTEXTIZE = YES MOTION_CONF_OPTS += --without-optimizecpu @@ -23,20 +24,14 @@ endif ifeq ($(BR2_PACKAGE_MYSQL),y) MOTION_DEPENDENCIES += mysql -MOTION_CONF_OPTS += \ - --with-mysql \ - --with-mysql-include=$(STAGING_DIR)/usr/include/mysql \ - --with-mysql-lib=$(STAGING_DIR)/usr/lib +MOTION_CONF_OPTS += --with-mysql else MOTION_CONF_OPTS += --without-mysql endif ifeq ($(BR2_PACKAGE_POSTGRESQL),y) MOTION_DEPENDENCIES += postgresql -MOTION_CONF_OPTS += \ - --with-pgsql \ - --with-pgsql-include=$(STAGING_DIR)/usr/include \ - --with-pgsql-lib=$(STAGING_DIR)/usr/lib +MOTION_CONF_OPTS += --with-pgsql else MOTION_CONF_OPTS += --without-pgsql endif @@ -58,9 +53,9 @@ endif # Do not use default install target as it installs many unneeded files and # directories: docs, examples and init scripts define MOTION_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/motion-dist.conf \ + $(INSTALL) -D -m 0644 $(@D)/data/motion-dist.conf \ $(TARGET_DIR)/etc/motion/motion.conf - $(INSTALL) -D -m 0755 $(@D)/motion $(TARGET_DIR)/usr/bin/motion + $(INSTALL) -D -m 0755 $(@D)/src/motion $(TARGET_DIR)/usr/bin/motion endef define MOTION_INSTALL_INIT_SYSV