From aa2509b9d5028172855a7c38db1d4ebacbe36cc2 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 5 Nov 2020 20:04:30 -0800 Subject: [PATCH] motion: update to 4.3.2 Remove upstreamed patch. Signed-off-by: Rosen Penev --- multimedia/motion/Makefile | 6 +-- .../motion/patches/020-libmicrohttpd.patch | 47 ------------------- 2 files changed, 3 insertions(+), 50 deletions(-) delete mode 100644 multimedia/motion/patches/020-libmicrohttpd.patch diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 12b2f0196b..f865d75bef 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=motion -PKG_VERSION:=4.3.1 -PKG_RELEASE:=4 +PKG_VERSION:=4.3.2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/Motion-Project/motion/tar.gz/release-$(PKG_VERSION)? -PKG_HASH:=545712b10fc4a0134e994b7d8a3773c1c22f0bf4bd7afea7d7ffff357aca9ea5 +PKG_HASH:=dafa4264b2d8e4778f8be5871f09b6c0ec710d5a836182c583469c18db944d70 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-release-$(PKG_VERSION) PKG_MAINTAINER:=Roger D diff --git a/multimedia/motion/patches/020-libmicrohttpd.patch b/multimedia/motion/patches/020-libmicrohttpd.patch deleted file mode 100644 index 6a0fadfae7..0000000000 --- a/multimedia/motion/patches/020-libmicrohttpd.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- a/src/webu.c -+++ b/src/webu.c -@@ -1203,7 +1203,7 @@ static void webu_answer_strm_type(struct webui_ctx *webui) { - - } - --static int webu_answer_ctrl(void *cls -+static enum MHD_Result webu_answer_ctrl(void *cls - , struct MHD_Connection *connection - , const char *url - , const char *method -@@ -1213,7 +1213,7 @@ static int webu_answer_ctrl(void *cls - , void **ptr) { - - /* This function "answers" the request for a webcontrol.*/ -- int retcd; -+ enum MHD_Result retcd; - struct webui_ctx *webui = *ptr; - - /* Eliminate compiler warnings */ -@@ -1275,7 +1275,7 @@ static int webu_answer_ctrl(void *cls - - } - --static int webu_answer_strm(void *cls -+static enum MHD_Result webu_answer_strm(void *cls - , struct MHD_Connection *connection - , const char *url - , const char *method -@@ -1285,7 +1285,7 @@ static int webu_answer_strm(void *cls - , void **ptr) { - - /* Answer the request for all the streams*/ -- int retcd; -+ enum MHD_Result retcd; - struct webui_ctx *webui = *ptr; - - /* Eliminate compiler warnings */ -@@ -1484,7 +1484,7 @@ static void webu_mhd_features_basic(struct mhdstart_ctx *mhdst){ - #if MHD_VERSION < 0x00094400 - (void)mhdst; - #else -- int retcd; -+ enum MHD_Result retcd; - retcd = MHD_is_feature_supported (MHD_FEATURE_BASIC_AUTH); - if (retcd == MHD_YES){ - MOTION_LOG(DBG, TYPE_STREAM, NO_ERRNO ,_("Basic authentication: available")); -- 2.30.2