[arch-commits] Commit in freerdp/repos/community-x86_64 (4 files)
David Runge
dvzrv at archlinux.org
Thu Apr 23 15:31:05 UTC 2020
Date: Thursday, April 23, 2020 @ 15:31:04
Author: dvzrv
Revision: 618287
archrelease: copy trunk to community-x86_64
Added:
freerdp/repos/community-x86_64/PKGBUILD
(from rev 618285, freerdp/trunk/PKGBUILD)
freerdp/repos/community-x86_64/freerdp-2.0.0-manpage_formatting.patch
(from rev 618285, freerdp/trunk/freerdp-2.0.0-manpage_formatting.patch)
Deleted:
freerdp/repos/community-x86_64/PKGBUILD
freerdp/repos/community-x86_64/freerdp-2.0.0-manpage_formatting.patch
----------------------------------------+
PKGBUILD | 136 +++++++++++++++----------------
freerdp-2.0.0-manpage_formatting.patch | 24 ++---
2 files changed, 82 insertions(+), 78 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2020-04-23 15:31:02 UTC (rev 618286)
+++ PKGBUILD 2020-04-23 15:31:04 UTC (rev 618287)
@@ -1,66 +0,0 @@
-# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
-# Contributor: David Runge <dvzrv at archlinux.org>
-# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-_name=FreeRDP
-pkgname=freerdp
-epoch=2
-pkgver=2.0.0
-pkgrel=1
-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')
-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"
- "$pkgname-2.0.0-manpage_formatting.patch")
-sha512sums=('efdaa1b018e5166c0f2469663bdd0dc788de0577d0c0cb8b98048a535f8cb07de1078f86aaacc9445d42078d2e02fd7bc7f1ed700ca96032976f6bd84c68ee8f'
- 'd960e042d1527b5d5721136b6b20fc36f65beafd010581ea5b908668537fe9fe622de6689a29c0274b0d6f1e513615f0d02e56c1d1d1e613d093e145d39af8d7')
-
-prepare() {
- mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
- cd "${pkgname}-${pkgver}"
- # fix man page formatting:
- # https://bugs.archlinux.org/task/64814
- patch -Np1 -i "../${pkgname}-2.0.0-manpage_formatting.patch"
-}
-
-build() {
- cd "${pkgname}-${pkgver}"
- 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() {
- depends+=('libasound.so' 'libavcodec.so' 'libavutil.so' 'libpulse.so'
- 'libswscale.so' 'libswresample.so' 'libsystemd.so' 'libusb-1.0.so')
- cd "${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install -C build
- install -vDm 644 {ChangeLog,README.md} \
- -t "${pkgdir}/usr/share/doc/${pkgname}"
-}
Copied: freerdp/repos/community-x86_64/PKGBUILD (from rev 618285, freerdp/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2020-04-23 15:31:04 UTC (rev 618287)
@@ -0,0 +1,70 @@
+# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Contributor: David Runge <dvzrv at archlinux.org>
+# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
+
+_name=FreeRDP
+pkgname=freerdp
+epoch=2
+pkgver=2.0.0
+pkgrel=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'
+'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')
+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"
+ "$pkgname-2.0.0-manpage_formatting.patch"
+ "${pkgname}-2.0.0-usb_redirection_channel.patch::https://github.com/${pkgname}/${pkgname}/commit/0f8437d1d86b2798edd46033974eb9678b6eecf0.patch")
+sha512sums=('efdaa1b018e5166c0f2469663bdd0dc788de0577d0c0cb8b98048a535f8cb07de1078f86aaacc9445d42078d2e02fd7bc7f1ed700ca96032976f6bd84c68ee8f'
+ 'd960e042d1527b5d5721136b6b20fc36f65beafd010581ea5b908668537fe9fe622de6689a29c0274b0d6f1e513615f0d02e56c1d1d1e613d093e145d39af8d7'
+ '6ae7bbdd787e8005c52d1c89348d1e8691d48684863f67005dfbe3b1302eb2f6098008b74147e171dc1e4e6764579609fea9168253282fcef95c1cc4f81b89b9')
+
+prepare() {
+ mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
+ cd "${pkgname}-${pkgver}"
+ # fix man page formatting:
+ # https://bugs.archlinux.org/task/64814
+ patch -Np1 -i "../${pkgname}-2.0.0-manpage_formatting.patch"
+ # fix usb redirection channel: https://bugs.archlinux.org/task/66209
+ patch -Np1 -i "../${pkgname}-2.0.0-usb_redirection_channel.patch"
+}
+
+build() {
+ cd "${pkgname}-${pkgver}"
+ 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() {
+ depends+=('libasound.so' 'libavcodec.so' 'libavutil.so' 'libpulse.so'
+ 'libswscale.so' 'libswresample.so' 'libsystemd.so' 'libusb-1.0.so')
+ cd "${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install -C build
+ install -vDm 644 {ChangeLog,README.md} \
+ -t "${pkgdir}/usr/share/doc/${pkgname}"
+}
Deleted: freerdp-2.0.0-manpage_formatting.patch
===================================================================
--- freerdp-2.0.0-manpage_formatting.patch 2020-04-23 15:31:02 UTC (rev 618286)
+++ freerdp-2.0.0-manpage_formatting.patch 2020-04-23 15:31:04 UTC (rev 618287)
@@ -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})
Copied: freerdp/repos/community-x86_64/freerdp-2.0.0-manpage_formatting.patch (from rev 618285, freerdp/trunk/freerdp-2.0.0-manpage_formatting.patch)
===================================================================
--- freerdp-2.0.0-manpage_formatting.patch (rev 0)
+++ freerdp-2.0.0-manpage_formatting.patch 2020-04-23 15:31:04 UTC (rev 618287)
@@ -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})
More information about the arch-commits
mailing list