Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13024 from neheb/mottion

Browse source 
motion: fix old libmicrohttpd usage
This commit is contained in:
Rosen Penev 2020-08-05 10:39:40 -07:00 committed by GitHub
commit 92ccf95904
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
multimedia/motion/Makefile
View file

@ -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)?

47
multimedia/motion/patches/020-libmicrohttpd.patch Normal file
View file

@ -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"));