[arch-commits] Commit in krfb/repos (3 files)

[Antonio Rojas via arch-commits]

Date: Sunday, March 8, 2020 @ 10:42:57
  Author: arojas
Revision: 377174

archrelease: copy trunk to testing-x86_64

Added:
  krfb/repos/testing-x86_64/
  krfb/repos/testing-x86_64/PKGBUILD
(from rev 377173, krfb/trunk/PKGBUILD)
  krfb/repos/testing-x86_64/krfb-pipewire-0.3.patch
(from rev 377173, krfb/trunk/krfb-pipewire-0.3.patch)

-+
 PKGBUILD|   39 +++
 krfb-pipewire-0.3.patch |  551 ++
 2 files changed, 590 insertions(+)

Copied: krfb/repos/testing-x86_64/PKGBUILD (from rev 377173, 
krfb/trunk/PKGBUILD)
===
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2020-03-08 10:42:57 UTC (rev 377174)
@@ -0,0 +1,39 @@
+# Maintainer: Antonio Rojas 
+# Maintainer: Felix Yan 
+
+pkgname=krfb
+pkgver=19.12.3
+pkgrel=3
+pkgdesc='Desktop Sharing'
+url='https://www.kde.org/applications/system/krfb'
+arch=(x86_64)
+license=(LGPL)
+depends=(kdnssd kxmlgui kwallet libvncserver pipewire kcompletion 
hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools)
+groups=(kde-applications kdenetwork)
+source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
+ krfb-pipewire-0.3.patch)
+sha256sums=('cb88997dc7b15b992d1de5c5cabaeccb37122e20823501ac29140875259782ee'
+'SKIP'
+'1ed4a455f294b28b70194e0dd793d3ecb53a9494e94bfde40772921f73ee66c1')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid 

+  F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck 

+
+prepare() {
+  mkdir -p build
+
+  cd $pkgname-$pkgver
+  patch -p1 -i ../krfb-pipewire-0.3.patch # Fix build with pipewire 0.3
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+-DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krfb/repos/testing-x86_64/krfb-pipewire-0.3.patch (from rev 377173, 
krfb/trunk/krfb-pipewire-0.3.patch)
===
--- testing-x86_64/krfb-pipewire-0.3.patch  (rev 0)
+++ testing-x86_64/krfb-pipewire-0.3.patch  2020-03-08 10:42:57 UTC (rev 
377174)
@@ -0,0 +1,551 @@
+From 92c9905f36722c764f19bcc7c2d76e7f8af1ece7 Mon Sep 17 00:00:00 2001
+From: Jan Grulich 
+Date: Mon, 10 Feb 2020 16:24:05 +0100
+Subject: PW framebuffer: support upcoming PipeWire 0.3
+
+Summary: Adds support for slightly different PipeWire API.
+
+Test Plan: Tested with xdg-desktop-portal-kde and new pipewire.
+
+Reviewers: Kanedias
+
+Reviewed By: Kanedias
+
+Differential Revision: https://phabricator.kde.org/D27287
+---
+ cmake/modules/FindPipeWire.cmake |  27 +++-
+ framebuffers/pipewire/pw_framebuffer.cpp | 212 ++-
+ framebuffers/pipewire/pw_framebuffer.h   |   2 +-
+ 3 files changed, 174 insertions(+), 67 deletions(-)
+
+diff --git a/cmake/modules/FindPipeWire.cmake 
b/cmake/modules/FindPipeWire.cmake
+index 2410afd..9717ac0 100644
+--- a/cmake/modules/FindPipeWire.cmake
 b/cmake/modules/FindPipeWire.cmake
+@@ -32,7 +32,7 @@
+ #=
+ # Copyright 2014 Alex Merry 
+ # Copyright 2014 Martin Gräßlin 
+-# Copyright 2018 Jan Grulich 
++# Copyright 2018-2020 Jan Grulich 
+ #
+ # Redistribution and use in source and binary forms, with or without
+ # modification, are permitted provided that the following conditions
+@@ -61,9 +61,11 @@
+ # Use pkg-config to get the directories and then use these values
+ # in the FIND_PATH() and FIND_LIBRARY() calls
+ find_package(PkgConfig QUIET)
+-pkg_check_modules(PKG_PipeWire QUIET libpipewire-0.2 libpipewire-0.3)
+ 
+-set(PipeWire_DEFINITIONS "${PKG_PipeWire_CFLAGS_OTHER}")
++pkg_search_module(PKG_PipeWire QUIET libpipewire-0.3 libpipewire-0.2)
++pkg_search_module(PKG_Spa QUIET libspa-0.2 libspa-0.1)
++
++set(PipeWire_DEFINITIONS "${PKG_PipeWire_CFLAGS}" "${PKG_Spa_CFLAGS}")
+ set(PipeWire_VERSION "${PKG_PipeWire_VERSION}")
+ 
+ find_path(PipeWire_INCLUDE_DIRS
+@@ -71,13 +73,23 @@ find_path(PipeWire_INCLUDE_DIRS
+ pipewire/pipewire.h
+ HINTS
+ ${PKG_PipeWire_INCLUDE_DIRS}
++${PKG_PipeWire_INCLUDE_DIRS}/pipewire-0.3
++)
++
++find_path(Spa_INCLUDE_DIRS
++NAMES
++spa/param/props.h
++HINTS
++${PKG_Spa_INCLUDE_DIRS}
++${PKG_Spa_INCLUDE_DIRS}/spa-0.2
+ )
+ 
+ find_library(PipeWire_LIBRARIES
+ NAMES
+-pipewire-0.2 pipewire-0.3
++pipewire-0.3
++pipewire-0.2
+ HINTS
+-${PKG_PipeWire_LIBRARIES_DIRS}
++${PKG_PipeWire_LIBRARY_DIRS}
+ )
+ 
+ include(FindPackageHandleStandardArgs)
+@@ -87,6 +99,7 @@ find_package_handle_standard_args(PipeWire
+ REQUIRED_VARS
+ PipeWire_LIBRARIES
+ PipeWire_INCLUDE_DIRS
++Spa_INCLUDE_DIRS
+ VERSION_VAR
+   

[arch-commits] Commit in krfb/repos (3 files)

[Antonio Rojas]

Date: Friday, July 21, 2017 @ 20:01:58
  Author: arojas
Revision: 301053

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  krfb/repos/kde-unstable-x86_64/
  krfb/repos/kde-unstable-x86_64/PKGBUILD
(from rev 301052, krfb/kde-unstable/PKGBUILD)
  krfb/repos/kde-unstable-x86_64/krfb-gcc6.patch
(from rev 301052, krfb/kde-unstable/krfb-gcc6.patch)

-+
 PKGBUILD|   45 +
 krfb-gcc6.patch |   13 +
 2 files changed, 58 insertions(+)

Copied: krfb/repos/kde-unstable-x86_64/PKGBUILD (from rev 301052, 
krfb/kde-unstable/PKGBUILD)
===
--- kde-unstable-x86_64/PKGBUILD(rev 0)
+++ kde-unstable-x86_64/PKGBUILD2017-07-21 20:01:58 UTC (rev 301053)
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: Antonio Rojas 
+# Maintainer: Felix Yan 
+
+pkgname=krfb
+pkgver=17.07.80
+pkgrel=1
+pkgdesc='Desktop Sharing'
+url='https://www.kde.org/applications/system/krfb'
+arch=(i686 x86_64)
+license=(LGPL)
+depends=(kdnssd kxmlgui kwallet libvncserver libxdamage)
+makedepends=(extra-cmake-modules kdoctools python)
+conflicts=(kdenetwork-krfb)
+replaces=(kdenetwork-krfb)
+groups=(kde-applications kdenetwork)
+source=("https://download.kde.org/unstable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
 krfb-gcc6.patch)
+sha256sums=('89124f29eb7fc8cd2ad4971f382d3762b1d59cc0cea0e61b66959b45b6d0aca0'
+'SKIP'
+'09543509640c404aaadb8881732f698aa39d66f039b4ea9216d392eb67b16656')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid 

+  F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck 

+
+prepare() {
+  mkdir -p build
+
+# Fix build with GCC6 (Fedora)
+  cd $pkgname-$pkgver
+  patch -p1 -i ../krfb-gcc6.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DKDE_INSTALL_LIBDIR=lib \
+-DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krfb/repos/kde-unstable-x86_64/krfb-gcc6.patch (from rev 301052, 
krfb/kde-unstable/krfb-gcc6.patch)
===
--- kde-unstable-x86_64/krfb-gcc6.patch (rev 0)
+++ kde-unstable-x86_64/krfb-gcc6.patch 2017-07-21 20:01:58 UTC (rev 301053)
@@ -0,0 +1,13 @@
+diff -up krfb-15.12.2/krfb/rfb.h.than krfb-15.12.2/krfb/rfb.h
+--- krfb-15.12.2/krfb/rfb.h.than   2016-02-18 14:31:57.918262431 +0100
 krfb-15.12.2/krfb/rfb.h2016-02-18 14:35:20.029628544 +0100
+@@ -8,6 +8,9 @@
+ 
+ #include "rfb/rfb.h"
+ 
++#ifdef max // fix conflict with max() macro using gcc6 
++#undef max
++#endif
+ #undef TRUE
+ #undef FALSE
+ 

[arch-commits] Commit in krfb/repos (3 files)

[Antonio Rojas]

Date: Saturday, March 25, 2017 @ 01:10:59
  Author: arojas
Revision: 291422

archrelease: copy kde-unstable to kde-unstable-x86_64

Added:
  krfb/repos/kde-unstable-x86_64/
  krfb/repos/kde-unstable-x86_64/PKGBUILD
(from rev 291421, krfb/kde-unstable/PKGBUILD)
  krfb/repos/kde-unstable-x86_64/krfb-gcc6.patch
(from rev 291421, krfb/kde-unstable/krfb-gcc6.patch)

-+
 PKGBUILD|   44 
 krfb-gcc6.patch |   13 +
 2 files changed, 57 insertions(+)

Copied: krfb/repos/kde-unstable-x86_64/PKGBUILD (from rev 291421, 
krfb/kde-unstable/PKGBUILD)
===
--- kde-unstable-x86_64/PKGBUILD(rev 0)
+++ kde-unstable-x86_64/PKGBUILD2017-03-25 01:10:59 UTC (rev 291422)
@@ -0,0 +1,44 @@
+# $Id$
+# Maintainer: Antonio Rojas 
+# Maintainer: Felix Yan 
+
+pkgname=krfb
+pkgver=17.03.80
+pkgrel=1
+pkgdesc='Desktop Sharing'
+url='https://www.kde.org/applications/system/krfb'
+arch=(i686 x86_64)
+license=(LGPL)
+depends=(kdnssd kxmlgui kwallet libvncserver libxdamage)
+makedepends=(extra-cmake-modules kdoctools python)
+conflicts=(kdenetwork-krfb)
+replaces=(kdenetwork-krfb)
+groups=(kde-applications kdenetwork)
+source=("https://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig}
 krfb-gcc6.patch)
+sha256sums=('3582b2303ff1390353b13def5d5c0475cf5b8224887f05c8334bd0afc1d51106'
+'SKIP'
+'09543509640c404aaadb8881732f698aa39d66f039b4ea9216d392eb67b16656')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid 

+
+prepare() {
+  mkdir -p build
+
+# Fix build with GCC6 (Fedora)
+  cd $pkgname-$pkgver
+  patch -p1 -i ../krfb-gcc6.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
+-DCMAKE_BUILD_TYPE=Release \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DKDE_INSTALL_LIBDIR=lib \
+-DBUILD_TESTING=OFF
+  make
+}
+
+package() {
+  cd build
+  make DESTDIR="$pkgdir" install
+}

Copied: krfb/repos/kde-unstable-x86_64/krfb-gcc6.patch (from rev 291421, 
krfb/kde-unstable/krfb-gcc6.patch)
===
--- kde-unstable-x86_64/krfb-gcc6.patch (rev 0)
+++ kde-unstable-x86_64/krfb-gcc6.patch 2017-03-25 01:10:59 UTC (rev 291422)
@@ -0,0 +1,13 @@
+diff -up krfb-15.12.2/krfb/rfb.h.than krfb-15.12.2/krfb/rfb.h
+--- krfb-15.12.2/krfb/rfb.h.than   2016-02-18 14:31:57.918262431 +0100
 krfb-15.12.2/krfb/rfb.h2016-02-18 14:35:20.029628544 +0100
+@@ -8,6 +8,9 @@
+ 
+ #include "rfb/rfb.h"
+ 
++#ifdef max // fix conflict with max() macro using gcc6 
++#undef max
++#endif
+ #undef TRUE
+ #undef FALSE
+