Control: tags -1 +pending +patch Dear maintainer,
I've prepared an NMU for moc (versioned as 1:2.6.0~svn-r3005-4) and uploaded it to DELAYED/7. Please feel free to tell me if I should delay it longer. Regards.diff -Nru moc-2.6.0~svn-r3005/debian/changelog moc-2.6.0~svn-r3005/debian/changelog
--- moc-2.6.0~svn-r3005/debian/changelog 2023-09-12 23:07:32.000000000 -0400 +++ moc-2.6.0~svn-r3005/debian/changelog 2024-12-16 20:45:11.000000000 -0500 @@ -1,3 +1,15 @@ +moc (1:2.6.0~svn-r3005-4) unstable; urgency=medium + + * Take over package maintenance via ITS process. (Closes: #1088885) + * debian/control: Update build-dep: use libncurses-dev. + * Merge changes from Ubuntu: + + [ Zixing Liu ] + * d/p/1000-ffmpeg-7.0.patch: add a patch to fix build with FFmpeg 7 + (Closes: #1072436, #1081666) + + -- Boyuan Yang <[email protected]> Mon, 16 Dec 2024 20:45:11 -0500 + moc (1:2.6.0~svn-r3005-3.1) unstable; urgency=medium * Non-maintainer upload.diff -Nru moc-2.6.0~svn-r3005/debian/control moc-2.6.0~svn-r3005/debian/control
--- moc-2.6.0~svn-r3005/debian/control 2023-09-12 23:07:32.000000000 -0400 +++ moc-2.6.0~svn-r3005/debian/control 2024-12-16 20:45:10.000000000 -0500 @@ -1,8 +1,8 @@ Source: moc Section: sound Priority: optional -Maintainer: Elimar Riesebieter <[email protected]> -Standards-Version: 4.6.1 +Maintainer: Boyuan Yang <[email protected]> +Standards-Version: 4.7.0 Build-Depends: chrpath, debhelper-compat (= 13), libasound2-dev [linux-any], @@ -20,8 +20,7 @@ libmagic-dev, libmodplug-dev, libmpcdec-dev, - libncurses5-dev, - libncursesw5-dev, + libncurses-dev, libogg-dev, libopusfile-dev, libpopt-dev,diff -Nru moc-2.6.0~svn-r3005/debian/patches/1000-ffmpeg-7.0.patch moc-2.6.0~svn-r3005/debian/patches/1000-ffmpeg-7.0.patch --- moc-2.6.0~svn-r3005/debian/patches/1000-ffmpeg-7.0.patch 1969-12-31 19:00:00.000000000 -0500 +++ moc-2.6.0~svn-r3005/debian/patches/1000-ffmpeg-7.0.patch 2024-12-16 20:39:54.000000000 -0500
@@ -0,0 +1,48 @@ +Index: moc/decoder_plugins/ffmpeg/ffmpeg.c+Origin: Ubuntu, https://launchpad.net/ubuntu/+archive/primary/+sourcefiles/moc/1:2.6.0~svn-r3005-3.1ubuntu1/moc_2.6.0~svn-r3005-3.1ubuntu1.debian.tar.xz
+===================================================================
+--- moc.orig/decoder_plugins/ffmpeg/ffmpeg.c
++++ moc/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -562,10 +562,10 @@ static bool is_seek_broken (struct ffmpe
+ /* Downmix multi-channel audios to stereo. */
+ static void set_downmixing (struct ffmpeg_data *data)
+ {
+- if (av_get_channel_layout_nb_channels (data->enc->channel_layout) <= 2)
++ if ((data->enc->ch_layout.nb_channels) <= 2)
+ return;
+
+- data->enc->request_channel_layout = AV_CH_LAYOUT_STEREO;
++ av_channel_layout_from_mask(&data->enc->ch_layout, AV_CH_LAYOUT_STEREO);
+ }
+
+ static int ffmpeg_io_read_cb (void *s, uint8_t *buf, int count)
+@@ -1128,16 +1128,16 @@ static int decode_packet (struct ffmpeg_
+ is_planar = av_sample_fmt_is_planar (data->enc->sample_fmt);
+ packed = (char *)frame->extended_data[0];
+ packed_size = frame->nb_samples * data->sample_width
+- * data->enc->channels;
++ *
data->enc->ch_layout.nb_channels;
+
+- if (is_planar && data->enc->channels > 1) {
++ if (is_planar && data->enc->ch_layout.nb_channels > 1) {
+ int sample, ch;
+
+ packed = xmalloc (packed_size);
+
+ for (sample = 0; sample < frame->nb_samples; sample +=
1) {
+- for (ch = 0; ch < data->enc->channels; ch += 1)
+- memcpy (packed + (sample *
data->enc->channels + ch)
++ for (ch = 0; ch <
data->enc->ch_layout.nb_channels; ch += 1)
++ memcpy (packed + (sample *
data->enc->ch_layout.nb_channels + ch)
+ *
data->sample_width,
+ (char *)frame->extended_data[ch] + sample *
data->sample_width,
+ data->sample_width); +@@ -1235,7 +1235,7 @@ static int ffmpeg_decode (void *prv_data + return 0; + + /* FFmpeg claims to always return native endian. */ +- sound_params->channels = data->enc->channels; ++ sound_params->channels = data->enc->ch_layout.nb_channels; + sound_params->rate = data->enc->sample_rate; + sound_params->fmt = data->fmt | SFMT_NE; +diff -Nru moc-2.6.0~svn-r3005/debian/patches/series moc-2.6.0~svn-r3005/debian/patches/series --- moc-2.6.0~svn-r3005/debian/patches/series 2023-09-12 23:07:32.000000000 -0400 +++ moc-2.6.0~svn-r3005/debian/patches/series 2024-12-16 20:36:37.000000000 -0500
@@ -8,3 +8,4 @@ 0008-Rename-configure.in-to-configure.ac.patch 0009-Add-https-to-is_url.patch 0010-ffmpeg-6.0.patch +1000-ffmpeg-7.0.patch
OpenPGP_signature.asc
Description: OpenPGP digital signature
