3.0.0.beta2.r8

3 files changed, 166 insertions, 90 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 014c14738ea5..bc25e9a38c98 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = freerdp-git
-	pkgdesc = Free implementation of the Remote Desktop Protocol (RDP) - git checkout
-	pkgver = 2.0.0.r1158.gf57449749
+	pkgdesc = Free implementation of the Remote Desktop Protocol (RDP)
+	pkgver = 3.0.0.beta2.r8.g2252d5300
 	pkgrel = 1
-	url = https://www.freerdp.com/
+	url = https://github.com/FreeRDP/FreeRDP
 	arch = i686
 	arch = x86_64
 	license = Apache
@@ -10,21 +10,19 @@ pkgbase = freerdp-git
 	makedepends = cmake
 	makedepends = docbook-xsl
 	makedepends = ffmpeg
+	makedepends = icu
 	makedepends = krb5
 	makedepends = libjpeg-turbo
 	makedepends = libpulse
 	makedepends = libusb
+	makedepends = openssl
 	makedepends = pam
-	makedepends = systemd-libs
+	makedepends = systemd
 	makedepends = xmlto
 	makedepends = xorgproto
-	depends = dbus-glib
-	depends = fuse
+	makedepends = git
 	depends = glibc
-	depends = gstreamer
-	depends = gst-plugins-base-libs
 	depends = libcups
-	depends = libgssglue
 	depends = libx11
 	depends = libxcursor
 	depends = libxext
@@ -37,32 +35,29 @@ pkgbase = freerdp-git
 	depends = libxrandr
 	depends = libxrender
 	depends = libxtst
-	depends = openssl
 	depends = pcsclite
 	depends = wayland
-	depends = icu
-	optdepends = libva
-	provides = freerdp
-	provides = libfreerdp3.so
-	provides = libfreerdp-client3.so
-	provides = libfreerdp-server3.so
-	provides = libfreerdp-shadow3.so
-	provides = libfreerdp-shadow-subsystem3.so
-	provides = libwinpr3.so
-	provides = libwinpr-tools3.so
+	depends = cjson
+	depends = fuse3
+	depends = pkcs11-helper
+	depends = sdl2_ttf
+	depends = webkit2gtk
+	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 = libuwac0.so
+	provides = freerdp
 	conflicts = freerdp
 	source = freerdp::git+https://github.com/FreeRDP/FreeRDP.git
 	sha256sums = SKIP
 
 pkgname = freerdp-git
-	depends = dbus-glib
-	depends = fuse
 	depends = glibc
-	depends = gstreamer
-	depends = gst-plugins-base-libs
 	depends = libcups
-	depends = libgssglue
 	depends = libx11
 	depends = libxcursor
 	depends = libxext
@@ -75,17 +70,32 @@ pkgname = freerdp-git
 	depends = libxrandr
 	depends = libxrender
 	depends = libxtst
-	depends = openssl
 	depends = pcsclite
 	depends = wayland
-	depends = icu
+	depends = cjson
+	depends = fuse3
+	depends = pkcs11-helper
+	depends = sdl2_ttf
+	depends = webkit2gtk
+	depends = alsa-lib
 	depends = libasound.so
+	depends = ffmpeg
 	depends = libavcodec.so
 	depends = libavutil.so
+	depends = libswresample.so
+	depends = libswscale.so
+	depends = icu
+	depends = libicuuc.so
+	depends = libjpeg-turbo
 	depends = libjpeg.so
-	depends = libpam.so
+	depends = libpulse
 	depends = libpulse.so
-	depends = libswscale.so
-	depends = libswresample.so
-	depends = libsystemd.so
+	depends = libusb
 	depends = libusb-1.0.so
+	depends = openssl
+	depends = libcrypto.so
+	depends = libssl.so
+	depends = pam
+	depends = libpam.so
+	depends = systemd-libs
+	depends = libsystemd.so
diff --git a/.gitignore b/.gitignore
index 31d27563afeb..018a3de08144 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 *
-!.gitignore
 !PKGBUILD
-!.SRCINFO
\ No newline at end of file
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index b32eb894034a..8a195de2cd6f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,71 +1,137 @@
-# Maintainer: Nathan Loewen <loewen.nathan@gmail.com>
+# Maintainer:
+# Contributor: Nathan Loewen <loewen.nathan@gmail.com>
 # Contributor: Christian Hesse <mail@eworm.de>
 # Contributor: Alexey Vasiliev <robbinton@gmail.com>
 
-# community/freerdp maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# community/freerdp contributor: David Runge <dvzrv@archlinux.org>
-# community/freerdp contributor: Stijn Segers <francesco dot borromini at gmail dot com>
-
-pkgname=freerdp-git
-pkgver=2.0.0.r1158.gf57449749
+_pkgname="freerdp"
+pkgname="$_pkgname-git"
+pkgver=3.0.0.beta2.r8.g2252d5300
 pkgrel=1
-pkgdesc="Free implementation of the Remote Desktop Protocol (RDP) - git checkout"
+pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
 arch=('i686' 'x86_64')
 url="https://www.freerdp.com/"
 license=('Apache')
-depends=('dbus-glib' 'fuse' 'glibc' 'gstreamer' 'gst-plugins-base-libs' 'libcups'
-'libgssglue' 'libx11' 'libxcursor' 'libxext' 'libxdamage' 'libxfixes'
-'libxkbcommon' 'libxi' 'libxinerama' 'libxkbfile' 'libxrandr' 'libxrender'
-'libxtst' 'openssl' 'pcsclite' 'wayland' 'icu')
-optdepends=('libva')
-makedepends=('alsa-lib' 'cmake' 'docbook-xsl' 'ffmpeg' 'krb5' 'libjpeg-turbo'
-'libpulse' 'libusb' 'pam' 'systemd-libs' 'xmlto' 'xorgproto')
-provides=('freerdp' 'libfreerdp3.so' 'libfreerdp-client3.so' 'libfreerdp-server3.so'
-'libfreerdp-shadow3.so' 'libfreerdp-shadow-subsystem3.so' 'libwinpr3.so'
-'libwinpr-tools3.so' 'libuwac0.so')
-conflicts=('freerdp')
-source=('freerdp::git+https://github.com/FreeRDP/FreeRDP.git')
-sha256sums=('SKIP')
 
-pkgver() {
-  cd freerdp/
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
+depends=(
+  # extra/freerdp
+  glibc
+  libcups
+  libx11
+  libxcursor
+  libxext
+  libxdamage
+  libxfixes
+  libxkbcommon
+  libxi
+  libxinerama
+  libxkbfile
+  libxrandr
+  libxrender
+  libxtst
+  pcsclite
+  wayland
+)
+makedepends=(
+  # extra/freerdp
+  alsa-lib
+  cmake
+  docbook-xsl
+  ffmpeg
+  icu
+  krb5
+  libjpeg-turbo
+  libpulse
+  libusb
+  openssl
+  pam
+  systemd
+  xmlto
+  xorgproto
+)
+provides=(
+  # extra/freerdp
+  libfreerdp2.so
+  libfreerdp-client2.so
+  libfreerdp-server2
+  libfreerdp-shadow2.so
+  libfreerdp-shadow-subsystem2.so
+  libwinpr2.so
+  libwinpr-tools2.so
+  libuwac0.so
+)
+
+if [ x"$_pkgname" != x"$pkgname" ] ; then
+  # git package
+  depends+=(
+    'cjson'
+    'fuse3'
+    'pkcs11-helper'
+    'sdl2_ttf'
+    'webkit2gtk'
+  )
+  makedepends+=('git')
+  provides+=("$_pkgname")
+  conflicts+=("$_pkgname")
+
+  url="https://github.com/FreeRDP/FreeRDP"
+
+  source=("$_pkgname"::"git+https://github.com/FreeRDP/FreeRDP.git")
+  sha256sums=('SKIP')
+
+  _pkgsrc="$_pkgname"
+
+  pkgver() {
+    cd "$srcdir/$_pkgsrc"
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  }
+fi
 
 build() {
-  cd freerdp/
-  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_JPEG=ON \
-        -DWITH_SERVER=ON \
-        -DWITH_SWSCALE=ON \
-        -DWITH_CHANNELS=ON \
-        -DWITH_CLIENT_CHANNELS=ON \
-        -DWITH_SERVER_CHANNELS=ON \
-        -DCHANNEL_URBDRC_CLIENT=ON \
-        -DWITH_VAAPI=ON \
-        -DWITH_FUSE=ON \
-        -DWITH_ICU=ON \
-        -Wno-dev \
-        -B build \
-        -S .
-  make -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 "$_pkgsrc"
+  )
+
+  cmake "${cmake_options[@]}"
+  cmake --build build --verbose
 }
 
-package() {
-  depends+=('libasound.so' 'libavcodec.so' 'libavutil.so' 'libjpeg.so' 'libpam.so'
-  'libpulse.so' 'libswscale.so' 'libswresample.so' 'libsystemd.so'
-  'libusb-1.0.so')
-  cd freerdp/
-  make DESTDIR="${pkgdir}" install -C build
-  install -vDm 644 {ChangeLog,README.md} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
+check() {
+  ctest --test-dir build --output-on-failure || true
 }
 
+package() {
+  depends+=(
+    alsa-lib libasound.so
+    ffmpeg libavcodec.so libavutil.so libswresample.so libswscale.so
+    icu libicuuc.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
+  )
+
+  DESTDIR="$pkgdir" cmake --install build
+  install -vDm0644 "$_pkgsrc"/{ChangeLog,README.md} -t "$pkgdir/usr/share/doc/$pkgname/"
+}