git » freerdp.git » commit 594b786

Add changes required for version 3.1.0

author David Runge
2023-12-14 16:19:12 UTC
committer David Runge
2024-01-01 22:07:05 UTC
parent 29b2379986532fc3b727cb568c0ba022e8d591cb

Add changes required for version 3.1.0

Be more specific about which features to require.
Remove patch that is now no longer required.

Signed-off-by: David Runge <dvzrv@archlinux.org>

.SRCINFO +45 -19
PKGBUILD +37 -22
freerdp-2.0.0-manpage_formatting.patch +0 -12

diff --git a/.SRCINFO b/.SRCINFO
index 0e33716..0757514 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = freerdp
 	pkgdesc = Free implementation of the Remote Desktop Protocol (RDP)
-	pkgver = 2.11.4
+	pkgver = 3.1.0
 	pkgrel = 1
 	epoch = 2
 	url = https://www.freerdp.com/
@@ -9,17 +9,26 @@ pkgbase = freerdp
 	makedepends = alsa-lib
 	makedepends = cmake
 	makedepends = docbook-xsl
+	makedepends = e2fsprogs
 	makedepends = ffmpeg
+	makedepends = glib2
+	makedepends = gtk3
 	makedepends = icu
 	makedepends = krb5
 	makedepends = libjpeg-turbo
+	makedepends = libp11
 	makedepends = libpulse
 	makedepends = libusb
 	makedepends = openssl
 	makedepends = pam
-	makedepends = systemd
+	makedepends = pkcs11-helper
+	makedepends = webkit2gtk
 	makedepends = xmlto
 	makedepends = xorgproto
+	makedepends = zlib
+	depends = cjson
+	depends = fuse3
+	depends = gcc-libs
 	depends = glibc
 	depends = libcups
 	depends = libx11
@@ -34,24 +43,27 @@ pkgbase = freerdp
 	depends = libxrandr
 	depends = libxrender
 	depends = libxtst
-	depends = pcsclite
+	depends = sdl2
+	depends = sdl2_ttf
 	depends = wayland
-	provides = libfreerdp2.so
-	provides = libfreerdp-client2.so
-	provides = libfreerdp-server2
-	provides = libfreerdp-shadow2.so
-	provides = libfreerdp-shadow-subsystem2.so
-	provides = libwinpr2.so
-	provides = libwinpr-tools2.so
+	provides = libfreerdp-client3.so
+	provides = libfreerdp-server-proxy3.so
+	provides = libfreerdp-server3
+	provides = libfreerdp-shadow-subsystem3.so
+	provides = libfreerdp-shadow3.so
+	provides = libfreerdp3.so
 	provides = libuwac0.so
-	source = https://github.com/freerdp/freerdp/archive/2.11.4/freerdp-2.11.4.tar.gz
-	source = freerdp-2.0.0-manpage_formatting.patch
-	sha512sums = 8bdc3958bef8a17bc8bdb1d3376e38bd7f77eff788a873da5c26e34c9a9aecd7a0e33429c9011322f8cb7d3c715fde2141c619c45a9f8f4c69da770f1945dddb
-	sha512sums = d960e042d1527b5d5721136b6b20fc36f65beafd010581ea5b908668537fe9fe622de6689a29c0274b0d6f1e513615f0d02e56c1d1d1e613d093e145d39af8d7
-	b2sums = af52e1860ceb70672e328e8e4d5cd831cc5384a52fb8116c019986456369c39b770788a56f70d3570248765e803d1fc632566d7d8865595e08f1f5c28fbab7a4
-	b2sums = 8242fe56ba9cf5352d836f656645a46142c1aecea3e8200203117a0cccc226135591c16fa0a24cfa196ade7b703832ff6871a948fd3bbbcc1d9c6df9885dc360
+	provides = librdtk0.so
+	provides = libwinpr-tools3.so
+	provides = libwinpr3.so
+	source = https://github.com/freerdp/freerdp/archive/3.1.0/freerdp-3.1.0.tar.gz
+	sha512sums = 0a463c241d09ea354fdd943c010a2ecca1ad20f6ba5ea037422884f3b668ac6c4c30f73d12077368cd54f74418ef65b267628934a050fcbb3ff1e96d84ae954e
+	b2sums = 39031026b2ff878b0e4a86907985704d0d64058bf9a2de6f3b8c4617cac3b8a5ee0d34d4e6e962e0e4388996c39d16b96a245525a51c33a533dad38e6b865a53
 
 pkgname = freerdp
+	depends = cjson
+	depends = fuse3
+	depends = gcc-libs
 	depends = glibc
 	depends = libcups
 	depends = libx11
@@ -66,17 +78,28 @@ pkgname = freerdp
 	depends = libxrandr
 	depends = libxrender
 	depends = libxtst
-	depends = pcsclite
+	depends = sdl2
+	depends = sdl2_ttf
 	depends = wayland
 	depends = alsa-lib
 	depends = libasound.so
+	depends = e2fsprogs
+	depends = libcom_err.so
 	depends = ffmpeg
 	depends = libavcodec.so
 	depends = libavutil.so
 	depends = libswresample.so
 	depends = libswscale.so
+	depends = glib2
+	depends = libglib-2.0.so
+	depends = libgobject-2.0.so
+	depends = gtk3
+	depends = libgtk-3.so
 	depends = icu
 	depends = libicuuc.so
+	depends = krb5
+	depends = libk5crypto.so
+	depends = libkrb5.so
 	depends = libjpeg-turbo
 	depends = libjpeg.so
 	depends = libpulse
@@ -88,5 +111,8 @@ pkgname = freerdp
 	depends = libssl.so
 	depends = pam
 	depends = libpam.so
-	depends = systemd-libs
-	depends = libsystemd.so
+	depends = webkit2gtk
+	depends = libjavascriptcoregtk-4.0.so
+	depends = libwebkit2gtk-4.0.so
+	depends = zlib
+	depends = libz.so
diff --git a/PKGBUILD b/PKGBUILD
index 4364a79..51f0c2e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,8 @@
 
 _name=FreeRDP
 pkgname=freerdp
-pkgver=2.11.4
+pkgver=3.1.0
+_libver=${pkgver/.*/}
 pkgrel=1
 epoch=2
 pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
@@ -12,6 +13,9 @@ arch=(x86_64)
 url="https://www.freerdp.com/"
 license=(Apache-2.0)
 depends=(
+  cjson
+  fuse3
+  gcc-libs
   glibc
   libcups
   libx11
@@ -26,49 +30,49 @@ depends=(
   libxrandr
   libxrender
   libxtst
-  pcsclite
+  sdl2
+  sdl2_ttf
   wayland
 )
 makedepends=(
   alsa-lib
   cmake
   docbook-xsl
+  e2fsprogs
   ffmpeg
+  glib2
+  gtk3
   icu
   krb5
   libjpeg-turbo
+  libp11
   libpulse
   libusb
   openssl
   pam
-  systemd
+  pkcs11-helper
+  webkit2gtk
   xmlto
   xorgproto
+  zlib
 )
 provides=(
-  libfreerdp2.so
-  libfreerdp-client2.so
-  libfreerdp-server2
-  libfreerdp-shadow2.so
-  libfreerdp-shadow-subsystem2.so
-  libwinpr2.so
-  libwinpr-tools2.so
+  libfreerdp-client$_libver.so
+  libfreerdp-server-proxy$_libver.so
+  libfreerdp-server$_libver
+  libfreerdp-shadow-subsystem$_libver.so
+  libfreerdp-shadow$_libver.so
+  libfreerdp$_libver.so
   libuwac0.so
+  librdtk0.so
+  libwinpr-tools$_libver.so
+  libwinpr$_libver.so
 )
 source=(
   https://github.com/$pkgname/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz
-  $pkgname-2.0.0-manpage_formatting.patch
 )
-sha512sums=('8bdc3958bef8a17bc8bdb1d3376e38bd7f77eff788a873da5c26e34c9a9aecd7a0e33429c9011322f8cb7d3c715fde2141c619c45a9f8f4c69da770f1945dddb'
-            'd960e042d1527b5d5721136b6b20fc36f65beafd010581ea5b908668537fe9fe622de6689a29c0274b0d6f1e513615f0d02e56c1d1d1e613d093e145d39af8d7')
-b2sums=('af52e1860ceb70672e328e8e4d5cd831cc5384a52fb8116c019986456369c39b770788a56f70d3570248765e803d1fc632566d7d8865595e08f1f5c28fbab7a4'
-        '8242fe56ba9cf5352d836f656645a46142c1aecea3e8200203117a0cccc226135591c16fa0a24cfa196ade7b703832ff6871a948fd3bbbcc1d9c6df9885dc360')
-
-prepare() {
-  # fix man page formatting:
-  # https://bugs.archlinux.org/task/64814
-  patch -d $_name-$pkgver -p1 -i ../$pkgname-2.0.0-manpage_formatting.patch
-}
+sha512sums=('0a463c241d09ea354fdd943c010a2ecca1ad20f6ba5ea037422884f3b668ac6c4c30f73d12077368cd54f74418ef65b267628934a050fcbb3ff1e96d84ae954e')
+b2sums=('39031026b2ff878b0e4a86907985704d0d64058bf9a2de6f3b8c4617cac3b8a5ee0d34d4e6e962e0e4388996c39d16b96a245525a51c33a533dad38e6b865a53')
 
 build() {
   local cmake_options=(
@@ -79,18 +83,24 @@ build() {
     -D CMAKE_BUILD_TYPE=None
     -D CMAKE_SKIP_INSTALL_RPATH=ON
     -D PROXY_PLUGINDIR=/usr/lib/freerdp2/server/proxy/plugins
+    -D WITH_ALSA=ON
     -D WITH_CHANNELS=ON
     -D WITH_CLIENT_CHANNELS=ON
     -D WITH_CUPS=ON
     -D WITH_DSP_FFMPEG=ON
     -D WITH_FFMPEG=ON
+    -D WITH_FUSE=ON
     -D WITH_ICU=ON
     -D WITH_JPEG=ON
     -D WITH_PCSC=ON
     -D WITH_PULSE=ON
     -D WITH_SERVER=ON
     -D WITH_SERVER_CHANNELS=ON
+    -D WITH_SYSTEMD=ON
     -D WITH_SWSCALE=ON
+    -D WITH_WAYLAND=ON
+    -D WITH_WINPR_TOOLS=ON
+    -D WITH_X11=ON
     -S $_name-$pkgver
     -W no-dev
   )
@@ -106,14 +116,19 @@ check() {
 package() {
   depends+=(
     alsa-lib libasound.so
+    e2fsprogs libcom_err.so
     ffmpeg libavcodec.so libavutil.so libswresample.so libswscale.so
+    glib2 libglib-2.0.so libgobject-2.0.so
+    gtk3 libgtk-3.so
     icu libicuuc.so
+    krb5 libk5crypto.so libkrb5.so
     libjpeg-turbo libjpeg.so
     libpulse libpulse.so
     libusb libusb-1.0.so
     openssl libcrypto.so libssl.so
     pam libpam.so
-    systemd-libs libsystemd.so
+    webkit2gtk libjavascriptcoregtk-4.0.so libwebkit2gtk-4.0.so
+    zlib libz.so
   )
 
   DESTDIR="$pkgdir" cmake --install build
diff --git a/freerdp-2.0.0-manpage_formatting.patch b/freerdp-2.0.0-manpage_formatting.patch
deleted file mode 100644
index ed252a8..0000000
--- a/freerdp-2.0.0-manpage_formatting.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN a/cmake/FindDocBookXSL.cmake b/cmake/FindDocBookXSL.cmake
---- a/cmake/FindDocBookXSL.cmake	2018-11-20 11:43:51.000000000 +0100
-+++ b/cmake/FindDocBookXSL.cmake	2020-01-30 10:37:44.827482448 +0100
-@@ -30,7 +30,7 @@
-    set (STYLESHEET_PATH_LIST)
-    foreach (STYLESHEET_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH})
-       file(GLOB STYLESHEET_SUFFIX_ITER RELATIVE ${STYLESHEET_PREFIX_ITER}
--           ${STYLESHEET_PREFIX_ITER}/share/xml/docbook/xsl-stylesheets-*
-+           ${STYLESHEET_PREFIX_ITER}/share/xml/docbook/xsl-stylesheets-*-nons
-       )
-       if (STYLESHEET_SUFFIX_ITER)
-          list (APPEND STYLESHEET_PATH_LIST ${STYLESHEET_SUFFIX_ITER})