This is an automated email from the git hooks/post-receive script. odyx pushed a commit to branch debian/master in repository planetblupi.
commit ba8498d42661d7f00a5c07eb917adde4fa8be1ac Merge: 11b4d65 3c3e92b Author: Didier Raboud <[email protected]> Date: Fri Oct 20 16:05:16 2017 +0200 merge patched-debian/master into debian/master CMakeLists.txt | 26 +++- debian/.git-dpm | 4 +- ...RL-dependency-optional-through-the-PLANET.patch | 142 +++++++++++++++++++++ debian/patches/series | 1 + src/blupi.cxx | 10 +- 5 files changed, 177 insertions(+), 6 deletions(-) diff --cc debian/.git-dpm index 2111a8d,0000000..2d4a8d8 mode 100644,000000..100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@@ -1,8 -1,0 +1,8 @@@ +# see git-dpm(1) from git-dpm package - aa6cb7114d1f2f7af95a0567817aa3e593ba13dc - aa6cb7114d1f2f7af95a0567817aa3e593ba13dc ++3c3e92b86af7488f2f051bad32e840cf13bcf59a ++3c3e92b86af7488f2f051bad32e840cf13bcf59a +e0ace8819512553d3680e912e419a5df1b8295ab +e0ace8819512553d3680e912e419a5df1b8295ab +planetblupi_1.11.0.orig.tar.xz +d62eb5661224b1859f3b23afdbfbe03349e2f789 +23135816 diff --cc debian/patches/0002-Make-the-CURL-dependency-optional-through-the-PLANET.patch index 0000000,0000000..2d09179 new file mode 100644 --- /dev/null +++ b/debian/patches/0002-Make-the-CURL-dependency-optional-through-the-PLANET.patch @@@ -1,0 -1,0 +1,142 @@@ ++From 3c3e92b86af7488f2f051bad32e840cf13bcf59a Mon Sep 17 00:00:00 2001 ++From: Didier Raboud <[email protected]> ++Date: Fri, 20 Oct 2017 16:04:46 +0200 ++Subject: Make the CURL dependency optional, through the ++ PLANETBLUPI_HTTP_VERSION_CHECK CMake option ++ ++--- ++ CMakeLists.txt | 26 +++++++++++++++++++++++--- ++ src/blupi.cxx | 10 +++++++++- ++ 2 files changed, 32 insertions(+), 4 deletions(-) ++ ++diff --git a/CMakeLists.txt b/CMakeLists.txt ++index 66e8f7d..0c62d6a 100644 ++--- a/CMakeLists.txt +++++ b/CMakeLists.txt ++@@ -18,6 +18,8 @@ set (PB_PRODUCT_NAME "Planet Blupi") ++ set (PB_PACKAGE_NAME "planetblupi") ++ set (PB_DESCRIPTION "Planet Blupi - A delerious spell-binding game") ++ +++option(PLANETBLUPI_HTTP_VERSION_CHECK "Run a version check over HTTP (with CURL)" OFF) +++ ++ configure_file ( ++ "${PROJECT_SOURCE_DIR}/src/config.h.in" ++ "${PROJECT_BINARY_DIR}/include/config.h" ++@@ -115,7 +117,10 @@ find_package (PkgConfig REQUIRED) ++ pkg_search_module (SDL2 REQUIRED sdl2) ++ pkg_search_module (SDL2_MIXER REQUIRED SDL2_mixer) ++ pkg_search_module (SDL2_IMAGE REQUIRED SDL2_image) ++-pkg_search_module (CURL REQUIRED libcurl) +++if(${PLANETBLUPI_HTTP_VERSION_CHECK}) +++ pkg_search_module (CURL REQUIRED libcurl) +++ add_definitions(-DUSE_CURL) +++endif() ++ ++ if ("${STATIC_BUILD}") ++ pkg_search_module (PNG REQUIRED libpng) ++@@ -131,7 +136,9 @@ if ("${STATIC_BUILD}") ++ pkg_search_module (PULSE REQUIRED libpulse) ++ endif () ++ ++- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCURL_STATICLIB") +++ if(${PLANETBLUPI_HTTP_VERSION_CHECK}) +++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCURL_STATICLIB") +++ endif () ++ endif () ++ ++ ########################### ++@@ -147,7 +154,6 @@ if ("${STATIC_BUILD}") ++ ${SDL2_STATIC_LIBRARIES} ++ ${SDL2_MIXER_STATIC_LIBRARIES} ++ ${SDL2_IMAGE_STATIC_LIBRARIES} ++- ${CURL_STATIC_LIBRARIES} ++ ${SDLKitchensink_STATIC_LIBRARIES} ++ ${PNG_STATIC_LIBRARIES} ++ ${AVCODEC_STATIC_LIBRARIES} ++@@ -156,6 +162,13 @@ if ("${STATIC_BUILD}") ++ ${SWSCALE_STATIC_LIBRARIES} ++ ${SWRESAMPLE_STATIC_LIBRARIES} ++ ) +++ +++ if(${PLANETBLUPI_HTTP_VERSION_CHECK}) +++ set (planetblupi_DEPS +++ ${planetblupi_DEPS} +++ ${CURL_STATIC_LIBRARIES} +++ ) +++ endif () ++ ++ if (UNIX AND NOT APPLE) ++ list (APPEND planetblupi_DEPS ++@@ -173,6 +186,13 @@ else () ++ ${SDLKitchensink_LIBRARIES} ++ pthread ++ ) +++ +++ if(${PLANETBLUPI_HTTP_VERSION_CHECK}) +++ set (planetblupi_DEPS +++ ${planetblupi_DEPS} +++ ${CURL_LIBRARIES} +++ ) +++ endif () ++ endif () ++ ++ target_link_libraries (planetblupi PUBLIC ${planetblupi_DEPS}) ++diff --git a/src/blupi.cxx b/src/blupi.cxx ++index 461fbd2..86b0260 100644 ++--- a/src/blupi.cxx +++++ b/src/blupi.cxx ++@@ -30,7 +30,9 @@ ++ ++ #include <SDL2/SDL_image.h> ++ #include <argagg/argagg.hpp> ++-#include <curl/curl.h> +++#ifdef USE_CURL +++ #include <curl/curl.h> +++#endif ++ ++ #include "json/json.hpp" ++ ++@@ -81,11 +83,13 @@ bool g_bTermInit = false; // initialisation en cours ++ Uint32 g_lastPhase = 999; ++ static bool g_pause; ++ +++#ifdef USE_CURL ++ struct url_data { ++ CURLcode status; ++ char * buffer; ++ size_t size; ++ }; +++#endif ++ ++ template <typename Out> ++ static void ++@@ -461,6 +465,7 @@ InitFail (const char * msg) ++ static size_t ++ updateCallback (void * ptr, size_t size, size_t nmemb, void * data) ++ { +++#ifdef USE_CURL ++ size_t realsize = size * nmemb; ++ url_data * mem = static_cast<url_data *> (data); ++ ++@@ -474,11 +479,13 @@ updateCallback (void * ptr, size_t size, size_t nmemb, void * data) ++ } ++ ++ return realsize; +++#endif ++ } ++ ++ static void ++ CheckForUpdates () ++ { +++#ifdef USE_CURL ++ url_data chunk; ++ ++ chunk.buffer = nullptr; /* we expect realloc(NULL, size) to work */ ++@@ -515,6 +522,7 @@ CheckForUpdates () ++ free (chunk.buffer); ++ ++ curl_easy_cleanup (curl); +++#endif ++ } ++ ++ static int diff --cc debian/patches/series index 7156133,0000000..65813ac mode 100644,000000..100644 --- a/debian/patches/series +++ b/debian/patches/series @@@ -1,1 -1,0 +1,2 @@@ +0001-The-planetblupi-executable-goes-to-usr-games-not-usr.patch ++0002-Make-the-CURL-dependency-optional-through-the-PLANET.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/planetblupi.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
