[SCM] libvpx/debian-experimental: New upstream release
onovy at users.alioth.debian.org
onovy at users.alioth.debian.org
Wed Aug 10 21:51:11 UTC 2016
The following commit has been merged in the debian-experimental branch:
commit 8df9917cf906dbf7dfdd75c5dc6b731c399a140b
Author: Ondřej Nový <onovy at debian.org>
Date: Wed Aug 10 23:51:02 2016 +0200
New upstream release
diff --git a/debian/changelog b/debian/changelog
index 6ca6734..afee993 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libvpx (1.6.0-1) UNRELEASED; urgency=medium
+
+ * New upstream release
+ - ABI version bump
+
+ -- Ondřej Nový <onovy at debian.org> Wed, 10 Aug 2016 23:34:54 +0200
+
libvpx (1.5.0-4) unstable; urgency=medium
* Team upload.
diff --git a/debian/control b/debian/control
index 1ee40f1..6b99f90 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/libvpx.git/
Package: libvpx-dev
Section: libdevel
Architecture: any
-Depends: libvpx3 (= ${binary:Version}),
+Depends: libvpx4 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Multi-Arch: same
@@ -26,7 +26,7 @@ Description: VP8 and VP9 video codec (development files)
This package contains the development libraries, header files needed by
programs that want to compile with libvpx.
-Package: libvpx3
+Package: libvpx4
Section: libs
Architecture: any
Depends: ${shlibs:Depends},
@@ -56,7 +56,7 @@ Description: VP8 and VP9 video codec (API documentation)
Package: vpx-tools
Section: utils
Architecture: any
-Depends: libvpx3 (= ${binary:Version}),
+Depends: libvpx4 (= ${binary:Version}),
${shlibs:Depends},
${misc:Depends}
Multi-Arch: foreign
diff --git a/debian/libvpx3.symbols b/debian/libvpx3.symbols
deleted file mode 100644
index a5e93ce..0000000
--- a/debian/libvpx3.symbols
+++ /dev/null
@@ -1,44 +0,0 @@
-libvpx.so.3 libvpx3 #MINVER#
-* Build-Depends-Package: libvpx-dev
- vpx_codec_build_config at Base 1.5.0
- vpx_codec_control_ at Base 1.5.0
- vpx_codec_dec_init_ver at Base 1.5.0
- vpx_codec_decode at Base 1.5.0
- vpx_codec_destroy at Base 1.5.0
- vpx_codec_enc_config_default at Base 1.5.0
- vpx_codec_enc_config_set at Base 1.5.0
- vpx_codec_enc_init_multi_ver at Base 1.5.0
- vpx_codec_enc_init_ver at Base 1.5.0
- vpx_codec_encode at Base 1.5.0
- vpx_codec_err_to_string at Base 1.5.0
- vpx_codec_error at Base 1.5.0
- vpx_codec_error_detail at Base 1.5.0
- vpx_codec_get_caps at Base 1.5.0
- vpx_codec_get_cx_data at Base 1.5.0
- vpx_codec_get_frame at Base 1.5.0
- vpx_codec_get_global_headers at Base 1.5.0
- vpx_codec_get_preview_frame at Base 1.5.0
- vpx_codec_get_stream_info at Base 1.5.0
- vpx_codec_iface_name at Base 1.5.0
- vpx_codec_peek_stream_info at Base 1.5.0
- vpx_codec_register_put_frame_cb at Base 1.5.0
- vpx_codec_register_put_slice_cb at Base 1.5.0
- vpx_codec_set_cx_data_buf at Base 1.5.0
- vpx_codec_set_frame_buffer_functions at Base 1.5.0
- vpx_codec_version at Base 1.5.0
- vpx_codec_version_extra_str at Base 1.5.0
- vpx_codec_version_str at Base 1.5.0
- vpx_codec_vp8_cx at Base 1.5.0
- vpx_codec_vp8_cx_algo at Base 1.5.0
- vpx_codec_vp8_dx at Base 1.5.0
- vpx_codec_vp8_dx_algo at Base 1.5.0
- vpx_codec_vp9_cx at Base 1.5.0
- vpx_codec_vp9_cx_algo at Base 1.5.0
- vpx_codec_vp9_dx at Base 1.5.0
- vpx_codec_vp9_dx_algo at Base 1.5.0
- vpx_img_alloc at Base 1.5.0
- vpx_img_flip at Base 1.5.0
- vpx_img_free at Base 1.5.0
- vpx_img_set_rect at Base 1.5.0
- vpx_img_wrap at Base 1.5.0
-
diff --git a/debian/libvpx4.symbols b/debian/libvpx4.symbols
new file mode 100644
index 0000000..a17d1e4
--- /dev/null
+++ b/debian/libvpx4.symbols
@@ -0,0 +1,42 @@
+libvpx.so.4 libvpx4 #MINVER#
+ vpx_codec_build_config at Base 1.6.0
+ vpx_codec_control_ at Base 1.6.0
+ vpx_codec_dec_init_ver at Base 1.6.0
+ vpx_codec_decode at Base 1.6.0
+ vpx_codec_destroy at Base 1.6.0
+ vpx_codec_enc_config_default at Base 1.6.0
+ vpx_codec_enc_config_set at Base 1.6.0
+ vpx_codec_enc_init_multi_ver at Base 1.6.0
+ vpx_codec_enc_init_ver at Base 1.6.0
+ vpx_codec_encode at Base 1.6.0
+ vpx_codec_err_to_string at Base 1.6.0
+ vpx_codec_error at Base 1.6.0
+ vpx_codec_error_detail at Base 1.6.0
+ vpx_codec_get_caps at Base 1.6.0
+ vpx_codec_get_cx_data at Base 1.6.0
+ vpx_codec_get_frame at Base 1.6.0
+ vpx_codec_get_global_headers at Base 1.6.0
+ vpx_codec_get_preview_frame at Base 1.6.0
+ vpx_codec_get_stream_info at Base 1.6.0
+ vpx_codec_iface_name at Base 1.6.0
+ vpx_codec_peek_stream_info at Base 1.6.0
+ vpx_codec_register_put_frame_cb at Base 1.6.0
+ vpx_codec_register_put_slice_cb at Base 1.6.0
+ vpx_codec_set_cx_data_buf at Base 1.6.0
+ vpx_codec_set_frame_buffer_functions at Base 1.6.0
+ vpx_codec_version at Base 1.6.0
+ vpx_codec_version_extra_str at Base 1.6.0
+ vpx_codec_version_str at Base 1.6.0
+ vpx_codec_vp8_cx at Base 1.6.0
+ vpx_codec_vp8_cx_algo at Base 1.6.0
+ vpx_codec_vp8_dx at Base 1.6.0
+ vpx_codec_vp8_dx_algo at Base 1.6.0
+ vpx_codec_vp9_cx at Base 1.6.0
+ vpx_codec_vp9_cx_algo at Base 1.6.0
+ vpx_codec_vp9_dx at Base 1.6.0
+ vpx_codec_vp9_dx_algo at Base 1.6.0
+ vpx_img_alloc at Base 1.6.0
+ vpx_img_flip at Base 1.6.0
+ vpx_img_free at Base 1.6.0
+ vpx_img_set_rect at Base 1.6.0
+ vpx_img_wrap at Base 1.6.0
diff --git a/debian/patches/fix-build.patch b/debian/patches/fix-build.patch
index 8fcd329..eb88409 100644
--- a/debian/patches/fix-build.patch
+++ b/debian/patches/fix-build.patch
@@ -1,5 +1,5 @@
---- libvpx-1.5.0.orig/vp8/common/treecoder.c
-+++ libvpx-1.5.0/vp8/common/treecoder.c
+--- a/vp8/common/treecoder.c
++++ b/vp8/common/treecoder.c
@@ -18,7 +18,7 @@
static void tree2tok(
@@ -9,7 +9,7 @@
int i,
int v,
int L
-@@ -42,12 +42,12 @@ static void tree2tok(
+@@ -42,12 +42,12 @@
while (++v & 1);
}
@@ -24,7 +24,7 @@
int offset)
{
tree2tok(p - offset, t, 0, 0, 0);
-@@ -56,7 +56,7 @@ void vp8_tokens_from_tree_offset(struct
+@@ -56,7 +56,7 @@
static void branch_counts(
int n, /* n = size of alphabet */
vp8_token tok [ /* n */ ],
@@ -33,7 +33,7 @@
unsigned int branch_ct [ /* n-1 */ ] [2],
const unsigned int num_events[ /* n */ ]
)
-@@ -109,7 +109,7 @@ static void branch_counts(
+@@ -109,7 +109,7 @@
void vp8_tree_probs_from_distribution(
int n, /* n = size of alphabet */
vp8_token tok [ /* n */ ],
@@ -42,9 +42,9 @@
vp8_prob probs [ /* n-1 */ ],
unsigned int branch_ct [ /* n-1 */ ] [2],
const unsigned int num_events[ /* n */ ],
---- libvpx-1.5.0.orig/vp8/common/treecoder.h
-+++ libvpx-1.5.0/vp8/common/treecoder.h
-@@ -57,8 +57,8 @@ typedef const struct vp8_token_struct
+--- a/vp8/common/treecoder.h
++++ b/vp8/common/treecoder.h
+@@ -57,8 +57,8 @@
/* Construct encoding array from tree. */
@@ -55,7 +55,7 @@
int offset);
-@@ -70,7 +70,7 @@ void vp8_tokens_from_tree_offset(struct
+@@ -70,7 +70,7 @@
void vp8_tree_probs_from_distribution(
int n, /* n = size of alphabet */
vp8_token tok [ /* n */ ],
@@ -64,7 +64,7 @@
vp8_prob probs [ /* n-1 */ ],
unsigned int branch_ct [ /* n-1 */ ] [2],
const unsigned int num_events[ /* n */ ],
-@@ -83,7 +83,7 @@ void vp8_tree_probs_from_distribution(
+@@ -83,7 +83,7 @@
void vp8bc_tree_probs_from_distribution(
int n, /* n = size of alphabet */
vp8_token tok [ /* n */ ],
@@ -73,9 +73,9 @@
vp8_prob probs [ /* n-1 */ ],
unsigned int branch_ct [ /* n-1 */ ] [2],
const unsigned int num_events[ /* n */ ],
---- libvpx-1.5.0.orig/vp8/decoder/treereader.h
-+++ libvpx-1.5.0/vp8/decoder/treereader.h
-@@ -31,7 +31,7 @@ typedef BOOL_DECODER vp8_reader;
+--- 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 !!! */
@@ -84,9 +84,9 @@
const vp8_prob *const p
)
{
---- libvpx-1.5.0.orig/vp8/encoder/bitstream.c
-+++ libvpx-1.5.0/vp8/encoder/bitstream.c
-@@ -64,7 +64,7 @@ static void update_mode(
+--- a/vp8/encoder/bitstream.c
++++ b/vp8/encoder/bitstream.c
+@@ -64,7 +64,7 @@
vp8_writer *const w,
int n,
vp8_token tok [/* n */],
@@ -95,8 +95,8 @@
vp8_prob Pnew [/* n-1 */],
vp8_prob Pcur [/* n-1 */],
unsigned int bct [/* n-1 */] [2],
---- libvpx-1.5.0.orig/vp8/encoder/treewriter.c
-+++ libvpx-1.5.0/vp8/encoder/treewriter.c
+--- a/vp8/encoder/treewriter.c
++++ b/vp8/encoder/treewriter.c
@@ -13,7 +13,7 @@
static void cost(
@@ -106,7 +106,7 @@
const vp8_prob *const P,
int i,
int c
-@@ -33,11 +33,11 @@ static void cost(
+@@ -33,11 +33,11 @@
}
while (++i & 1);
}
@@ -120,9 +120,9 @@
{
cost(c, t, p, start, 0);
}
---- libvpx-1.5.0.orig/vp8/encoder/treewriter.h
-+++ libvpx-1.5.0/vp8/encoder/treewriter.h
-@@ -61,7 +61,7 @@ static INLINE unsigned int vp8_cost_bran
+--- a/vp8/encoder/treewriter.h
++++ b/vp8/encoder/treewriter.h
+@@ -61,7 +61,7 @@
static void vp8_treed_write
(
vp8_writer *const w,
@@ -131,7 +131,7 @@
const vp8_prob *const p,
int v,
int n /* number of bits in v, assumed nonzero */
-@@ -80,7 +80,7 @@ static void vp8_treed_write
+@@ -80,7 +80,7 @@
static INLINE void vp8_write_token
(
vp8_writer *const w,
@@ -140,7 +140,7 @@
const vp8_prob *const p,
vp8_token *const x
)
-@@ -89,7 +89,7 @@ static INLINE void vp8_write_token
+@@ -89,7 +89,7 @@
}
static int vp8_treed_cost(
@@ -149,7 +149,7 @@
const vp8_prob *const p,
int v,
int n /* number of bits in v, assumed nonzero */
-@@ -110,7 +110,7 @@ static int vp8_treed_cost(
+@@ -110,7 +110,7 @@
}
static INLINE int vp8_cost_token
(
@@ -158,7 +158,7 @@
const vp8_prob *const p,
vp8_token *const x
)
-@@ -121,11 +121,11 @@ static INLINE int vp8_cost_token
+@@ -121,11 +121,11 @@
/* Fill array of costs for all possible token values. */
void vp8_cost_tokens(
@@ -172,18 +172,18 @@
);
#ifdef __cplusplus
---- libvpx-1.5.0.orig/vp9/encoder/vp9_cost.c
-+++ libvpx-1.5.0/vp9/encoder/vp9_cost.c
-@@ -35,7 +35,7 @@ const unsigned int vp9_prob_cost[256] =
- 22, 21, 19, 18, 16, 15, 13, 12, 10, 9, 7, 6,
- 4, 3, 1, 1};
+--- 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;
-@@ -51,11 +51,11 @@ static void cost(int *costs, vpx_tree tr
+@@ -54,11 +54,11 @@
}
}
@@ -197,9 +197,9 @@
assert(tree[0] <= 0 && tree[1] > 0);
costs[-tree[0]] = vp9_cost_bit(probs[0], 0);
---- libvpx-1.5.0.orig/vp9/encoder/vp9_cost.h
-+++ libvpx-1.5.0/vp9/encoder/vp9_cost.h
-@@ -31,7 +31,7 @@ static INLINE unsigned int cost_branch25
+--- 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);
}
@@ -208,7 +208,7 @@
int bits, int len) {
int cost = 0;
vpx_tree_index i = 0;
-@@ -45,8 +45,8 @@ static INLINE int treed_cost(vpx_tree tr
+@@ -49,8 +49,8 @@
return cost;
}
@@ -219,9 +219,9 @@
#ifdef __cplusplus
} // extern "C"
---- libvpx-1.5.0.orig/vp9/encoder/vp9_treewriter.c
-+++ libvpx-1.5.0/vp9/encoder/vp9_treewriter.c
-@@ -31,7 +31,7 @@ void vp9_tokens_from_tree(struct vp9_tok
+--- a/vp9/encoder/vp9_treewriter.c
++++ b/vp9/encoder/vp9_treewriter.c
+@@ -31,7 +31,7 @@
tree2tok(tokens, tree, 0, 0, 0);
}
@@ -230,7 +230,7 @@
unsigned int branch_ct[][2],
const unsigned int num_events[]) {
unsigned int left, right;
-@@ -51,7 +51,7 @@ static unsigned int convert_distribution
+@@ -51,7 +51,7 @@
return left + right;
}
@@ -239,8 +239,8 @@
unsigned int branch_ct[/* n-1 */][2],
const unsigned int num_events[/* n */]) {
convert_distribution(0, tree, branch_ct, num_events);
---- libvpx-1.5.0.orig/vp9/encoder/vp9_treewriter.h
-+++ libvpx-1.5.0/vp9/encoder/vp9_treewriter.h
+--- a/vp9/encoder/vp9_treewriter.h
++++ b/vp9/encoder/vp9_treewriter.h
@@ -17,7 +17,7 @@
extern "C" {
#endif
@@ -250,9 +250,9 @@
unsigned int branch_ct[ /* n - 1 */ ][2],
const unsigned int num_events[ /* n */ ]);
---- libvpx-1.5.0.orig/vpx_dsp/prob.h
-+++ libvpx-1.5.0/vpx_dsp/prob.h
-@@ -41,7 +41,7 @@ typedef int8_t vpx_tree_index;
+--- 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. */
diff --git a/debian/rules b/debian/rules
index 3c1fab9..ed30845 100755
--- a/debian/rules
+++ b/debian/rules
@@ -155,11 +155,11 @@ binary-arch: build install
dh_testdir
dh_testroot
dh_install -s
- mkdir -p debian/libvpx3/usr/lib/$(DEB_HOST_MULTIARCH)
- cp -a builddir/vpx-vp8-*/lib/libvpx.so.* debian/libvpx3/usr/lib/$(DEB_HOST_MULTIARCH)
+ mkdir -p debian/libvpx4/usr/lib/$(DEB_HOST_MULTIARCH)
+ cp -a builddir/vpx-vp8-*/lib/libvpx.so.* debian/libvpx4/usr/lib/$(DEB_HOST_MULTIARCH)
ifeq ($(BUILD_NEON), Yes)
- mkdir -p debian/libvpx3/usr/lib/$(DEB_HOST_MULTIARCH)/vfp/neon
- cp -a builddir-neon/vpx-vp8-*/lib/libvpx.so.* debian/libvpx3/usr/lib/$(DEB_HOST_MULTIARCH)/vfp/neon
+ mkdir -p debian/libvpx4/usr/lib/$(DEB_HOST_MULTIARCH)/vfp/neon
+ cp -a builddir-neon/vpx-vp8-*/lib/libvpx.so.* debian/libvpx4/usr/lib/$(DEB_HOST_MULTIARCH)/vfp/neon
endif
mkdir -p debian/libvpx-dev/usr/lib/$(DEB_HOST_MULTIARCH)
cp -a builddir/vpx-vp8-*/lib/libvpx.so builddir/vpx-vp8-*/lib/libvpx.a debian/libvpx-dev/usr/lib/$(DEB_HOST_MULTIARCH)
@@ -168,10 +168,10 @@ endif
dh_link -s
dh_strip -s --dbgsym-migration='libvpx3-dbg (<< 1.5.0-3~)'
# Make sure not to conflict with past SONAMEs:
- rm -rf debian/libvpx3-dbg/usr/lib/debug/usr/bin
+ rm -rf debian/libvpx4-dbg/usr/lib/debug/usr/bin
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -plibvpx3 -V 'libvpx3 (>= 1.5.0)' -- -c4
+ dh_makeshlibs -plibvpx4 -V 'libvpx4 (>= 1.6.0)' -- -c4
dh_installdeb -s
dh_shlibdeps -s
dh_gencontrol -s
--
libvpx packaging
More information about the pkg-multimedia-commits
mailing list