tags 739432 + pending
thanks
Dear maintainer,
I've prepared an NMU for jitsi (versioned as 2.4.4997-1.1) and
uploaded it to DELAYED/5. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru jitsi-2.4.4997/debian/changelog jitsi-2.4.4997/debian/changelog
--- jitsi-2.4.4997/debian/changelog 2014-01-15 17:03:00.000000000 -0500
+++ jitsi-2.4.4997/debian/changelog 2014-03-31 21:52:23.000000000 -0400
@@ -1,3 +1,10 @@
+jitsi (2.4.4997-1.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Add patch from Anton Khirnov and compile against libav10 (Closes: #739432)
+
+ -- Reinhard Tartler <siret...@tauware.de> Mon, 31 Mar 2014 21:41:07 -0400
+
jitsi (2.4.4997-1) unstable; urgency=low
* Updates upstream.
diff -Nru jitsi-2.4.4997/debian/control jitsi-2.4.4997/debian/control
--- jitsi-2.4.4997/debian/control 2014-01-15 17:02:59.000000000 -0500
+++ jitsi-2.4.4997/debian/control 2014-03-31 21:41:26.000000000 -0400
@@ -13,11 +13,11 @@
ant-contrib,
maven,
autotools-dev,
- libavutil-dev,
- libavcodec-dev,
- libavformat-dev,
- libavfilter-dev,
- libswscale-dev,
+ libavutil-dev (>= 6:10~),
+ libavcodec-dev (>= 6:10~),
+ libavformat-dev (>= 6:10~),
+ libavfilter-dev (>= 6:10~),
+ libswscale-dev (>= 6:10~),
libvpx-dev,
libxpp3-java,
libjzlib-java,
diff -Nru jitsi-2.4.4997/debian/patches/libav10.patch jitsi-2.4.4997/debian/patches/libav10.patch
--- jitsi-2.4.4997/debian/patches/libav10.patch 1969-12-31 19:00:00.000000000 -0500
+++ jitsi-2.4.4997/debian/patches/libav10.patch 2014-03-31 21:40:46.000000000 -0400
@@ -0,0 +1,79 @@
+From: an...@khirnov.net
+To: 739...@bugs.debian.org
+Subject: Re: FTBFS with libav10
+Date: Thu, 27 Feb 2014 18:14:56 +0100
+
+--- a/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.c
++++ b/lib/src/libjitsi/src/native/ffmpeg/org_jitsi_impl_neomedia_codec_FFmpeg.c
+@@ -163,14 +163,28 @@ Java_org_jitsi_impl_neomedia_codec_FFmpe
+ = (*env)->GetByteArrayElements (env, samples, NULL);
+
+ if (samples_ptr) {
+- ret = (jint) avcodec_encode_audio(
+- (AVCodecContext *) (intptr_t) ctx,
+- (uint8_t *) (buf_ptr + buf_offset), (int) buf_size,
+- (const short *) (samples_ptr + samples_offset));
++ AVCodecContext *avctx = (AVCodecContext*)(intptr_t)ctx;
++ AVPacket pkt;
++ AVFrame *frame = av_frame_alloc();
++ int got_output;
++
++ if (!frame)
++ return AVERROR(ENOMEM);
++ frame->data[0] = (uint8_t*)(samples_ptr + samples_offset);
++ frame->linesize[0] = avctx->frame_size * av_get_bytes_per_sample(avctx->sample_fmt) *
++ avctx->channels;
++
++ pkt.data = (uint8_t*)(buf_ptr + buf_offset);
++ pkt.size = buf_size;
++ ret = (jint) avcodec_encode_audio2(
++ avctx, &pkt, frame, &got_output);
+ (*env)->ReleaseByteArrayElements(
+ env,
+ samples, samples_ptr,
+ JNI_ABORT);
++ av_frame_free(&frame);
++ if (ret >= 0)
++ ret = got_output ? pkt.size : 0;
+ } else
+ ret = -1;
+ (*env)->ReleaseByteArrayElements (env, buf, buf_ptr, 0);
+@@ -192,12 +206,18 @@ Java_org_jitsi_impl_neomedia_codec_FFmpe
+ jbyte *buf_ptr = (*env)->GetByteArrayElements (env, buf, NULL);
+
+ if (buf_ptr) {
++ int got_output;
++ AVPacket pkt;
++ pkt.data = (uint8_t*)buf_ptr;
++ pkt.size = (int)buf_size;
+ ret
+ = (jint)
+- avcodec_encode_video(
++ avcodec_encode_video2(
+ (AVCodecContext *) (intptr_t) ctx,
+- (uint8_t *) buf_ptr, (int) buf_size,
+- (const AVFrame *) (intptr_t) frame);
++ &pkt, (const AVFrame *) (intptr_t) frame,
++ &got_output);
++ if (ret >= 0)
++ ret = got_output ? pkt.size : 0;
+ (*env)->ReleaseByteArrayElements (env, buf, buf_ptr, 0);
+ } else
+ ret = -1;
+@@ -210,14 +230,14 @@ JNIEXPORT jlong JNICALL
+ Java_org_jitsi_impl_neomedia_codec_FFmpeg_avcodec_1find_1decoder
+ (JNIEnv *env, jclass clazz, jint id)
+ {
+- return (jlong) (intptr_t) avcodec_find_decoder((enum CodecID) id);
++ return (jlong) (intptr_t) avcodec_find_decoder((enum AVCodecID) id);
+ }
+
+ JNIEXPORT jlong JNICALL
+ Java_org_jitsi_impl_neomedia_codec_FFmpeg_avcodec_1find_1encoder
+ (JNIEnv *env, jclass clazz, jint id)
+ {
+- return (jlong) (intptr_t) avcodec_find_encoder((enum CodecID) id);
++ return (jlong) (intptr_t) avcodec_find_encoder((enum AVCodecID) id);
+ }
+
+ JNIEXPORT jint JNICALL
diff -Nru jitsi-2.4.4997/debian/patches/series jitsi-2.4.4997/debian/patches/series
--- jitsi-2.4.4997/debian/patches/series 2014-01-15 17:03:00.000000000 -0500
+++ jitsi-2.4.4997/debian/patches/series 2014-03-31 21:40:21.000000000 -0400
@@ -1,3 +1,4 @@
bcprov-upgrade-1.48
remove-hflip
guava-update
+libav10.patch
