[SCM] xjadeo/master: Build with ffmpeg.

[mira-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fbdde399af4d348f2cd2b1ae8de2bdb77e0d8b09
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Sep 8 12:43:49 2015 +0200

    Build with ffmpeg.

diff --git a/debian/control b/debian/control
index 16b842e..911a1e0 100644
--- a/debian/control
+++ b/debian/control
@@ -9,9 +9,10 @@ Build-Depends:
  debhelper (>= 9),
  dh-autoreconf,
  libasound2-dev [linux-any],
- libavcodec-dev (>= 6:10~),
- libavformat-dev (>= 6:10~),
- libavutil-dev (>= 6:10~),
+ libavcodec-dev (>= 7:2.7.1),
+ libavformat-dev (>= 7:2.7.1),
+ libavutil-dev (>= 7:2.7.1),
+ libswscale-dev (>= 7:2.7.1),
  libfreetype6-dev,
  libimlib2-dev,
  libjack-dev,
@@ -19,7 +20,6 @@ Build-Depends:
  libltcsmpte-dev,
  libportmidi-dev [linux-any],
  libqt4-dev,
- libswscale-dev (>= 6:10~),
  libx11-dev,
  libxpm-dev,
  libxv-dev,
diff --git a/debian/patches/0001-Fix-building-with-Libav-10-11.patch b/debian/patches/0001-Fix-building-with-Libav-10-11.patch
deleted file mode 100644
index 43e18d5..0000000
--- a/debian/patches/0001-Fix-building-with-Libav-10-11.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 420a5876bbd1bb0afe99ebd7897b328a91237125 Mon Sep 17 00:00:00 2001
-From: Anton Khirnov <anton at khirnov.net>
-Date: Tue, 30 Sep 2014 08:00:22 +0200
-Subject: [PATCH] Fix building with Libav 10/11.
-
----
- src/xjadeo/xjadeo.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-Index: xjadeo/src/xjadeo/xjadeo.c
-===================================================================
---- xjadeo.orig/src/xjadeo/xjadeo.c
-+++ xjadeo/src/xjadeo/xjadeo.c
-@@ -471,7 +471,7 @@ static uint64_t parse_pts_from_frame (AV
- 
- 	pts = AV_NOPTS_VALUE;
- 
--#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 49, 100)
-+#if 0
- 	if (pts == AV_NOPTS_VALUE) {
- 		pts = av_frame_get_best_effort_timestamp (f);
- 		if (pts != AV_NOPTS_VALUE) {
-@@ -898,6 +898,7 @@ static int index_frames () {
- 
- 		int err = 0;
- 		int bailout = 100;
-+        int64_t pkt_pos = INT64_MIN;
- 		while (!got_pic && --bailout) {
- 
- 			if ((err = av_read_frame (pFormatCtx, &packet)) < 0) {
-@@ -911,6 +912,8 @@ static int index_frames () {
- 				error |= 32;
- 				break;
- 			}
-+            if (pkt_pos == INT64_MIN)
-+                pkt_pos = packet.pos;
- 
- #ifdef USE_DUP_PACKET
- 			if (av_dup_packet (&packet) < 0) {
-@@ -949,7 +952,7 @@ static int index_frames () {
- 		if (err < 0 || !bailout) continue;
- 
- 		fidx[i].frame_pts = pts;
--		fidx[i].frame_pos = av_frame_get_pkt_pos (pFrame);
-+		fidx[i].frame_pos = pkt_pos;
- 		if (pts != AV_NOPTS_VALUE) {
- #if 0 // DEBUG
- 			printf("FN %"PRId64", PKT-PTS %"PRId64" FRM-PTS: %"PRId64"\n", i, fidx[i].pkt_pts, fidx[i].frame_pts);
-@@ -1319,11 +1322,11 @@ int open_movie (char* file_name) {
- 	 * hence here AVRational fractions are inverse.
- 	 */
- 	framerate = 0;
--#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(55, 0, 100) // 9cf788eca8ba (merge a75f01d7e0)
-+#if 1
- 	{
--		AVRational fr = av_stream->r_frame_rate;
-+		AVRational fr = av_stream->avg_frame_rate;
- 		if (fr.den > 0 && fr.num > 0) {
--			framerate = av_q2d (av_stream->r_frame_rate);
-+			framerate = av_q2d (av_stream->avg_frame_rate);
- 			fr_Q.den = fr.num;
- 			fr_Q.num = fr.den;
- 		}
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 1038967..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-building-with-Libav-10-11.patch

-- 
xjadeo packaging