Re: s390x only buildroot problem

[Richard Shaw <hobbes1069@xxxxxxxxx>]

On Sun, Nov 29, 2020 at 2:55 PM Dominik 'Rathann' Mierzejewski <dominik@xxxxxxxxxxxxxx> wrote:

On Sunday, 29 November 2020 at 21:36, Richard Shaw wrote:
> On Sun, Nov 29, 2020 at 12:43 PM Rex Dieter <rdieter@xxxxxxxxx> wrote:
>
> > Richard Shaw wrote:
> >
> > Other packages are (still) affected, including:
> >
> > vulkan-loader
> >
> > (and anything else that depends on it, including:
> > gstreamer1-plugins-bad-free
> >
>
> For the hell of it I added a conditional for s390x BR: vulcan and kicked
> off a scratch build to see if it's optional.
>
> https://koji.fedoraproject.org/koji/taskinfo?taskID=56407778

...
gst-libs/gst/vulkan/meson.build:146:2: ERROR: Problem encountered: vulkan plugin enabled, but vulkan.h not found
...

I guess you need to disable vulkan plugin on s390x.

I've got a scratch build started that does just that. I can use pp rights to do it but I feel it's a pretty invasive change to a package I don't maintain.

https://koji.fedoraproject.org/koji/taskinfo?taskID=56407895

Thanks,

Richard

$ fedpkg diff
diff --git a/gstreamer1-plugins-bad-free.spec b/gstreamer1-plugins-bad-free.spec
index e60e4db..16fc69a 100644
--- a/gstreamer1-plugins-bad-free.spec
+++ b/gstreamer1-plugins-bad-free.spec
@@ -83,8 +83,10 @@ BuildRequires:  gtk3-devel >= 3.4
 BuildRequires:  bluez-libs-devel >= 5.0
 BuildRequires:  libwebp-devel
 BuildRequires:  mesa-libEGL-devel
+%ifnarch s390x
 BuildRequires:  vulkan-devel
 #BuildRequires:  mesa-vulkan-devel
+%endif
 BuildRequires:  webrtc-audio-processing-devel
 BuildRequires:  libaom-devel
 BuildRequires:  libmicrodns-devel
@@ -268,7 +270,10 @@ aren't tested well enough, or the code is not of good enough quality.
     -D libde265=disabled -D musepack=disabled -D openni2=disabled \
     -D sctp=disabled -D svthevcenc=disabled -D voaacenc=disabled \
     -D zxing=disabled -D wpe=disabled -D x11=disabled \
-    -D openh264=disabled
+    -D openh264=disabled  \
+%ifarch s390x
+    -D vulkan=disabled}
+%endif
 
 %meson_build
 
@@ -370,7 +375,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %{_libdir}/libgstsctp-%{majorminor}.so.*
 %{_libdir}/libgsttranscoder-%{majorminor}.so.*
 %{_libdir}/libgsturidownloader-%{majorminor}.so.*
+%ifnarch s390x
 %{_libdir}/libgstvulkan-%{majorminor}.so.*
+%endif
 %{_libdir}/libgstwebrtc-%{majorminor}.so.*
 %if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/libgstwayland-%{majorminor}.so.*
@@ -486,7 +493,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %{_libdir}/gstreamer-%{majorminor}/libgstsoundtouch.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsrt.so
 %{_libdir}/gstreamer-%{majorminor}/libgstsrtp.so
+%ifnarch s390x
 %{_libdir}/gstreamer-%{majorminor}/libgstvulkan.so
+%endif
 %if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/gstreamer-%{majorminor}/libgstwaylandsink.so
 %endif
@@ -571,7 +580,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %{_libdir}/libgstsctp-%{majorminor}.so
 %{_libdir}/libgsttranscoder-%{majorminor}.so
 %{_libdir}/libgsturidownloader-%{majorminor}.so
+%ifnarch s390x
 %{_libdir}/libgstvulkan-%{majorminor}.so
+%endif
 %{_libdir}/libgstwebrtc-%{majorminor}.so
 %if 0%{?fedora} || 0%{?rhel} > 7
 %{_libdir}/libgstwayland-%{majorminor}.so
@@ -589,7 +600,9 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %{_includedir}/gstreamer-%{majorminor}/gst/sctp
 %{_includedir}/gstreamer-%{majorminor}/gst/transcoder
 %{_includedir}/gstreamer-%{majorminor}/gst/uridownloader
+%ifnarch s390x
 %{_includedir}/gstreamer-%{majorminor}/gst/vulkan/
+%endif
 %{_includedir}/gstreamer-%{majorminor}/gst/webrtc/
 
 # pkg-config files
@@ -603,8 +616,10 @@ rm $RPM_BUILD_ROOT%{_bindir}/playout
 %{_libdir}/pkgconfig/gstreamer-sctp-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-transcoder-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-webrtc-%{majorminor}.pc
+%ifnarch s390x
 %{_libdir}/pkgconfig/gstreamer-vulkan-%{majorminor}.pc
 %{_libdir}/pkgconfig/gstreamer-vulkan-wayland-%{majorminor}.pc
+%endif
 
 

 %changelog 

_______________________________________________
devel mailing list -- devel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to devel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/devel@xxxxxxxxxxxxxxxxxxxxxxx