[vcmi] 01/01: Upload to unstable, fix boost1.60 build failure, acknowledge NMU
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Thu Aug 11 16:39:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository vcmi.
commit ab0f1e5447a7044b426b6a1becf87b061a907992
Author: Gianfranco Costamagna <locutusofborg at debian.org>
Date: Thu Aug 11 18:37:52 2016 +0200
Upload to unstable, fix boost1.60 build failure, acknowledge NMU
---
debian/changelog | 22 +++++++++++--
debian/patches/boost1.60.diff | 71 +++++++++++++++++++++++++++++++++++++++++
debian/patches/ffmpeg_2.9.patch | 64 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 2 ++
4 files changed, 157 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 30d23cc..5e41bf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,26 @@
-vcmi (0.98+dfsg-3) UNRELEASED; urgency=medium
+vcmi (0.98+dfsg-3) unstable; urgency=medium
+ * Team upload.
+
+ [ Gianfranco Costamagna ]
+ * Acknowledge previous NMU, thanks!
+
+ [ Stephen Kitt ]
* Migrate to dbgsym debug packages.
- -- Stephen Kitt <skitt at debian.org> Sun, 20 Dec 2015 18:41:03 +0100
+ [ Matthias Klose ]
+ * Fix build failure with boost1.60.
+
+ -- Gianfranco Costamagna <locutusofborg at debian.org> Thu, 11 Aug 2016 18:33:10 +0200
+
+vcmi (0.98+dfsg-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Andreas Cadhalpun ]
+ * Fix build with ffmpeg 3.0. (Closes: #803866)
+
+ -- Sebastian Ramacher <sramacher at debian.org> Sun, 24 Apr 2016 19:35:24 +0200
vcmi (0.98+dfsg-2) unstable; urgency=medium
diff --git a/debian/patches/boost1.60.diff b/debian/patches/boost1.60.diff
new file mode 100644
index 0000000..a2d3c9c
--- /dev/null
+++ b/debian/patches/boost1.60.diff
@@ -0,0 +1,71 @@
+Index: b/lib/Connection.cpp
+===================================================================
+--- a/lib/Connection.cpp
++++ b/lib/Connection.cpp
+@@ -440,7 +440,7 @@ CTypeList::TypeInfoPtr CTypeList::regist
+ return typeDescr; //type found, return ptr to structure
+
+ //type not found - add it to the list and return given ID
+- auto newType = make_shared<TypeDescriptor>();
++ auto newType = std::make_shared<TypeDescriptor>();
+ newType->typeID = typeInfos.size() + 1;
+ newType->name = type->name();
+ typeInfos[type] = newType;
+Index: b/client/Client.cpp
+===================================================================
+--- a/client/Client.cpp
++++ b/client/Client.cpp
+@@ -451,7 +451,7 @@ void CClient::newGame( CConnection *con,
+ }
+ else
+ {
+- installNewPlayerInterface(make_shared<CPlayerInterface>(color), color);
++ installNewPlayerInterface(std::make_shared<CPlayerInterface>(color), color);
+ humanPlayers++;
+ }
+ }
+@@ -467,7 +467,7 @@ void CClient::newGame( CConnection *con,
+ if(!gNoGUI)
+ {
+ boost::unique_lock<boost::recursive_mutex> un(*LOCPLINT->pim);
+- auto p = make_shared<CPlayerInterface>(PlayerColor::NEUTRAL);
++ auto p = std::make_shared<CPlayerInterface>(PlayerColor::NEUTRAL);
+ p->observerInDuelMode = true;
+ installNewPlayerInterface(p, boost::none);
+ GH.curInt = p.get();
+@@ -550,7 +550,7 @@ void CClient::serialize(CISer & h, const
+ else
+ {
+ assert(isHuman);
+- nInt = make_shared<CPlayerInterface>(pid);
++ nInt = std::make_shared<CPlayerInterface>(pid);
+ }
+
+ nInt->dllName = dllname;
+@@ -620,7 +620,7 @@ void CClient::serialize(CISer & h, const
+ else
+ {
+ assert(isHuman);
+- nInt = make_shared<CPlayerInterface>(pid);
++ nInt = std::make_shared<CPlayerInterface>(pid);
+ }
+
+ nInt->dllName = dllname;
+@@ -866,7 +866,7 @@ void CClient::installNewPlayerInterface(
+ playerint[colorUsed] = gameInterface;
+
+ logGlobal->traceStream() << boost::format("\tInitializing the interface for player %s") % colorUsed;
+- auto cb = make_shared<CCallback>(gs, color, this);
++ auto cb = std::make_shared<CCallback>(gs, color, this);
+ callbacks[colorUsed] = cb;
+ battleCallbacks[colorUsed] = cb;
+ gameInterface->init(cb);
+@@ -887,7 +887,7 @@ void CClient::installNewBattleInterface(
+ if(needCallback)
+ {
+ logGlobal->traceStream() << boost::format("\tInitializing the battle interface for player %s") % *color;
+- auto cbc = make_shared<CBattleCallback>(gs, color, this);
++ auto cbc = std::make_shared<CBattleCallback>(gs, color, this);
+ battleCallbacks[colorUsed] = cbc;
+ battleInterface->init(cbc);
+ }
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
new file mode 100644
index 0000000..04ba4f4
--- /dev/null
+++ b/debian/patches/ffmpeg_2.9.patch
@@ -0,0 +1,64 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
+Last-Update: <2015-11-02>
+
+--- a/client/CVideoHandler.cpp
++++ b/client/CVideoHandler.cpp
+@@ -155,7 +155,7 @@
+ }
+
+ // Allocate video frame
+- frame = avcodec_alloc_frame();
++ frame = av_frame_alloc();
+
+ //setup scaling
+
+@@ -201,21 +201,21 @@
+ #endif
+ { // Convert the image into YUV format that SDL uses
+ sws = sws_getContext(codecContext->width, codecContext->height, codecContext->pix_fmt,
+- pos.w, pos.h, PIX_FMT_YUV420P,
++ pos.w, pos.h, AV_PIX_FMT_YUV420P,
+ SWS_BICUBIC, nullptr, nullptr, nullptr);
+ }
+ else
+ {
+
+- PixelFormat screenFormat = PIX_FMT_NONE;
++ AVPixelFormat screenFormat = AV_PIX_FMT_NONE;
+ if (screen->format->Bshift > screen->format->Rshift)
+ {
+ // this a BGR surface
+ switch (screen->format->BytesPerPixel)
+ {
+- case 2: screenFormat = PIX_FMT_BGR565; break;
+- case 3: screenFormat = PIX_FMT_BGR24; break;
+- case 4: screenFormat = PIX_FMT_BGR32; break;
++ case 2: screenFormat = AV_PIX_FMT_BGR565; break;
++ case 3: screenFormat = AV_PIX_FMT_BGR24; break;
++ case 4: screenFormat = AV_PIX_FMT_BGR32; break;
+ default: return false;
+ }
+ }
+@@ -224,9 +224,9 @@
+ // this a RGB surface
+ switch (screen->format->BytesPerPixel)
+ {
+- case 2: screenFormat = PIX_FMT_RGB565; break;
+- case 3: screenFormat = PIX_FMT_RGB24; break;
+- case 4: screenFormat = PIX_FMT_RGB32; break;
++ case 2: screenFormat = AV_PIX_FMT_RGB565; break;
++ case 3: screenFormat = AV_PIX_FMT_RGB24; break;
++ case 4: screenFormat = AV_PIX_FMT_RGB32; break;
+ default: return false;
+ }
+ }
+@@ -411,7 +411,7 @@
+
+ if (frame)
+ {
+- av_free(frame);
++ av_frame_free(&frame);
+ frame = nullptr;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 7399905..840570c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
disable-privacy-breach
build_with_boost_1.58
+ffmpeg_2.9.patch
+boost1.60.diff
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/vcmi.git
More information about the Pkg-games-commits
mailing list