diff -Nru oxide-qt-1.11.3/debian/changelog oxide-qt-1.11.3/debian/changelog --- oxide-qt-1.11.3/debian/changelog 2015-12-18 11:02:31.000000000 +0000 +++ oxide-qt-1.11.3/debian/changelog 2015-12-22 10:53:59.000000000 +0000 @@ -1,8 +1,8 @@ -oxide-qt (1.11.3-0ubuntu2) xenial; urgency=medium +oxide-qt (1.11.3-0ubuntu3) xenial; urgency=medium - * No-change rebuild against Qt 5.5. + * Add patches/fix-libvpx-build-gcc53.patch (LP: #1528297) - -- Łukasz 'sil2100' Zemczak Fri, 18 Dec 2015 12:02:06 +0100 + -- Olivier Tilloy Tue, 22 Dec 2015 11:52:56 +0100 oxide-qt (1.11.3-0ubuntu1) xenial; urgency=medium diff -Nru oxide-qt-1.11.3/debian/patches/fix-libvpx-build-gcc53.patch oxide-qt-1.11.3/debian/patches/fix-libvpx-build-gcc53.patch --- oxide-qt-1.11.3/debian/patches/fix-libvpx-build-gcc53.patch 1970-01-01 00:00:00.000000000 +0000 +++ oxide-qt-1.11.3/debian/patches/fix-libvpx-build-gcc53.patch 2015-12-22 10:51:36.000000000 +0000 @@ -0,0 +1,289 @@ +Description: patch libvpx to build against gcc 5.3 +Bug: https://launchpad.net/bugs/1528297 +Author: Olivier Tilloy + +Index: oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/common/treecoder.c +=================================================================== +--- oxide-qt-1.11.3.orig/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/common/treecoder.c 2015-12-22 10:34:59 +0000 ++++ oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/common/treecoder.c 2015-12-22 10:36:08 +0000 +@@ -18,7 +18,7 @@ + + static void tree2tok( + struct vp8_token_struct *const p, +- vp8_tree t, ++ vp8_tree_p t, + int i, + int v, + int L +@@ -42,12 +42,12 @@ + while (++v & 1); + } + +-void vp8_tokens_from_tree(struct vp8_token_struct *p, vp8_tree t) ++void vp8_tokens_from_tree(struct vp8_token_struct *p, vp8_tree_p t) + { + tree2tok(p, t, 0, 0, 0); + } + +-void vp8_tokens_from_tree_offset(struct vp8_token_struct *p, vp8_tree t, ++void vp8_tokens_from_tree_offset(struct vp8_token_struct *p, vp8_tree_p t, + int offset) + { + tree2tok(p - offset, t, 0, 0, 0); +@@ -56,7 +56,7 @@ + static void branch_counts( + int n, /* n = size of alphabet */ + vp8_token tok [ /* n */ ], +- vp8_tree tree, ++ vp8_tree_p tree, + unsigned int branch_ct [ /* n-1 */ ] [2], + const unsigned int num_events[ /* n */ ] + ) +@@ -109,7 +109,7 @@ + void vp8_tree_probs_from_distribution( + int n, /* n = size of alphabet */ + vp8_token tok [ /* n */ ], +- vp8_tree tree, ++ vp8_tree_p tree, + vp8_prob probs [ /* n-1 */ ], + unsigned int branch_ct [ /* n-1 */ ] [2], + const unsigned int num_events[ /* n */ ], +Index: oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/common/treecoder.h +=================================================================== +--- oxide-qt-1.11.3.orig/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/common/treecoder.h 2015-12-22 10:34:59 +0000 ++++ oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/common/treecoder.h 2015-12-22 10:37:10 +0000 +@@ -57,8 +57,8 @@ + + /* Construct encoding array from tree. */ + +-void vp8_tokens_from_tree(struct vp8_token_struct *, vp8_tree); +-void vp8_tokens_from_tree_offset(struct vp8_token_struct *, vp8_tree, ++void vp8_tokens_from_tree(struct vp8_token_struct *, vp8_tree_p); ++void vp8_tokens_from_tree_offset(struct vp8_token_struct *, vp8_tree_p, + int offset); + + +@@ -70,7 +70,7 @@ + void vp8_tree_probs_from_distribution( + int n, /* n = size of alphabet */ + vp8_token tok [ /* n */ ], +- vp8_tree tree, ++ vp8_tree_p tree, + vp8_prob probs [ /* n-1 */ ], + unsigned int branch_ct [ /* n-1 */ ] [2], + const unsigned int num_events[ /* n */ ], +@@ -83,7 +83,7 @@ + void vp8bc_tree_probs_from_distribution( + int n, /* n = size of alphabet */ + vp8_token tok [ /* n */ ], +- vp8_tree tree, ++ vp8_tree_p tree, + vp8_prob probs [ /* n-1 */ ], + unsigned int branch_ct [ /* n-1 */ ] [2], + const unsigned int num_events[ /* n */ ], +Index: oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/decoder/treereader.h +=================================================================== +--- oxide-qt-1.11.3.orig/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/decoder/treereader.h 2015-12-22 10:34:59 +0000 ++++ oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/decoder/treereader.h 2015-12-22 10:36:08 +0000 +@@ -31,7 +31,7 @@ + + static INLINE int vp8_treed_read( + vp8_reader *const r, /* !!! must return a 0 or 1 !!! */ +- vp8_tree t, ++ vp8_tree_p t, + const vp8_prob *const p + ) + { +Index: oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/encoder/bitstream.c +=================================================================== +--- oxide-qt-1.11.3.orig/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/encoder/bitstream.c 2015-12-22 10:34:59 +0000 ++++ oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/encoder/bitstream.c 2015-12-22 10:36:08 +0000 +@@ -64,7 +64,7 @@ + vp8_writer *const w, + int n, + vp8_token tok [/* n */], +- vp8_tree tree, ++ vp8_tree_p tree, + vp8_prob Pnew [/* n-1 */], + vp8_prob Pcur [/* n-1 */], + unsigned int bct [/* n-1 */] [2], +Index: oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/encoder/treewriter.c +=================================================================== +--- oxide-qt-1.11.3.orig/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/encoder/treewriter.c 2015-12-22 10:34:59 +0000 ++++ oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/encoder/treewriter.c 2015-12-22 10:36:08 +0000 +@@ -13,7 +13,7 @@ + + static void cost( + int *const C, +- vp8_tree T, ++ vp8_tree_p T, + const vp8_prob *const P, + int i, + int c +@@ -33,11 +33,11 @@ + } + while (++i & 1); + } +-void vp8_cost_tokens(int *c, const vp8_prob *p, vp8_tree t) ++void vp8_cost_tokens(int *c, const vp8_prob *p, vp8_tree_p t) + { + cost(c, t, p, 0, 0); + } +-void vp8_cost_tokens2(int *c, const vp8_prob *p, vp8_tree t,int start) ++void vp8_cost_tokens2(int *c, const vp8_prob *p, vp8_tree_p t,int start) + { + cost(c, t, p, start, 0); + } +Index: oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/encoder/treewriter.h +=================================================================== +--- oxide-qt-1.11.3.orig/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/encoder/treewriter.h 2015-12-22 10:34:59 +0000 ++++ oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp8/encoder/treewriter.h 2015-12-22 10:36:08 +0000 +@@ -61,7 +61,7 @@ + static void vp8_treed_write + ( + vp8_writer *const w, +- vp8_tree t, ++ vp8_tree_p t, + const vp8_prob *const p, + int v, + int n /* number of bits in v, assumed nonzero */ +@@ -80,7 +80,7 @@ + static INLINE void vp8_write_token + ( + vp8_writer *const w, +- vp8_tree t, ++ vp8_tree_p t, + const vp8_prob *const p, + vp8_token *const x + ) +@@ -89,7 +89,7 @@ + } + + static int vp8_treed_cost( +- vp8_tree t, ++ vp8_tree_p t, + const vp8_prob *const p, + int v, + int n /* number of bits in v, assumed nonzero */ +@@ -110,7 +110,7 @@ + } + static INLINE int vp8_cost_token + ( +- vp8_tree t, ++ vp8_tree_p t, + const vp8_prob *const p, + vp8_token *const x + ) +@@ -121,11 +121,11 @@ + /* Fill array of costs for all possible token values. */ + + void vp8_cost_tokens( +- int *Costs, const vp8_prob *, vp8_tree ++ int *Costs, const vp8_prob *, vp8_tree_p + ); + + void vp8_cost_tokens2( +- int *Costs, const vp8_prob *, vp8_tree, int ++ int *Costs, const vp8_prob *, vp8_tree_p, int + ); + + #ifdef __cplusplus +Index: oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_cost.c +=================================================================== +--- oxide-qt-1.11.3.orig/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_cost.c 2015-12-22 10:34:59 +0000 ++++ oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_cost.c 2015-12-22 10:36:08 +0000 +@@ -35,7 +35,7 @@ + 22, 21, 19, 18, 16, 15, 13, 12, 10, 9, 7, 6, + 4, 3, 1, 1}; + +-static void cost(int *costs, vpx_tree tree, const vpx_prob *probs, ++static void cost(int *costs, vpx_tree_p tree, const vpx_prob *probs, + int i, int c) { + const vpx_prob prob = probs[i / 2]; + int b; +@@ -51,11 +51,11 @@ + } + } + +-void vp9_cost_tokens(int *costs, const vpx_prob *probs, vpx_tree tree) { ++void vp9_cost_tokens(int *costs, const vpx_prob *probs, vpx_tree_p tree) { + cost(costs, tree, probs, 0, 0); + } + +-void vp9_cost_tokens_skip(int *costs, const vpx_prob *probs, vpx_tree tree) { ++void vp9_cost_tokens_skip(int *costs, const vpx_prob *probs, vpx_tree_p tree) { + assert(tree[0] <= 0 && tree[1] > 0); + + costs[-tree[0]] = vp9_cost_bit(probs[0], 0); +Index: oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_cost.h +=================================================================== +--- oxide-qt-1.11.3.orig/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_cost.h 2015-12-22 10:34:59 +0000 ++++ oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_cost.h 2015-12-22 10:36:08 +0000 +@@ -31,7 +31,7 @@ + return ct[0] * vp9_cost_zero(p) + ct[1] * vp9_cost_one(p); + } + +-static INLINE int treed_cost(vpx_tree tree, const vpx_prob *probs, ++static INLINE int treed_cost(vpx_tree_p tree, const vpx_prob *probs, + int bits, int len) { + int cost = 0; + vpx_tree_index i = 0; +@@ -45,8 +45,8 @@ + return cost; + } + +-void vp9_cost_tokens(int *costs, const vpx_prob *probs, vpx_tree tree); +-void vp9_cost_tokens_skip(int *costs, const vpx_prob *probs, vpx_tree tree); ++void vp9_cost_tokens(int *costs, const vpx_prob *probs, vpx_tree_p tree); ++void vp9_cost_tokens_skip(int *costs, const vpx_prob *probs, vpx_tree_p tree); + + #ifdef __cplusplus + } // extern "C" +Index: oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_treewriter.c +=================================================================== +--- oxide-qt-1.11.3.orig/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_treewriter.c 2015-12-22 10:34:59 +0000 ++++ oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_treewriter.c 2015-12-22 10:36:08 +0000 +@@ -31,7 +31,7 @@ + tree2tok(tokens, tree, 0, 0, 0); + } + +-static unsigned int convert_distribution(unsigned int i, vpx_tree tree, ++static unsigned int convert_distribution(unsigned int i, vpx_tree_p tree, + unsigned int branch_ct[][2], + const unsigned int num_events[]) { + unsigned int left, right; +@@ -51,7 +51,7 @@ + return left + right; + } + +-void vp9_tree_probs_from_distribution(vpx_tree tree, ++void vp9_tree_probs_from_distribution(vpx_tree_p tree, + unsigned int branch_ct[/* n-1 */][2], + const unsigned int num_events[/* n */]) { + convert_distribution(0, tree, branch_ct, num_events); +Index: oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_treewriter.h +=================================================================== +--- oxide-qt-1.11.3.orig/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_treewriter.h 2015-12-22 10:34:59 +0000 ++++ oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vp9/encoder/vp9_treewriter.h 2015-12-22 10:36:08 +0000 +@@ -17,7 +17,7 @@ + extern "C" { + #endif + +-void vp9_tree_probs_from_distribution(vpx_tree tree, ++void vp9_tree_probs_from_distribution(vpx_tree_p tree, + unsigned int branch_ct[ /* n - 1 */ ][2], + const unsigned int num_events[ /* n */ ]); + +Index: oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vpx_dsp/prob.h +=================================================================== +--- oxide-qt-1.11.3.orig/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vpx_dsp/prob.h 2015-12-22 10:34:59 +0000 ++++ oxide-qt-1.11.3/third_party/chromium/src/third_party/libvpx_new/source/libvpx/vpx_dsp/prob.h 2015-12-22 10:36:08 +0000 +@@ -41,7 +41,7 @@ + Index > 0 means need another bit, specification at index. + Nonnegative indices are always even; processing begins at node 0. */ + +-typedef const vpx_tree_index vpx_tree[]; ++typedef const vpx_tree_index vpx_tree[], *vpx_tree_p; + + static INLINE vpx_prob clip_prob(int p) { + return (p > 255) ? 255 : (p < 1) ? 1 : p; diff -Nru oxide-qt-1.11.3/debian/patches/series oxide-qt-1.11.3/debian/patches/series --- oxide-qt-1.11.3/debian/patches/series 2015-12-04 21:59:30.000000000 +0000 +++ oxide-qt-1.11.3/debian/patches/series 2015-12-22 10:46:53.000000000 +0000 @@ -1 +1,2 @@ gross-hack-for-dual-ffmpeg-build.patch +fix-libvpx-build-gcc53.patch