[SCM] libvpx/master: Removed d/patches/fix-build.patch - not needed anymore
onovy at users.alioth.debian.org
onovy at users.alioth.debian.org
Tue Jan 17 12:30:02 UTC 2017
The following commit has been merged in the master branch:
commit 0d5ea52027dff217b281f3f403e093d07f629a93
Author: Ondřej Nový <onovy at debian.org>
Date: Tue Jan 17 12:47:40 2017 +0100
Removed d/patches/fix-build.patch - not needed anymore
diff --git a/debian/patches/fix-build.patch b/debian/patches/fix-build.patch
deleted file mode 100644
index 04d7904..0000000
--- a/debian/patches/fix-build.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-Author: Olivier Tilloy <olivier.tilloy at canonical.com>
-Subject: Fix invalid C that causes the build to fail
-Origin: https://bugs.launchpad.net/ubuntu/+source/libvpx/+bug/1528297
-Forwarded: no
-
---- a/vp8/common/treecoder.c
-+++ b/vp8/common/treecoder.c
-@@ -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 */ ],
---- a/vp8/common/treecoder.h
-+++ b/vp8/common/treecoder.h
-@@ -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 */ ],
---- a/vp8/decoder/treereader.h
-+++ b/vp8/decoder/treereader.h
-@@ -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
- )
- {
---- a/vp8/encoder/bitstream.c
-+++ b/vp8/encoder/bitstream.c
-@@ -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],
---- a/vp8/encoder/treewriter.c
-+++ b/vp8/encoder/treewriter.c
-@@ -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);
- }
---- a/vp8/encoder/treewriter.h
-+++ b/vp8/encoder/treewriter.h
-@@ -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
---- a/vp9/encoder/vp9_cost.c
-+++ b/vp9/encoder/vp9_cost.c
-@@ -37,7 +37,7 @@
- 48, 45, 42, 38, 35, 32, 29, 26, 23, 20, 18, 15,
- 12, 9, 6, 3};
-
--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;
-@@ -54,11 +54,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);
---- a/vp9/encoder/vp9_cost.h
-+++ b/vp9/encoder/vp9_cost.h
-@@ -35,7 +35,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;
-@@ -49,8 +49,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"
---- a/vp9/encoder/vp9_treewriter.c
-+++ b/vp9/encoder/vp9_treewriter.c
-@@ -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);
---- a/vp9/encoder/vp9_treewriter.h
-+++ b/vp9/encoder/vp9_treewriter.h
-@@ -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 */ ]);
-
---- a/vpx_dsp/prob.h
-+++ b/vpx_dsp/prob.h
-@@ -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 --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d8e388a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-fix-build.patch
--
libvpx packaging
More information about the pkg-multimedia-commits
mailing list