Hello community, here is the log from the commit of package freerdp for openSUSE:Factory checked in at 2020-04-22 20:42:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freerdp (Old) and /work/SRC/openSUSE:Factory/.freerdp.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "freerdp" Wed Apr 22 20:42:26 2020 rev:40 rq:794909 version:2.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/freerdp/freerdp.changes 2020-04-15 19:53:57.329584398 +0200 +++ /work/SRC/openSUSE:Factory/.freerdp.new.2738/freerdp.changes 2020-04-22 20:42:29.722159211 +0200 @@ -1,0 +2,14 @@ +Fri Apr 17 12:51:02 UTC 2020 - Johannes Weberhofer <[email protected]> + +- Updated and reviewed make command and added fix-freerdp-2.0.0-usbdk-build.patch + to fix boo#1169679 and make USB working again +- Fixed build for SLE_12 +- Cleaned up spec file + +------------------------------------------------------------------- +Fri Apr 17 09:37:36 UTC 2020 - Martin Liška <[email protected]> + +- Add fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch in order + to fix boo#1169748. + +------------------------------------------------------------------- New: ---- fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch fix-freerdp-2.0.0-usbdk-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freerdp.spec ++++++ --- /var/tmp/diff_new_pack.5hkVFX/_old 2020-04-22 20:42:30.706161137 +0200 +++ /var/tmp/diff_new_pack.5hkVFX/_new 2020-04-22 20:42:30.710161145 +0200 @@ -18,10 +18,7 @@ # X264 and OPENH264 are disabled because openSUSE does not provide the codecs # enable -DWITH_GSSAPI=ON again after #gh/FreeRDP/FreeRDP/4348 has been fixed -# -#global _with_ffmpeg 1 -#global _with_x264 1 -#global _with_openh264 1 +#global _with_gss 1 # %define major_version 2 %define uwac_version 0 @@ -37,6 +34,10 @@ Group: Productivity/Networking/Other URL: https://www.freerdp.com/ Source0: https://github.com/FreeRDP/FreeRDP/archive/%{version}.tar.gz#/FreeRDP-%{version}.tar.gz +# PATCH-FIX-UPSTREAM fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch boo#1169748 +Patch0: fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch +# PATCH-FIX-UPSTREAM fix-freerdp-2.0.0-usbdk-build.patch boo#1169679 +Patch1: fix-freerdp-2.0.0-usbdk-build.patch BuildRequires: chrpath BuildRequires: cmake >= 2.8 BuildRequires: cups-devel @@ -75,6 +76,9 @@ BuildRequires: pkgconfig(xtst) BuildRequires: pkgconfig(xv) Requires: lib%{name}%{major_version} = %{version}-%{release} +%if 0%{?sle_version} >= 150000 +BuildRequires: pkgconfig(libavcodec) +%endif %description FreeRDP is a client-side implementation of the Remote Desktop Protocol (RDP) @@ -171,6 +175,7 @@ %prep %setup -q -n FreeRDP-%{version} +%autopatch -p1 %build if [ -z "$SOURCE_DATE_EPOCH" ]; then @@ -181,47 +186,23 @@ %cmake \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_INSTALL_LIBDIR=%{_lib} \ -DCMAKE_SKIP_RPATH=ON \ - -DWITH_ALSA=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DWITH_SERVER=ON \ -DWITH_PCSC=ON \ -DWITH_CAIRO=ON \ -DWITH_CUPS=ON \ - -DWITH_PULSE=ON \ -%ifarch %{ix86} x86_64 - -DWITH_SSE2=ON \ -%endif + -DWITH_JPEG=ON \ -DWITH_X264=OFF \ -DWITH_OPENH264=OFF \ - -DWITH_CLIENT=ON \ - -DWITH_SERVER=ON \ - -DCHANNEL_GEOMETRY=ON \ - -DWITH_CHANNELS=ON \ - -DWITH_DIRECTFB=OFF \ - -DWITH_FFMPEG=%{?_with_ffmpeg:ON}%{?!_with_ffmpeg:OFF} \ -DWITH_GSM=ON \ -DWITH_GSSAPI=%{?_with_gss:ON}%{?!_with_gss:OFF} \ - -DWITH_GSTREAMER_0_10=OFF \ - -DWITH_GSTREAMER_1_0=ON \ - -DWITH_ICU=ON \ - -DWITH_IPP=OFF \ - -DWITH_JPEG=ON \ - -DWITH_KRB5=ON \ - -DWITH_LIBRARY_VERSIONING=ON \ - -DWITH_OPENH264=%{?_with_openh264:ON}%{?!_with_openh264:OFF} \ - -DWITH_OPENSSL=ON \ - -DWITH_X11=ON \ - -DWITH_X264=%{?_with_x264:ON}%{?!_with_x264:OFF} \ - -DWITH_XCURSOR=ON \ - -DWITH_XEXT=ON \ - -DWITH_XKBFILE=ON \ - -DWITH_XI=ON \ - -DWITH_XINERAMA=ON \ - -DWITH_XRENDER=ON \ - -DWITH_XV=ON \ - -DWITH_ZLIB=ON + -DWITH_CHANNELS=ON \ + -DBUILTIN_CHANNELS=ON \ + -DCHANNEL_URBDRC=ON \ + -DCHANNEL_URBDRC_CLIENT=ON -%make_build +make %{?_smp_mflags} %install cd build ++++++ fix-URBDRC_DEVICE_ADD_FLAG-definitions.patch ++++++ >From aa39e08c29a43c2353b9f158edb0b113c7e0751f Mon Sep 17 00:00:00 2001 From: akallabeth <[email protected]> Date: Fri, 10 Apr 2020 14:16:19 +0200 Subject: [PATCH] Fixed URBDRC DEVICE_ADD_FLAG definitions --- channels/urbdrc/client/urbdrc_main.h | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/channels/urbdrc/client/urbdrc_main.h b/channels/urbdrc/client/urbdrc_main.h index 5ec839983b..749aaf8727 100644 --- a/channels/urbdrc/client/urbdrc_main.h +++ b/channels/urbdrc/client/urbdrc_main.h @@ -222,14 +222,12 @@ struct _IUDEVMAN UINT32 status; }; -enum -{ - DEVICE_ADD_FLAG_BUS, - DEVICE_ADD_FLAG_DEV, - DEVICE_ADD_FLAG_VENDOR, - DEVICE_ADD_FLAG_PRODUCT, - DEVICE_ADD_FLAG_REGISTER -} device_add_flag_t; +#define DEVICE_ADD_FLAG_BUS 0x01 +#define DEVICE_ADD_FLAG_DEV 0x02 +#define DEVICE_ADD_FLAG_VENDOR 0x04 +#define DEVICE_ADD_FLAG_PRODUCT 0x08 +#define DEVICE_ADD_FLAG_REGISTER 0x10 + #define DEVICE_ADD_FLAG_ALL \ (DEVICE_ADD_FLAG_BUS | DEVICE_ADD_FLAG_DEV | DEVICE_ADD_FLAG_VENDOR | \ DEVICE_ADD_FLAG_PRODUCT | DEVICE_ADD_FLAG_REGISTER) ++++++ fix-freerdp-2.0.0-usbdk-build.patch ++++++ >From 0f8437d1d86b2798edd46033974eb9678b6eecf0 Mon Sep 17 00:00:00 2001 From: jacobopantoja <[email protected]> Date: Sat, 11 Apr 2020 00:11:23 +0200 Subject: [PATCH] Restrict USBDK to Windows builds This commit restricts ebdaea6f3b5e410b9a3380368d6023c52bed67cc to just Win32 builds --- channels/urbdrc/client/libusb/libusb_udevman.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/channels/urbdrc/client/libusb/libusb_udevman.c b/channels/urbdrc/client/libusb/libusb_udevman.c index 7509326c22..f372e9577a 100644 --- a/channels/urbdrc/client/libusb/libusb_udevman.c +++ b/channels/urbdrc/client/libusb/libusb_udevman.c @@ -879,6 +879,7 @@ UINT freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS if (rc != LIBUSB_SUCCESS) goto fail; +#ifdef _WIN32 #if LIBUSB_API_VERSION >= 0x01000106 /* Prefer usbDK backend on windows. Not uspported on other platforms. */ rc = libusb_set_option(udevman->context, LIBUSB_OPTION_USE_USBDK); @@ -894,6 +895,7 @@ UINT freerdp_urbdrc_client_subsystem_entry(PFREERDP_URBDRC_SERVICE_ENTRY_POINTS WLog_ERR(TAG, "LIBUSB_OPTION_USE_USBDK %s [%d]", libusb_strerror(rc), rc); goto fail; } +#endif #endif udevman->flags = UDEVMAN_FLAG_ADD_BY_VID_PID;
