[hedgewars] 01/01: Add new patch

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg-guest pushed a commit to branch master
in repository hedgewars.

commit 9866012e0664380aaddde43f30c95be495b82c5e
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Nov 4 10:52:30 2015 +0100

    Add new  patch
---
 debian/changelog                                   |  4 +-
 ...More-refinements-about-version-contraints.patch | 92 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 96 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index c5dacd4..31b035d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,11 @@ hedgewars (0.9.22-dfsg-3) unstable; urgency=medium
 
   [ Andreas Cadhalpun ]
   * d/p/ffmpeg_2.9.patch: update for ffmpeg_2.9 compatibility (Closes: #803825).
+  * d/p/0001-More-refinements-about-version-contraints.patch:
+    refine the version constraints
 
   [ Gianfranco Costamagna ]
-  * debian/patches/0001-Update-for-retrocompatibility.patch
+  * d/p/0001-Update-for-retrocompatibility.patch
     update ffmpeg_2.9.patch to work also with older ffmpeg/libav implementations.
 
  -- Gianfranco Costamagna <locutusofborg at debian.org>  Tue, 03 Nov 2015 10:38:33 +0100
diff --git a/debian/patches/0001-More-refinements-about-version-contraints.patch b/debian/patches/0001-More-refinements-about-version-contraints.patch
new file mode 100644
index 0000000..8d09ad2
--- /dev/null
+++ b/debian/patches/0001-More-refinements-about-version-contraints.patch
@@ -0,0 +1,92 @@
+From 92cb54f0d41ff91bb5dc809e82ff9a025119c7fc Mon Sep 17 00:00:00 2001
+From: Andreas Cadhalpun <andreas.cadhalpun at googlemail.com>
+Date: Wed, 4 Nov 2015 10:44:27 +0100
+Subject: [PATCH] More refinements about version contraints
+
+---
+ QTfrontend/util/LibavInteraction.cpp |  2 +-
+ hedgewars/avwrapper/avwrapper.c      | 14 +++++++-------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/QTfrontend/util/LibavInteraction.cpp b/QTfrontend/util/LibavInteraction.cpp
+index 425368c..ed3795b 100644
+--- a/QTfrontend/util/LibavInteraction.cpp
++++ b/QTfrontend/util/LibavInteraction.cpp
+@@ -106,7 +106,7 @@ LibavInteraction::LibavInteraction() : QObject()
+             if (!pCodec->pix_fmts)
+                 continue;
+             bool yuv420Supported = false;
+-#if LIBAVCODEC_VERSION_MAJOR > 56
++#if LIBAVCODEC_VERSION_MAJOR > 51
+             for (const AVPixelFormat* pfmt = pCodec->pix_fmts; *pfmt != -1; pfmt++)
+                 if (*pfmt == AV_PIX_FMT_YUV420P)
+ #else
+diff --git a/hedgewars/avwrapper/avwrapper.c b/hedgewars/avwrapper/avwrapper.c
+index 264014a..0e4082f 100644
+--- a/hedgewars/avwrapper/avwrapper.c
++++ b/hedgewars/avwrapper/avwrapper.c
+@@ -158,7 +158,7 @@ static void AddAudioStream()
+     else
+         g_NumSamples = g_pAudio->frame_size;
+     g_pSamples = (int16_t*)av_malloc(g_NumSamples*g_Channels*sizeof(int16_t));
+-#if LIBAVCODEC_VERSION_MAJOR > 56
++#if LIBAVCODEC_VERSION_MAJOR > 52
+     g_pAFrame = av_frame_alloc();
+ #else
+     g_pAFrame = avcodec_alloc_frame();
+@@ -245,7 +245,7 @@ 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 */
+-#if LIBAVCODEC_VERSION_MAJOR > 56
++#if LIBAVCODEC_VERSION_MAJOR > 51
+     g_pVideo->pix_fmt = AV_PIX_FMT_YUV420P;
+ #else
+     g_pVideo->pix_fmt = PIX_FMT_YUV420P;
+@@ -307,7 +307,7 @@ static int AddVideoStream()
+ #endif
+         return FatalError("Could not open video codec %s", g_pVCodec->long_name);
+ 
+-#if LIBAVCODEC_VERSION_MAJOR > 56
++#if LIBAVCODEC_VERSION_MAJOR > 52
+     g_pVFrame = av_frame_alloc();
+ #else
+     g_pVFrame = avcodec_alloc_frame();
+@@ -330,14 +330,14 @@ static int WriteFrame(AVFrame* pFrame)
+     // write interleaved audio frame
+     if (g_pAStream)
+     {
+-#if LIBAVCODEC_VERSION_MAJOR > 56
++#if LIBAVCODEC_VERSION_MAJOR > 55
+         VideoTime = (double)av_stream_get_end_pts(g_pVStream)*g_pVStream->time_base.num/g_pVStream->time_base.den;
+ #else
+         VideoTime = (double)g_pVStream->pts.val*g_pVStream->time_base.num/g_pVStream->time_base.den;
+ #endif
+         do
+         {
+-#if LIBAVCODEC_VERSION_MAJOR > 56
++#if LIBAVCODEC_VERSION_MAJOR > 55
+             AudioTime = (double)av_stream_get_end_pts(g_pAStream)*g_pAStream->time_base.num/g_pAStream->time_base.den;
+ #else
+             AudioTime = (double)g_pAStream->pts.val*g_pAStream->time_base.num/g_pAStream->time_base.den;
+@@ -547,7 +547,7 @@ AVWRAP_DECL int AVWrapper_Close()
+         avcodec_close(g_pVideo);
+         av_free(g_pVideo);
+         av_free(g_pVStream);
+-#if LIBAVCODEC_VERSION_MAJOR > 56
++#if LIBAVCODEC_VERSION_MAJOR > 52
+         av_frame_free(&g_pVFrame);
+ #else
+         av_free(g_pVFrame);
+@@ -558,7 +558,7 @@ AVWRAP_DECL int AVWrapper_Close()
+         avcodec_close(g_pAudio);
+         av_free(g_pAudio);
+         av_free(g_pAStream);
+-#if LIBAVCODEC_VERSION_MAJOR > 56
++#if LIBAVCODEC_VERSION_MAJOR > 52
+         av_frame_free(&g_pAFrame);
+ #else
+         av_free(g_pAFrame);
+-- 
+2.1.4
+
diff --git a/debian/patches/series b/debian/patches/series
index edb810d..662a516 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 ffmpeg_2.9.patch
 0001-Update-for-retrocompatibility.patch
+0001-More-refinements-about-version-contraints.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/hedgewars.git