Created
April 9, 2020 23:14
-
-
Save tinywrkb/ce3509867e2228addc2edf1d46799498 to your computer and use it in GitHub Desktop.
freerdp-git: follow community/freerdp patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From e9898a611683922d20b2c4fb12730d1a7db1cd23 Mon Sep 17 00:00:00 2001 | |
From: tinywrkb <tinywrkb@gmail.com> | |
Date: Fri, 10 Apr 2020 02:10:45 +0300 | |
Subject: [PATCH] follow community/freerdp | |
--- | |
PKGBUILD | 97 ++++++++++++++++---------- | |
freerdp-2.0.0-manpage_formatting.patch | 12 ++++ | |
2 files changed, 72 insertions(+), 37 deletions(-) | |
create mode 100644 freerdp-2.0.0-manpage_formatting.patch | |
diff --git a/PKGBUILD b/PKGBUILD | |
index 3529df1..61c1d71 100644 | |
--- a/PKGBUILD | |
+++ b/PKGBUILD | |
@@ -1,53 +1,76 @@ | |
# Maintainer: Christian Hesse <mail@eworm.de> | |
# Contributor: Alexey Vasiliev <robbinton@gmail.com> | |
+# | |
+# community/freerdp maintainer: | |
+# Sergej Pupykin <pupykin.s+arch@gmail.com> | |
+# | |
+# community/freerdp contributors: | |
+# David Runge <dvzrv@archlinux.org> | |
+# Stijn Segers <francesco dot borromini at gmail dot com> | |
+_gitname=freerdp | |
pkgname=freerdp-git | |
-pkgdesc='Free RDP client - git checkout' | |
-pkgver=2.0.0.rc4.r1127.g2df3eb045 | |
+pkgver=2.0.0.r0.g5ab2bed87 | |
pkgrel=1 | |
-depends=('openssl' 'libxcursor' 'libcups' 'alsa-lib' 'libxext' 'libxdamage' | |
- 'ffmpeg' 'libxkbfile' 'libxinerama' 'libxv' 'openh264') | |
-makedepends=('git' 'krb5' 'cmake' 'xorgproto') | |
-arch=('i686' 'x86_64') | |
-url="http://www.freerdp.com/" | |
-license=('GPL') | |
-provides=('freerdp') | |
+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' | |
+'libjpeg-turbo' 'libgssglue' 'libx11' 'libxcursor' 'libxext' 'libxdamage' | |
+'libxfixes' 'libxkbcommon' 'libxi' 'libxinerama' 'libxkbfile' 'libxrandr' | |
+'libxrender' 'libxtst' 'mbedtls' 'openssl' 'pam' 'pcsclite' 'wayland') | |
+makedepends=('alsa-lib' 'cmake' 'docbook-xsl' 'ffmpeg' 'krb5' 'libpulse' | |
+'libusb' 'systemd-libs' 'xmlto' 'xorgproto') | |
conflicts=('freerdp') | |
-source=('freerdp::git://github.com/FreeRDP/FreeRDP.git') | |
-sha256sums=('SKIP') | |
+provides=('libfreerdp2.so' 'libfreerdp-client2.so' 'libfreerdp-server2' | |
+'libfreerdp-shadow2.so' 'libfreerdp-shadow-subsystem2.so' 'libwinpr2.so' | |
+'libwinpr-tools2.so' 'libuwac0.so' 'freerdp') | |
+source=("git+https://github.com/${_gitname}/${_gitname}.git" | |
+ "$_gitname-2.0.0-manpage_formatting.patch") | |
+sha512sums=('SKIP' | |
+ 'd960e042d1527b5d5721136b6b20fc36f65beafd010581ea5b908668537fe9fe622de6689a29c0274b0d6f1e513615f0d02e56c1d1d1e613d093e145d39af8d7') | |
pkgver() { | |
- cd freerdp/ | |
+ cd ${_gitname} | |
+ git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' | |
+} | |
- if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then | |
- printf '%s.r%s.g%s' \ | |
- "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG})" \ | |
- "$(git rev-list --count ${GITTAG}..)" \ | |
- "$(git rev-parse --short HEAD)" | |
- else | |
- printf '0.r%s.g%s' \ | |
- "$(git rev-list --count master)" \ | |
- "$(git rev-parse --short HEAD)" | |
- fi | |
+prepare() { | |
+ cd "${_gitname}" | |
+ # fix man page formatting: | |
+ # https://bugs.archlinux.org/task/64814 | |
+ patch -Np1 -i "../${_gitname}-2.0.0-manpage_formatting.patch" | |
} | |
build() { | |
- cd freerdp/ | |
- | |
- cmake \ | |
- -DCMAKE_INSTALL_PREFIX=/usr \ | |
- -DCMAKE_INSTALL_LIBDIR=lib \ | |
- -DWITH_PULSE=ON \ | |
- -DWITH_SERVER=ON \ | |
- -DWITH_OPENH264=ON \ | |
- -DWITH_CUPS=ON \ | |
- . | |
- make | |
+ cd "${_gitname}" | |
+ cmake -DCMAKE_INSTALL_PREFIX=/usr \ | |
+ -DCMAKE_INSTALL_LIBDIR=lib \ | |
+ -DWITH_DSP_FFMPEG=ON \ | |
+ -DWITH_FFMPEG=ON \ | |
+ -DWITH_MBEDTLS=ON \ | |
+ -DWITH_PULSE=ON \ | |
+ -DWITH_CUPS=ON \ | |
+ -DWITH_PCSC=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 \ | |
+ -DPROXY_PLUGINDIR=/usr/lib/freerdp2/server/proxy/plugins \ | |
+ -B build \ | |
+ -S . | |
+ make VERBOSE=1 -C build | |
} | |
package() { | |
- cd freerdp/ | |
- | |
- make DESTDIR="${pkgdir}/" install | |
+ depends+=('libasound.so' 'libavcodec.so' 'libavutil.so' 'libpulse.so' | |
+ 'libswscale.so' 'libswresample.so' 'libsystemd.so' 'libusb-1.0.so') | |
+ cd "${_gitname}" | |
+ make DESTDIR="${pkgdir}" install -C build | |
+ install -vDm 644 {ChangeLog,README.md} \ | |
+ -t "${pkgdir}/usr/share/doc/${pkgname}" | |
} | |
- | |
diff --git a/freerdp-2.0.0-manpage_formatting.patch b/freerdp-2.0.0-manpage_formatting.patch | |
new file mode 100644 | |
index 0000000..ed252a8 | |
--- /dev/null | |
+++ b/freerdp-2.0.0-manpage_formatting.patch | |
@@ -0,0 +1,12 @@ | |
+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}) | |
-- | |
2.26.0 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment