Accepting request 1133463 from home:jtorres:branches:X11:RemoteDesktop

- Add sdl dependencies to build the sdl-freerdp client.
  * This is due to the wlfreerdp client being deprecated.

- Cleanup specfile.
  * Rely preferably on pkgconfig to pull devel packages instead of 
    hardcoding them.

OBS-URL: https://build.opensuse.org/request/show/1133463
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/freerdp?expand=0&rev=158

freerdp.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Dec 15 11:02:39 UTC 2023 - Joan Torres <joan.torres@suse.com>
+
+- Add sdl dependencies to build the sdl-freerdp client.
+  * This is due to the wlfreerdp client being deprecated.
+
+- Cleanup specfile.
+  * Rely preferably on pkgconfig to pull devel packages instead of 
+    hardcoding them.
+
 -------------------------------------------------------------------
 Thu Dec 14 07:23:30 UTC 2023 - Paolo Stivanin <info@paolostivanin.com>
 

freerdp.spec

@@ -46,34 +46,41 @@ Source0:        https://github.com/FreeRDP/FreeRDP/archive/%{version}.tar.gz#/Fr
 Source1:        freerdp-rpmlintrc
 BuildRequires:  chrpath
 BuildRequires:  cmake >= 2.8
-BuildRequires:  cups-devel
 BuildRequires:  ed
 BuildRequires:  fdupes
-BuildRequires:  fuse3-devel
 BuildRequires:  gcc-c++
 BuildRequires:  hicolor-icon-theme
 BuildRequires:  libgsm-devel
-BuildRequires:  libjpeg-devel
-BuildRequires:  pkcs11-helper-devel
 BuildRequires:  pkgconfig
-BuildRequires:  xmlto
-BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(cups)
+BuildRequires:  pkgconfig(fuse3)
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0)
 BuildRequires:  pkgconfig(icu-i18n)
 %{?_with_gss:BuildRequires:  pkgconfig(krb5) >= 1.13}
-%{?_with_lame:BuildRequires:  libmp3lame-devel}
+%{?_with_ffmpeg:
+BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
+BuildRequires:  pkgconfig(libavutil)
+}
+BuildRequires:  pkgconfig(libcjson)
+BuildRequires:  pkgconfig(libjpeg)
+%{?_with_lame:BuildRequires:  pkgconfig(libmp3lame)}
 BuildRequires:  pkgconfig(libpcsclite)
+BuildRequires:  pkgconfig(libpkcs11-helper-1)
 BuildRequires:  pkgconfig(libpulse)
 BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(libusb-1.0)
-%{?_with_openh264:BuildRequires:  libopenh264-devel}
+%{?_with_openh264:BuildRequires:  pkgconfig(openh264)}
 BuildRequires:  pkgconfig(openssl)
 %{?_with_soxr:BuildRequires:  pkgconfig(soxr)}
+BuildRequires:  xmlto
+BuildRequires:  pkgconfig(SDL2_ttf)
+BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(webkit2gtk-4.0)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xdamage)
@@ -86,10 +93,7 @@ BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(xtst)
 BuildRequires:  pkgconfig(xv)
-%{?_with_ffmpeg:
+BuildRequires:  pkgconfig(zlib)
-BuildRequires:  pkgconfig(libavcodec) >= 57.48.101
-BuildRequires:  pkgconfig(libavutil)
-}
 # force installation of latest library version
 Requires:       lib%{name}%{libfreerdp_package} = %{version}-%{release}
 
@@ -98,6 +102,15 @@ FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
 following the Microsoft Open Specifications. This package provides the client
 application.
 
+%package sdl
+Summary:        Remote Desktop Viewer Client
+Group:          Productivity/Networking/Other
+
+%description sdl
+FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP)
+following the Microsoft Open Specifications. This package provides the
+sdl-based client application.
+
 %package wayland
 Summary:        Remote Desktop Viewer Client
 Group:          Productivity/Networking/Other
@@ -259,6 +272,7 @@ fi
         -DWITH_CLIENT=ON \
         -DWITH_DIRECTFB=OFF \
         -DWITH_FFMPEG=%{?_with_ffmpeg:ON}%{?!_with_ffmpeg:OFF} \
+        -DWITH_DSP_FFMPEG=%{?_with_ffmpeg:ON}%{?!_with_ffmpeg:OFF} \
         -DWITH_GSM=ON \
         -DWITH_GSSAPI=%{?_with_gss:ON}%{?!_with_gss:OFF} \
         -DWITH_GSTREAMER_1_0=ON -DWITH_GSTREAMER_0_10=OFF \
@@ -332,6 +346,9 @@ cd build
 %{_mandir}/man1/x%{name}.1%{?ext_man}
 %{_mandir}/man7/wlog.7%{?ext_man}
 
+%files sdl
+%{_bindir}/sdl-%{name}
+
 %files wayland
 %{_bindir}/wl%{name}
 %{_mandir}/man1/wl%{name}.1%{?ext_man}