[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1008607: marked as done (xine-lib-1.2: FTBFS with dav1d 1.0.0)

Your message dated Wed, 18 May 2022 23:52:43 +0000
with message-id <E1nrTT9-0005a1-Nm@fasolo.debian.org>
and subject line Bug#1008607: fixed in xine-lib-1.2 1.2.12-2
has caused the Debian Bug report #1008607,
regarding xine-lib-1.2: FTBFS with dav1d 1.0.0
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
1008607: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1008607
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message --- 
Source: xine-lib-1.2
Version: 1.2.12-1
Severity: important
Tags: sid bookworm ftbfs patch
Forwarded: https://sourceforge.net/p/xine/tickets/11/


xine-lib-1.2 FTBFS with dav1d 1.0.0 in experimental:
|libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../include -I../..
-I../../include -I../../include -I../../src -I../../src/xine-engine
-I../../src/xine-engine -I../../src/xine-utils -I../../src/input
-I../../src/input -I../../lib -I../../lib -DNDEBUG -D_REENTRANT
-DXINE_COMPILE -Wdate-time -D_FORTIFY_SOURCE=2 -O3
-fexpensive-optimizations -ffast-math -fvisibility=hidden
-I/usr/include/libpng16 -pipe -Wall -Wformat=2 -Wno-format-zero-length
-Wmissing-format-attribute -Werror-implicit-function-declaration
-Wstrict-aliasing=2 -Wchar-subscripts -Wmissing-declarations
-Wmissing-prototypes -Wwrite-strings -Wpointer-arith -g -g -O2
-ffile-prefix-map=/build/xine-lib-1.2-1.2.12=.
-fstack-protector-strong -Wformat -Werror=format-security -O3
-fexpensive-optimizations -ffast-math -Wall -Wchar-subscripts
-Wnested-externs -Wcast-align -Wmissing-declarations
-Wmissing-prototypes -Wmissing-format-attribute -Wno-pointer-sign
-Wformat=2 -Wno-format-zero-length -Wformat-security
-Wstrict-aliasing=2 -Werror=implicit-function-declaration -c libpng.c
-fPIC -DPIC -o .libs/xineplug_decode_libpng_la-libpng.o
|dav1d.c: In function '_open_plugin':
|dav1d.c:547:11: error: 'Dav1dSettings' has no member named 'n_frame_threads'
|  547 |   settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2;
|      |           ^
|dav1d.c:548:12: error: 'Dav1dSettings' has no member named
'n_tile_threads'; did you mean 'n_threads'?
|  548 |   settings.n_tile_threads = MAX(1, ncpu -
settings.n_frame_threads + 1);
|      |            ^~~~~~~~~~~~~~
|      |            n_threads
|In file included from ../../lib/os_internal.h:71,
|                 from ../../include/config.h:47,
|                 from dav1d.c:23:
|dav1d.c:548:51: error: 'Dav1dSettings' has no member named 'n_frame_threads'
|  548 |   settings.n_tile_threads = MAX(1, ncpu -
settings.n_frame_threads + 1);
|      |                                                   ^
|libtool: compile:  gcc -DHAVE_CONFIG_H -I. -I../../include -I../..
-I../../include -I../../include -I../../src -I../../src/xine-engine
-I../../src/xine-engine -I../../src/xine-utils -I../../src/input
-I../../src/input -I../../lib -I../../lib -DNDEBUG -D_REENTRANT
-DXINE_COMPILE -Wdate-time -D_FORTIFY_SOURCE=2 -O3
-fexpensive-optimizations -ffast-math -fvisibility=hidden -pipe -Wall
-Wformat=2 -Wno-format-zero-length -Wmissing-format-attribute
-Werror-implicit-function-declaration -Wstrict-aliasing=2
-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes
-Wwrite-strings -Wpointer-arith -g -g -O2
-ffile-prefix-map=/build/xine-lib-1.2-1.2.12=.
-fstack-protector-strong -Wformat -Werror=format-security -O3
-fexpensive-optimizations -ffast-math -Wall -Wchar-subscripts
-Wnested-externs -Wcast-align -Wmissing-declarations
-Wmissing-prototypes -Wmissing-format-attribute -Wno-pointer-sign
-Wformat=2 -Wno-format-zero-length -Wformat-security
-Wstrict-aliasing=2 -Werror=implicit-function-declaration -c
group_raw.c  -fPIC -DPIC -o .libs/group_raw.o
|dav1d.c:548:51: error: 'Dav1dSettings' has no member named 'n_frame_threads'
|  548 |   settings.n_tile_threads = MAX(1, ncpu -
settings.n_frame_threads + 1);
|      |                                                   ^
|In file included from ../../include/xine/input_plugin.h:28,
|                 from ../../include/xine/xine_internal.h:35,
|                 from dav1d.c:38:
|dav1d.c:551:21: error: 'Dav1dSettings' has no member named 'n_frame_threads'
|  551 |             settings.n_frame_threads, settings.n_tile_threads);
|      |                     ^
|../../include/xine/xineutils.h:687:40: note: in definition of macro 'xprintf'
|  687 |         xine_log(xine, XINE_LOG_TRACE, __VA_ARGS__);
              \
|      |                                        ^~~~~~~~~~~
|dav1d.c:551:48: error: 'Dav1dSettings' has no member named
'n_tile_threads'; did you mean 'n_threads'?
|  551 |             settings.n_frame_threads, settings.n_tile_threads);
|      |                                                ^~~~~~~~~~~~~~
|../../include/xine/xineutils.h:687:40: note: in definition of macro 'xprintf'
|  687 |         xine_log(xine, XINE_LOG_TRACE, __VA_ARGS__);
              \
|      |                                        ^~~~~~~~~~~

The attached upstream patch fix this issue.

Best,
Dylan

From b0d8e56959af72e9ece0a44d746231ac80b85de9 Mon Sep 17 00:00:00 2001
From: Petri Hintukainen <phintuka@users.sourceforge.net>
Date: Thu, 24 Mar 2022 19:19:19 +0200
Subject: [PATCH] dav1d 1.0.0 support

https://sourceforge.net/p/xine/tickets/11/
---
 ChangeLog             | 2 ++
 src/video_dec/dav1d.c | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/video_dec/dav1d.c b/src/video_dec/dav1d.c
index 06187295c..187b357cc 100644
--- a/src/video_dec/dav1d.c
+++ b/src/video_dec/dav1d.c
@@ -544,11 +544,17 @@ static video_decoder_t *_open_plugin(video_decoder_class_t *class_gen, xine_stre
 
   /* multithreading */
   ncpu = xine_cpu_count();
+#if DAV1D_API_VERSION_MAJOR > 5
+  settings.n_threads = ncpu + 1;
+  xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
+            "Using %d threads\n", settings.n_threads);
+#else
   settings.n_frame_threads = (ncpu > 8) ? 4 : (ncpu < 2) ? 1 : ncpu/2;
   settings.n_tile_threads = MAX(1, ncpu - settings.n_frame_threads + 1);
   xprintf(stream->xine, XINE_VERBOSITY_DEBUG, LOG_MODULE ": "
             "Using %d frame threads, %d tile threads\n",
             settings.n_frame_threads, settings.n_tile_threads);
+#endif
 
   /* dri frame allocator */
   settings.allocator.cookie = this;

--- End Message ---
--- Begin Message --- 
Source: xine-lib-1.2
Source-Version: 1.2.12-2
Done: Vagrant Cascadian <vagrant@debian.org>

We believe that the bug you reported is fixed in the latest version of
xine-lib-1.2, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1008607@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Vagrant Cascadian <vagrant@debian.org> (supplier of updated xine-lib-1.2 package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Wed, 18 May 2022 16:18:54 -0700
Source: xine-lib-1.2
Architecture: source
Version: 1.2.12-2
Distribution: unstable
Urgency: medium
Maintainer: Debian QA Group <packages@qa.debian.org>
Changed-By: Vagrant Cascadian <vagrant@debian.org>
Closes: 1008607 1010948
Changes:
 xine-lib-1.2 (1.2.12-2) unstable; urgency=medium
 .
   * QA upload.
 .
   [ Debian Janitor ]
   * Remove constraints unnecessary since buster:
     + Build-Depends: Drop versioned constraint on libavcodec-dev,
       libavformat-dev, libcdio-dev, libdirectfb-dev, libjack-dev and
       libpostproc-dev.
 .
   [ Vagrant Cascadian ]
   * debian/rules: Remove the build path from libxine.pc in dh_install
     override. (Closes: #1010948)
   * debian/patches: Fix building with dav1d. (Closes: #1008607) Thanks to
     Dylan Aïssi and Petri Hintukainen.
   * debian/control: Update Standards-Version to 4.6.1.
Checksums-Sha1:
 958853b678b0d604bf66bfd7fe36df7d331f4a91 2735 xine-lib-1.2_1.2.12-2.dsc
 587b219735457329d73a7be77a05173b822ec88d 37060 xine-lib-1.2_1.2.12-2.debian.tar.xz
 05b82dced825600dac2cfe6e9a348ffa881464f2 22430 xine-lib-1.2_1.2.12-2_arm64.buildinfo
Checksums-Sha256:
 0430d849034094ea88fd2897305f8452b249e3911068f13b71fc7984ade7139e 2735 xine-lib-1.2_1.2.12-2.dsc
 bd466ba2901de2971bda03e13d51a2074bd8cb78934dd9fa4a2d98484482da91 37060 xine-lib-1.2_1.2.12-2.debian.tar.xz
 b169757802ca27b8935c1153243e23cac8b9ba4c8f246f5d4b43bef0c25d3cf1 22430 xine-lib-1.2_1.2.12-2_arm64.buildinfo
Files:
 907ac39fabb304077d35379682edadc3 2735 libs optional xine-lib-1.2_1.2.12-2.dsc
 458733f1415c31412ca4d0f982216be5 37060 libs optional xine-lib-1.2_1.2.12-2.debian.tar.xz
 7eabbe2487299f04d954952a4bc05bb9 22430 libs optional xine-lib-1.2_1.2.12-2_arm64.buildinfo

-----BEGIN PGP SIGNATURE-----

iIkEARYKADEWIQRlgHNhO/zFx+LkXUXcUY/If5cWqgUCYoWErhMcdmFncmFudEBk
ZWJpYW4ub3JnAAoJENxRj8h/lxaq3rAA/iiLifWm+GCmAtis+aqH0ncpGzCzq1r/
RVUIUNJqJNcmAQCS5HRp1Smr9mpWdkxMsxEVZtdgNfiNpK4WxC0PHdcUAw==
=0rhH
-----END PGP SIGNATURE-----

--- End Message ---
Reply to: