[vcmi] 04/10: remove patches that were included upstream
Johannes Schauer
josch at moszumanska.debian.org
Tue Nov 8 13:11:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
josch pushed a commit to branch master
in repository vcmi.
commit 5d85c48e1bb3195ab41f96cc442b09dfb52adc2f
Author: Johannes Schauer <josch at debian.org>
Date: Tue Nov 8 06:42:15 2016 -0200
remove patches that were included upstream
---
debian/changelog | 2 +
debian/patches/boost1.60.diff | 71 ------------------------------------
debian/patches/build_with_boost_1.58 | 39 --------------------
debian/patches/ffmpeg_2.9.patch | 64 --------------------------------
debian/patches/series | 3 --
5 files changed, 2 insertions(+), 177 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8250c85..6dc9360 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
vcmi (0.99+dfsg-1) UNRELEASED; urgency=medium
* new upstream release
+ * remove patches boost1.60.diff, build_with_boost_1.58 and ffmpeg_2.9.patch
+ as they all have been included by upstream
-- Johannes Schauer <josch at debian.org> Tue, 08 Nov 2016 06:33:04 -0200
diff --git a/debian/patches/boost1.60.diff b/debian/patches/boost1.60.diff
deleted file mode 100644
index a2d3c9c..0000000
--- a/debian/patches/boost1.60.diff
+++ /dev/null
@@ -1,71 +0,0 @@
-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/build_with_boost_1.58 b/debian/patches/build_with_boost_1.58
deleted file mode 100644
index 668c9bf..0000000
--- a/debian/patches/build_with_boost_1.58
+++ /dev/null
@@ -1,39 +0,0 @@
-commit aa00fdbd0e99b2beec382c7677a64d962b748dcb
-Author: Rohit Nirmal <rohitnirmal9 at gmail.com>
-Date: Wed May 6 19:16:51 2015 -0500
-
- Fix building with Boost 1.58.
-
---- a/CCallback.cpp
-+++ b/CCallback.cpp
-@@ -80,7 +80,7 @@ void CCallback::recruitCreatures(const C
-
- bool CCallback::dismissCreature(const CArmedInstance *obj, SlotID stackPos)
- {
-- if(((player>=0) && obj->tempOwner != player) || (obj->stacksCount()<2 && obj->needsLastStack()))
-+ if((player && obj->tempOwner != player) || (obj->stacksCount()<2 && obj->needsLastStack()))
- return false;
-
- DisbandCreature pack(stackPos,obj->id);
---- a/lib/CArtHandler.cpp
-+++ b/lib/CArtHandler.cpp
-@@ -671,7 +671,7 @@ boost::optional<std::vector<CArtifact*>&
- case CArtifact::ART_RELIC:
- return relics;
- default: //special artifacts should not be erased
-- return nullptr;
-+ return boost::optional<std::vector<CArtifact*>&>();
- }
- }
-
---- a/lib/CGameInfoCallback.cpp
-+++ b/lib/CGameInfoCallback.cpp
-@@ -403,7 +403,7 @@ std::vector <const CGObjectInstance * >
-
- for(const CGObjectInstance * obj : t->visitableObjects)
- {
-- if(player < nullptr || obj->ID != Obj::EVENT) //hide events from players
-+ if(player || obj->ID != Obj::EVENT) //hide events from players
- ret.push_back(obj);
- }
-
diff --git a/debian/patches/ffmpeg_2.9.patch b/debian/patches/ffmpeg_2.9.patch
deleted file mode 100644
index 04ba4f4..0000000
--- a/debian/patches/ffmpeg_2.9.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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 21027e3..31acd96 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
disable-privacy-breach
-build_with_boost_1.58
-ffmpeg_2.9.patch
-boost1.60.diff
--
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