[hedgewars] 03/12: Drop old patches
Gianfranco Costamagna
locutusofborg at moszumanska.debian.org
Thu Nov 16 15:41:44 UTC 2017
This is an automated email from the git hooks/post-receive script.
locutusofborg pushed a commit to branch master
in repository hedgewars.
commit c18cda82e8b5e039cc130ba6496204b63756a3b6
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date: Thu Nov 16 15:17:44 2017 +0100
Drop old patches
---
.../14a48ec6c0e4e7c4c475eacc9ae3b093656c163a.patch | 56 ----
.../2488090353fc122b4af030ea55bbff494c204c9b.patch | 36 ---
.../3e1856bb563ad889e113f5ba440196e1c9e07b50.patch | 25 --
.../5de297c5621455b9117aa7caca2785d21ae1bf04.patch | 27 --
.../62e5519664f25ccdbdeb51e3e08c9017c95b25c1.patch | 31 --
.../7bb49917ebcd9734dd5a44bffa645d3889e60e72.patch | 24 --
.../850e289b11dbe0415ba909ef87e13533c0e6ee41.patch | 39 ---
.../93292d80924aeadfda9f327ba78891cc4bab6c3c.patch | 22 --
.../9da8e039c97c4a52161bd563b75ffa35acd75ec5.patch | 22 --
.../a0e5bd1d4d77c1558394d9ac6b6b8a5030ef5282.patch | 31 --
.../ab7e24456dd3dec808862f14d831c7abb14aadc9.patch | 29 --
debian/patches/ad435d95ca4b.patch | 110 --------
.../ce3a58617e5732376b4ef5d47fc2be73b705a154.patch | 24 --
.../dc19837f6b9bccddcd2fc05e1d44255aab79b614.patch | 58 ----
.../e8654674c5ee580b2ec8392d3ae732c10195c039.patch | 312 ---------------------
.../f121e6c350a041a429a57ba4748ad673aa8420ea.patch | 31 --
debian/patches/pas2c-ghc8.patch | 27 --
debian/patches/series | 17 --
18 files changed, 921 deletions(-)
diff --git a/debian/patches/14a48ec6c0e4e7c4c475eacc9ae3b093656c163a.patch b/debian/patches/14a48ec6c0e4e7c4c475eacc9ae3b093656c163a.patch
deleted file mode 100644
index ccf0df2..0000000
--- a/debian/patches/14a48ec6c0e4e7c4c475eacc9ae3b093656c163a.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 14a48ec6c0e4e7c4c475eacc9ae3b093656c163a Mon Sep 17 00:00:00 2001
-From: Vittorio Giovara <vittorio.giovara at gmail.com>
-Date: Tue, 10 Nov 2015 13:53:15 +0100
-Subject: [PATCH] videorec: Appropriately rescale timestamps and duration
-
-Applies to both audio and video for them to be in sync.
-
---HG--
-extra : hg-git-rename-source : git
----
- hedgewars/avwrapper/avwrapper.c | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index cc7d712..f041af3 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -66,6 +66,17 @@ static uint8_t g_OutBuffer[OUTBUFFER_SIZE];
- #if LIBAVCODEC_VERSION_MAJOR < 56
- #define av_frame_alloc avcodec_alloc_frame
- #define av_frame_free av_freep
-+#define av_packet_rescale_ts rescale_ts
-+
-+static void rescale_ts(AVPacket *pkt, AVRational ctb, AVRational stb)
-+{
-+ if (pkt->pts != AV_NOPTS_VALUE)
-+ pkt->pts = av_rescale_q(pkt->pts, ctb, stb);
-+ if (pkt->dts != AV_NOPTS_VALUE)
-+ pkt->dts = av_rescale_q(pkt->dts, ctb, stb);
-+ if (pkt->duration > 0)
-+ pkt->duration = av_rescale_q(pkt->duration, ctb, stb);
-+}
- #endif
-
- #if LIBAVCODEC_VERSION_MAJOR < 57
-@@ -216,6 +227,8 @@ static int WriteAudioFrame()
- return FatalError("avcodec_encode_audio2 failed");
- if (!got_packet)
- return 0;
-+
-+ av_packet_rescale_ts(&Packet, g_pAudio->time_base, g_pAStream->time_base);
- #else
- if (NumSamples == 0)
- return 0;
-@@ -374,10 +387,7 @@ static int WriteFrame(AVFrame* pFrame)
- if (!got_packet)
- return 0;
-
-- if (Packet.pts != AV_NOPTS_VALUE)
-- Packet.pts = av_rescale_q(Packet.pts, g_pVideo->time_base, g_pVStream->time_base);
-- if (Packet.dts != AV_NOPTS_VALUE)
-- Packet.dts = av_rescale_q(Packet.dts, g_pVideo->time_base, g_pVStream->time_base);
-+ av_packet_rescale_ts(&Packet, g_pVideo->time_base, g_pVStream->time_base);
- #else
- Packet.size = avcodec_encode_video(g_pVideo, g_OutBuffer, OUTBUFFER_SIZE, pFrame);
- if (Packet.size < 0)
diff --git a/debian/patches/2488090353fc122b4af030ea55bbff494c204c9b.patch b/debian/patches/2488090353fc122b4af030ea55bbff494c204c9b.patch
deleted file mode 100644
index 244444e..0000000
--- a/debian/patches/2488090353fc122b4af030ea55bbff494c204c9b.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2488090353fc122b4af030ea55bbff494c204c9b Mon Sep 17 00:00:00 2001
-From: Vittorio Giovara <vittorio.giovara at gmail.com>
-Date: Tue, 10 Nov 2015 13:53:12 +0100
-Subject: [PATCH] videorec: Fix flushing encoders
-
-When passing NULL frames, encoders empty their queues, but we have
-to stop polling from them when they don't any more data.
-
---HG--
-extra : hg-git-rename-source : git
----
- hedgewars/avwrapper/avwrapper.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index d6a07ab..232398c 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -508,7 +508,7 @@ AVWRAP_DECL int AVWrapper_Close()
- {
- do
- ret = WriteFrame(NULL);
-- while (ret >= 0);
-+ while (ret > 0);
- if (ret < 0)
- return ret;
- }
-@@ -517,7 +517,7 @@ AVWRAP_DECL int AVWrapper_Close()
- {
- ret = WriteAudioFrame();
- }
-- while(ret >= 0);
-+ while(ret > 0);
- if (ret < 0)
- return ret;
-
diff --git a/debian/patches/3e1856bb563ad889e113f5ba440196e1c9e07b50.patch b/debian/patches/3e1856bb563ad889e113f5ba440196e1c9e07b50.patch
deleted file mode 100644
index f305d7f..0000000
--- a/debian/patches/3e1856bb563ad889e113f5ba440196e1c9e07b50.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 3e1856bb563ad889e113f5ba440196e1c9e07b50 Mon Sep 17 00:00:00 2001
-From: Vittorio Giovara <vittorio.giovara at gmail.com>
-Date: Tue, 10 Nov 2015 13:53:13 +0100
-Subject: [PATCH] videorec: Fully set frame properties
-
---HG--
-extra : hg-git-rename-source : git
----
- hedgewars/avwrapper/avwrapper.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index 232398c..3941ab6 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -311,6 +311,9 @@ static int AddVideoStream()
- if (!g_pVFrame)
- return FatalError("Could not allocate frame");
-
-+ g_pVFrame->width = g_Width;
-+ g_pVFrame->height = g_Height;
-+ g_pVFrame->format = AV_PIX_FMT_YUV420P;
- g_pVFrame->linesize[0] = g_Width;
- g_pVFrame->linesize[1] = g_Width/2;
- g_pVFrame->linesize[2] = g_Width/2;
diff --git a/debian/patches/5de297c5621455b9117aa7caca2785d21ae1bf04.patch b/debian/patches/5de297c5621455b9117aa7caca2785d21ae1bf04.patch
deleted file mode 100644
index ddf815e..0000000
--- a/debian/patches/5de297c5621455b9117aa7caca2785d21ae1bf04.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5de297c5621455b9117aa7caca2785d21ae1bf04 Mon Sep 17 00:00:00 2001
-From: Vittorio Giovara <vittorio.giovara at gmail.com>
-Date: Thu, 12 Nov 2015 02:41:40 +0100
-Subject: [PATCH] libavinteraction: Adjust version guard for
- av_codec_is_encoder()
-
----
- QTfrontend/util/LibavInteraction.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/QTfrontend/util/LibavInteraction.cpp b/QTfrontend/util/LibavInteraction.cpp
-index d5fbe37..0c62aa4 100644
---- a/QTfrontend/util/LibavInteraction.cpp
-+++ b/QTfrontend/util/LibavInteraction.cpp
-@@ -33,8 +33,11 @@ extern "C"
- #include "HWApplication.h"
-
- // compatibility section
--#if LIBAVCODEC_VERSION_MAJOR < 55
-+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 8, 0)
- #define av_codec_is_encoder(x) x->encode
-+#endif
-+
-+#if LIBAVCODEC_VERSION_MAJOR < 55
- #define AVCodecID CodecID
- #endif
-
diff --git a/debian/patches/62e5519664f25ccdbdeb51e3e08c9017c95b25c1.patch b/debian/patches/62e5519664f25ccdbdeb51e3e08c9017c95b25c1.patch
deleted file mode 100644
index 4e74667..0000000
--- a/debian/patches/62e5519664f25ccdbdeb51e3e08c9017c95b25c1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 62e5519664f25ccdbdeb51e3e08c9017c95b25c1 Mon Sep 17 00:00:00 2001
-From: Vittorio Giovara <vittorio.giovara at gmail.com>
-Date: Wed, 4 Nov 2015 16:53:38 +0100
-Subject: [PATCH] Specify the enum type for Pixel and Sample formats
-
----
- QTfrontend/util/LibavInteraction.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/QTfrontend/util/LibavInteraction.cpp b/QTfrontend/util/LibavInteraction.cpp
-index ab76292..d5fbe37 100644
---- a/QTfrontend/util/LibavInteraction.cpp
-+++ b/QTfrontend/util/LibavInteraction.cpp
-@@ -116,7 +116,7 @@ LibavInteraction::LibavInteraction() : QObject()
- if (!pCodec->pix_fmts)
- continue;
- bool yuv420Supported = false;
-- for (const AVPixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++)
-+ for (const enum AVPixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++)
- if (*pfmt == AV_PIX_FMT_YUV420P)
- {
- yuv420Supported = true;
-@@ -131,7 +131,7 @@ LibavInteraction::LibavInteraction() : QObject()
- if (!pCodec->sample_fmts)
- continue;
- bool s16Supported = false;
-- for (const AVSampleFormat* pfmt = pCodec->sample_fmts; *pfmt != -1; pfmt++)
-+ for (const enum AVSampleFormat* pfmt = pCodec->sample_fmts; *pfmt != -1; pfmt++)
- if (*pfmt == AV_SAMPLE_FMT_S16)
- {
- s16Supported = true;
diff --git a/debian/patches/7bb49917ebcd9734dd5a44bffa645d3889e60e72.patch b/debian/patches/7bb49917ebcd9734dd5a44bffa645d3889e60e72.patch
deleted file mode 100644
index 7bc0089..0000000
--- a/debian/patches/7bb49917ebcd9734dd5a44bffa645d3889e60e72.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7bb49917ebcd9734dd5a44bffa645d3889e60e72 Mon Sep 17 00:00:00 2001
-From: Vittorio Giovara <vittorio.giovara at gmail.com>
-Date: Tue, 10 Nov 2015 13:53:10 +0100
-Subject: [PATCH] videorec: Make sure the audio packet is considered empty
-
---HG--
-extra : hg-git-rename-source : git
----
- hedgewars/avwrapper/avwrapper.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index 20b0785..d6a07ab 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -192,6 +192,8 @@ static int WriteAudioFrame()
-
- AVPacket Packet;
- av_init_packet(&Packet);
-+ Packet.data = NULL;
-+ Packet.size = 0;
-
- int NumSamples = fread(g_pSamples, 2*g_Channels, g_NumSamples, g_pSoundFile);
-
diff --git a/debian/patches/850e289b11dbe0415ba909ef87e13533c0e6ee41.patch b/debian/patches/850e289b11dbe0415ba909ef87e13533c0e6ee41.patch
deleted file mode 100644
index 7483f43..0000000
--- a/debian/patches/850e289b11dbe0415ba909ef87e13533c0e6ee41.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 850e289b11dbe0415ba909ef87e13533c0e6ee41 Mon Sep 17 00:00:00 2001
-From: Vittorio Giovara <vittorio.giovara at gmail.com>
-Date: Tue, 10 Nov 2015 13:53:14 +0100
-Subject: [PATCH] videorec: Always initialize audio and video time bases
-
-In both context and stream.
-
---HG--
-extra : hg-git-rename-source : git
----
- hedgewars/avwrapper/avwrapper.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index 3941ab6..cc7d712 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -149,6 +149,10 @@ static void AddAudioStream()
- g_pAudio->sample_rate = g_Frequency;
- g_pAudio->channels = g_Channels;
-
-+ // set time base as invers of sample rate
-+ g_pAudio->time_base.den = g_pAStream->time_base.den = g_Frequency;
-+ g_pAudio->time_base.num = g_pAStream->time_base.num = 1;
-+
- // set quality
- g_pAudio->bit_rate = 160000;
-
-@@ -254,8 +258,8 @@ static int AddVideoStream()
- of which frame timestamps are represented. for fixed-fps content,
- timebase should be 1/framerate and timestamp increments should be
- identically 1. */
-- g_pVideo->time_base.den = g_Framerate.num;
-- g_pVideo->time_base.num = g_Framerate.den;
-+ g_pVideo->time_base.den = g_pVStream->time_base.den = g_Framerate.num;
-+ g_pVideo->time_base.num = g_pVStream->time_base.num = g_Framerate.den;
- //g_pVideo->gop_size = 12; /* emit one intra frame every twelve frames at most */
- g_pVideo->pix_fmt = AV_PIX_FMT_YUV420P;
-
diff --git a/debian/patches/93292d80924aeadfda9f327ba78891cc4bab6c3c.patch b/debian/patches/93292d80924aeadfda9f327ba78891cc4bab6c3c.patch
deleted file mode 100644
index 82bf8c8..0000000
--- a/debian/patches/93292d80924aeadfda9f327ba78891cc4bab6c3c.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 93292d80924aeadfda9f327ba78891cc4bab6c3c Mon Sep 17 00:00:00 2001
-From: koda <vittorio.giovara at gmail.com>
-Date: Mon, 16 Nov 2015 13:59:04 +0100
-Subject: [PATCH] avwrapper: Adjust prefixed symobols version guard
-
----
- hedgewars/avwrapper/avwrapper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index 9ed00b4..3441f0f 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -79,7 +79,7 @@ static void rescale_ts(AVPacket *pkt, AVRational ctb, AVRational stb)
- }
- #endif
-
--#if LIBAVCODEC_VERSION_MAJOR < 57
-+#if LIBAVCODEC_VERSION_MAJOR < 56
- #define AV_CODEC_CAP_DELAY CODEC_CAP_DELAY
- #define AV_CODEC_CAP_VARIABLE_FRAME_SIZE CODEC_CAP_VARIABLE_FRAME_SIZE
- #define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
diff --git a/debian/patches/9da8e039c97c4a52161bd563b75ffa35acd75ec5.patch b/debian/patches/9da8e039c97c4a52161bd563b75ffa35acd75ec5.patch
deleted file mode 100644
index c7b22f8..0000000
--- a/debian/patches/9da8e039c97c4a52161bd563b75ffa35acd75ec5.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 9da8e039c97c4a52161bd563b75ffa35acd75ec5 Mon Sep 17 00:00:00 2001
-From: Vittorio Giovara <vittorio.giovara at gmail.com>
-Date: Wed, 4 Nov 2015 16:53:43 +0100
-Subject: [PATCH] Let initialization happen in the appropriate function
-
----
- hedgewars/avwrapper/avwrapper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index b28c5db..2e90cce 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -190,7 +190,7 @@ static int WriteAudioFrame()
- if (!g_pAStream)
- return 0;
-
-- AVPacket Packet = { 0 };
-+ AVPacket Packet;
- av_init_packet(&Packet);
-
- int NumSamples = fread(g_pSamples, 2*g_Channels, g_NumSamples, g_pSoundFile);
diff --git a/debian/patches/a0e5bd1d4d77c1558394d9ac6b6b8a5030ef5282.patch b/debian/patches/a0e5bd1d4d77c1558394d9ac6b6b8a5030ef5282.patch
deleted file mode 100644
index bfc6e39..0000000
--- a/debian/patches/a0e5bd1d4d77c1558394d9ac6b6b8a5030ef5282.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From a0e5bd1d4d77c1558394d9ac6b6b8a5030ef5282 Mon Sep 17 00:00:00 2001
-From: Vittorio Giovara <vittorio.giovara at gmail.com>
-Date: Tue, 10 Nov 2015 13:53:16 +0100
-Subject: [PATCH] videorec: Use future API for raw video encoding
-
---HG--
-extra : hg-git-rename-source : git
----
- hedgewars/avwrapper/avwrapper.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index f041af3..1f48af4 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -365,6 +365,7 @@ static int WriteFrame(AVFrame* pFrame)
- Packet.size = 0;
-
- g_pVFrame->pts++;
-+#if LIBAVCODEC_VERSION_MAJOR < 58
- if (g_pFormat->flags & AVFMT_RAWPICTURE)
- {
- /* raw video case. The API will change slightly in the near
-@@ -379,6 +380,7 @@ static int WriteFrame(AVFrame* pFrame)
- return 0;
- }
- else
-+#endif
- {
- #if LIBAVCODEC_VERSION_MAJOR >= 54
- int got_packet;
diff --git a/debian/patches/ab7e24456dd3dec808862f14d831c7abb14aadc9.patch b/debian/patches/ab7e24456dd3dec808862f14d831c7abb14aadc9.patch
deleted file mode 100644
index 65dcf89..0000000
--- a/debian/patches/ab7e24456dd3dec808862f14d831c7abb14aadc9.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ab7e24456dd3dec808862f14d831c7abb14aadc9 Mon Sep 17 00:00:00 2001
-From: koda <vittorio.giovara at gmail.com>
-Date: Sat, 7 Nov 2015 15:07:33 +0100
-Subject: [PATCH] videorec: Drop setting x264 preset
-
-It is the default one anyway.
----
- hedgewars/avwrapper/avwrapper.c | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index 2e90cce..20b0785 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -302,13 +302,7 @@ static int AddVideoStream()
- #endif
-
- // open the codec
--#if LIBAVCODEC_VERSION_MAJOR >= 53
-- AVDictionary* pDict = NULL;
-- if (strcmp(g_pVCodec->name, "libx264") == 0)
-- av_dict_set(&pDict, "preset", "medium", 0);
--#endif
--
-- if (avcodec_open2(g_pVideo, g_pVCodec, &pDict) < 0)
-+ if (avcodec_open2(g_pVideo, g_pVCodec, NULL) < 0)
- return FatalError("Could not open video codec %s", g_pVCodec->long_name);
-
- g_pVFrame = av_frame_alloc();
diff --git a/debian/patches/ad435d95ca4b.patch b/debian/patches/ad435d95ca4b.patch
deleted file mode 100644
index 593c21a..0000000
--- a/debian/patches/ad435d95ca4b.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-# HG changeset patch
-# User unc0rr
-# Date 1475346425 -10800
-# Node ID ad435d95ca4b5fbffb88a440ea28548d6784d8cf
-# Parent 0b8f2116aa26e68d262fb812e6d441c1a3dec145
- - Use sandi instead of dataenc (bugs.debian.org/836686)
- - Only try to import module from the package being tested
- (sometimes packages have modules with equal names, so a test
- for module presence could succeed when you have one package
- installed instead of another)
-
-Index: hedgewars/cmake_modules/CheckHaskellModuleExists.cmake
-===================================================================
---- hedgewars.orig/cmake_modules/CheckHaskellModuleExists.cmake
-+++ hedgewars/cmake_modules/CheckHaskellModuleExists.cmake
-@@ -28,6 +28,9 @@
- "-DMODULE=${MODULE}"
- "-DFUNCTION=${FUNCTION}"
- "-DPARAMETERS=${PARAMETERS}"
-+ -hide-all-packages
-+ -package ${LIBRARY}
-+ -package base
- -cpp
- -c "${CMAKE_MODULE_PATH}/checkModule.hs"
- RESULT_VARIABLE COMMAND_RESULT
-Index: hedgewars/gameServer/CMakeLists.txt
-===================================================================
---- hedgewars.orig/gameServer/CMakeLists.txt
-+++ hedgewars/gameServer/CMakeLists.txt
-@@ -13,7 +13,7 @@
- check_haskell_module_exists("Network.BSD" getHostName 0 network)
- check_haskell_module_exists("Data.Time" getCurrentTime 0 time)
- check_haskell_module_exists("Control.Monad.State" fix 1 mtl)
--check_haskell_module_exists("Codec.Binary.Base64" encode 1 dataenc)
-+check_haskell_module_exists("Codec.Binary.Base64" encode 1 sandi)
- check_haskell_module_exists("System.Log.Logger" warningM 1 hslogger)
- check_haskell_module_exists("System.Process" createProcess 3 process)
- check_haskell_module_exists("Data.ByteString.Lazy.UTF8" decode 1 utf8-string)
-Index: hedgewars/gameServer/EngineInteraction.hs
-===================================================================
---- hedgewars.orig/gameServer/EngineInteraction.hs
-+++ hedgewars/gameServer/EngineInteraction.hs
-@@ -59,7 +59,7 @@
- #endif
-
- toEngineMsg :: B.ByteString -> B.ByteString
--toEngineMsg msg = B.pack $ Base64.encode (fromIntegral (BW.length msg) : BW.unpack msg)
-+toEngineMsg msg = Base64.encode (fromIntegral (BW.length msg) `BW.cons` msg)
-
-
- {-fromEngineMsg :: B.ByteString -> Maybe B.ByteString
-@@ -81,15 +81,15 @@
- checkNetCmd :: B.ByteString -> (B.ByteString, B.ByteString, Maybe (Maybe B.ByteString))
- checkNetCmd msg = check decoded
- where
-- decoded = liftM (splitMessages . BW.pack) $ Base64.decode $ B.unpack msg
-- check Nothing = (B.empty, B.empty, Nothing)
-- check (Just msgs) = let (a, b) = (filter isLegal msgs, filter isNonEmpty a) in (encode a, encode b, lft a)
-- encode = B.pack . Base64.encode . BW.unpack . B.concat
-+ decoded = liftM splitMessages $ Base64.decode msg
-+ check (Left _) = (B.empty, B.empty, Nothing)
-+ check (Right msgs) = let (a, b) = (filter isLegal msgs, filter isNonEmpty a) in (encode a, encode b, lft a)
-+ encode = Base64.encode . B.concat
- isLegal m = (B.length m > 1) && (flip Set.member legalMessages . B.head . B.tail $ m)
- lft = foldr l Nothing
- l m n = let m' = B.head $ B.tail m; tst = flip Set.member in
- if not $ tst timedMessages m' then n
-- else if '+' /= m' then Just Nothing else Just . Just . B.pack . Base64.encode . BW.unpack $ m
-+ else if '+' /= m' then Just Nothing else Just . Just . Base64.encode $ m
- isNonEmpty = (/=) '+' . B.head . B.tail
- legalMessages = Set.fromList $ "M#+LlRrUuDdZzAaSjJ,sNpPwtgfhbc12345" ++ slotMessages
- slotMessages = "\128\129\130\131\132\133\134\135\136\137\138"
-Index: hedgewars/gameServer/NetRoutines.hs
-===================================================================
---- hedgewars.orig/gameServer/NetRoutines.hs
-+++ hedgewars/gameServer/NetRoutines.hs
-@@ -25,11 +25,8 @@
- import Control.Monad
- import Data.Unique
- import qualified Codec.Binary.Base64 as Base64
--import qualified Data.ByteString as BW
--import qualified Data.ByteString.Char8 as B
- import qualified Control.Exception as E
- import System.Entropy
--import Data.Either
- -----------------------------
- import CoreTypes
- import Utils
-@@ -48,7 +45,7 @@
- sendChan' <- newChan
-
- uid <- newUnique
-- salt <- liftM (B.pack . Base64.encode . BW.unpack) $ hGetEntropy ch 18
-+ salt <- liftM Base64.encode $ hGetEntropy ch 18
-
- let newClient =
- (ClientInfo
-Index: hedgewars/gameServer/hedgewars-server.cabal
-===================================================================
---- hedgewars.orig/gameServer/hedgewars-server.cabal
-+++ hedgewars/gameServer/hedgewars-server.cabal
-@@ -26,7 +26,7 @@
- random,
- time,
- mtl >= 2,
-- dataenc,
-+ sandi,
- hslogger,
- process,
- deepseq,
diff --git a/debian/patches/ce3a58617e5732376b4ef5d47fc2be73b705a154.patch b/debian/patches/ce3a58617e5732376b4ef5d47fc2be73b705a154.patch
deleted file mode 100644
index 8f09c43..0000000
--- a/debian/patches/ce3a58617e5732376b4ef5d47fc2be73b705a154.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From ce3a58617e5732376b4ef5d47fc2be73b705a154 Mon Sep 17 00:00:00 2001
-From: Vittorio Giovara <vittorio.giovara at gmail.com>
-Date: Tue, 10 Nov 2015 13:53:40 +0100
-Subject: [PATCH] videorec: Drop a commented out option
-
---HG--
-extra : hg-git-rename-source : git
----
- hedgewars/avwrapper/avwrapper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index 1f48af4..9ed00b4 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -273,7 +273,7 @@ static int AddVideoStream()
- identically 1. */
- g_pVideo->time_base.den = g_pVStream->time_base.den = g_Framerate.num;
- g_pVideo->time_base.num = g_pVStream->time_base.num = g_Framerate.den;
-- //g_pVideo->gop_size = 12; /* emit one intra frame every twelve frames at most */
-+
- g_pVideo->pix_fmt = AV_PIX_FMT_YUV420P;
-
- // set quality
diff --git a/debian/patches/dc19837f6b9bccddcd2fc05e1d44255aab79b614.patch b/debian/patches/dc19837f6b9bccddcd2fc05e1d44255aab79b614.patch
deleted file mode 100644
index 2949135..0000000
--- a/debian/patches/dc19837f6b9bccddcd2fc05e1d44255aab79b614.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From dc19837f6b9bccddcd2fc05e1d44255aab79b614 Mon Sep 17 00:00:00 2001
-From: unc0rr <unc0rr at gmail.com>
-Date: Wed, 29 Jun 2016 20:16:29 +0300
-Subject: [PATCH] bytestring-show RIP
-
----
- gameServer/CMakeLists.txt | 1 -
- gameServer/Utils.hs | 5 ++---
- gameServer/hedgewars-server.cabal | 1 -
- 3 files changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/gameServer/CMakeLists.txt b/gameServer/CMakeLists.txt
-index 46eaa80..1cead84 100644
---- a/gameServer/CMakeLists.txt
-+++ b/gameServer/CMakeLists.txt
-@@ -9,7 +9,6 @@ check_haskell_module_exists("Control.Exception" mask 1 base)
- check_haskell_module_exists("Data.Map" size 1 containers)
- check_haskell_module_exists("Data.Vector" length 1 vector)
- check_haskell_module_exists("Data.ByteString" pack 1 bytestring)
--check_haskell_module_exists("Text.Show.ByteString" putDigit 1 bytestring-show)
- check_haskell_module_exists("Network.BSD" getHostName 0 network)
- check_haskell_module_exists("Data.Time" getCurrentTime 0 time)
- check_haskell_module_exists("Control.Monad.State" fix 1 mtl)
-diff --git a/gameServer/Utils.hs b/gameServer/Utils.hs
-index 9514f57..ec93dc0 100644
---- a/gameServer/Utils.hs
-+++ b/gameServer/Utils.hs
-@@ -29,7 +29,6 @@ import System.IO
- import qualified Data.List as List
- import Control.Monad
- import qualified Data.ByteString.Lazy as BL
--import qualified Text.Show.ByteString as BS
- import qualified Data.ByteString.Char8 as B
- import qualified Data.ByteString.UTF8 as UTF8
- import Data.Maybe
-@@ -130,8 +129,8 @@ unfoldrE f b =
- Right (a, new_b) -> let (a', b') = unfoldrE f new_b in (a : a', b')
- Left new_b -> ([], new_b)
-
--showB :: (BS.Show a) => a -> B.ByteString
--showB = B.concat . BL.toChunks . BS.show
-+showB :: (Show a) => a -> B.ByteString
-+showB = B.pack . show
-
- readInt_ :: (Num a) => B.ByteString -> a
- readInt_ str =
-diff --git a/gameServer/hedgewars-server.cabal b/gameServer/hedgewars-server.cabal
-index f36a190..63f4bbe 100644
---- a/gameServer/hedgewars-server.cabal
-+++ b/gameServer/hedgewars-server.cabal
-@@ -21,7 +21,6 @@ Executable hedgewars-server
- containers,
- vector,
- bytestring,
-- bytestring-show,
- network >= 2.3,
- random,
- time,
diff --git a/debian/patches/e8654674c5ee580b2ec8392d3ae732c10195c039.patch b/debian/patches/e8654674c5ee580b2ec8392d3ae732c10195c039.patch
deleted file mode 100644
index d791586..0000000
--- a/debian/patches/e8654674c5ee580b2ec8392d3ae732c10195c039.patch
+++ /dev/null
@@ -1,312 +0,0 @@
-From e8654674c5ee580b2ec8392d3ae732c10195c039 Mon Sep 17 00:00:00 2001
-From: Vittorio Giovara <vittorio.giovara at gmail.com>
-Date: Wed, 4 Nov 2015 16:53:33 +0100
-Subject: [PATCH] Update libav API, keeping forward and backward compatibility
-
----
- QTfrontend/util/LibavInteraction.cpp | 38 +++++++++---------
- hedgewars/avwrapper/avwrapper.c | 76 +++++++++++++++++++++---------------
- 2 files changed, 64 insertions(+), 50 deletions(-)
-
-diff --git a/QTfrontend/util/LibavInteraction.cpp b/QTfrontend/util/LibavInteraction.cpp
-index 7f2ed30..ab76292 100644
---- a/QTfrontend/util/LibavInteraction.cpp
-+++ b/QTfrontend/util/LibavInteraction.cpp
-@@ -21,7 +21,9 @@
- #if VIDEOREC
- extern "C"
- {
-+#include "libavcodec/avcodec.h"
- #include "libavformat/avformat.h"
-+#include "libavutil/avutil.h"
- }
-
- #include <QVector>
-@@ -30,13 +32,25 @@ extern "C"
-
- #include "HWApplication.h"
-
--#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54, 25, 0)
--#define CodecID AVCodecID
-+// compatibility section
-+#if LIBAVCODEC_VERSION_MAJOR < 55
-+#define av_codec_is_encoder(x) x->encode
-+#define AVCodecID CodecID
-+#endif
-+
-+#if LIBAVFORMAT_VERSION_MAJOR < 54
-+#define avformat_find_stream_info(x, y) av_find_stream_info(x)
-+#define avformat_close_input(x) av_close_input_file(*(x))
-+#endif
-+
-+#if LIBAVUTIL_VERSION_MAJOR < 54
-+#define AVPixelFormat PixelFormat
-+#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P
- #endif
-
- struct Codec
- {
-- CodecID id;
-+ AVCodecID id;
- bool isAudio;
- QString shortName; // used for identification
- QString longName; // used for displaying to user
-@@ -56,7 +70,7 @@ QList<Codec> codecs;
- QMap<QString,Format> formats;
-
- // test if given format supports given codec
--bool FormatQueryCodec(AVOutputFormat *ofmt, enum CodecID codec_id)
-+bool FormatQueryCodec(AVOutputFormat *ofmt, enum AVCodecID codec_id)
- {
- #if LIBAVFORMAT_VERSION_MAJOR >= 54
- return avformat_query_codec(ofmt, codec_id, FF_COMPLIANCE_NORMAL) == 1;
-@@ -76,11 +90,7 @@ LibavInteraction::LibavInteraction() : QObject()
- AVCodec* pCodec = NULL;
- while ((pCodec = av_codec_next(pCodec)))
- {
--#if LIBAVCODEC_VERSION_MAJOR >= 54
- if (!av_codec_is_encoder(pCodec))
--#else
-- if (!pCodec->encode)
--#endif
- continue;
-
- if (pCodec->type != AVMEDIA_TYPE_VIDEO && pCodec->type != AVMEDIA_TYPE_AUDIO)
-@@ -106,8 +116,8 @@ LibavInteraction::LibavInteraction() : QObject()
- if (!pCodec->pix_fmts)
- continue;
- bool yuv420Supported = false;
-- for (const PixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++)
-- if (*pfmt == PIX_FMT_YUV420P)
-+ for (const AVPixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++)
-+ if (*pfmt == AV_PIX_FMT_YUV420P)
- {
- yuv420Supported = true;
- break;
-@@ -274,11 +284,7 @@ QString LibavInteraction::getFileInfo(const QString & filepath)
- QByteArray utf8path = filepath.toUtf8();
- if (avformat_open_input(&pContext, utf8path.data(), NULL, NULL) < 0)
- return "";
--#if LIBAVFORMAT_VERSION_MAJOR < 53
-- if (av_find_stream_info(pContext) < 0)
--#else
- if (avformat_find_stream_info(pContext, NULL) < 0)
--#endif
- return "";
-
- int s = float(pContext->duration)/AV_TIME_BASE;
-@@ -312,11 +318,7 @@ QString LibavInteraction::getFileInfo(const QString & filepath)
- AVDictionaryEntry* pComment = av_dict_get(pContext->metadata, "comment", NULL, 0);
- if (pComment)
- desc += QString("\n") + pComment->value;
--#if LIBAVFORMAT_VERSION_MAJOR < 53
-- av_close_input_file(pContext);
--#else
- avformat_close_input(&pContext);
--#endif
- return desc;
- }
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index 9077de3..b28c5db 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -21,13 +21,12 @@
- #include <stdint.h>
- #include <string.h>
- #include <stdarg.h>
-+
-+#include "libavcodec/avcodec.h"
- #include "libavformat/avformat.h"
-+#include "libavutil/avutil.h"
- #include "libavutil/mathematics.h"
-
--#ifndef AVIO_FLAG_WRITE
--#define AVIO_FLAG_WRITE AVIO_WRONLY
--#endif
--
- #if (defined _MSC_VER)
- #define AVWRAP_DECL __declspec(dllexport)
- #elif ((__GNUC__ >= 3) && (!__EMX__) && (!sun))
-@@ -57,11 +56,38 @@ static int16_t* g_pSamples;
- static int g_NumSamples;
-
-
-+// compatibility section
- #if LIBAVCODEC_VERSION_MAJOR < 54
- #define OUTBUFFER_SIZE 200000
- static uint8_t g_OutBuffer[OUTBUFFER_SIZE];
-+#define avcodec_open2(x, y, z) avcodec_open(x, y)
-+#endif
-+
-+#if LIBAVCODEC_VERSION_MAJOR < 56
-+#define av_frame_alloc avcodec_alloc_frame
-+#define av_frame_free av_freep
-+#endif
-+
-+#if LIBAVCODEC_VERSION_MAJOR < 57
-+#define AV_CODEC_CAP_DELAY CODEC_CAP_DELAY
-+#define AV_CODEC_CAP_VARIABLE_FRAME_SIZE CODEC_CAP_VARIABLE_FRAME_SIZE
-+#define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-+#define AV_CODEC_FLAG_QSCALE CODEC_FLAG_QSCALE
-+#endif
-+
-+#if LIBAVFORMAT_VERSION_MAJOR < 53
-+#define AVIO_FLAG_WRITE AVIO_WRONLY
-+#endif
-+
-+#if LIBAVFORMAT_VERSION_MAJOR < 54
-+#define avformat_new_stream(x, y) av_new_stream(x, y->type == AVMEDIA_TYPE_AUDIO)
-+#endif
-+
-+#if LIBAVUTIL_VERSION_MAJOR < 54
-+#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P
- #endif
-
-+
- // pointer to function from hwengine (uUtils.pas)
- static void (*AddFileLogRaw)(const char* pString);
-
-@@ -105,11 +131,7 @@ static void Log(const char* pFmt, ...)
-
- static void AddAudioStream()
- {
--#if LIBAVFORMAT_VERSION_MAJOR >= 53
- g_pAStream = avformat_new_stream(g_pContainer, g_pACodec);
--#else
-- g_pAStream = av_new_stream(g_pContainer, 1);
--#endif
- if(!g_pAStream)
- {
- Log("Could not allocate audio stream\n");
-@@ -131,26 +153,22 @@ static void AddAudioStream()
- g_pAudio->bit_rate = 160000;
-
- // for codecs that support variable bitrate use it, it should be better
-- g_pAudio->flags |= CODEC_FLAG_QSCALE;
-+ g_pAudio->flags |= AV_CODEC_FLAG_QSCALE;
- g_pAudio->global_quality = 1*FF_QP2LAMBDA;
-
- // some formats want stream headers to be separate
- if (g_pFormat->flags & AVFMT_GLOBALHEADER)
-- g_pAudio->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ g_pAudio->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-
- // open it
--#if LIBAVCODEC_VERSION_MAJOR >= 53
- if (avcodec_open2(g_pAudio, g_pACodec, NULL) < 0)
--#else
-- if (avcodec_open(g_pAudio, g_pACodec) < 0)
--#endif
- {
- Log("Could not open audio codec %s\n", g_pACodec->long_name);
- return;
- }
-
- #if LIBAVCODEC_VERSION_MAJOR >= 54
-- if (g_pACodec->capabilities & CODEC_CAP_VARIABLE_FRAME_SIZE)
-+ if (g_pACodec->capabilities & AV_CODEC_CAP_VARIABLE_FRAME_SIZE)
- #else
- if (g_pAudio->frame_size == 0)
- #endif
-@@ -158,7 +176,7 @@ static void AddAudioStream()
- else
- g_NumSamples = g_pAudio->frame_size;
- g_pSamples = (int16_t*)av_malloc(g_NumSamples*g_Channels*sizeof(int16_t));
-- g_pAFrame = avcodec_alloc_frame();
-+ g_pAFrame = av_frame_alloc();
- if (!g_pAFrame)
- {
- Log("Could not allocate frame\n");
-@@ -217,11 +235,7 @@ static int WriteAudioFrame()
- // add a video output stream
- static int AddVideoStream()
- {
--#if LIBAVFORMAT_VERSION_MAJOR >= 53
- g_pVStream = avformat_new_stream(g_pContainer, g_pVCodec);
--#else
-- g_pVStream = av_new_stream(g_pContainer, 0);
--#endif
- if (!g_pVStream)
- return FatalError("Could not allocate video stream");
-
-@@ -241,20 +255,20 @@ static int AddVideoStream()
- g_pVideo->time_base.den = g_Framerate.num;
- g_pVideo->time_base.num = g_Framerate.den;
- //g_pVideo->gop_size = 12; /* emit one intra frame every twelve frames at most */
-- g_pVideo->pix_fmt = PIX_FMT_YUV420P;
-+ g_pVideo->pix_fmt = AV_PIX_FMT_YUV420P;
-
- // set quality
- if (g_VQuality > 100)
- g_pVideo->bit_rate = g_VQuality;
- else
- {
-- g_pVideo->flags |= CODEC_FLAG_QSCALE;
-+ g_pVideo->flags |= AV_CODEC_FLAG_QSCALE;
- g_pVideo->global_quality = g_VQuality*FF_QP2LAMBDA;
- }
-
- // some formats want stream headers to be separate
- if (g_pFormat->flags & AVFMT_GLOBALHEADER)
-- g_pVideo->flags |= CODEC_FLAG_GLOBAL_HEADER;
-+ g_pVideo->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-
- #if LIBAVCODEC_VERSION_MAJOR < 53
- // for some versions of ffmpeg x264 options must be set explicitly
-@@ -292,14 +306,12 @@ static int AddVideoStream()
- AVDictionary* pDict = NULL;
- if (strcmp(g_pVCodec->name, "libx264") == 0)
- av_dict_set(&pDict, "preset", "medium", 0);
-+#endif
-
- if (avcodec_open2(g_pVideo, g_pVCodec, &pDict) < 0)
--#else
-- if (avcodec_open(g_pVideo, g_pVCodec) < 0)
--#endif
- return FatalError("Could not open video codec %s", g_pVCodec->long_name);
-
-- g_pVFrame = avcodec_alloc_frame();
-+ g_pVFrame = av_frame_alloc();
- if (!g_pVFrame)
- return FatalError("Could not allocate frame");
-
-@@ -317,10 +329,10 @@ static int WriteFrame(AVFrame* pFrame)
- // write interleaved audio frame
- if (g_pAStream)
- {
-- VideoTime = (double)g_pVStream->pts.val*g_pVStream->time_base.num/g_pVStream->time_base.den;
-+ VideoTime = (double)g_pVFrame->pts * g_pVStream->time_base.num/g_pVStream->time_base.den;
- do
- {
-- AudioTime = (double)g_pAStream->pts.val*g_pAStream->time_base.num/g_pAStream->time_base.den;
-+ AudioTime = (double)g_pAFrame->pts * g_pAStream->time_base.num/g_pAStream->time_base.den;
- ret = WriteAudioFrame();
- }
- while (AudioTime < VideoTime && ret);
-@@ -496,7 +508,7 @@ AVWRAP_DECL int AVWrapper_Close()
- {
- int ret;
- // output buffered frames
-- if (g_pVCodec->capabilities & CODEC_CAP_DELAY)
-+ if (g_pVCodec->capabilities & AV_CODEC_CAP_DELAY)
- {
- do
- ret = WriteFrame(NULL);
-@@ -526,14 +538,14 @@ AVWRAP_DECL int AVWrapper_Close()
- avcodec_close(g_pVideo);
- av_free(g_pVideo);
- av_free(g_pVStream);
-- av_free(g_pVFrame);
-+ av_frame_free(&g_pVFrame);
- }
- if (g_pAStream)
- {
- avcodec_close(g_pAudio);
- av_free(g_pAudio);
- av_free(g_pAStream);
-- av_free(g_pAFrame);
-+ av_frame_free(&g_pAFrame);
- av_free(g_pSamples);
- fclose(g_pSoundFile);
- }
diff --git a/debian/patches/f121e6c350a041a429a57ba4748ad673aa8420ea.patch b/debian/patches/f121e6c350a041a429a57ba4748ad673aa8420ea.patch
deleted file mode 100644
index 582d896..0000000
--- a/debian/patches/f121e6c350a041a429a57ba4748ad673aa8420ea.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f121e6c350a041a429a57ba4748ad673aa8420ea Mon Sep 17 00:00:00 2001
-From: koda <vittorio.giovara at gmail.com>
-Date: Mon, 16 Nov 2015 18:28:10 +0100
-Subject: [PATCH] avwrapper: Explicitly check for macro existence
-
----
- hedgewars/avwrapper/avwrapper.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
-index 3441f0f..346b3a8 100644
---- a/hedgewars/avwrapper/avwrapper.c
-+++ b/hedgewars/avwrapper/avwrapper.c
-@@ -79,10 +79,16 @@ static void rescale_ts(AVPacket *pkt, AVRational ctb, AVRational stb)
- }
- #endif
-
--#if LIBAVCODEC_VERSION_MAJOR < 56
-+#ifndef AV_CODEC_CAP_DELAY
- #define AV_CODEC_CAP_DELAY CODEC_CAP_DELAY
-+#endif
-+#ifndef AV_CODEC_CAP_VARIABLE_FRAME_SIZE
- #define AV_CODEC_CAP_VARIABLE_FRAME_SIZE CODEC_CAP_VARIABLE_FRAME_SIZE
-+#endif
-+#ifndef AV_CODEC_FLAG_GLOBAL_HEADER
- #define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
-+#endif
-+#ifndef AV_CODEC_FLAG_QSCALE
- #define AV_CODEC_FLAG_QSCALE CODEC_FLAG_QSCALE
- #endif
-
diff --git a/debian/patches/pas2c-ghc8.patch b/debian/patches/pas2c-ghc8.patch
deleted file mode 100644
index b2a2c33..0000000
--- a/debian/patches/pas2c-ghc8.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- a/tools/pas2c/Pas2C.hs
-+++ b/tools/pas2c/Pas2C.hs
-@@ -297,6 +297,7 @@ uses2C uses@(Uses unitIds) = do
- mapM_ (id2C IOInsert . setBaseType BTUnit) unitIds
- return $ vcat . map (\i -> text $ "#include \"" ++ i ++ ".h\"") $ uses2List uses
- where
-+ injectNamespace :: Identifier -> State RenderState ()
- injectNamespace (Identifier i _) = do
- getNS <- gets (flip Map.lookup . namespaces)
- modify (\s -> s{currentScope = Map.unionWith (++) (fromMaybe Map.empty (getNS i)) $ currentScope s})
---- a/tools/pas2c/PascalParser.hs
-+++ b/tools/pas2c/PascalParser.hs
-@@ -239,10 +239,10 @@ rangeDecl = choice [
- ] <?> "range declaration"
- where
- rangeft = do
-- e1 <- initExpression
-- string' ".."
-- e2 <- initExpression
-- return $ RangeFromTo e1 e2
-+ e1 <- initExpression
-+ string' ".."
-+ e2 <- initExpression
-+ return $ RangeFromTo e1 e2
-
- typeVarDeclaration :: Bool -> Parsec String u [TypeVarDeclaration]
- typeVarDeclaration isImpl = (liftM concat . many . choice) [
diff --git a/debian/patches/series b/debian/patches/series
index d0ec5e8..1bdb7d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,19 +1,2 @@
-e8654674c5ee580b2ec8392d3ae732c10195c039.patch
-62e5519664f25ccdbdeb51e3e08c9017c95b25c1.patch
-5de297c5621455b9117aa7caca2785d21ae1bf04.patch
-9da8e039c97c4a52161bd563b75ffa35acd75ec5.patch
-ab7e24456dd3dec808862f14d831c7abb14aadc9.patch
-7bb49917ebcd9734dd5a44bffa645d3889e60e72.patch
-2488090353fc122b4af030ea55bbff494c204c9b.patch
-3e1856bb563ad889e113f5ba440196e1c9e07b50.patch
-850e289b11dbe0415ba909ef87e13533c0e6ee41.patch
-14a48ec6c0e4e7c4c475eacc9ae3b093656c163a.patch
-a0e5bd1d4d77c1558394d9ac6b6b8a5030ef5282.patch
-ce3a58617e5732376b4ef5d47fc2be73b705a154.patch
-93292d80924aeadfda9f327ba78891cc4bab6c3c.patch
-f121e6c350a041a429a57ba4748ad673aa8420ea.patch
-ad435d95ca4b.patch
-dc19837f6b9bccddcd2fc05e1d44255aab79b614.patch
disable-test.patch
fix-comment-desktop-file.patch
-pas2c-ghc8.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git
More information about the Pkg-games-commits
mailing list