[SCM] gerbera/master: Refresh patches and drop patches applied upstream
jcowgill at users.alioth.debian.org
jcowgill at users.alioth.debian.org
Thu Oct 12 08:38:48 UTC 2017
The following commit has been merged in the master branch:
commit 84c05fb39d3f2f4a509ad2452172097c94a96980
Author: James Cowgill <jcowgill at debian.org>
Date: Fri Oct 6 19:44:58 2017 +0100
Refresh patches and drop patches applied upstream
diff --git a/debian/patches/0001_fix_spelling_errors.patch b/debian/patches/0001_fix_spelling_errors.patch
deleted file mode 100644
index b9bd3ce..0000000
--- a/debian/patches/0001_fix_spelling_errors.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix spelling errors.
- Fix the spelling errors mentioned by lintian.
-Author: Miguel A. Colón Vélez <debian.micove at gmail.com>
-Applied-Upstream: https://github.com/v00d00/gerbera/commit/529bdade73bc7c2c1a6e9919110a345ab8a76d75
-Last-Update: 2017-05-31
-
---- a/src/web_request_handler.h
-+++ b/src/web_request_handler.h
-@@ -149,7 +149,7 @@ public:
- IN enum UpnpOpenFileMode mode,
- IN zmm::String range);
-
-- /// \brief This method must be overriden by the subclasses that actually process the given request.
-+ /// \brief This method must be overridden by the subclasses that actually process the given request.
- virtual void process() = 0;
-
- /// \brief builds full path to a script for the given relative filename
diff --git a/debian/patches/0008_symlinks.patch b/debian/patches/0008_symlinks.patch
index 1a5e7c4..825817e 100644
--- a/debian/patches/0008_symlinks.patch
+++ b/debian/patches/0008_symlinks.patch
@@ -12,7 +12,7 @@ Forwarded: no
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/content_manager.cc
+++ b/src/content_manager.cc
-@@ -178,7 +178,7 @@ ContentManager::ContentManager()
+@@ -181,7 +181,7 @@ ContentManager::ContentManager()
/* init filemagic */
#ifdef HAVE_MAGIC
if (!ignore_unknown_extensions) {
diff --git a/debian/patches/0009_CMake-Improve-compat-with-libupnp-1.8.2.patch b/debian/patches/0009_CMake-Improve-compat-with-libupnp-1.8.2.patch
deleted file mode 100644
index 5e3a7c5..0000000
--- a/debian/patches/0009_CMake-Improve-compat-with-libupnp-1.8.2.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From e5e5e4f4e5a87390d5a4b4f7dd97da4703621184 Mon Sep 17 00:00:00 2001
-From: Ian Whyman <thev00d00 at gentoo.org>
-Date: Sun, 20 Aug 2017 12:34:36 +0100
-Subject: [PATCH 1/2] CMake: Improve compat with libupnp 1.8.2
-
----
- CMakeLists.txt | 2 +-
- cmake/FindLibUpnp.cmake | 21 +++++++++++----------
- 2 files changed, 12 insertions(+), 11 deletions(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -364,7 +364,7 @@ endif()
-
- # Debian ships a snapshot from 2010: libupnp4 (1.8.0~svn20100507-1.2)
- # This is missing templated types so we need to ifdef
--if(UPNP_INCLUDE_DIR AND NOT EXISTS "${UPNP_INCLUDE_DIR}/upnp-1.8/TemplateInclude.h")
-+if(UPNP_INCLUDE_DIR AND NOT EXISTS "${UPNP_INCLUDE_DIR}/TemplateInclude.h")
- message (WARNING "\n!! You are using a very old 1.8 snapshot. Please upgrade to a newer snapshot from upstream (https://github.com/mrjimenez/pupnp) !!\n")
- message (STATUS "gerbera: Enabling old libupnp snapshot compat. Web interface will probably not work.")
- add_definitions(-DUPNP_OLD_SNAPSHOT)
---- a/cmake/FindLibUpnp.cmake
-+++ b/cmake/FindLibUpnp.cmake
-@@ -8,30 +8,31 @@
- # UPNP_HAS_REUSEADDR - If LinUPnP was built with SO_REUSEADDR support
-
- find_package(PkgConfig QUIET)
--pkg_check_modules (PC_UPNP QUIET libupnp-1.8)
-+pkg_check_modules (PC_UPNP QUIET libupnp-1.8 libupnp)
-
--find_path(UPNP_INCLUDE_DIR upnp-1.8/upnp.h
-+find_path(UPNP_INCLUDE_DIR upnp.h
- HINTS ${PC_UPNP_INCLUDEDIR} ${PC_UPNP_INCLUDE_DIRS}
-- PATH_SUFFIXES upnp)
-+ PATH_SUFFIXES upnp-1.8 upnp)
-+
- find_library(UPNP_UPNP_LIBRARY
-- NAMES libupnp-1.8 upnp-1.8 upnp4
-+ NAMES libupnp-1.8 upnp-1.8 libupnp upnp upnp4
- HINTS ${PC_UPNP_LIBDIR} ${PC_UPNP_LIBRARY_DIRS})
-+
- find_library(UPNP_IXML_LIBRARY
-- NAMES libixml-1.8 ixml-1.8 ixml4
-+ NAMES libixml-1.8 ixml-1.8 libixml ixml ixml4
- HINTS ${PC_UPNP_LIBDIR} ${PC_UPNP_LIBRARY_DIRS})
-
--if(EXISTS "${UPNP_INCLUDE_DIR}/upnp-1.8/upnpconfig.h")
-- file (STRINGS ${UPNP_INCLUDE_DIR}/upnp-1.8/upnpconfig.h _UPNP_DEFS REGEX "^[ \t]*#define[ \t]+UPNP_VERSION_(MAJOR|MINOR|PATCH)")
-+if(EXISTS ${UPNP_INCLUDE_DIR}/upnpconfig.h)
-+ file (STRINGS ${UPNP_INCLUDE_DIR}/upnpconfig.h _UPNP_DEFS REGEX "^[ \t]*#define[ \t]+UPNP_VERSION_(MAJOR|MINOR|PATCH)")
- string (REGEX REPLACE ".*UPNP_VERSION_MAJOR ([0-9]+).*" "\\1" UPNP_MAJOR_VERSION "${_UPNP_DEFS}")
- string (REGEX REPLACE ".*UPNP_VERSION_MINOR ([0-9]+).*" "\\1" UPNP_MINOR_VERSION "${_UPNP_DEFS}")
- string (REGEX REPLACE ".*UPNP_VERSION_PATCH ([0-9]+).*" "\\1" UPNP_PATCH_VERSION "${_UPNP_DEFS}")
- set (UPNP_VERSION_STRING "${UPNP_MAJOR_VERSION}.${UPNP_MINOR_VERSION}.${UPNP_PATCH_VERSION}")
-
- # Check for IPv6
-- file (STRINGS ${UPNP_INCLUDE_DIR}/upnp-1.8/upnpconfig.h UPNP_HAS_IPV6 REGEX "^[ \t]*#define[ \t]+UPNP_ENABLE_IPV6[ \t]+(1)$")
-+ file (STRINGS ${UPNP_INCLUDE_DIR}/upnpconfig.h UPNP_HAS_IPV6 REGEX "^[ \t]*#define[ \t]+UPNP_ENABLE_IPV6[ \t]+(1)$")
- # Check for SO_REUSEADDR
-- file (STRINGS ${UPNP_INCLUDE_DIR}/upnp-1.8/upnpconfig.h UPNP_HAS_REUSEADDR REGEX "^[ \t]*#define[ \t]+UPNP_MINISERVER_REUSEADDR[ \t]+(1)$")
--
-+ file (STRINGS ${UPNP_INCLUDE_DIR}/upnpconfig.h UPNP_HAS_REUSEADDR REGEX "^[ \t]*#define[ \t]+UPNP_MINISERVER_REUSEADDR[ \t]+(1)$")
- endif()
-
- include(FindPackageHandleStandardArgs)
diff --git a/debian/patches/0010_Unqualify-libupnp-includes.patch b/debian/patches/0010_Unqualify-libupnp-includes.patch
deleted file mode 100644
index c3ea5b0..0000000
--- a/debian/patches/0010_Unqualify-libupnp-includes.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-From 555d33fb7bc357d952c662f4de9986e33d483926 Mon Sep 17 00:00:00 2001
-From: Ian Whyman <thev00d00 at gentoo.org>
-Date: Mon, 21 Aug 2017 22:13:03 +0100
-Subject: [PATCH 2/2] Unqualify libupnp includes
-
-We now correctly set in the libupnp include path in CMake, so this is no
-longer needed.
-
-Should fix the build with libupnp 1.8.2.
-
-Thanks to @whorfin for reporting
-
-Fixes #137
----
- src/action_request.h | 2 +-
- src/buffered_io_handler.h | 2 +-
- src/curl_io_handler.h | 2 +-
- src/file_io_handler.cc | 2 +-
- src/io_handler.cc | 2 +-
- src/io_handler.h | 2 +-
- src/io_handler_buffer_helper.h | 2 +-
- src/mem_io_handler.cc | 2 +-
- src/subscription_request.h | 2 +-
- src/transcoding/transcode_ext_handler.cc | 2 +-
- src/transcoding/transcode_ext_handler.h | 2 +-
- src/transcoding/transcode_handler.h | 2 +-
- src/url_request_handler.cc | 2 +-
- 13 files changed, 13 insertions(+), 13 deletions(-)
-
-diff --git a/src/action_request.h b/src/action_request.h
-index 7c1d97ab..4550b12f 100644
---- a/src/action_request.h
-+++ b/src/action_request.h
-@@ -33,7 +33,7 @@
- #ifndef __ACTION_REQUEST_H__
- #define __ACTION_REQUEST_H__
-
--#include <upnp-1.8/upnp.h>
-+#include <upnp.h>
-
- #include "common.h"
- #include "mxml/mxml.h"
-diff --git a/src/buffered_io_handler.h b/src/buffered_io_handler.h
-index 541a8e10..c530729b 100644
---- a/src/buffered_io_handler.h
-+++ b/src/buffered_io_handler.h
-@@ -32,7 +32,7 @@
- #ifndef __BUFFERED_IO_HANDLER_H__
- #define __BUFFERED_IO_HANDLER_H__
-
--#include <upnp-1.8/upnp.h>
-+#include <upnp.h>
-
- #include "common.h"
- #include "io_handler_buffer_helper.h"
-diff --git a/src/curl_io_handler.h b/src/curl_io_handler.h
-index 8cbc260e..c34ff3a1 100644
---- a/src/curl_io_handler.h
-+++ b/src/curl_io_handler.h
-@@ -35,7 +35,7 @@
- #define __CURL_IO_HANDLER_H__
-
- #include <curl/curl.h>
--#include <upnp-1.8/upnp.h>
-+#include <upnp.h>
-
- #include "common.h"
- #include "io_handler_buffer_helper.h"
-diff --git a/src/file_io_handler.cc b/src/file_io_handler.cc
-index d2d3e218..8a4a56b7 100644
---- a/src/file_io_handler.cc
-+++ b/src/file_io_handler.cc
-@@ -34,7 +34,7 @@
- #include <unistd.h>
- #include <cstring>
- #include <cstdio>
--#include <upnp-1.8/ixml.h>
-+#include <ixml.h>
-
- #include "server.h"
- #include "common.h"
-diff --git a/src/io_handler.cc b/src/io_handler.cc
-index 3a1579f3..44b28cb8 100644
---- a/src/io_handler.cc
-+++ b/src/io_handler.cc
-@@ -31,7 +31,7 @@
- /// This handles the VirtualDirCallbacks that come from the web server.
-
- #include <unistd.h>
--#include <upnp-1.8/ixml.h>
-+#include <ixml.h>
-
- #include "server.h"
-
-diff --git a/src/io_handler.h b/src/io_handler.h
-index b62a4393..08353751 100644
---- a/src/io_handler.h
-+++ b/src/io_handler.h
-@@ -32,7 +32,7 @@
- #ifndef __IO_HANDLER_H__
- #define __IO_HANDLER_H__
-
--#include <upnp-1.8/upnp.h>
-+#include <upnp.h>
-
- #include "common.h"
-
-diff --git a/src/io_handler_buffer_helper.h b/src/io_handler_buffer_helper.h
-index 5f0cdc2a..bad70ac0 100644
---- a/src/io_handler_buffer_helper.h
-+++ b/src/io_handler_buffer_helper.h
-@@ -33,7 +33,7 @@
- #define __IO_HANDLER_BUFFER_HELPER_H__
-
- #include <pthread.h>
--#include <upnp-1.8/upnp.h>
-+#include <upnp.h>
- #include <mutex>
- #include <condition_variable>
-
-diff --git a/src/mem_io_handler.cc b/src/mem_io_handler.cc
-index c398b100..ae77a56c 100644
---- a/src/mem_io_handler.cc
-+++ b/src/mem_io_handler.cc
-@@ -36,7 +36,7 @@
- #include <unistd.h>
- #include <cstring>
- #include <cstdio>
--#include <upnp-1.8/ixml.h>
-+#include <ixml.h>
- #include <ctime>
- #include "common.h"
- #include "storage.h"
-diff --git a/src/subscription_request.h b/src/subscription_request.h
-index e956d545..2bf91706 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-1.8/upnp.h>
-+#include <upnp.h>
-
- #include "common.h"
-
-diff --git a/src/transcoding/transcode_ext_handler.cc b/src/transcoding/transcode_ext_handler.cc
-index b12dc97a..9e622647 100644
---- a/src/transcoding/transcode_ext_handler.cc
-+++ b/src/transcoding/transcode_ext_handler.cc
-@@ -36,7 +36,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
--#include <upnp-1.8/ixml.h>
-+#include <ixml.h>
- #include <unistd.h>
- #include <cstring>
- #include <cstdio>
-diff --git a/src/transcoding/transcode_ext_handler.h b/src/transcoding/transcode_ext_handler.h
-index ac7d14f0..5b2b155a 100644
---- a/src/transcoding/transcode_ext_handler.h
-+++ b/src/transcoding/transcode_ext_handler.h
-@@ -32,7 +32,7 @@
- #ifndef __TRANSCODE_EXTERNAL_HANDLER_H__
- #define __TRANSCODE_EXTERNAL_HANDLER_H__
-
--#include <upnp-1.8/upnp.h>
-+#include <upnp.h>
-
- #include "common.h"
- #include "transcode_handler.h"
-diff --git a/src/transcoding/transcode_handler.h b/src/transcoding/transcode_handler.h
-index 40001b06..064ed4e8 100644
---- a/src/transcoding/transcode_handler.h
-+++ b/src/transcoding/transcode_handler.h
-@@ -32,7 +32,7 @@
- #ifndef __TRANSCODE_HANDLER_H__
- #define __TRANSCODE_HANDLER_H__
-
--#include <upnp-1.8/upnp.h>
-+#include <upnp.h>
-
- #include "common.h"
- #include "io_handler.h"
-diff --git a/src/url_request_handler.cc b/src/url_request_handler.cc
-index 93e818df..1cd73fb2 100644
---- a/src/url_request_handler.cc
-+++ b/src/url_request_handler.cc
-@@ -31,7 +31,7 @@
-
- #ifdef HAVE_CURL
-
--#include <upnp-1.8/ixml.h>
-+#include <ixml.h>
-
- #include "server.h"
- #include "common.h"
---
-2.14.1
-
diff --git a/debian/patches/0011_duktape-nolib.patch b/debian/patches/0011_duktape-nolib.patch
index 1860d4d..d4d767e 100644
--- a/debian/patches/0011_duktape-nolib.patch
+++ b/debian/patches/0011_duktape-nolib.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/cmake/FindDuktape.cmake
+++ b/cmake/FindDuktape.cmake
-@@ -7,23 +7,18 @@
+@@ -7,16 +7,11 @@
# DUKTAPE_DEFINITIONS - Compiler switches required for using Duktape
#
@@ -21,7 +21,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
- HINTS ${PC_DUK_INCLUDEDIR} ${PC_DUK_INCLUDE_DIRS}
- PATH_SUFFIXES duktape)
-
--find_library(DUKTAPE_LIBARY
+-find_library(DUKTAPE_LIBRARY
- NAMES duktape libduktape
- HINTS ${PC_DUK_LIBDIR} ${PC_DUK_LIBRARY_DIRS})
+add_library(duktape STATIC "/usr/share/duktape/duktape.c")
@@ -29,12 +29,3 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Duktape
-- REQUIRED_VARS DUKTAPE_LIBARY DUKTAPE_INCLUDE_DIR)
-+ REQUIRED_VARS DUKTAPE_LIBRARY DUKTAPE_INCLUDE_DIR)
-
- if (DUKTAPE_FOUND)
-- set (DUKTAPE_LIBRARIES ${DUKTAPE_LIBARY})
-+ set (DUKTAPE_LIBRARIES ${DUKTAPE_LIBRARY})
- set (DUKTAPE_INCLUDE_DIRS ${DUKTAPE_INCLUDE_DIR} )
- endif ()
-
diff --git a/debian/patches/0012_reload-log-on-hup.patch b/debian/patches/0012_reload-log-on-hup.patch
index df4b08c..f4b2f0f 100644
--- a/debian/patches/0012_reload-log-on-hup.patch
+++ b/debian/patches/0012_reload-log-on-hup.patch
@@ -7,7 +7,7 @@ Forwarded: no
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/main.cc
+++ b/src/main.cc
-@@ -115,6 +115,7 @@ int main(int argc, char** argv, char** e
+@@ -114,6 +114,7 @@ int main(int argc, char** argv, char** e
String magic;
bool debug_logging = false;
bool print_version = false;
@@ -15,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
Ref<Array<StringBase> > addFile(new Array<StringBase>());
-@@ -180,6 +181,7 @@ int main(int argc, char** argv, char** e
+@@ -174,6 +175,7 @@ int main(int argc, char** argv, char** e
case 'l':
log_debug("Log file: %s\n", optarg);
@@ -23,7 +23,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
log_open(optarg);
break;
-@@ -438,6 +440,12 @@ For more information visit " DESC_MANUFA
+@@ -415,6 +417,12 @@ For more information visit " DESC_MANUFA
exit(EXIT_FAILURE);
}
diff --git a/debian/patches/0013_more-spelling.patch b/debian/patches/0013_more-spelling.patch
index 4e37e8f..8a3d81e 100644
--- a/debian/patches/0013_more-spelling.patch
+++ b/debian/patches/0013_more-spelling.patch
@@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
CdsContainer::CdsContainer() : CdsObject()
--- a/src/config_manager.cc
+++ b/src/config_manager.cc
-@@ -389,7 +389,7 @@ String ConfigManager::createDefaultConfi
+@@ -393,7 +393,7 @@ String ConfigManager::createDefaultConfi
Ref<Comment> docinfo(new Comment(_("\n\
See http://gerbera.io or read the docs for more\n\
@@ -25,7 +25,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
"),
true));
config->appendChild(RefCast(docinfo, Node));
-@@ -797,7 +797,7 @@ void ConfigManager::migrate()
+@@ -800,7 +800,7 @@ void ConfigManager::migrate()
if (migrated_flag) {
root->indent();
save();
@@ -36,7 +36,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/src/server.cc
+++ b/src/server.cc
-@@ -218,7 +218,7 @@ void Server::upnp_init()
+@@ -206,7 +206,7 @@ void Server::upnp_init()
throw _UpnpException(ret, _("upnp_init: UpnpRegisterRootDevice failed"));
}
diff --git a/debian/patches/series b/debian/patches/series
index d5025df..e555bff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
-0001_fix_spelling_errors.patch
0008_symlinks.patch
-0009_CMake-Improve-compat-with-libupnp-1.8.2.patch
-0010_Unqualify-libupnp-includes.patch
0011_duktape-nolib.patch
0012_reload-log-on-hup.patch
0013_more-spelling.patch
--
gerbera packaging
More information about the pkg-multimedia-commits
mailing list