[SCM] xjadeo/master: Refreshed patches.

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

The following commit has been merged in the master branch:
commit 81eccf9501114a5b22978067645bd67e33d7a6da
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Tue Jun 10 09:18:48 2014 +0200

    Refreshed patches.

diff --git a/debian/patches/02-fix_hardening.patch b/debian/patches/02-fix_hardening.patch
index 8d63773..cfd9422 100644
--- a/debian/patches/02-fix_hardening.patch
+++ b/debian/patches/02-fix_hardening.patch
@@ -5,11 +5,11 @@ Last-Update: 2013-08-10
 
 Index: xjadeo/src/qt-gui/qjadeo.pro.in
 ===================================================================
---- xjadeo.orig/src/qt-gui/qjadeo.pro.in	2013-06-17 02:20:01.978567062 +0200
-+++ xjadeo/src/qt-gui/qjadeo.pro.in	2013-08-10 23:30:49.904904795 +0200
-@@ -15,6 +15,10 @@
+--- xjadeo.orig/src/qt-gui/qjadeo.pro.in
++++ xjadeo/src/qt-gui/qjadeo.pro.in
+@@ -19,6 +19,10 @@ QMAKE_LFLAGS += $(LDFLAGS)
  
- #QMAKE_CXXFLAGS_WARN_ON += -Wno-non-virtual-dtor
+ QMAKE_CXXFLAGS += $(CPPFLAGS)
  
 +QMAKE_LFLAGS += $(LDFLAGS)
 +
diff --git a/debian/patches/03-libav10.patch b/debian/patches/03-libav10.patch
index 2e2bc83..f82599a 100644
--- a/debian/patches/03-libav10.patch
+++ b/debian/patches/03-libav10.patch
@@ -2,40 +2,40 @@ Author: anton at khirnov.net
 Description: Fix FTBFS with libav10
 Bug-Debian: http://bugs.debian.org/739431
 
-Index: xjadeo-0.7.6/src/xjadeo/avinfo.c
-===================================================================
---- xjadeo-0.7.6.orig/src/xjadeo/avinfo.c	2013-07-12 15:55:35.000000000 +0000
-+++ xjadeo-0.7.6/src/xjadeo/avinfo.c	2014-02-23 13:53:41.626711805 +0000
-@@ -367,7 +367,7 @@
- #elif LIBAVFORMAT_BUILD <= 4629
-       printf("    <framerate>%.2f</framerate>\n", 1/av_q2d(codec->time_base));
- #else
--      printf("    <framerate>%.2f</framerate>\n", av_q2d(st->r_frame_rate));
-+      printf("    <framerate>%.2f</framerate>\n", av_q2d(st->avg_frame_rate));
- #endif
- #if LIBAVFORMAT_BUILD < 3473920
-       printf("    <pixelformat>%s</pixelformat>\n", avcodec_get_pix_fmt_name(codec->pix_fmt));
-Index: xjadeo-0.7.6/src/xjadeo/xjadeo.c
-===================================================================
---- xjadeo-0.7.6.orig/src/xjadeo/xjadeo.c	2013-08-06 15:47:39.000000000 +0000
-+++ xjadeo-0.7.6/src/xjadeo/xjadeo.c	2014-02-23 13:54:17.091594177 +0000
-@@ -410,8 +410,8 @@
- #elif LIBAVFORMAT_BUILD <= 4623 // I'm not sure that this is correct:
- 	else framerate = (double) av_stream->r_frame_rate / (double) av_stream->r_frame_rate_base;
- #else
--	else if(av_stream->r_frame_rate.den && av_stream->r_frame_rate.num) {
--		framerate = av_q2d(av_stream->r_frame_rate);
-+	else if(av_stream->avg_frame_rate.den && av_stream->avg_frame_rate.num) {
-+		framerate = av_q2d(av_stream->avg_frame_rate);
- 		if ((framerate < 4 || framerate > 100 ) && (av_stream->time_base.num && av_stream->time_base.den))
- 			framerate = 1.0/av_q2d(av_stream->time_base);
- 	}
-@@ -687,7 +687,7 @@
- 	} else {
- 	// does not work with -F <double>, but it's more accurate when rounding ratios
- 		timestamp=av_rescale_q(timestamp,c1_Q,v_stream->time_base); 
--		timestamp=av_rescale_q(timestamp,c1_Q,v_stream->r_frame_rate); //< timestamp/=framerate; 
-+		timestamp=av_rescale_q(timestamp,c1_Q,v_stream->avg_frame_rate); //< timestamp/=framerate;
- 	}
- 
- # ifdef FFDEBUG
+Index: xjadeo/src/xjadeo/avinfo.c
+===================================================================
+--- xjadeo.orig/src/xjadeo/avinfo.c
++++ xjadeo/src/xjadeo/avinfo.c
+@@ -367,7 +367,7 @@ int main(int argc, char *argv[])
+ #elif LIBAVFORMAT_BUILD <= 4629
+       printf("    <framerate>%.2f</framerate>\n", 1/av_q2d(codec->time_base));
+ #else
+-      printf("    <framerate>%.2f</framerate>\n", av_q2d(st->r_frame_rate));
++      printf("    <framerate>%.2f</framerate>\n", av_q2d(st->avg_frame_rate));
+ #endif
+ #if LIBAVFORMAT_BUILD < 3473920
+       printf("    <pixelformat>%s</pixelformat>\n", avcodec_get_pix_fmt_name(codec->pix_fmt));
+Index: xjadeo/src/xjadeo/xjadeo.c
+===================================================================
+--- xjadeo.orig/src/xjadeo/xjadeo.c
++++ xjadeo/src/xjadeo/xjadeo.c
+@@ -410,8 +410,8 @@ int open_movie(char* file_name) {
+ #elif LIBAVFORMAT_BUILD <= 4623 // I'm not sure that this is correct:
+ 	else framerate = (double) av_stream->r_frame_rate / (double) av_stream->r_frame_rate_base;
+ #else
+-	else if(av_stream->r_frame_rate.den && av_stream->r_frame_rate.num) {
+-		framerate = av_q2d(av_stream->r_frame_rate);
++	else if(av_stream->avg_frame_rate.den && av_stream->avg_frame_rate.num) {
++		framerate = av_q2d(av_stream->avg_frame_rate);
+ 		if ((framerate < 4 || framerate > 100 ) && (av_stream->time_base.num && av_stream->time_base.den))
+ 			framerate = 1.0/av_q2d(av_stream->time_base);
+ 	}
+@@ -687,7 +687,7 @@ int my_seek_frame (AVPacket *packet, int
+ 	} else {
+ 	// does not work with -F <double>, but it's more accurate when rounding ratios
+ 		timestamp=av_rescale_q(timestamp,c1_Q,v_stream->time_base); 
+-		timestamp=av_rescale_q(timestamp,c1_Q,v_stream->r_frame_rate); //< timestamp/=framerate; 
++		timestamp=av_rescale_q(timestamp,c1_Q,v_stream->avg_frame_rate); //< timestamp/=framerate;
+ 	}
+ 
+ # ifdef FFDEBUG

-- 
xjadeo packaging