Accepting request 994545 from home:sbradnick

- Making adjustments as per https://build.opensuse.org/request/show/994288
  * Swapping out '--without-strict'
  * Using CFLAGS '-Wno-error=deprecated-declarations' for all flavors
  * Addin 'ExcludeArch:    %ix86'

- Making adjustments for 'ffmpeg-4' vs. 'ffmpeg-5'

OBS-URL: https://build.opensuse.org/request/show/994545
OBS-URL: https://build.opensuse.org/package/show/X11:Utilities/xpra?expand=0&rev=110

xpra.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Wed Aug 10 12:43:24 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
+
+- Making adjustments as per https://build.opensuse.org/request/show/994288
+  * Swapping out '--without-strict'
+  * Using CFLAGS '-Wno-error=deprecated-declarations' for all flavors
+  * Addin 'ExcludeArch:    %ix86'
+
+-------------------------------------------------------------------
+Sun Aug  7 01:55:02 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
+
+- Making adjustments for 'ffmpeg-4' vs. 'ffmpeg-5'
+
 -------------------------------------------------------------------
 Sat Aug  6 06:52:23 UTC 2022 - Scott Bradnick <scott.bradnick@suse.com>
 

xpra.spec

@@ -25,7 +25,14 @@
 # setup.py build --verbose ...
 # Xpra version 4.4
 %define xpra_ver 4.4
-# -----
+# ----
+%if 0%{?suse_version} >= 1550
+%define ffmpeg_ver 5
+%else
+%define ffmpeg_ver 4
+%endif
+
+# ----
 %global __requires_exclude ^typelib\\(GtkosxApplication\\)|typelib\\(GdkGLExt\\)|typelib\\(GtkGLExt\\).*$
 Name:           xpra
 Version:        4.4+git20220726.a03b3f67e
@@ -36,27 +43,30 @@ Group:          System/X11/Utilities
 URL:            https://www.xpra.org/
 Source0:        %{name}-%{version}.tar.gz
 Source1:        xpra-icon.png
-# -----
+# ----
 BuildRequires:  ImageMagick
 BuildRequires:  brotli
 BuildRequires:  cups
 BuildRequires:  cups-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
+BuildRequires:  ffmpeg-%{ffmpeg_ver}
+BuildRequires:  ffmpeg-%{ffmpeg_ver}-libavcodec-devel
+BuildRequires:  ffmpeg-%{ffmpeg_ver}-libavformat-devel
+BuildRequires:  ffmpeg-%{ffmpeg_ver}-libavutil-devel
+BuildRequires:  ffmpeg-%{ffmpeg_ver}-libswresample-devel
+BuildRequires:  ffmpeg-%{ffmpeg_ver}-libswscale-devel
 BuildRequires:  git-core
 BuildRequires:  hicolor-icon-theme
-# Needed for proper OS detection by setup.py
+# ----
-### 20220725, smb: This line seems to goof up 15.4; 15.3 gets "openSUSE-release", 15.4 gets "dummy-release" this way
-#%%if 0%%{?suse_version} >= 1550 || 0%%{?sle_version} >= 150500
-#####
 %if 0%{?suse_version} >= 1550
 %define using_release "distribution-release"
-BuildRequires: distribution-release
+BuildRequires:  distribution-release
 %else
 %define using_release "openSUSE-release"
-BuildRequires: openSUSE-release
+BuildRequires:  openSUSE-release
 %endif
-# ---------
+# ----
 BuildRequires:  pam-devel
 %if %{with pandoc}
 BuildRequires:  pandoc
@@ -65,8 +75,8 @@ BuildRequires:  pkgconfig
 BuildRequires:  python3-Cython >= 0.20.0
 BuildRequires:  python3-devel
 BuildRequires:  python3-gobject-devel
-BuildRequires:  python3-setuptools
 BuildRequires:  python3-pyxdg
+BuildRequires:  python3-setuptools
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libavcodec) >= 58
@@ -111,7 +121,6 @@ Requires:       shared-mime-info
 Requires:       xf86-video-dummy
 Requires:       xorg-x11-xauth
 Requires(post): %fillup_prereq
-Recommends:     xdg-menu
 Recommends:     lsb-release
 Recommends:     pinentry
 Recommends:     pulseaudio-module-x11
@@ -123,6 +132,9 @@ Recommends:     python3-opengl-accelerate
 Recommends:     python3-paramiko
 Recommends:     python3-pyinotify
 Recommends:     python3-pyxdg
+Recommends:     xdg-menu
+# Overflow errors on 32-bit
+ExcludeArch:    %ix86
 %{?systemd_ordering}
 
 %description
@@ -154,15 +166,16 @@ sed -e 's|__FILLUPDIR__|%{_fillupdir}|' \
 %build
 
 ### DEBUGGING
-echo "using_release: %using_release"
+echo "ffmpeg_ver:    %ffmpeg_ver"
 echo "sle_version:   %sle_version"
 echo "suse_version:  %suse_version"
+echo "using_release: %using_release"
 #####
 
 export CFLAGS="%{optflags}"
-%if 0%{?suse_version} <= 1500
+#%%if 0%%{?suse_version} <= 1500
 export CFLAGS="$CFLAGS -Wno-error=deprecated-declarations"
-%endif
+#%%endif
 python3 setup.py clean
 
 python3 setup.py build \
@@ -181,7 +194,16 @@ python3 setup.py build \
 %if !%{with pandoc}
   --without-docs \
 %endif
+%if %{ffmpeg_ver} == 4
   --without-nvfbc
+%endif
+%if %{ffmpeg_ver} == 5
+  --without-nvfbc
+%endif
+#%%if %%{ffmpeg_ver} == 5
+#  --without-nvfbc \
+#  --without-strict
+#%%endif
 
 %install
 python3 setup.py install \