[SCM] lives/master: Apply upstream patch to fix compilation with GCC 5

sramacher at users.alioth.debian.org sramacher at users.alioth.debian.org
Sun Jul 5 15:07:26 UTC 2015


The following commit has been merged in the master branch:
commit 419be9998eae8fd09a87ab64d97e661fef9c59f7
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jul 5 16:27:11 2015 +0200

    Apply upstream patch to fix compilation with GCC 5
    
    Closes: #777984

diff --git a/debian/patches/05-gcc-5.patch b/debian/patches/05-gcc-5.patch
new file mode 100644
index 0000000..c64b6ec
--- /dev/null
+++ b/debian/patches/05-gcc-5.patch
@@ -0,0 +1,17 @@
+Description: Fix compilation with GCC 5
+Origin: upstream,
+ http://sourceforge.net/p/lives/code/2241/
+Bug-Debian: https://bugs.debian.org/777984
+Last-Update: 2015-07-05
+
+--- lives-2.4.0~ds0.orig/src/cvirtual.c
++++ lives-2.4.0~ds0/src/cvirtual.c
+@@ -19,7 +19,7 @@
+ 
+ 
+ /** count virtual frames between start and end (inclusive) */
+-LIVES_INLINE int count_virtual_frames(int *findex, int start, int end) {
++int count_virtual_frames(int *findex, int start, int end) {
+   register int i;
+   int count=0;
+   for (i=start-1; i<end; i++) if (findex[i]!=-1) count++;
diff --git a/debian/patches/series b/debian/patches/series
index 690e7e7..2801844 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,6 @@
 02-drop_py3_multiencoder.patch
 03-libav10.patch
 04-gtk-3.16.patch
+05-gcc-5.patch
 parallel-build.patch
 9990-buildsystem.patch

-- 
lives packaging



More information about the pkg-multimedia-commits mailing list