Control: tags 803866 + pending Dear maintainer,
I've prepared an NMU for vcmi (versioned as 0.98+dfsg-2.1) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -Nru vcmi-0.98+dfsg/debian/changelog vcmi-0.98+dfsg/debian/changelog
--- vcmi-0.98+dfsg/debian/changelog 2015-08-29 10:45:18.000000000 +0200
+++ vcmi-0.98+dfsg/debian/changelog 2016-04-24 19:35:25.000000000 +0200
@@ -1,3 +1,12 @@
+vcmi (0.98+dfsg-2.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+
+ [ Andreas Cadhalpun ]
+ * Fix build with ffmpeg 3.0. (Closes: #803866)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Sun, 24 Apr 2016 19:35:24 +0200
+
vcmi (0.98+dfsg-2) unstable; urgency=medium
* backport patch build_with_boost_1.58 from upstream to build with boost
diff -Nru vcmi-0.98+dfsg/debian/patches/build_with_boost_1.58 vcmi-0.98+dfsg/debian/patches/build_with_boost_1.58
--- vcmi-0.98+dfsg/debian/patches/build_with_boost_1.58 2015-08-29 10:44:12.000000000 +0200
+++ vcmi-0.98+dfsg/debian/patches/build_with_boost_1.58 2016-04-25 00:20:56.000000000 +0200
@@ -6,7 +6,7 @@
--- a/CCallback.cpp
+++ b/CCallback.cpp
-@@ -80,7 +80,7 @@ void CCallback::recruitCreatures(const C
+@@ -80,7 +80,7 @@
bool CCallback::dismissCreature(const CArmedInstance *obj, SlotID stackPos)
{
@@ -17,7 +17,7 @@
DisbandCreature pack(stackPos,obj->id);
--- a/lib/CArtHandler.cpp
+++ b/lib/CArtHandler.cpp
-@@ -671,7 +671,7 @@ boost::optional<std::vector<CArtifact*>&
+@@ -671,7 +671,7 @@
case CArtifact::ART_RELIC:
return relics;
default: //special artifacts should not be erased
@@ -28,7 +28,7 @@
--- a/lib/CGameInfoCallback.cpp
+++ b/lib/CGameInfoCallback.cpp
-@@ -403,7 +403,7 @@ std::vector <const CGObjectInstance * >
+@@ -403,7 +403,7 @@
for(const CGObjectInstance * obj : t->visitableObjects)
{
diff -Nru vcmi-0.98+dfsg/debian/patches/ffmpeg_2.9.patch vcmi-0.98+dfsg/debian/patches/ffmpeg_2.9.patch
--- vcmi-0.98+dfsg/debian/patches/ffmpeg_2.9.patch 1970-01-01 01:00:00.000000000 +0100
+++ vcmi-0.98+dfsg/debian/patches/ffmpeg_2.9.patch 2016-04-25 00:49:19.000000000 +0200
@@ -0,0 +1,64 @@
+Description: Replace deprecated FFmpeg API
+Author: Andreas Cadhalpun <andreas.cadhal...@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 -Nru vcmi-0.98+dfsg/debian/patches/series vcmi-0.98+dfsg/debian/patches/series
--- vcmi-0.98+dfsg/debian/patches/series 2015-08-29 10:44:03.000000000 +0200
+++ vcmi-0.98+dfsg/debian/patches/series 2016-04-25 00:21:34.000000000 +0200
@@ -1,2 +1,3 @@
disable-privacy-breach
build_with_boost_1.58
+ffmpeg_2.9.patch
signature.asc
Description: PGP signature
