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

Merge pull request #12923 from neheb/gerber

Browse source 
gerbera: update to 1.6.0
This commit is contained in:
Rosen Penev 2020-07-26 02:11:22 -07:00 committed by GitHub
commit 299ca8c3e1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 289 additions and 271 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
multimedia/gerbera/Makefile
View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gerbera PKG_NAME:=gerbera
PKG_VERSION:=1.5.0 PKG_VERSION:=1.6.0
PKG_RELEASE:=9 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/gerbera/gerbera/tar.gz/v$(PKG_VERSION)?
PKG_HASH:=693a99b295bc79d842f036a6d04996d4676ac0791d65f3a1f7aab4badf9fb5ef PKG_HASH:=3a4956ec5fea1101e8daa32d9cfb985db908a49e2ac6137a1b2bf509e2684a6c
PKG_MAINTAINER:= PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0-or-later PKG_LICENSE:=GPL-2.0-or-later
@ -46,8 +46,8 @@ endef
CMAKE_OPTIONS += \ CMAKE_OPTIONS += \
-DCXX_FILESYSTEM_NO_LINK_NEEDED=$(if $(CONFIG_GCC_USE_VERSION_9),ON,OFF) \ -DCXX_FILESYSTEM_NO_LINK_NEEDED=$(if $(CONFIG_GCC_USE_VERSION_9),ON,OFF) \
-DCXX_FILESYSTEM_STDCPPFS_NEEDED=$(if $(CONFIG_GCC_USE_VERSION_8),OFF,ON) \ -DCXX_FILESYSTEM_STDCPPFS_NEEDED=$(if $(CONFIG_GCC_USE_VERSION_8),OFF,ON) \
-DICONV_INCLUDE_DIR=$(ICONV_PREFIX)/include \ -DIconv_INCLUDE_DIR=$(ICONV_PREFIX)/include \
-DICONV_LIBRARIES=$(ICONV_PREFIX)/lib/libiconv.a \ -DIconv_LIBRARY=$(ICONV_PREFIX)/lib/libiconv.a \
-DWITH_MAGIC=ON \ -DWITH_MAGIC=ON \
-DWITH_MYSQL=OFF \ -DWITH_MYSQL=OFF \
-DWITH_CURL=OFF \ -DWITH_CURL=OFF \
@ -67,8 +67,8 @@ CMAKE_OPTIONS += \
TARGET_CFLAGS += \ TARGET_CFLAGS += \
-ffunction-sections \ -ffunction-sections \
-fdata-sections \ -fdata-sections \
-flto \ -flto
-I$(STAGING_DIR)/usr/include/npupnp/upnp
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
define Package/gerbera/install define Package/gerbera/install

36
multimedia/gerbera/patches/010-iconv.patch
View file

@ -1,36 +0,0 @@
From 77cae5ff9b8dff22bfebac905f1579562609dd35 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 4 May 2020 12:44:34 -0700
Subject: [PATCH] remove iconv casting
iconv_t is sometimes a pointer and other times an int. Remove casting
to make it work with the latter.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
src/util/string_converter.cc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/util/string_converter.cc b/src/util/string_converter.cc
index 272787ad..e1724b39 100644
--- a/src/util/string_converter.cc
+++ b/src/util/string_converter.cc
@@ -41,15 +41,15 @@ StringConverter::StringConverter(const std::string& from, const std::string& to)
dirty = false;
cd = iconv_open(to.c_str(), from.c_str());
- if (cd == reinterpret_cast<iconv_t>(-1)) {
- cd = static_cast<iconv_t>(nullptr);
+ if (!cd) {
+ cd = {};
throw_std_runtime_error(std::string("iconv: ") + strerror(errno));
}
}
StringConverter::~StringConverter()
{
- if (cd != static_cast<iconv_t>(nullptr))
+ if (cd)
iconv_close(cd);
}

156
multimedia/gerbera/patches/010-treewide-include-upnp-upnp.h-instead-of-upnp.h.patch Normal file
View file

@ -0,0 +1,156 @@
From 664b9970687b3d888999f24ef55444add016ba95 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 24 Jul 2020 19:53:08 -0700
Subject: [PATCH] treewide: include upnp/upnp.h instead of upnp.h
pupnp installs in include/upnp. npupnp installs in include/npupnp/upnp.
This commit helps with compatibility between the two.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
src/action_request.h | 2 +-
src/iohandler/buffered_io_handler.h | 2 +-
src/iohandler/curl_io_handler.h | 2 +-
src/iohandler/io_handler.h | 2 +-
src/iohandler/io_handler_buffer_helper.h | 2 +-
src/subscription_request.h | 2 +-
src/transcoding/transcode_ext_handler.h | 2 +-
src/transcoding/transcode_handler.h | 2 +-
src/util/upnp_clients.cc | 2 +-
src/util/upnp_headers.h | 2 +-
10 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/action_request.h b/src/action_request.h
index 4f57bf22..28c9f66e 100644
--- a/src/action_request.h
+++ b/src/action_request.h
@@ -35,7 +35,7 @@
#include <memory>
#include <pugixml.hpp>
-#include <upnp.h>
+#include <upnp/upnp.h>
#include "common.h"
diff --git a/src/iohandler/buffered_io_handler.h b/src/iohandler/buffered_io_handler.h
index f110a9b2..d8ec1157 100644
--- a/src/iohandler/buffered_io_handler.h
+++ b/src/iohandler/buffered_io_handler.h
@@ -33,7 +33,7 @@
#define __BUFFERED_IO_HANDLER_H__
#include <memory>
-#include <upnp.h>
+#include <upnp/upnp.h>
#include "common.h"
#include "io_handler_buffer_helper.h"
diff --git a/src/iohandler/curl_io_handler.h b/src/iohandler/curl_io_handler.h
index 809274dd..d87ceefc 100644
--- a/src/iohandler/curl_io_handler.h
+++ b/src/iohandler/curl_io_handler.h
@@ -35,7 +35,7 @@
#define __CURL_IO_HANDLER_H__
#include <curl/curl.h>
-#include <upnp.h>
+#include <upnp/upnp.h>
#include "common.h"
#include "io_handler_buffer_helper.h"
diff --git a/src/iohandler/io_handler.h b/src/iohandler/io_handler.h
index 2dc03118..0b2b962a 100644
--- a/src/iohandler/io_handler.h
+++ b/src/iohandler/io_handler.h
@@ -32,7 +32,7 @@
#ifndef __IO_HANDLER_H__
#define __IO_HANDLER_H__
-#include <upnp.h>
+#include <upnp/upnp.h>
#include "common.h"
diff --git a/src/iohandler/io_handler_buffer_helper.h b/src/iohandler/io_handler_buffer_helper.h
index 660ee9d0..9c3b0c94 100644
--- a/src/iohandler/io_handler_buffer_helper.h
+++ b/src/iohandler/io_handler_buffer_helper.h
@@ -35,7 +35,7 @@
#include <condition_variable>
#include <mutex>
#include <pthread.h>
-#include <upnp.h>
+#include <upnp/upnp.h>
#include "common.h"
#include "io_handler.h"
diff --git a/src/subscription_request.h b/src/subscription_request.h
index 4c15d85b..17d6f7d5 100644
--- a/src/subscription_request.h
+++ b/src/subscription_request.h
@@ -33,7 +33,7 @@
#ifndef __SUBSCRIPTION_REQUEST_H__
#define __SUBSCRIPTION_REQUEST_H__
-#include <upnp.h>
+#include <upnp/upnp.h>
#include "common.h"
diff --git a/src/transcoding/transcode_ext_handler.h b/src/transcoding/transcode_ext_handler.h
index 64b5081b..aa197e5a 100644
--- a/src/transcoding/transcode_ext_handler.h
+++ b/src/transcoding/transcode_ext_handler.h
@@ -33,7 +33,7 @@
#define __TRANSCODE_EXTERNAL_HANDLER_H__
#include <memory>
-#include <upnp.h>
+#include <upnp/upnp.h>
#include "common.h"
#include "transcode_handler.h"
diff --git a/src/transcoding/transcode_handler.h b/src/transcoding/transcode_handler.h
index 295f2262..3ba2ba93 100644
--- a/src/transcoding/transcode_handler.h
+++ b/src/transcoding/transcode_handler.h
@@ -34,7 +34,7 @@
#include <memory>
#include <string>
-#include <upnp.h>
+#include <upnp/upnp.h>
#include "common.h"
diff --git a/src/util/upnp_clients.cc b/src/util/upnp_clients.cc
index 2033cf31..e866e456 100644
--- a/src/util/upnp_clients.cc
+++ b/src/util/upnp_clients.cc
@@ -29,7 +29,7 @@
#include "config/config.h"
#include "util/tools.h"
-#include <upnp.h>
+#include <upnp/upnp.h>
// table of supported clients (sequence of entries matters!)
std::vector<struct ClientInfo> Clients::clientInfo = std::vector<struct ClientInfo> {
diff --git a/src/util/upnp_headers.h b/src/util/upnp_headers.h
index 306ebfdf..c9896acb 100644
--- a/src/util/upnp_headers.h
+++ b/src/util/upnp_headers.h
@@ -28,7 +28,7 @@
#include <map>
#include <memory>
-#include <upnp.h>
+#include <upnp/upnp.h>
#include <vector>
class Headers {
--
2.26.2

228
multimedia/gerbera/patches/040-npupnp.patch → multimedia/gerbera/patches/020-Quick-changes-for-working-with-NPUPNP.patch
View file

@ -1,75 +1,100 @@
From 2ebccbb993dca41674de295f2d513abd568f971a Mon Sep 17 00:00:00 2001 From c454e03731808c8ea056c5609a599a7988dbea98 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org> From: Jean-Francois Dockes <jf@dockes.org>
Date: Fri, 13 Mar 2020 09:19:04 +0100 Date: Fri, 13 Mar 2020 09:19:04 +0100
Subject: [PATCH] Quick changes for working with NPUPNP Subject: [PATCH] Quick changes for working with NPUPNP
(Rebased and made default)
Signed-off-by: Rosen Penev <rosenp@gmail.com>
--- ---
CMakeLists.txt | 12 +++++------- CMakeLists.txt | 34 +++++++++++++++---------
src/action_request.cc | 11 +++++++++++ src/action_request.cc | 11 +++++++-
src/device_description_handler.cc | 4 ++++ src/device_description_handler.cc | 4 +++
src/file_request_handler.cc | 4 ++++ src/file_request_handler.cc | 4 +++
src/iohandler/file_io_handler.cc | 2 ++ src/iohandler/file_io_handler.cc | 2 ++
src/iohandler/io_handler.cc | 2 ++ src/iohandler/io_handler.cc | 2 ++
src/iohandler/mem_io_handler.cc | 2 ++ src/iohandler/mem_io_handler.cc | 2 ++
src/serve_request_handler.cc | 9 ++++++++- src/serve_request_handler.cc | 8 ++++++
src/server.cc | 8 ++++++++ src/server.cc | 8 ++++++
src/transcoding/transcode_ext_handler.cc | 2 ++ src/transcoding/transcode_ext_handler.cc | 2 ++
src/upnp_cds.cc | 12 +++++++++++- src/upnp_cds.cc | 11 ++++++++
src/upnp_cm.cc | 11 +++++++++++ src/upnp_cm.cc | 11 ++++++++
src/upnp_mrreg.cc | 10 +++++++++- src/upnp_mrreg.cc | 10 ++++++-
src/url_request_handler.cc | 6 ++++++ src/url_request_handler.cc | 6 +++++
src/util/upnp_clients.cc | 12 ++++++++++++ src/util/upnp_clients.cc | 12 +++++++++
src/util/upnp_headers.cc | 14 +++++++++++++- src/util/upnp_headers.cc | 14 ++++++++++
src/util/upnp_headers.h | 2 ++ src/web/web_request_handler.cc | 4 +++
src/web/web_request_handler.cc | 4 ++++ 17 files changed, 130 insertions(+), 15 deletions(-)
18 files changed, 116 insertions(+), 11 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 46f2ca5c..b51300d9 100644 index 81f7818e..d8107660 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -293,13 +293,11 @@ if (LFS_FOUND) @@ -303,23 +303,31 @@ add_definitions(${LFS_DEFINITIONS})
target_link_libraries(gerbera ${LFS_LIBRARIES}) add_compile_options(${LFS_COMPILE_OPTIONS})
endif() target_link_libraries(libgerbera ${LFS_LIBRARIES})
-find_package (LibUpnp REQUIRED) -find_package (pupnp "1.12.1" REQUIRED)
-include_directories(${UPNP_INCLUDE_DIRS}) +pkg_check_modules (NPUPNP libnpupnp)
-target_link_libraries (gerbera ${UPNP_LIBRARIES}) +if (NPUPNP_FOUND)
- + include_directories (${NPUPNP_INCLUDE_DIRS})
-if (UPNP_VERSION_STRING VERSION_LESS "1.12.1") + set(CMAKE_REQUIRED_LIBRARIES npupnp)
- message(FATAL_ERROR "gerbera requires libupnp 1.12.1 or above.") + add_definitions(-DUSING_NPUPNP)
+ target_link_libraries (libgerbera ${NPUPNP_LIBRARIES})
+else()
+ find_package (pupnp "1.12.1" REQUIRED)
-set(CMAKE_REQUIRED_LIBRARIES pupnp::pupnp)
+ set(CMAKE_REQUIRED_LIBRARIES pupnp::pupnp)
-check_cxx_symbol_exists(UPNP_ENABLE_IPV6 "upnpconfig.h" UPNP_HAS_IPV6)
-if (NOT UPNP_HAS_IPV6)
- message(FATAL_ERROR "Gerbera requires libupnp with IPv6 support.")
-endif() -endif()
+#### Hard-coded NPUPNP defs for now, just for testing + check_cxx_symbol_exists(UPNP_ENABLE_IPV6 "upnpconfig.h" UPNP_HAS_IPV6)
+add_definitions(-DUSING_NPUPNP) + if (NOT UPNP_HAS_IPV6)
+include_directories(/usr/include/npupnp/upnp) + message(FATAL_ERROR "Gerbera requires libupnp with IPv6 support.")
+target_link_libraries (gerbera -lnpupnp) + endif()
+set (UPNP_HAS_IPV6 1)
if (NOT UPNP_HAS_IPV6) -check_cxx_symbol_exists(UPNP_MINISERVER_REUSEADDR "upnpconfig.h" UPNP_HAS_REUSEADDR)
message(FATAL_ERROR "Gerbera requires libupnp with IPv6 support.") -if (NOT UPNP_HAS_REUSEADDR)
- message(WARNING [=[
-!! It is strongly recommended to build libupnp with --enable-reuseaddr !!
-Without this option Gerbera will be unable to restart with the same port number.]=])
-endif()
+ check_cxx_symbol_exists(UPNP_MINISERVER_REUSEADDR "upnpconfig.h" UPNP_HAS_REUSEADDR)
+ if (NOT UPNP_HAS_REUSEADDR)
+ message(WARNING [=[
+ !! It is strongly recommended to build libupnp with --enable-reuseaddr !!
+ Without this option Gerbera will be unable to restart with the same port number.]=])
+ endif()
-target_link_libraries (libgerbera pupnp::pupnp)
+ target_link_libraries (libgerbera pupnp::pupnp)
+endif()
find_package(fmt REQUIRED)
target_link_libraries(libgerbera fmt::fmt)
diff --git a/src/action_request.cc b/src/action_request.cc diff --git a/src/action_request.cc b/src/action_request.cc
index 3aa4a991..29be6aaf 100644 index fab0e910..0615dc58 100644
--- a/src/action_request.cc --- a/src/action_request.cc
+++ b/src/action_request.cc +++ b/src/action_request.cc
@@ -65,11 +65,17 @@ std::string ActionRequest::getServiceID() const @@ -65,10 +65,14 @@ std::string ActionRequest::getServiceID() const
std::unique_ptr<pugi::xml_document> ActionRequest::getRequest() const std::unique_ptr<pugi::xml_document> ActionRequest::getRequest() const
{ {
+#if !defined(USING_NPUPNP) - DOMString cxml = ixmlPrintDocument(UpnpActionRequest_get_ActionRequest(upnp_request));
DOMString cxml = ixmlPrintDocument(UpnpActionRequest_get_ActionRequest(upnp_request));
+#endif
auto request = std::make_unique<pugi::xml_document>(); auto request = std::make_unique<pugi::xml_document>();
+#if defined(USING_NPUPNP) +#if defined(USING_NPUPNP)
+ auto ret = request->load_string(upnp_request->xmlAction.c_str()); + auto ret = request->load_string(upnp_request->xmlAction.c_str());
+#else +#else
+ DOMString cxml = ixmlPrintDocument(UpnpActionRequest_get_ActionRequest(upnp_request));
auto ret = request->load_string(cxml); auto ret = request->load_string(cxml);
ixmlFreeDOMString(cxml); ixmlFreeDOMString(cxml);
+#endif +#endif
if (ret.status != pugi::xml_parse_status::status_ok) if (ret.status != pugi::xml_parse_status::status_ok)
throw_std_runtime_error("Unable to parse ixml"); throw_std_runtime_error("Unable to parse ixml");
@@ -94,6 +98,7 @@ void ActionRequest::update()
@@ -94,6 +100,7 @@ void ActionRequest::update()
std::string xml = buf.str(); std::string xml = buf.str();
log_debug("ActionRequest::update(): {}", xml.c_str()); log_debug("ActionRequest::update(): {}", xml.c_str());
@ -77,13 +102,13 @@ index 3aa4a991..29be6aaf 100644
IXML_Document* result = nullptr; IXML_Document* result = nullptr;
int err = ixmlParseBufferEx(xml.c_str(), &result); int err = ixmlParseBufferEx(xml.c_str(), &result);
@@ -105,6 +112,10 @@ void ActionRequest::update() @@ -105,6 +110,10 @@ void ActionRequest::update()
UpnpActionRequest_set_ActionResult(upnp_request, result); UpnpActionRequest_set_ActionResult(upnp_request, result);
UpnpActionRequest_set_ErrCode(upnp_request, errCode); UpnpActionRequest_set_ErrCode(upnp_request, errCode);
} }
+#else +#else
+ UpnpActionRequest_set_xmlResponse(upnp_request, xml); + UpnpActionRequest_set_xmlResponse(upnp_request, xml);
+ UpnpActionRequest_set_ErrCode(upnp_request, errCode); + UpnpActionRequest_set_ErrCode(upnp_request, errCode);
+#endif +#endif
} else { } else {
// ok, here there can be two cases // ok, here there can be two cases
@ -105,7 +130,7 @@ index 6aca745e..cf2e8015 100644
UpnpFileInfo_set_IsDirectory(info, 0); UpnpFileInfo_set_IsDirectory(info, 0);
} }
diff --git a/src/file_request_handler.cc b/src/file_request_handler.cc diff --git a/src/file_request_handler.cc b/src/file_request_handler.cc
index e8579b06..615f7e85 100644 index cfa3eaed..915e411b 100644
--- a/src/file_request_handler.cc --- a/src/file_request_handler.cc
+++ b/src/file_request_handler.cc +++ b/src/file_request_handler.cc
@@ -238,7 +238,11 @@ void FileRequestHandler::getInfo(const char* filename, UpnpFileInfo* info) @@ -238,7 +238,11 @@ void FileRequestHandler::getInfo(const char* filename, UpnpFileInfo* info)
@ -163,7 +188,7 @@ index 5574a16d..2916fd12 100644
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
diff --git a/src/serve_request_handler.cc b/src/serve_request_handler.cc diff --git a/src/serve_request_handler.cc b/src/serve_request_handler.cc
index 8eaf46af..b9bd7b25 100644 index 210140a3..01dde69b 100644
--- a/src/serve_request_handler.cc --- a/src/serve_request_handler.cc
+++ b/src/serve_request_handler.cc +++ b/src/serve_request_handler.cc
@@ -94,7 +94,11 @@ void ServeRequestHandler::getInfo(const char* filename, UpnpFileInfo* info) @@ -94,7 +94,11 @@ void ServeRequestHandler::getInfo(const char* filename, UpnpFileInfo* info)
@ -178,11 +203,10 @@ index 8eaf46af..b9bd7b25 100644
} else { } else {
throw_std_runtime_error("Not a regular file: " + path); throw_std_runtime_error("Not a regular file: " + path);
} }
@@ -157,8 +161,11 @@ std::unique_ptr<IOHandler> ServeRequestHandler::open(const char* filename, @@ -158,7 +162,11 @@ std::unique_ptr<IOHandler> ServeRequestHandler::open(const char* filename,
info->is_readable = 0;
} }
-
+#if defined(USING_NPUPNP) +#if defined(USING_NPUPNP)
+ info->content_type = mimetype; + info->content_type = mimetype;
+#else +#else
@ -192,10 +216,10 @@ index 8eaf46af..b9bd7b25 100644
} else { } else {
throw_std_runtime_error("Not a regular file: " + path); throw_std_runtime_error("Not a regular file: " + path);
diff --git a/src/server.cc b/src/server.cc diff --git a/src/server.cc b/src/server.cc
index 913a4913..7cbabc71 100644 index a83c28cd..d4ce3e51 100644
--- a/src/server.cc --- a/src/server.cc
+++ b/src/server.cc +++ b/src/server.cc
@@ -398,9 +398,17 @@ int Server::handleUpnpClientEvent(Upnp_EventType eventType, const void* event) @@ -393,9 +393,17 @@ int Server::handleUpnpClientEvent(Upnp_EventType eventType, const void* event)
case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE: case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
case UPNP_DISCOVERY_SEARCH_RESULT: { case UPNP_DISCOVERY_SEARCH_RESULT: {
auto d_event = reinterpret_cast<const UpnpDiscovery*>(event); auto d_event = reinterpret_cast<const UpnpDiscovery*>(event);
@ -214,7 +238,7 @@ index 913a4913..7cbabc71 100644
Clients::addClientByDiscovery(destAddr, userAgent, location); Clients::addClientByDiscovery(destAddr, userAgent, location);
break; break;
diff --git a/src/transcoding/transcode_ext_handler.cc b/src/transcoding/transcode_ext_handler.cc diff --git a/src/transcoding/transcode_ext_handler.cc b/src/transcoding/transcode_ext_handler.cc
index 4dad0e3f..412c1370 100644 index 67ee79d9..ffc89eb2 100644
--- a/src/transcoding/transcode_ext_handler.cc --- a/src/transcoding/transcode_ext_handler.cc
+++ b/src/transcoding/transcode_ext_handler.cc +++ b/src/transcoding/transcode_ext_handler.cc
@@ -37,7 +37,9 @@ @@ -37,7 +37,9 @@
@ -228,7 +252,7 @@ index 4dad0e3f..412c1370 100644
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
diff --git a/src/upnp_cds.cc b/src/upnp_cds.cc diff --git a/src/upnp_cds.cc b/src/upnp_cds.cc
index 6491fa78..a758655c 100644 index 12ffeea2..b44268d3 100644
--- a/src/upnp_cds.cc --- a/src/upnp_cds.cc
+++ b/src/upnp_cds.cc +++ b/src/upnp_cds.cc
@@ -284,6 +284,7 @@ void ContentDirectoryService::processSubscriptionRequest(const std::unique_ptr<S @@ -284,6 +284,7 @@ void ContentDirectoryService::processSubscriptionRequest(const std::unique_ptr<S
@ -245,7 +269,7 @@ index 6491fa78..a758655c 100644
ixmlDocument_free(event); ixmlDocument_free(event);
+#else +#else
+ UpnpAcceptSubscriptionXML( + UpnpAcceptSubscriptionXML(
+ deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(), + deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(),
+ DESC_CDS_SERVICE_ID, xml, request->getSubscriptionID().c_str()); + DESC_CDS_SERVICE_ID, xml, request->getSubscriptionID().c_str());
+#endif +#endif
log_debug("end"); log_debug("end");
@ -259,21 +283,19 @@ index 6491fa78..a758655c 100644
IXML_Document* event = nullptr; IXML_Document* event = nullptr;
int err = ixmlParseBufferEx(xml.c_str(), &event); int err = ixmlParseBufferEx(xml.c_str(), &event);
if (err != IXML_SUCCESS) { if (err != IXML_SUCCESS) {
@@ -323,8 +330,11 @@ void ContentDirectoryService::sendSubscriptionUpdate(const std::string& containe @@ -325,6 +332,10 @@ void ContentDirectoryService::sendSubscriptionUpdate(const std::string& containe
UpnpNotifyExt(deviceHandle,
config->getOption(CFG_SERVER_UDN).c_str(),
DESC_CDS_SERVICE_ID, event); DESC_CDS_SERVICE_ID, event);
-
ixmlDocument_free(event); ixmlDocument_free(event);
+#else +#else
+ UpnpNotifyXML(deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(), + UpnpNotifyXML(deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(),
+ DESC_CDS_SERVICE_ID, xml); + DESC_CDS_SERVICE_ID, xml);
+#endif +#endif
log_debug("end"); log_debug("end");
} }
diff --git a/src/upnp_cm.cc b/src/upnp_cm.cc diff --git a/src/upnp_cm.cc b/src/upnp_cm.cc
index aa608480..33f86bd2 100644 index aa608480..c6553d6f 100644
--- a/src/upnp_cm.cc --- a/src/upnp_cm.cc
+++ b/src/upnp_cm.cc +++ b/src/upnp_cm.cc
@@ -127,6 +127,7 @@ void ConnectionManagerService::processSubscriptionRequest(const std::unique_ptr< @@ -127,6 +127,7 @@ void ConnectionManagerService::processSubscriptionRequest(const std::unique_ptr<
@ -290,8 +312,8 @@ index aa608480..33f86bd2 100644
ixmlDocument_free(event); ixmlDocument_free(event);
+#else +#else
+ UpnpAcceptSubscriptionXML( + UpnpAcceptSubscriptionXML(
+ deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(), + deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(),
+ DESC_CM_SERVICE_ID, xml, request->getSubscriptionID().c_str()); + DESC_CM_SERVICE_ID, xml, request->getSubscriptionID().c_str());
+#endif +#endif
} }
@ -310,11 +332,11 @@ index aa608480..33f86bd2 100644
ixmlDocument_free(event); ixmlDocument_free(event);
+#else +#else
+ UpnpNotifyXML(deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(), + UpnpNotifyXML(deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(),
+ DESC_CM_SERVICE_ID, xml); + DESC_CM_SERVICE_ID, xml);
+#endif +#endif
} }
diff --git a/src/upnp_mrreg.cc b/src/upnp_mrreg.cc diff --git a/src/upnp_mrreg.cc b/src/upnp_mrreg.cc
index 16eefaed..f993f452 100644 index 16eefaed..342c0cab 100644
--- a/src/upnp_mrreg.cc --- a/src/upnp_mrreg.cc
+++ b/src/upnp_mrreg.cc +++ b/src/upnp_mrreg.cc
@@ -34,7 +34,9 @@ @@ -34,7 +34,9 @@
@ -342,8 +364,8 @@ index 16eefaed..f993f452 100644
ixmlDocument_free(event); ixmlDocument_free(event);
+#else +#else
+ UpnpAcceptSubscriptionXML( + UpnpAcceptSubscriptionXML(
+ deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(), + deviceHandle, config->getOption(CFG_SERVER_UDN).c_str(),
+ DESC_MRREG_SERVICE_ID, xml, request->getSubscriptionID().c_str()); + DESC_MRREG_SERVICE_ID, xml, request->getSubscriptionID().c_str());
+#endif +#endif
} }
@ -375,26 +397,26 @@ index f2a99c94..66af027b 100644
/// \todo transcoding for get_info /// \todo transcoding for get_info
diff --git a/src/util/upnp_clients.cc b/src/util/upnp_clients.cc diff --git a/src/util/upnp_clients.cc b/src/util/upnp_clients.cc
index ab02b58d..7bc85d77 100644 index e866e456..4bf3033a 100644
--- a/src/util/upnp_clients.cc --- a/src/util/upnp_clients.cc
+++ b/src/util/upnp_clients.cc +++ b/src/util/upnp_clients.cc
@@ -203,6 +203,15 @@ bool Clients::getInfoByType(const std::string& match, ClientMatchType type, cons @@ -268,6 +268,15 @@ bool Clients::getInfoByType(const std::string& match, ClientMatchType type, cons
bool Clients::downloadDescription(const std::string& location, std::unique_ptr<pugi::xml_document>& xml) bool Clients::downloadDescription(const std::string& location, std::unique_ptr<pugi::xml_document>& xml)
{ {
+#if defined(USING_NPUPNP) +#if defined(USING_NPUPNP)
+ std::string description, ct; + std::string description, ct;
+ int errCode = UpnpDownloadUrlItem(location, description, ct); + int errCode = UpnpDownloadUrlItem(location, description, ct);
+ if (errCode != UPNP_E_SUCCESS) { + if (errCode != UPNP_E_SUCCESS) {
+ log_debug("Error obtaining client description from {} -- error = {}", location, errCode); + log_debug("Error obtaining client description from {} -- error = {}", location, errCode);
+ return false; + return false;
+ } + }
+ const char *cxml = description.c_str(); + const char* cxml = description.c_str();
+#else +#else
IXML_Document* descDoc = nullptr; IXML_Document* descDoc = nullptr;
int errCode = UpnpDownloadXmlDoc(location.c_str(), &descDoc); int errCode = UpnpDownloadXmlDoc(location.c_str(), &descDoc);
if (errCode != UPNP_E_SUCCESS) { if (errCode != UPNP_E_SUCCESS) {
@@ -211,12 +220,15 @@ bool Clients::downloadDescription(const std::string& location, std::unique_ptr<p @@ -276,12 +285,15 @@ bool Clients::downloadDescription(const std::string& location, std::unique_ptr<p
} }
DOMString cxml = ixmlPrintDocument(descDoc); DOMString cxml = ixmlPrintDocument(descDoc);
@ -411,20 +433,34 @@ index ab02b58d..7bc85d77 100644
log_debug("Unable to parse xml client description from {}", location); log_debug("Unable to parse xml client description from {}", location);
return false; return false;
diff --git a/src/util/upnp_headers.cc b/src/util/upnp_headers.cc diff --git a/src/util/upnp_headers.cc b/src/util/upnp_headers.cc
index c05cffe6..19ba88ca 100644 index ef85106b..aec13850 100644
--- a/src/util/upnp_headers.cc --- a/src/util/upnp_headers.cc
+++ b/src/util/upnp_headers.cc +++ b/src/util/upnp_headers.cc
@@ -96,18 +96,29 @@ void Headers::writeHeaders(UpnpFileInfo* fileInfo) const @@ -25,11 +25,13 @@
#include "upnp_headers.h" // API
+#if !defined(USING_NPUPNP)
#if (UPNP_VERSION > 11201)
#include <UpnpExtraHeaders.h>
#else
#include <ExtraHeaders.h>
#endif
+#endif
#include <string>
#include "common.h"
@@ -101,18 +103,29 @@ void Headers::writeHeaders(UpnpFileInfo* fileInfo) const
if (headers == nullptr) if (headers == nullptr)
return; return;
+#if defined(USING_NPUPNP) +#if defined(USING_NPUPNP)
+ for (auto iter : *headers) { + for (const auto& iter : *headers) {
+ fileInfo->response_headers.push_back(iter); + fileInfo->response_headers.push_back(iter);
+ } + }
+#else +#else
auto head = const_cast<UpnpListHead*>(UpnpFileInfo_get_ExtraHeadersList(fileInfo)); auto head = const_cast<UpnpListHead*>(UpnpFileInfo_get_ExtraHeadersList(fileInfo));
for (auto iter : *headers) { for (const auto& iter : *headers) {
UpnpExtraHeaders* h = UpnpExtraHeaders_new(); UpnpExtraHeaders* h = UpnpExtraHeaders_new();
UpnpExtraHeaders_set_resp(h, formatHeader(iter, false).c_str()); UpnpExtraHeaders_set_resp(h, formatHeader(iter, false).c_str());
UpnpListInsert(head, UpnpListEnd(head), const_cast<UpnpListHead*>(UpnpExtraHeaders_get_node(h))); UpnpListInsert(head, UpnpListEnd(head), const_cast<UpnpListHead*>(UpnpExtraHeaders_get_node(h)));
@ -437,43 +473,28 @@ index c05cffe6..19ba88ca 100644
auto ret = std::make_unique<std::map<std::string, std::string>>(); auto ret = std::make_unique<std::map<std::string, std::string>>();
+#if defined(USING_NPUPNP) +#if defined(USING_NPUPNP)
+ for (const auto& entry : fileInfo->request_headers) { + for (const auto& entry : fileInfo->request_headers) {
+ ret->insert(entry); + ret->insert(entry);
+ } + }
+#else +#else
auto head = const_cast<UpnpListHead*>(UpnpFileInfo_get_ExtraHeadersList(fileInfo)); auto head = const_cast<UpnpListHead*>(UpnpFileInfo_get_ExtraHeadersList(fileInfo));
UpnpListIter pos; UpnpListIter pos;
for (pos = UpnpListBegin(head); pos != UpnpListEnd(head); pos = UpnpListNext(head, pos)) { for (pos = UpnpListBegin(head); pos != UpnpListEnd(head); pos = UpnpListNext(head, pos)) {
@@ -116,6 +127,7 @@ std::unique_ptr<std::map<std::string, std::string>> Headers::readHeaders(UpnpFil @@ -121,6 +134,7 @@ std::unique_ptr<std::map<std::string, std::string>> Headers::readHeaders(UpnpFil
auto add = parseHeader(header); auto add = parseHeader(header);
ret->insert(add); ret->insert(add);
} }
-
+#endif +#endif
+
return ret; return ret;
} }
diff --git a/src/util/upnp_headers.h b/src/util/upnp_headers.h
index 9677d6e4..dd839236 100644
--- a/src/util/upnp_headers.h
+++ b/src/util/upnp_headers.h
@@ -26,7 +26,9 @@
#ifndef GERBERA_HEADERS_H
#define GERBERA_HEADERS_H
+#if !defined(USING_NPUPNP)
#include <ExtraHeaders.h>
+#endif
#include <map>
#include <memory>
#include <upnp.h>
diff --git a/src/web/web_request_handler.cc b/src/web/web_request_handler.cc diff --git a/src/web/web_request_handler.cc b/src/web/web_request_handler.cc
index 71fc9fd5..2ca6601b 100644 index 60e2d028..117dcbfa 100644
--- a/src/web/web_request_handler.cc --- a/src/web/web_request_handler.cc
+++ b/src/web/web_request_handler.cc +++ b/src/web/web_request_handler.cc
@@ -120,7 +120,11 @@ void WebRequestHandler::getInfo(const char* filename, UpnpFileInfo* info) @@ -112,7 +112,11 @@ void WebRequestHandler::getInfo(const char* filename, UpnpFileInfo* info)
std::string mimetype = (returnType == "xml") ? MIMETYPE_XML : MIMETYPE_JSON;
contentType = mimetype + "; charset=" + DEFAULT_INTERNAL_CHARSET; std::string contentType = mimetype + "; charset=" + DEFAULT_INTERNAL_CHARSET;
+#if defined(USING_NPUPNP) +#if defined(USING_NPUPNP)
+ UpnpFileInfo_set_ContentType(info, contentType); + UpnpFileInfo_set_ContentType(info, contentType);
@ -483,3 +504,6 @@ index 71fc9fd5..2ca6601b 100644
Headers headers; Headers headers;
headers.addHeader(std::string { "Cache-Control" }, std::string { "no-cache, must-revalidate" }); headers.addHeader(std::string { "Cache-Control" }, std::string { "no-cache, must-revalidate" });
headers.writeHeaders(info); headers.writeHeaders(info);
--
2.26.2

41
multimedia/gerbera/patches/020-pid.patch
View file

@ -1,41 +0,0 @@
From 59d37af2d6afd3d0ab6e8c5f3ea099435150c349 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Tue, 2 Jun 2020 15:55:25 -0700
Subject: [PATCH] add missing unistd header
Error with pid_t.
Found with musl + libcxx.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
src/util/process.h | 2 ++
src/util/process_executor.h | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/util/process.h b/src/util/process.h
index e79e016c..8778aa34 100644
--- a/src/util/process.h
+++ b/src/util/process.h
@@ -35,6 +35,8 @@
#include <memory>
#include <string>
+#include <unistd.h>
+
// forward declaration
class Config;
diff --git a/src/util/process_executor.h b/src/util/process_executor.h
index eaccf451..2a724087 100644
--- a/src/util/process_executor.h
+++ b/src/util/process_executor.h
@@ -35,6 +35,8 @@
#include <string>
#include <vector>
+#include <unistd.h>
+
#include "executor.h"
class ProcessExecutor : public Executor {

74
multimedia/gerbera/patches/030-unistd.patch
View file

@ -1,74 +0,0 @@
From 89b289cde29c731f995642a341dc5fd3b47ec7a0 Mon Sep 17 00:00:00 2001
From: Jean-Francois Dockes <jf@dockes.org>
Date: Mon, 4 May 2020 16:32:23 +0200
Subject: [PATCH] The access() system call needs unistd.h, at least on Focal
---
src/file_request_handler.cc | 2 +-
src/iohandler/io_handler_chainer.cc | 2 +-
src/serve_request_handler.cc | 2 +-
src/util/upnp_quirks.cc | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/file_request_handler.cc b/src/file_request_handler.cc
index e8579b06..cfa3eaed 100644
--- a/src/file_request_handler.cc
+++ b/src/file_request_handler.cc
@@ -30,9 +30,9 @@
/// \file file_request_handler.cc
#include "file_request_handler.h" // API
-
#include <filesystem>
#include <sys/stat.h>
+#include <unistd.h>
#include <utility>
#include "config/config_manager.h"
diff --git a/src/iohandler/io_handler_chainer.cc b/src/iohandler/io_handler_chainer.cc
index e8701cd7..beaa9d03 100644
--- a/src/iohandler/io_handler_chainer.cc
+++ b/src/iohandler/io_handler_chainer.cc
@@ -30,8 +30,8 @@
/// \file io_handler_chainer.cc
#include "io_handler_chainer.h" // API
-
#include <cstdlib>
+#include <unistd.h>
#include "exceptions.h"
diff --git a/src/serve_request_handler.cc b/src/serve_request_handler.cc
index 8eaf46af..210140a3 100644
--- a/src/serve_request_handler.cc
+++ b/src/serve_request_handler.cc
@@ -30,8 +30,8 @@
/// \file serve_request_handler.cc
#include "serve_request_handler.h"
-
#include <sys/stat.h>
+#include <unistd.h>
#include <utility>
#include "config/config_manager.h"
diff --git a/src/util/upnp_quirks.cc b/src/util/upnp_quirks.cc
index df137370..e6f510b4 100644
--- a/src/util/upnp_quirks.cc
+++ b/src/util/upnp_quirks.cc
@@ -24,13 +24,13 @@
/// \file upnp_quirks.cc
#include "upnp_quirks.h" // API
-
#include "cds_objects.h"
#include "config/config_manager.h"
#include "server.h"
#include "util/tools.h"
#include "util/upnp_clients.h"
#include "util/upnp_headers.h"
+#include <unistd.h>
Quirks::Quirks(std::shared_ptr<Config> config, const struct sockaddr_storage* addr, const std::string& userAgent)
: config(std::move(config))

11
multimedia/gerbera/patches/050-npupnp-408.patch
View file

@ -1,11 +0,0 @@
--- a/src/upnp_cds.cc
+++ b/src/upnp_cds.cc
@@ -83,7 +83,7 @@ void ContentDirectoryService::doBrowse(const std::unique_ptr<ActionRequest>& req
if (BrowseFlag == "BrowseDirectChildren")
flag |= BROWSE_DIRECT_CHILDREN;
else if (BrowseFlag != "BrowseMetadata")
- throw UpnpException(UPNP_SOAP_E_INVALID_ARGS,
+ throw UpnpException(UPNP_E_INVALID_ARGUMENT,
"invalid browse flag: " + BrowseFlag);
auto parent = storage->loadObject(objectID);