motion: fix old libmicrohttpd usage

Doesn't seem to be needed for this package but it does fix several
warnings.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile
index 283adc721f21daf01c645c31bf9cc427bcf78799..0caecf35a5af9cf484ba0c070cd61e36477b8cbb 100644 (file)
--- a/multimedia/motion/Makefile
+++ b/multimedia/motion/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=motion
 PKG_VERSION:=4.3.1
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-release-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/Motion-Project/motion/tar.gz/release-$(PKG_VERSION)?

diff --git a/multimedia/motion/patches/020-libmicrohttpd.patch b/multimedia/motion/patches/020-libmicrohttpd.patch
new file mode 100644 (file)
index 0000000..6a0fadf
--- /dev/null
+++ b/multimedia/motion/patches/020-libmicrohttpd.patch
@@ -0,0 +1,47 @@
+--- 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"));