Re: qt6-multimedia: fix macppc

2023-07-23 Thread Rafael Sadowski 
On Sat Jul 22, 2023 at 01:11:37AM +0200, Tobias Heider wrote:
> When trying to build qt6-multimedia I noticed the build fails because
> of missing Altivec support.  The included CMake file does some ppc
> specific CFLAG magic but matches on the wrong value.
> 
> The diff below unbreaks it for me.  I am not quite sure how the REV bump
> works with those multi package folders like qt.
> 
> ok?

ok rsadowski

> 
> diff /home/user/got/co/ports
> commit - 909b2aa1081bfe2fe1f22f676e8f2d248c8550d9
> path + /home/user/got/co/ports
> blob - 3604a2a6918ab0b4e4c509779d466b515d073d6c
> file + x11/qt6/qtmultimedia/Makefile
> --- x11/qt6/qtmultimedia/Makefile
> +++ x11/qt6/qtmultimedia/Makefile
> @@ -1,6 +1,7 @@
>  QT6NAME =QtMultimedia
>  COMMENT =Qt6 multimedia components
>  PKGSPEC =qt6-qtmultimedia-${QT6_PKGSPEC}
> +REVISION=0
>  
>  SHARED_LIBS +=  Qt6Multimedia 3.0 # 6.5
>  SHARED_LIBS +=  Qt6MultimediaQuick3.0 # 6.5
> blob - /dev/null
> file + x11/qt6/qtmultimedia/patches/patch-src_resonance-audio_CMakeLists_txt 
> (mode 644)
> --- /dev/null
> +++ x11/qt6/qtmultimedia/patches/patch-src_resonance-audio_CMakeLists_txt
> @@ -0,0 +1,22 @@
> +On OpenBSD CMAKE_SYSTEM_PROCESSOR returns powerpc on macppc.
> +Fixes missing altivec compilation error on macppc.
> +
> +Index: src/resonance-audio/CMakeLists.txt
> +--- src/resonance-audio/CMakeLists.txt.orig
>  src/resonance-audio/CMakeLists.txt
> +@@ -215,13 +215,13 @@ qt_internal_add_3rdparty_library(BundledResonanceAudio
> + )
> + 
> + # Required by pffft on certain PowerPC archs
> +-qt_internal_extend_target(BundledResonanceAudio CONDITION GCC AND 
> (${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64)$")
> ++qt_internal_extend_target(BundledResonanceAudio CONDITION GCC AND 
> (${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64|powerpc)$")
> + COMPILE_OPTIONS
> + -maltivec
> + )
> + 
> + # Required by eigen on certain PowerPC archs
> +-qt_internal_extend_target(BundledResonanceAudio CONDITION 
> (${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64)$")
> ++qt_internal_extend_target(BundledResonanceAudio CONDITION 
> (${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64|powerpc)$")
> + COMPILE_OPTIONS
> + -mvsx
> + )
>

Re: qt6-multimedia: fix macppc

2023-07-21 Thread Klemens Nanni 
On Sat, Jul 22, 2023 at 01:11:37AM +0200, Tobias Heider wrote:
> When trying to build qt6-multimedia I noticed the build fails because
> of missing Altivec support.  The included CMake file does some ppc
> specific CFLAG magic but matches on the wrong value.
> 
> The diff below unbreaks it for me.  I am not quite sure how the REV bump
> works with those multi package folders like qt.
> 
> ok?

x11/qt6/qtmultimedia is a single port with a single package.
Either way, bumping REVISION (or all REVISION-*) instead of just
REVISION-pkg is always fine.

Haven't built or run-tested myself, but the patch seems reasonable.
OK kn if it works for you on macppc.

> 
> diff /home/user/got/co/ports
> commit - 909b2aa1081bfe2fe1f22f676e8f2d248c8550d9
> path + /home/user/got/co/ports
> blob - 3604a2a6918ab0b4e4c509779d466b515d073d6c
> file + x11/qt6/qtmultimedia/Makefile
> --- x11/qt6/qtmultimedia/Makefile
> +++ x11/qt6/qtmultimedia/Makefile
> @@ -1,6 +1,7 @@
>  QT6NAME =QtMultimedia
>  COMMENT =Qt6 multimedia components
>  PKGSPEC =qt6-qtmultimedia-${QT6_PKGSPEC}
> +REVISION=0
>  
>  SHARED_LIBS +=  Qt6Multimedia 3.0 # 6.5
>  SHARED_LIBS +=  Qt6MultimediaQuick3.0 # 6.5
> blob - /dev/null
> file + x11/qt6/qtmultimedia/patches/patch-src_resonance-audio_CMakeLists_txt 
> (mode 644)
> --- /dev/null
> +++ x11/qt6/qtmultimedia/patches/patch-src_resonance-audio_CMakeLists_txt
> @@ -0,0 +1,22 @@
> +On OpenBSD CMAKE_SYSTEM_PROCESSOR returns powerpc on macppc.
> +Fixes missing altivec compilation error on macppc.
> +
> +Index: src/resonance-audio/CMakeLists.txt
> +--- src/resonance-audio/CMakeLists.txt.orig
>  src/resonance-audio/CMakeLists.txt
> +@@ -215,13 +215,13 @@ qt_internal_add_3rdparty_library(BundledResonanceAudio
> + )
> + 
> + # Required by pffft on certain PowerPC archs
> +-qt_internal_extend_target(BundledResonanceAudio CONDITION GCC AND 
> (${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64)$")
> ++qt_internal_extend_target(BundledResonanceAudio CONDITION GCC AND 
> (${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64|powerpc)$")
> + COMPILE_OPTIONS
> + -maltivec
> + )
> + 
> + # Required by eigen on certain PowerPC archs
> +-qt_internal_extend_target(BundledResonanceAudio CONDITION 
> (${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64)$")
> ++qt_internal_extend_target(BundledResonanceAudio CONDITION 
> (${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64|powerpc)$")
> + COMPILE_OPTIONS
> + -mvsx
> + )
>

qt6-multimedia: fix macppc

2023-07-21 Thread Tobias Heider 
When trying to build qt6-multimedia I noticed the build fails because
of missing Altivec support.  The included CMake file does some ppc
specific CFLAG magic but matches on the wrong value.

The diff below unbreaks it for me.  I am not quite sure how the REV bump
works with those multi package folders like qt.

ok?

diff /home/user/got/co/ports
commit - 909b2aa1081bfe2fe1f22f676e8f2d248c8550d9
path + /home/user/got/co/ports
blob - 3604a2a6918ab0b4e4c509779d466b515d073d6c
file + x11/qt6/qtmultimedia/Makefile
--- x11/qt6/qtmultimedia/Makefile
+++ x11/qt6/qtmultimedia/Makefile
@@ -1,6 +1,7 @@
 QT6NAME =  QtMultimedia
 COMMENT =  Qt6 multimedia components
 PKGSPEC =  qt6-qtmultimedia-${QT6_PKGSPEC}
+REVISION=  0
 
 SHARED_LIBS +=  Qt6Multimedia 3.0 # 6.5
 SHARED_LIBS +=  Qt6MultimediaQuick3.0 # 6.5
blob - /dev/null
file + x11/qt6/qtmultimedia/patches/patch-src_resonance-audio_CMakeLists_txt 
(mode 644)
--- /dev/null
+++ x11/qt6/qtmultimedia/patches/patch-src_resonance-audio_CMakeLists_txt
@@ -0,0 +1,22 @@
+On OpenBSD CMAKE_SYSTEM_PROCESSOR returns powerpc on macppc.
+Fixes missing altivec compilation error on macppc.
+
+Index: src/resonance-audio/CMakeLists.txt
+--- src/resonance-audio/CMakeLists.txt.orig
 src/resonance-audio/CMakeLists.txt
+@@ -215,13 +215,13 @@ qt_internal_add_3rdparty_library(BundledResonanceAudio
+ )
+ 
+ # Required by pffft on certain PowerPC archs
+-qt_internal_extend_target(BundledResonanceAudio CONDITION GCC AND 
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64)$")
++qt_internal_extend_target(BundledResonanceAudio CONDITION GCC AND 
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64|powerpc)$")
+ COMPILE_OPTIONS
+ -maltivec
+ )
+ 
+ # Required by eigen on certain PowerPC archs
+-qt_internal_extend_target(BundledResonanceAudio CONDITION 
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64)$")
++qt_internal_extend_target(BundledResonanceAudio CONDITION 
(${CMAKE_SYSTEM_PROCESSOR} MATCHES "(ppc|ppc64|powerpc)$")
+ COMPILE_OPTIONS
+ -mvsx
+ )