Re: Bug#1038988: qt6-multimedia: Patch to build with system egein3

[Christian Marillat]

On 09 juil. 2023 11:47, Lisandro Damian Nicanor Perez Meyer 
 wrote:

> Hi!
>
> On sábado, 24 de junio de 2023 03:42:33 -03 Christian Marillat wrote:

[...]

> The patch looks really good, but I also just noticed that eigen3 provides 
> both 
> cmake and pkg-config files, so ideally we should try to use that. No, I'm not 
> asking you to do it, I'll tyr to give it a go.

This patch is intended for Debian. Don't spend your time to write a
patch for cmake or pkg-config. Upstream probably don't care with it.

Christian

Re: Bug#1038988: qt6-multimedia: Patch to build with system egein3

[Lisandro Damian Nicanor Perez Meyer]

Hi!

On sábado, 24 de junio de 2023 03:42:33 -03 Christian Marillat wrote:
> Source: qt6-multimedia
> Version: 6.4.2-5
> Severity: normal
> 
> Dear Maintainer,
> 
> Please find bellow a debdiff to build qt6-multimedia with system
> eigen3
> 
> Changes are:
>   Add libeigen3-dev to Build-Depends
>   Add a pacth to changes the cinclude path ../3rdparty/eigen to
> /usr/include/eigen3 in src/spatialaudio/CMakeLists.txt and
> src/resonance-audio/CMakeLists.txt

Thanks for your patch! to be totally honest I missed it yesterday while doing 
a Multimedia upload, my bad.

The patch looks really good, but I also just noticed that eigen3 provides both 
cmake and pkg-config files, so ideally we should try to use that. No, I'm not 
asking you to do it, I'll tyr to give it a go.

signature.asc
Description: This is a digitally signed message part.

Bug#1038988: qt6-multimedia: Patch to build with system egein3

[Christian Marillat]

Source: qt6-multimedia
Version: 6.4.2-5
Severity: normal

Dear Maintainer,

Please find bellow a debdiff to build qt6-multimedia with system
eigen3

Changes are:
  Add libeigen3-dev to Build-Depends
  Add a pacth to changes the cinclude path ../3rdparty/eigen to 
/usr/include/eigen3
  in src/spatialaudio/CMakeLists.txt and 
src/resonance-audio/CMakeLists.txt

Source build fine under an amd64 chroot (pbuilder)

Christian

,
| diff -Nru qt6-multimedia-6.4.2/debian/changelog 
qt6-multimedia-6.4.2/debian/changelog
| --- qt6-multimedia-6.4.2/debian/changelog 2023-05-06 17:40:13.0 
+0200
| +++ qt6-multimedia-6.4.2/debian/changelog 2023-06-24 08:20:40.0 
+0200
| @@ -1,3 +1,9 @@
| +qt6-multimedia (6.4.2-6) unstable; urgency=medium
| +
| +  * Build with system eigen3
| +
| + -- Christian Marillat   Sat, 24 Jun 2023 
08:20:40 +0200
| +
|  qt6-multimedia (6.4.2-5) unstable; urgency=medium
|  
|[ Patrick Franz ]
| diff -Nru qt6-multimedia-6.4.2/debian/control 
qt6-multimedia-6.4.2/debian/control
| --- qt6-multimedia-6.4.2/debian/control   2023-01-27 21:19:15.0 
+0100
| +++ qt6-multimedia-6.4.2/debian/control   2023-06-24 08:05:27.0 
+0200
| @@ -5,6 +5,7 @@
|  Uploaders: Patrick Franz , Lu YaNing 

|  Build-Depends: cmake (>= 3.24~),
| debhelper-compat (= 13),
| +   libeigen3-dev,
| libasound2-dev [linux-any],
| libavcodec-dev,
| libavdevice-dev,
| diff -Nru qt6-multimedia-6.4.2/debian/patches/series 
qt6-multimedia-6.4.2/debian/patches/series
| --- qt6-multimedia-6.4.2/debian/patches/series2023-01-22 
19:20:55.0 +0100
| +++ qt6-multimedia-6.4.2/debian/patches/series2023-06-24 
08:08:36.0 +0200
| @@ -1 +1,2 @@
|  provide_default_implementation_for_qplatformmediadevices.patch
| +system-eigen3.patch
| diff -Nru qt6-multimedia-6.4.2/debian/patches/system-eigen3.patch 
qt6-multimedia-6.4.2/debian/patches/system-eigen3.patch
| --- qt6-multimedia-6.4.2/debian/patches/system-eigen3.patch   1970-01-01 
01:00:00.0 +0100
| +++ qt6-multimedia-6.4.2/debian/patches/system-eigen3.patch   2023-06-24 
08:20:40.0 +0200
| @@ -0,0 +1,22 @@
| +--- a/src/spatialaudio/CMakeLists.txt
|  b/src/spatialaudio/CMakeLists.txt
| +@@ -11,7 +11,7 @@ qt_internal_add_module(SpatialAudio
| + "../3rdparty/resonance-audio/resonance_audio"
| + "../3rdparty/resonance-audio"
| + "../resonance-audio"
| +-"../3rdparty/eigen"
| ++"/usr/include/eigen3"
| + LIBRARIES
| + Qt::MultimediaPrivate
| + Qt::BundledResonanceAudio
| +--- a/src/resonance-audio/CMakeLists.txt
|  b/src/resonance-audio/CMakeLists.txt
| +@@ -204,7 +204,7 @@ qt_internal_add_3rdparty_library(Bundled
| + ${RA_SOURCE_DIR}
| + ${PFFFT_DIR}
| + ${SADIE_HRTFS_DIR}
| +-../3rdparty/eigen
| ++/usr/include/eigen3
| + )
| + 
| + # Required by pffft on certain PowerPC archs
`




-- System Information:
Debian Release: trixie/sid
  APT prefers buildd-unstable
  APT policy: (500, 'buildd-unstable'), (500, 'unstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 6.3.9-1-custom (SMP w/24 CPU threads; PREEMPT)
Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set
Shell: /bin/sh linked to /usr/bin/dash
Init: systemd (via /run/systemd/system)