git » freerdp.git » commit befa172

Upgrade to 2.10.0.

author David Runge
2023-02-16 14:42:28 UTC
committer David Runge
2023-02-16 14:42:28 UTC
parent 2b14a10921110cdde75b8f6f7b579b3a2739612f

Upgrade to 2.10.0.

Simplify calls to cmake to adhere to packaging guidelines.
Rewrite arrays to use one entry per line for better readability.
Add CMAKE_SKIP_INSTALL_RPATH=ON, as the libs and executable otherwise have unsafe rpath.

PKGBUILD +84 -35

diff --git a/PKGBUILD b/PKGBUILD
index 57782f5..f3c590e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,28 +4,68 @@
 
 _name=FreeRDP
 pkgname=freerdp
-pkgver=2.9.0
+pkgver=2.10.0
 pkgrel=1
 epoch=2
 pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
 arch=(x86_64)
 url="https://www.freerdp.com/"
 license=(Apache)
-depends=(dbus-glib glibc gstreamer gst-plugins-base-libs libcups libgssglue
-libx11 libxcursor libxext libxdamage libxfixes libxkbcommon libxi libxinerama
-libxkbfile libxrandr libxrender libxtst pcsclite wayland)
-makedepends=(alsa-lib cmake docbook-xsl ffmpeg icu krb5 libjpeg-turbo libpulse
-libusb openssl pam systemd-libs xmlto xorgproto)
-provides=(libfreerdp2.so libfreerdp-client2.so libfreerdp-server2
-libfreerdp-shadow2.so libfreerdp-shadow-subsystem2.so libwinpr2.so
-libwinpr-tools2.so libuwac0.so)
+depends=(
+  dbus-glib
+  glibc
+  gstreamer
+  gst-plugins-base-libs
+  libcups
+  libgssglue
+  libx11
+  libxcursor
+  libxext
+  libxdamage
+  libxfixes
+  libxkbcommon
+  libxi
+  libxinerama
+  libxkbfile
+  libxrandr
+  libxrender
+  libxtst
+  pcsclite
+  wayland
+)
+makedepends=(
+  alsa-lib
+  cmake
+  docbook-xsl
+  ffmpeg
+  icu
+  krb5
+  libjpeg-turbo
+  libpulse
+  libusb
+  openssl
+  pam
+  systemd
+  xmlto
+  xorgproto
+)
+provides=(
+  libfreerdp2.so
+  libfreerdp-client2.so
+  libfreerdp-server2
+  libfreerdp-shadow2.so
+  libfreerdp-shadow-subsystem2.so
+  libwinpr2.so
+  libwinpr-tools2.so
+  libuwac0.so
+)
 source=(
-  $pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/$pkgver.tar.gz
+  https://github.com/$pkgname/$pkgname/archive/$pkgver/$pkgname-$pkgver.tar.gz
   $pkgname-2.0.0-manpage_formatting.patch
 )
-sha512sums=('8b43ff28c5afaf6dc12f73fe9cab3969049f40725dedc873af5af1caabefec4bdd1bedad7df121c1440493e5441296db076ba7726242bfb32f76dad0b21564ed'
+sha512sums=('388c00d2f883b41d4ec127bcb871607429c136bfb99daf87f491e9f1e7d456e1fac403db9f9dec7611e729dfd2f913fa414ed3d0020d92c284c8f3ba1eeb80cb'
             'd960e042d1527b5d5721136b6b20fc36f65beafd010581ea5b908668537fe9fe622de6689a29c0274b0d6f1e513615f0d02e56c1d1d1e613d093e145d39af8d7')
-b2sums=('a03e7963505248779ce5e6550057bead16afaf9f6535df22edcb04fc22cddc55280adb5d5d1c99c29c0d62421cb891ed0677a4600f3da30a3e5f0185f6a3162b'
+b2sums=('1ca36b227fc9f04371587a8db5a85fb3af0453a6b0c51d981c8e41ecfd9994b3ce48f8c94b0c5c61223ed1a061f3ba800117ed01d5d49b4c2e7a9b5598888d1e'
         '8242fe56ba9cf5352d836f656645a46142c1aecea3e8200203117a0cccc226135591c16fa0a24cfa196ade7b703832ff6871a948fd3bbbcc1d9c6df9885dc360')
 
 prepare() {
@@ -35,27 +75,36 @@ prepare() {
 }
 
 build() {
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_INSTALL_LIBDIR=lib \
-        -DCMAKE_BUILD_TYPE=None \
-        -DPROXY_PLUGINDIR=/usr/lib/freerdp2/server/proxy/plugins \
-        -DWITH_DSP_FFMPEG=ON \
-        -DWITH_FFMPEG=ON \
-        -DWITH_PULSE=ON \
-        -DWITH_CUPS=ON \
-        -DWITH_PCSC=ON \
-        -DWITH_ICU=ON \
-        -DWITH_JPEG=ON \
-        -DWITH_SERVER=ON \
-        -DWITH_SWSCALE=ON \
-        -DWITH_CHANNELS=ON \
-        -DWITH_CLIENT_CHANNELS=ON \
-        -DWITH_SERVER_CHANNELS=ON \
-        -DCHANNEL_URBDRC_CLIENT=ON \
-        -Wno-dev \
-        -B build \
-        -S $_name-$pkgver
-  make VERBOSE=1 -C build
+  local cmake_options=(
+    -DCMAKE_INSTALL_PREFIX=/usr
+    -DCMAKE_INSTALL_LIBDIR=lib
+    -DCMAKE_BUILD_TYPE=None
+    -DCMAKE_SKIP_INSTALL_RPATH=ON
+    -DPROXY_PLUGINDIR=/usr/lib/freerdp2/server/proxy/plugins
+    -DWITH_DSP_FFMPEG=ON
+    -DWITH_FFMPEG=ON
+    -DWITH_PULSE=ON
+    -DWITH_CUPS=ON
+    -DWITH_PCSC=ON
+    -DWITH_ICU=ON
+    -DWITH_JPEG=ON
+    -DWITH_SERVER=ON
+    -DWITH_SWSCALE=ON
+    -DWITH_CHANNELS=ON
+    -DWITH_CLIENT_CHANNELS=ON
+    -DWITH_SERVER_CHANNELS=ON
+    -DCHANNEL_URBDRC_CLIENT=ON
+    -Wno-dev
+    -B build
+    -S $_name-$pkgver
+  )
+
+  cmake "${cmake_options[@]}"
+  cmake --build build --verbose
+}
+
+check() {
+  ctest --test-dir build --output-on-failure
 }
 
 package() {
@@ -71,6 +120,6 @@ package() {
     systemd-libs libsystemd.so
   )
 
-  make DESTDIR="$pkgdir" install -C build
-  install -vDm 644 $_name-$pkgver/{ChangeLog,README.md} -t "$pkgdir/usr/share/doc/$pkgname"
+  DESTDIR="$pkgdir" cmake --install build
+  install -vDm 644 $_name-$pkgver/{ChangeLog,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
 }