bump to 2.5.0-2: ffmpeg 5 rebuild, improve packaging

1 files changed, 52 insertions, 56 deletions

diff --git a/PKGBUILD b/PKGBUILD
index acf4982f2971..21a1237a6949 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,73 +1,69 @@
 # Maintainer: tinywrkb <tinywrkb@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>
+# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: David Runge <dvzrv@archlinux.org>
+# Contributor: Stijn Segers <francesco dot borromini at gmail dot com>
 
-_name=FreeRDP
-_pkgname=freerdp
 pkgname=freerdp-gstfree
 pkgver=2.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Free implementation of the Remote Desktop Protocol (RDP)"
-arch=('x86_64')
+arch=(x86_64)
 url="https://www.freerdp.com/"
-license=('Apache')
-depends=('dbus-glib' 'glibc' 'libcups' 'libgssglue' 'libx11' 'libxcursor' 'libxext'
-         'libxdamage' 'libxfixes' 'libxkbcommon' 'libxi' 'libxinerama' 'libxkbfile' 'libxrandr'
-         'libxrender' 'libxtst' 'openssl' 'pcsclite' 'wayland')
-makedepends=('alsa-lib' 'cmake' 'docbook-xsl' 'ffmpeg' 'icu' 'krb5' 'libjpeg-turbo'
-             'libpulse' 'libusb' 'pam' 'systemd-libs' 'xmlto' 'xorgproto')
-conflicts=('freerdp')
-provides=('libfreerdp2.so' 'libfreerdp-client2.so' 'libfreerdp-server2'
-'libfreerdp-shadow2.so' 'libfreerdp-shadow-subsystem2.so' 'libwinpr2.so'
-'libwinpr-tools2.so' 'libuwac0.so' 'freerdp')
-source=("${_pkgname}-${pkgver}.tar.gz::https://github.com/${_pkgname}/${_pkgname}/archive/${pkgver}.tar.gz"
-        "${_pkgname}-manpage_formatting.patch")
-sha512sums=('7720306c8d0915578f6758f46ba0e0b8a81bbdcd1c80e08711576605142467f6735f644099e79a05113959fb30cd1070ca138a523537a41a7102880daf89c04c'
-            'd960e042d1527b5d5721136b6b20fc36f65beafd010581ea5b908668537fe9fe622de6689a29c0274b0d6f1e513615f0d02e56c1d1d1e613d093e145d39af8d7')
+license=(APACHE)
+depends=(dbus-glib glibc libcups libgssglue
+         libx11 libxcursor libxext libxdamage libxfixes libxkbcommon libxi libxinerama
+         libxkbfile libxrandr libxrender libxtst openssl pcsclite wayland)
+makedepends=(alsa-lib cmake docbook-xsl ffmpeg git icu krb5 libjpeg-turbo libpulse
+             libusb pam systemd-libs xmlto xorgproto)
+conflicts=(freerdp)
+provides=(freerdp libfreerdp2.so libfreerdp-client2.so libfreerdp-server2
+          libfreerdp-shadow2.so libfreerdp-shadow-subsystem2.so libwinpr2.so
+          libwinpr-tools2.so libuwac0.so)
+_commit=d50aef95520df4216c638495a6049125c00742cb  # tags/2.5.0
+source=("freerdp::git+https://github.com/freerdp/freerdp.git#commit=${_commit}"
+        "freerdp-manpage_formatting.patch")
+sha256sums=('SKIP'
+            'd51a478b4664b59227dc6b22eda06a21a1b5905cedff1817043fc8cb73468a65')
 
 prepare() {
-  cd "${_name}-${pkgver}"
-  # fix man page formatting:
-  # https://bugs.archlinux.org/task/64814
-  patch -Np1 -i "../${_pkgname}-manpage_formatting.patch"
+  cd freerdp
+  # fix man page formatting, https://bugs.archlinux.org/task/64814
+  patch -Np1 -i ../freerdp-manpage_formatting.patch
+
+  # fix build with ffmpeg >= 5.0, https://github.com/FreeRDP/FreeRDP/pull/7578
+  git cherry-pick -n 811d94c742b33d1e6de33f7e84c794d8bae26d3a
 }
 
 build() {
-  cd "${_name}-${pkgver}"
-  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 \
-        -DWITH_VAAPI=OFF \
-        -DCHANNEL_URBDRC_CLIENT=ON \
-        -Wno-dev \
-        -B build \
-        -S .
+  local cmake_options=(
+    -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
+    -DWITH_VAAPI=OFF
+    -DCHANNEL_URBDRC_CLIENT=ON
+    -Wno-dev
+  )
+  cmake "${cmake_options[@]}" -B build -S freerdp
   make VERBOSE=1 -C build
 }
 
 package() {
-  depends+=('libasound.so' 'libavcodec.so' 'libavutil.so' 'libicuuc.so' 'libjpeg.so' 'libpam.so' 'libpulse.so'
-            'libswscale.so' 'libswresample.so' 'libsystemd.so' 'libusb-1.0.so')
-  cd "${_name}-${pkgver}"
+  depends+=(libasound.so libavcodec.so libavutil.so libicuuc.so libjpeg.so
+            libpam.so libpulse.so libswscale.so libswresample.so libsystemd.so
+            libusb-1.0.so)
   make DESTDIR="${pkgdir}" install -C build
-  install -vDm 644 {ChangeLog,README.md} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -Dm644 freerdp/{ChangeLog,README.md} -t "${pkgdir}/usr/share/doc/${pkgname}"
 }