From 035884fbb7e52c636d1d5f4c0a07fdf04ac58c84 Mon Sep 17 00:00:00 2001 From: Kridsada Thanabulpong Date: Sat, 28 Mar 2020 16:23:52 +0900 Subject: [PATCH 01/41] pipewire: update to 0.3.2 --- common/shlibs | 2 +- srcpkgs/alsa-pipewire | 1 + srcpkgs/libjack-pipewire | 1 + srcpkgs/libpulseaudio-pipewire | 1 + srcpkgs/pipewire/template | 71 ++++++++++++++++++++++++++-------- 5 files changed, 59 insertions(+), 17 deletions(-) create mode 120000 srcpkgs/alsa-pipewire create mode 120000 srcpkgs/libjack-pipewire create mode 120000 srcpkgs/libpulseaudio-pipewire diff --git a/common/shlibs b/common/shlibs index a208407b359..0b58777db72 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3199,7 +3199,7 @@ libarcan_shmif_ext.so.0.11 arcan-0.5.4.3_1 libarcan_shmif_server.so.0.11 arcan-0.5.4.3_1 libarcan_tui.so.0.11 arcan-0.5.4.3_1 liblwipv6.so.2 lwipv6-1.5a_1 -libpipewire-0.2.so.1 libpipewire-0.2.2_1 +libpipewire-0.3.so.0 libpipewire-0.3.2_1 libvolk.so.2.2.1 volk-2.2.1_1 libgnuradio-runtime.so.3.8.0 gnuradio-3.8.0.0_1 libgnuradio-pmt.so.3.8.0 gnuradio-3.8.0.0_1 diff --git a/srcpkgs/alsa-pipewire b/srcpkgs/alsa-pipewire new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/alsa-pipewire @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libjack-pipewire b/srcpkgs/libjack-pipewire new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libjack-pipewire @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/libpulseaudio-pipewire b/srcpkgs/libpulseaudio-pipewire new file mode 120000 index 00000000000..c9c97cf6707 --- /dev/null +++ b/srcpkgs/libpulseaudio-pipewire @@ -0,0 +1 @@ +pipewire \ No newline at end of file diff --git a/srcpkgs/pipewire/template b/srcpkgs/pipewire/template index 7f646dad11d..697c20c0347 100644 --- a/srcpkgs/pipewire/template +++ b/srcpkgs/pipewire/template @@ -1,26 +1,39 @@ # Template file for 'pipewire' pkgname=pipewire -version=0.2.7 +version=0.3.2 revision=1 build_style=meson -configure_args="-Dman=true -Dgstreamer=enabled -Ddocs=true -Dsystemd=false" +configure_args="-Dman=true -Dgstreamer=true -Ddocs=true -Dsystemd=false + -Dbluez5=true -Dffmpeg=true -Dpipewire-alsa=true -Dpipewire-jack=true + -Dpipewire-pulseaudio=true" hostmakedepends="doxygen graphviz pkg-config xmltoman" makedepends="SDL2-devel ffmpeg-devel gst-plugins-base1-devel jack-devel - sbc-devel v4l-utils-devel libva-devel" + sbc-devel v4l-utils-devel libva-devel libbluetooth-devel" short_desc="Server and user space API to deal with multimedia pipelines" maintainer="Orphaned " -#Next release will probably change to MIT, currently listed in master -license="LGPL-2.1-only, GPL-2.0-only " +license="MIT" homepage="https://pipewire.org/" -changelog="https://raw.githubusercontent.com/PipeWire/pipewire/master/NEWS" -distfiles="https://github.com/PipeWire/pipewire/archive/${version}.tar.gz" -checksum=bfaa0f6ae6c0791e2e0b59234d399753bf24f1b33dbf587682363a8463dd8df1 +changelog="https://gitlab.freedesktop.org/pipewire/pipewire/-/raw/master/NEWS" +distfiles="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${version}/pipewire-${version}.tar.gz" +checksum=fd1bb2ae65997d921d6c18e1828f23251dac3145bbe5031c324afeb39f9b26fb conf_files="/etc/pipewire/pipewire.conf" +CFLAGS+="-Wformat" + +if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then + makedepends+=" libatomic-devel" + LDFLAGS+=" -latomic" +fi + +post_install() { + vlicense LICENSE +} + libpipewire_package() { short_desc+=" - pipewire library" pkg_install() { - vmove "usr/lib/libpipewire-0.2.so.*" + vmove "usr/lib/libpipewire-0.3.so.*" + vmove usr/lib/pipewire-0.3 } } @@ -28,25 +41,25 @@ pipewire-devel_package() { depends="libpipewire-${version}_${revision}" short_desc+=" - pipewire and libspa development files" pkg_install() { - vmove usr/include/pipewire - vmove usr/include/spa - vmove usr/lib/pkgconfig/libpipewire-0.2.pc - vmove usr/lib/pkgconfig/libspa-0.1.pc - vmove usr/lib/libpipewire-0.2.so + vmove usr/include/pipewire-0.3 + vmove usr/include/spa-0.2 + vmove usr/lib/pkgconfig/libpipewire-0.3.pc + vmove usr/lib/pkgconfig/libspa-0.2.pc + vmove usr/lib/libpipewire-0.3.so } } libspa-ffmpeg_package() { short_desc+=" - ffmpeg plugins" pkg_install() { - vmove usr/lib/spa/ffmpeg + vmove usr/lib/spa-0.2/ffmpeg } } libspa-bluetooth_package() { short_desc+=" - bluetooth plugins" pkg_install() { - vmove usr/lib/spa/bluez5 + vmove usr/lib/spa-0.2/bluez5 } } @@ -57,6 +70,32 @@ gstreamer1-pipewire_package() { } } +libpulseaudio-pipewire_package() { + depends="libpipewire-${version}_${revision}" + short_desc+=" - PulseAudio client library" + pkg_install() { + vmove "usr/lib/libpulse-mainloop-glib-pw.so*" + vmove "usr/lib/libpulse-pw.so*" + vmove "usr/lib/libpulse-simple-pw.so*" + } +} + +alsa-pipewire_package() { + depends="libpipewire-${version}_${revision}" + short_desc+=" - ALSA client library" + pkg_install() { + vmove "usr/lib/alsa-lib" + } +} + +libjack-pipewire_package() { + depends="libpipewire-${version}_${revision}" + short_desc+=" - JACK client library" + pkg_install() { + vmove "usr/lib/libjack-pw.so*" + } +} + pipewire-doc_package() { archs=noarch short_desc+=" - documentation" From d568efb8929d965215bbe1b4e68544b1a3cb373b Mon Sep 17 00:00:00 2001 From: Kridsada Thanabulpong Date: Sat, 28 Mar 2020 16:24:46 +0900 Subject: [PATCH 02/41] xdg-desktop-portal-kde: rebuild for pipewire-0.3 --- srcpkgs/xdg-desktop-portal-kde/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/xdg-desktop-portal-kde/template b/srcpkgs/xdg-desktop-portal-kde/template index f26057d323a..9519abc19f6 100644 --- a/srcpkgs/xdg-desktop-portal-kde/template +++ b/srcpkgs/xdg-desktop-portal-kde/template @@ -1,7 +1,7 @@ # Template file for 'xdg-desktop-portal-kde' pkgname=xdg-desktop-portal-kde version=5.18.4.1 -revision=1 +revision=2 build_style=cmake hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools kcoreaddons gettext" makedepends="glib-devel kio-devel kwayland-devel libepoxy-devel pipewire-devel From 297644fb3afca32d6995c01c86b574ba90e5e113 Mon Sep 17 00:00:00 2001 From: Kridsada Thanabulpong Date: Sat, 28 Mar 2020 16:24:26 +0900 Subject: [PATCH 03/41] xdg-desktop-portal: rebuild for pipewire-0.3 --- .../patches/pipewire-0.3.patch | 551 ++++++++++++++++++ srcpkgs/xdg-desktop-portal/template | 8 +- 2 files changed, 557 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch diff --git a/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch b/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch new file mode 100644 index 00000000000..94ebe083598 --- /dev/null +++ b/srcpkgs/xdg-desktop-portal/patches/pipewire-0.3.patch @@ -0,0 +1,551 @@ +From a38901e5e7f835efe7b7a06c55790c8c20bc91a2 Mon Sep 17 00:00:00 2001 +From: Wim Taymans +Date: Tue, 14 Jan 2020 09:37:09 +0100 +Subject: [PATCH] PipeWire: update to 0.3 API + +--- + configure.ac | 2 +- + src/camera.c | 24 ++++---- + src/pipewire.c | 141 +++++++++++++--------------------------------- + src/pipewire.h | 10 ++-- + src/screen-cast.c | 98 ++++++-------------------------- + 5 files changed, 72 insertions(+), 203 deletions(-) + +diff --git configure.ac configure.ac +index 89902fa..62d7960 100644 +--- configure.ac ++++ configure.ac +@@ -97,7 +97,7 @@ AC_ARG_ENABLE(pipewire, + [AS_HELP_STRING([--enable-pipewire],[Enable PipeWire support. Needed for screen cast portal])], + enable_pipewire=$enableval, enable_pipewire=yes) + if test x$enable_pipewire = xyes ; then +- PKG_CHECK_MODULES(PIPEWIRE, [libpipewire-0.2 >= 0.2.6]) ++ PKG_CHECK_MODULES(PIPEWIRE, [libpipewire-0.3 >= 0.2.90]) + AC_DEFINE([HAVE_PIPEWIRE],[1], [Define to enable PipeWire support]) + fi + AM_CONDITIONAL([HAVE_PIPEWIRE],[test "$enable_pipewire" = "yes"]) +diff --git src/camera.c src/camera.c +index c2b392c..20fe3aa 100644 +--- src/camera.c ++++ src/camera.c +@@ -141,7 +141,7 @@ open_pipewire_camera_remote (const char *app_id, + GError **error) + { + PipeWireRemote *remote; +- struct spa_dict_item permission_items[1]; ++ struct pw_permission permission_items[2]; + struct pw_properties *pipewire_properties; + + pipewire_properties = +@@ -158,12 +158,12 @@ open_pipewire_camera_remote (const char *app_id, + * Hide all existing and future nodes by default. PipeWire will use the + * permission store to set up permissions. + */ +- permission_items[0].key = PW_CORE_PROXY_PERMISSIONS_DEFAULT; +- permission_items[0].value = "---"; ++ permission_items[0] = PW_PERMISSION_INIT (PW_ID_CORE, PW_PERM_RWX); ++ permission_items[1] = PW_PERMISSION_INIT (PW_ID_ANY, 0); + +- pw_core_proxy_permissions (pw_remote_get_core_proxy (remote->remote), +- &SPA_DICT_INIT (permission_items, +- G_N_ELEMENTS (permission_items))); ++ pw_client_update_permissions (pw_core_get_client(remote->core), ++ G_N_ELEMENTS (permission_items), ++ permission_items); + + pipewire_remote_roundtrip (remote); + +@@ -219,7 +219,7 @@ handle_open_pipewire_remote (XdpCamera *object, + } + + out_fd_list = g_unix_fd_list_new (); +- fd = pw_remote_steal_fd (remote->remote); ++ fd = pw_core_steal_fd (remote->core); + fd_id = g_unix_fd_list_append (out_fd_list, fd, &error); + close (fd); + pipewire_remote_destroy (remote); +@@ -250,29 +250,28 @@ camera_iface_init (XdpCameraIface *iface) + static void + global_added_cb (PipeWireRemote *remote, + uint32_t id, +- uint32_t type, ++ const char *type, + const struct spa_dict *props, + gpointer user_data) + { + Camera *camera = user_data; +- struct pw_type *core_type = pw_core_get_type (remote->core); + const struct spa_dict_item *media_class; + const struct spa_dict_item *media_role; + +- if (type != core_type->node) ++ if (strcmp(type, PW_TYPE_INTERFACE_Node) != 0) + return; + + if (!props) + return; + +- media_class = spa_dict_lookup_item (props, "media.class"); ++ media_class = spa_dict_lookup_item (props, PW_KEY_MEDIA_CLASS); + if (!media_class) + return; + + if (g_strcmp0 (media_class->value, "Video/Source") != 0) + return; + +- media_role = spa_dict_lookup_item (props, "media.role"); ++ media_role = spa_dict_lookup_item (props, PW_KEY_MEDIA_ROLE); + if (!media_role) + return; + +@@ -342,6 +341,7 @@ create_pipewire_remote (Camera *camera, + } + + pipewire_properties = pw_properties_new ("pipewire.access.portal.is_portal", "true", ++ "portal.monitor", "Camera", + NULL); + camera->pipewire_remote = pipewire_remote_new_sync (pipewire_properties, + global_added_cb, +diff --git src/pipewire.c src/pipewire.c +index 793a378..162cd55 100644 +--- src/pipewire.c ++++ src/pipewire.c +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #include "pipewire.h" + +@@ -36,27 +37,25 @@ static gboolean is_pipewire_initialized = FALSE; + static void + registry_event_global (void *user_data, + uint32_t id, +- uint32_t parent_id, + uint32_t permissions, +- uint32_t type, ++ const char *type, + uint32_t version, + const struct spa_dict *props) + { + PipeWireRemote *remote = user_data; +- struct pw_type *core_type = pw_core_get_type (remote->core); + const struct spa_dict_item *factory_object_type; + PipeWireGlobal *global; + + global = g_new0 (PipeWireGlobal, 1); + *global = (PipeWireGlobal) { +- .parent_id = parent_id, ++ .parent_id = id, + }; + + g_hash_table_insert (remote->globals, GINT_TO_POINTER (id), global); + if (remote->global_added_cb) + remote->global_added_cb (remote, id, type, props, remote->user_data); + +- if (type != core_type->factory) ++ if (strcmp(type, PW_TYPE_INTERFACE_Factory) != 0) + return; + + factory_object_type = spa_dict_lookup_item (props, "factory.type.name"); +@@ -81,8 +80,8 @@ registry_event_global_remove (void *user_data, + g_hash_table_remove (remote->globals, GINT_TO_POINTER (id)); + } + +-static const struct pw_registry_proxy_events registry_events = { +- PW_VERSION_REGISTRY_PROXY_EVENTS, ++static const struct pw_registry_events registry_events = { ++ PW_VERSION_REGISTRY_EVENTS, + .global = registry_event_global, + .global_remove = registry_event_global_remove, + }; +@@ -90,7 +89,7 @@ static const struct pw_registry_proxy_events registry_events = { + void + pipewire_remote_roundtrip (PipeWireRemote *remote) + { +- pw_core_proxy_sync (remote->core_proxy, ++remote->sync_seq); ++ remote->sync_seq = pw_core_sync (remote->core, PW_ID_CORE, remote->sync_seq); + pw_main_loop_run (remote->loop); + } + +@@ -98,16 +97,13 @@ static gboolean + discover_node_factory_sync (PipeWireRemote *remote, + GError **error) + { +- struct pw_type *core_type = pw_core_get_type (remote->core); +- struct pw_registry_proxy *registry_proxy; ++ struct pw_registry *registry; + +- registry_proxy = pw_core_proxy_get_registry (remote->core_proxy, +- core_type->registry, +- PW_VERSION_REGISTRY, 0); +- pw_registry_proxy_add_listener (registry_proxy, +- &remote->registry_listener, +- ®istry_events, +- remote); ++ registry = pw_core_get_registry (remote->core, PW_VERSION_REGISTRY, 0); ++ pw_registry_add_listener (registry, ++ &remote->registry_listener, ++ ®istry_events, ++ remote); + + pipewire_remote_roundtrip (remote); + +@@ -122,59 +118,35 @@ discover_node_factory_sync (PipeWireRemote *remote, + } + + static void +-on_state_changed (void *user_data, +- enum pw_remote_state old, +- enum pw_remote_state state, +- const char *error) ++core_event_error (void *user_data, ++ uint32_t id, ++ int seq, ++ int res, ++ const char *message) + { + PipeWireRemote *remote = user_data; + +- switch (state) ++ if (id == PW_ID_CORE) + { +- case PW_REMOTE_STATE_ERROR: +- if (!remote->error) +- { +- g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "%s", error); +- } ++ g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED, ++ "%s", message); + pw_main_loop_quit (remote->loop); +- break; +- case PW_REMOTE_STATE_UNCONNECTED: +- if (!remote->error) +- { +- g_set_error (&remote->error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Disconnected"); +- } +- pw_main_loop_quit (remote->loop); +- break; +- case PW_REMOTE_STATE_CONNECTING: +- break; +- case PW_REMOTE_STATE_CONNECTED: +- pw_main_loop_quit (remote->loop); +- break; +- default: +- g_warning ("Unknown PipeWire state"); +- break; + } + } + +-static const struct pw_remote_events remote_events = { +- PW_VERSION_REMOTE_EVENTS, +- .state_changed = on_state_changed, +-}; +- + static void + core_event_done (void *user_data, +- uint32_t seq) ++ uint32_t id, int seq) + { + PipeWireRemote *remote = user_data; + +- if (remote->sync_seq == seq) ++ if (id == PW_ID_CORE && remote->sync_seq == seq) + pw_main_loop_quit (remote->loop); + } + +-static const struct pw_core_proxy_events core_events = { +- PW_VERSION_CORE_PROXY_EVENTS, ++static const struct pw_core_events core_events = { ++ PW_VERSION_CORE_EVENTS, ++ .error = core_event_error, + .done = core_event_done, + }; + +@@ -237,8 +209,8 @@ void + pipewire_remote_destroy (PipeWireRemote *remote) + { + g_clear_pointer (&remote->globals, g_hash_table_destroy); +- g_clear_pointer (&remote->remote, pw_remote_destroy); +- g_clear_pointer (&remote->core, pw_core_destroy); ++ g_clear_pointer (&remote->core, pw_core_disconnect); ++ g_clear_pointer (&remote->context, pw_context_destroy); + g_clear_pointer (&remote->loop, pw_main_loop_destroy); + g_clear_error (&remote->error); + +@@ -307,68 +279,31 @@ pipewire_remote_new_sync (struct pw_properties *pipewire_properties, + return NULL; + } + +- remote->core = pw_core_new (pw_main_loop_get_loop (remote->loop), NULL); +- if (!remote->core) ++ remote->context = pw_context_new (pw_main_loop_get_loop (remote->loop), NULL, 0); ++ if (!remote->context) + { + pipewire_remote_destroy (remote); + pw_properties_free (pipewire_properties); + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Couldn't create PipeWire core"); ++ "Couldn't create PipeWire context"); + return NULL; + } + +- remote->remote = pw_remote_new (remote->core, pipewire_properties, 0); +- if (!remote->remote) ++ remote->core = pw_context_connect (remote->context, pipewire_properties, 0); ++ if (!remote->core) + { + pipewire_remote_destroy (remote); + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Couldn't create PipeWire remote"); ++ "Couldn't connect to PipeWire"); + return NULL; + } + + remote->globals = g_hash_table_new_full (NULL, NULL, NULL, g_free); + +- pw_remote_add_listener (remote->remote, +- &remote->remote_listener, +- &remote_events, +- remote); +- +- if (pw_remote_connect (remote->remote) != 0) +- { +- pipewire_remote_destroy (remote); +- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Couldn't connect PipeWire remote"); +- return NULL; +- } +- +- pw_main_loop_run (remote->loop); +- +- switch (pw_remote_get_state (remote->remote, NULL)) +- { +- case PW_REMOTE_STATE_ERROR: +- case PW_REMOTE_STATE_UNCONNECTED: +- *error = g_steal_pointer (&remote->error); +- pipewire_remote_destroy (remote); +- return NULL; +- case PW_REMOTE_STATE_CONNECTING: +- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "PipeWire loop stopped unexpectedly"); +- pipewire_remote_destroy (remote); +- return NULL; +- case PW_REMOTE_STATE_CONNECTED: +- break; +- default: +- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Unexpected PipeWire state"); +- pipewire_remote_destroy (remote); +- return NULL; +- } +- +- remote->core_proxy = pw_remote_get_core_proxy (remote->remote); +- pw_core_proxy_add_listener (remote->core_proxy, +- &remote->core_listener, +- &core_events, +- remote); ++ pw_core_add_listener (remote->core, ++ &remote->core_listener, ++ &core_events, ++ remote); + + if (!discover_node_factory_sync (remote, error)) + { +diff --git src/pipewire.h src/pipewire.h +index 0f1bf54..bf48d5e 100644 +--- src/pipewire.h ++++ src/pipewire.h +@@ -32,7 +32,7 @@ typedef struct _PipeWireGlobal + + typedef void (* PipeWireGlobalAddedCallback) (PipeWireRemote *remote, + uint32_t id, +- uint32_t type, ++ const char *type, + const struct spa_dict *props, + gpointer user_data); + +@@ -43,13 +43,11 @@ typedef void (* PipeWireGlobalRemovedCallback) (PipeWireRemote *remote, + struct _PipeWireRemote + { + struct pw_main_loop *loop; ++ struct pw_context *context; + struct pw_core *core; +- struct pw_remote *remote; +- struct spa_hook remote_listener; +- +- struct pw_core_proxy *core_proxy; + struct spa_hook core_listener; +- uint32_t sync_seq; ++ ++ int sync_seq; + + struct spa_hook registry_listener; + +diff --git src/screen-cast.c src/screen-cast.c +index 7881ddc..1677050 100644 +--- src/screen-cast.c ++++ src/screen-cast.c +@@ -31,10 +31,10 @@ + #include "xdp-impl-dbus.h" + #include "xdp-utils.h" + +-#define PERMISSION_ITEM(item_key, item_value) \ +- ((struct spa_dict_item) { \ +- .key = item_key, \ +- .value = item_value \ ++#define PERMISSION_ITEM(item_id, item_permissions) \ ++ ((struct pw_permission) { \ ++ .id = item_id, \ ++ .permissions = item_permissions \ + }) + + typedef struct _ScreenCast ScreenCast; +@@ -517,42 +517,9 @@ screen_cast_stream_get_pipewire_node_id (ScreenCastStream *stream) + return stream->id; + } + +-static void +-append_parent_permissions (PipeWireRemote *remote, +- GArray *permission_items, +- GList **string_stash, +- PipeWireGlobal *global, +- const char *permission) +-{ +- PipeWireGlobal *parent; +- char *parent_permission_value; +- +- if (global->parent_id == 0) +- return; +- +- parent = g_hash_table_lookup (remote->globals, GINT_TO_POINTER (global->parent_id)); +- +- if (parent->permission_set) +- return; +- parent->permission_set = TRUE; +- +- append_parent_permissions (remote, permission_items, string_stash, +- parent, permission); +- +- parent_permission_value = g_strdup_printf ("%u:%s", +- global->parent_id, +- permission); +- *string_stash = g_list_prepend (*string_stash, parent_permission_value); +- +- g_array_append_val (permission_items, +- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL, +- parent_permission_value)); +-} +- + static void + append_stream_permissions (PipeWireRemote *remote, + GArray *permission_items, +- GList **string_stash, + GList *streams) + { + GList *l; +@@ -561,21 +528,10 @@ append_stream_permissions (PipeWireRemote *remote, + { + ScreenCastStream *stream = l->data; + uint32_t stream_id; +- PipeWireGlobal *stream_global; +- char *stream_permission_value; + + stream_id = screen_cast_stream_get_pipewire_node_id (stream); +- stream_global = g_hash_table_lookup (remote->globals, +- GINT_TO_POINTER (stream_id)); +- +- append_parent_permissions (remote, permission_items, string_stash, +- stream_global, "r--"); +- +- stream_permission_value = g_strdup_printf ("%u:rwx", stream_id); +- *string_stash = g_list_prepend (*string_stash, stream_permission_value); + g_array_append_val (permission_items, +- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL, +- stream_permission_value)); ++ PERMISSION_ITEM (stream_id, PW_PERM_RWX)); + } + } + +@@ -587,9 +543,6 @@ open_pipewire_screen_cast_remote (const char *app_id, + struct pw_properties *pipewire_properties; + PipeWireRemote *remote; + g_autoptr(GArray) permission_items = NULL; +- char *node_factory_permission_string; +- GList *string_stash = NULL; +- struct spa_dict *permission_dict; + PipeWireGlobal *node_global; + + pipewire_properties = pw_properties_new ("pipewire.access.portal.app_id", app_id, +@@ -603,48 +556,31 @@ open_pipewire_screen_cast_remote (const char *app_id, + + permission_items = g_array_new (FALSE, TRUE, sizeof (struct spa_dict_item)); + +- /* +- * Hide all existing and future nodes (except the ones we explicitly list below. +- */ +- g_array_append_val (permission_items, +- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_EXISTING, +- "---")); +- g_array_append_val (permission_items, +- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_DEFAULT, +- "---")); +- + /* + * PipeWire:Interface:Core + * Needs rwx to be able create the sink node using the create-object method + */ + g_array_append_val (permission_items, +- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL, +- "0:rwx")); ++ PERMISSION_ITEM (PW_ID_CORE, PW_PERM_RWX)); + + /* + * PipeWire:Interface:NodeFactory + * Needs r-- so it can be passed to create-object when creating the sink node. + */ +- node_factory_permission_string = g_strdup_printf ("%d:r--", +- remote->node_factory_id); +- string_stash = g_list_prepend (string_stash, node_factory_permission_string); + g_array_append_val (permission_items, +- PERMISSION_ITEM (PW_CORE_PROXY_PERMISSIONS_GLOBAL, +- node_factory_permission_string)); +- node_global = g_hash_table_lookup (remote->globals, +- GINT_TO_POINTER (remote->node_factory_id)); +- append_parent_permissions (remote, permission_items, &string_stash, +- node_global, "r--"); ++ PERMISSION_ITEM (remote->node_factory_id, PW_PERM_R)); + +- append_stream_permissions (remote, permission_items, &string_stash, streams); ++ append_stream_permissions (remote, permission_items, streams); + +- permission_dict = +- &SPA_DICT_INIT ((struct spa_dict_item *) permission_items->data, +- permission_items->len); +- pw_core_proxy_permissions (pw_remote_get_core_proxy (remote->remote), +- permission_dict); ++ /* ++ * Hide all existing and future nodes (except the ones we explicitly list above). ++ */ ++ g_array_append_val (permission_items, ++ PERMISSION_ITEM (PW_ID_ANY, 0)); + +- g_list_free_full (string_stash, g_free); ++ pw_client_update_permissions (pw_core_get_client(remote->core), ++ permission_items->len, ++ (const struct pw_permission *)permission_items->data); + + pipewire_remote_roundtrip (remote); + +@@ -943,7 +879,7 @@ handle_open_pipewire_remote (XdpScreenCast *object, + } + + out_fd_list = g_unix_fd_list_new (); +- fd = pw_remote_steal_fd (remote->remote); ++ fd = pw_core_steal_fd (remote->core); + fd_id = g_unix_fd_list_append (out_fd_list, fd, &error); + close (fd); + pipewire_remote_destroy (remote); diff --git a/srcpkgs/xdg-desktop-portal/template b/srcpkgs/xdg-desktop-portal/template index eb8a4602f5d..1136b6a6e0e 100644 --- a/srcpkgs/xdg-desktop-portal/template +++ b/srcpkgs/xdg-desktop-portal/template @@ -1,10 +1,10 @@ # Template file for 'xdg-desktop-portal' pkgname=xdg-desktop-portal version=1.6.0 -revision=1 +revision=2 build_style=gnu-configure configure_args="--enable-pipewire --enable-geoclue --disable-libportal" -hostmakedepends="pkg-config glib-devel" +hostmakedepends="automake libtool gettext-devel pkg-config glib-devel" makedepends="flatpak-devel fuse-devel pipewire-devel geoclue2-devel" short_desc="Portal frontend service for Flatpak" maintainer="Duncaen " @@ -13,6 +13,10 @@ homepage="https://github.com/flatpak/xdg-desktop-portal" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" checksum=883c9c9a925e48af54812b5347f546dd776ec2e27076a83d5a8126af6bafb9da +pre_configure() { + autoreconf -vfi +} + post_install() { rm -rf "${DESTDIR}/usr/lib/systemd" } From b797c5db2a2744dbf4188200f3a8032a40935b49 Mon Sep 17 00:00:00 2001 From: Nafis Date: Thu, 30 Apr 2020 13:46:16 +0600 Subject: [PATCH 04/41] xdg-desktop-portal-gtk: update to 1.7.1. [ci skip] --- srcpkgs/xdg-desktop-portal-gtk/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/xdg-desktop-portal-gtk/template b/srcpkgs/xdg-desktop-portal-gtk/template index dee0e463386..c711ad15334 100644 --- a/srcpkgs/xdg-desktop-portal-gtk/template +++ b/srcpkgs/xdg-desktop-portal-gtk/template @@ -1,6 +1,6 @@ # Template file for 'xdg-desktop-portal-gtk' pkgname=xdg-desktop-portal-gtk -version=1.6.0 +version=1.7.1 revision=1 build_style=gnu-configure hostmakedepends="pkg-config libxslt glib-devel xdg-desktop-portal gettext" @@ -12,7 +12,7 @@ maintainer="Duncaen " license="LGPL-2.1-or-later" homepage="https://github.com/flatpak/xdg-desktop-portal-gtk" distfiles="https://github.com/flatpak/${pkgname}/releases/download/${version}/${pkgname}-${version}.tar.xz" -checksum=956fd16608247e7119d4c6d95a6dc6578dce257d2f272d03b3498572257e2f76 +checksum=b6f6d28451e89488dc1121be9355f06686546f869b8d1a2d607c2f63bbd8bb5e post_install() { rm -rf "${DESTDIR}/usr/lib/systemd" From 31514228e0c52feb7c68665b6b269fb0fa4f9f98 Mon Sep 17 00:00:00 2001 From: Kridsada Thanabulpong Date: Thu, 30 Apr 2020 06:17:17 +0900 Subject: [PATCH 05/41] mutter: rebuild for pipewire-0.3 [ci skip] --- srcpkgs/mutter/patches/pipewire-0.3.patch | 521 ++++++++++++++++++++++ srcpkgs/mutter/template | 2 +- 2 files changed, 522 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/mutter/patches/pipewire-0.3.patch diff --git a/srcpkgs/mutter/patches/pipewire-0.3.patch b/srcpkgs/mutter/patches/pipewire-0.3.patch new file mode 100644 index 00000000000..ebff65fba85 --- /dev/null +++ b/srcpkgs/mutter/patches/pipewire-0.3.patch @@ -0,0 +1,521 @@ +Build mutter against pipewire-0.3, based on a patch at: +https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1062 +--- meson.build ++++ meson.build +@@ -50,7 +50,7 @@ libinput_req = '>= 1.7' + gbm_req = '>= 10.3' + + # screen cast version requirements +-libpipewire_req = '>= 0.2.5' ++libpipewire_req = '>= 0.3.0' + + gnome = import('gnome') + pkg = import('pkgconfig') +@@ -241,7 +241,7 @@ endif + + have_remote_desktop = get_option('remote_desktop') + if have_remote_desktop +- libpipewire_dep = dependency('libpipewire-0.2', version: libpipewire_req) ++ libpipewire_dep = dependency('libpipewire-0.3', version: libpipewire_req) + endif + + have_introspection = get_option('introspection') +diff --git a/src/backends/meta-screen-cast-stream-src.c b/src/backends/meta-screen-cast-stream-src.c +index 82c5cba436..ba1ce94a7e 100644 +--- src/backends/meta-screen-cast-stream-src.c ++++ src/backends/meta-screen-cast-stream-src.c +@@ -29,6 +29,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -62,15 +63,6 @@ enum + + static guint signals[N_SIGNALS]; + +-typedef struct _MetaSpaType +-{ +- struct spa_type_media_type media_type; +- struct spa_type_media_subtype media_subtype; +- struct spa_type_format_video format_video; +- struct spa_type_video_format video_format; +- uint32_t meta_cursor; +-} MetaSpaType; +- + typedef struct _MetaPipeWireSource + { + GSource base; +@@ -82,19 +74,19 @@ typedef struct _MetaScreenCastStreamSrcPrivate + { + MetaScreenCastStream *stream; + ++ struct pw_context *pipewire_context; + struct pw_core *pipewire_core; +- struct pw_remote *pipewire_remote; +- struct pw_type *pipewire_type; + MetaPipeWireSource *pipewire_source; +- struct spa_hook pipewire_remote_listener; ++ struct spa_hook pipewire_core_listener; + + gboolean is_enabled; + + struct pw_stream *pipewire_stream; + struct spa_hook pipewire_stream_listener; ++ uint32_t node_id; + +- MetaSpaType spa_type; + struct spa_video_info_raw video_format; ++ int video_stride; + + uint64_t last_frame_timestamp_us; + +@@ -112,8 +104,6 @@ G_DEFINE_TYPE_WITH_CODE (MetaScreenCastStreamSrc, + meta_screen_cast_stream_src_init_initable_iface) + G_ADD_PRIVATE (MetaScreenCastStreamSrc)) + +-#define PROP_RANGE(min, max) 2, (min), (max) +- + static void + meta_screen_cast_stream_src_get_specs (MetaScreenCastStreamSrc *src, + int *width, +@@ -286,9 +276,6 @@ meta_screen_cast_stream_src_set_empty_cursor_sprite_metadata (MetaScreenCastStre + int x, + int y) + { +- MetaScreenCastStreamSrcPrivate *priv = +- meta_screen_cast_stream_src_get_instance_private (src); +- MetaSpaType *spa_type = &priv->spa_type; + struct spa_meta_bitmap *spa_meta_bitmap; + + spa_meta_cursor->id = 1; +@@ -300,7 +287,7 @@ meta_screen_cast_stream_src_set_empty_cursor_sprite_metadata (MetaScreenCastStre + spa_meta_bitmap = SPA_MEMBER (spa_meta_cursor, + spa_meta_cursor->bitmap_offset, + struct spa_meta_bitmap); +- spa_meta_bitmap->format = spa_type->video_format.RGBA; ++ spa_meta_bitmap->format = SPA_VIDEO_FORMAT_RGBA; + spa_meta_bitmap->offset = sizeof (struct spa_meta_bitmap); + + spa_meta_cursor->hotspot.x = 0; +@@ -317,9 +304,6 @@ meta_screen_cast_stream_src_set_cursor_sprite_metadata (MetaScreenCastStreamSrc + int y, + float scale) + { +- MetaScreenCastStreamSrcPrivate *priv = +- meta_screen_cast_stream_src_get_instance_private (src); +- MetaSpaType *spa_type = &priv->spa_type; + CoglTexture *cursor_texture; + struct spa_meta_bitmap *spa_meta_bitmap; + int hotspot_x, hotspot_y; +@@ -346,7 +330,7 @@ meta_screen_cast_stream_src_set_cursor_sprite_metadata (MetaScreenCastStreamSrc + spa_meta_bitmap = SPA_MEMBER (spa_meta_cursor, + spa_meta_cursor->bitmap_offset, + struct spa_meta_bitmap); +- spa_meta_bitmap->format = spa_type->video_format.RGBA; ++ spa_meta_bitmap->format = SPA_VIDEO_FORMAT_RGBA; + spa_meta_bitmap->offset = sizeof (struct spa_meta_bitmap); + + meta_cursor_sprite_get_hotspot (cursor_sprite, &hotspot_x, &hotspot_y); +@@ -382,12 +366,10 @@ static void + add_cursor_metadata (MetaScreenCastStreamSrc *src, + struct spa_buffer *spa_buffer) + { +- MetaScreenCastStreamSrcPrivate *priv = +- meta_screen_cast_stream_src_get_instance_private (src); +- MetaSpaType *spa_type = &priv->spa_type; + struct spa_meta_cursor *spa_meta_cursor; + +- spa_meta_cursor = spa_buffer_find_meta (spa_buffer, spa_type->meta_cursor); ++ spa_meta_cursor = spa_buffer_find_meta_data (spa_buffer, SPA_META_Cursor, ++ sizeof (*spa_meta_cursor)); + if (spa_meta_cursor) + meta_screen_cast_stream_src_set_cursor_metadata (src, spa_meta_cursor); + } +@@ -447,14 +429,14 @@ meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src) + { + data = spa_buffer->datas[0].data; + } +- else if (spa_buffer->datas[0].type == priv->pipewire_type->data.MemFd) ++ else if (spa_buffer->datas[0].type == SPA_DATA_MemFd) + { + map = mmap (NULL, spa_buffer->datas[0].maxsize + spa_buffer->datas[0].mapoffset, + PROT_READ | PROT_WRITE, MAP_SHARED, + spa_buffer->datas[0].fd, 0); + if (map == MAP_FAILED) + { +- g_warning ("Failed to mmap pipewire stream buffer: %s\n", ++ g_warning ("Failed to mmap pipewire stream buffer: %s", + strerror (errno)); + return; + } +@@ -469,28 +451,30 @@ meta_screen_cast_stream_src_maybe_record_frame (MetaScreenCastStreamSrc *src) + + if (meta_screen_cast_stream_src_record_frame (src, data)) + { +- struct spa_meta_video_crop *spa_meta_video_crop; ++ struct spa_meta_region *spa_meta_video_crop; + + spa_buffer->datas[0].chunk->size = spa_buffer->datas[0].maxsize; ++ spa_buffer->datas[0].chunk->stride = priv->video_stride; + + /* Update VideoCrop if needed */ + spa_meta_video_crop = +- spa_buffer_find_meta (spa_buffer, priv->pipewire_type->meta.VideoCrop); ++ spa_buffer_find_meta_data (spa_buffer, SPA_META_VideoCrop, ++ sizeof (*spa_meta_video_crop)); + if (spa_meta_video_crop) + { + if (meta_screen_cast_stream_src_get_videocrop (src, &crop_rect)) + { +- spa_meta_video_crop->x = crop_rect.x; +- spa_meta_video_crop->y = crop_rect.y; +- spa_meta_video_crop->width = crop_rect.width; +- spa_meta_video_crop->height = crop_rect.height; ++ spa_meta_video_crop->region.position.x = crop_rect.x; ++ spa_meta_video_crop->region.position.y = crop_rect.y; ++ spa_meta_video_crop->region.size.width = crop_rect.width; ++ spa_meta_video_crop->region.size.height = crop_rect.height; + } + else + { +- spa_meta_video_crop->x = 0; +- spa_meta_video_crop->y = 0; +- spa_meta_video_crop->width = priv->stream_width; +- spa_meta_video_crop->height = priv->stream_height; ++ spa_meta_video_crop->region.position.x = 0; ++ spa_meta_video_crop->region.position.y = 0; ++ spa_meta_video_crop->region.size.width = priv->stream_width; ++ spa_meta_video_crop->region.size.height = priv->stream_height; + } + } + } +@@ -555,7 +539,6 @@ on_stream_state_changed (void *data, + MetaScreenCastStreamSrc *src = data; + MetaScreenCastStreamSrcPrivate *priv = + meta_screen_cast_stream_src_get_instance_private (src); +- uint32_t node_id; + + switch (state) + { +@@ -563,14 +546,12 @@ on_stream_state_changed (void *data, + g_warning ("pipewire stream error: %s", error_message); + meta_screen_cast_stream_src_notify_closed (src); + break; +- case PW_STREAM_STATE_CONFIGURE: +- node_id = pw_stream_get_node_id (priv->pipewire_stream); +- g_signal_emit (src, signals[READY], 0, (unsigned int) node_id); +- break; +- case PW_STREAM_STATE_UNCONNECTED: +- case PW_STREAM_STATE_CONNECTING: +- case PW_STREAM_STATE_READY: + case PW_STREAM_STATE_PAUSED: ++ if (priv->node_id == SPA_ID_INVALID && priv->pipewire_stream) ++ { ++ priv->node_id = pw_stream_get_node_id (priv->pipewire_stream); ++ g_signal_emit (src, signals[READY], 0, (unsigned int) priv->node_id); ++ } + if (meta_screen_cast_stream_src_is_enabled (src)) + meta_screen_cast_stream_src_disable (src); + break; +@@ -578,68 +559,69 @@ on_stream_state_changed (void *data, + if (!meta_screen_cast_stream_src_is_enabled (src)) + meta_screen_cast_stream_src_enable (src); + break; ++ case PW_STREAM_STATE_UNCONNECTED: ++ case PW_STREAM_STATE_CONNECTING: ++ break; + } + } + + static void +-on_stream_format_changed (void *data, +- const struct spa_pod *format) ++on_stream_param_changed (void *data, ++ uint32_t id, ++ const struct spa_pod *format) + { + MetaScreenCastStreamSrc *src = data; + MetaScreenCastStreamSrcPrivate *priv = + meta_screen_cast_stream_src_get_instance_private (src); +- struct pw_type *pipewire_type = priv->pipewire_type; + uint8_t params_buffer[1024]; + int32_t width, height, stride, size; + struct spa_pod_builder pod_builder; + const struct spa_pod *params[3]; + const int bpp = 4; + +- if (!format) +- { +- pw_stream_finish_format (priv->pipewire_stream, 0, NULL, 0); +- return; +- } ++ if (!format || id != SPA_PARAM_Format) ++ return; + + spa_format_video_raw_parse (format, +- &priv->video_format, +- &priv->spa_type.format_video); ++ &priv->video_format); + + width = priv->video_format.size.width; + height = priv->video_format.size.height; + stride = SPA_ROUND_UP_N (width * bpp, 4); + size = height * stride; + ++ priv->video_stride = stride; ++ + pod_builder = SPA_POD_BUILDER_INIT (params_buffer, sizeof (params_buffer)); + +- params[0] = spa_pod_builder_object ( ++ params[0] = spa_pod_builder_add_object ( + &pod_builder, +- pipewire_type->param.idBuffers, pipewire_type->param_buffers.Buffers, +- ":", pipewire_type->param_buffers.size, "i", size, +- ":", pipewire_type->param_buffers.stride, "i", stride, +- ":", pipewire_type->param_buffers.buffers, "iru", 16, PROP_RANGE (2, 16), +- ":", pipewire_type->param_buffers.align, "i", 16); +- +- params[1] = spa_pod_builder_object ( ++ SPA_TYPE_OBJECT_ParamBuffers, SPA_PARAM_Buffers, ++ SPA_PARAM_BUFFERS_buffers, SPA_POD_CHOICE_RANGE_Int (16, 2, 16), ++ SPA_PARAM_BUFFERS_blocks, SPA_POD_Int (1), ++ SPA_PARAM_BUFFERS_size, SPA_POD_Int (size), ++ SPA_PARAM_BUFFERS_stride, SPA_POD_Int (stride), ++ SPA_PARAM_BUFFERS_align, SPA_POD_Int (16)); ++ ++ params[1] = spa_pod_builder_add_object ( + &pod_builder, +- pipewire_type->param.idMeta, pipewire_type->param_meta.Meta, +- ":", pipewire_type->param_meta.type, "I", pipewire_type->meta.VideoCrop, +- ":", pipewire_type->param_meta.size, "i", sizeof (struct spa_meta_video_crop)); ++ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta, ++ SPA_PARAM_META_type, SPA_POD_Id (SPA_META_VideoCrop), ++ SPA_PARAM_META_size, SPA_POD_Int (sizeof (struct spa_meta_region))); + +- params[2] = spa_pod_builder_object ( ++ params[2] = spa_pod_builder_add_object ( + &pod_builder, +- pipewire_type->param.idMeta, pipewire_type->param_meta.Meta, +- ":", pipewire_type->param_meta.type, "I", priv->spa_type.meta_cursor, +- ":", pipewire_type->param_meta.size, "i", CURSOR_META_SIZE (64, 64)); ++ SPA_TYPE_OBJECT_ParamMeta, SPA_PARAM_Meta, ++ SPA_PARAM_META_type, SPA_POD_Id (SPA_META_Cursor), ++ SPA_PARAM_META_size, SPA_POD_Int (CURSOR_META_SIZE (64, 64))); + +- pw_stream_finish_format (priv->pipewire_stream, 0, +- params, G_N_ELEMENTS (params)); ++ pw_stream_update_params (priv->pipewire_stream, params, G_N_ELEMENTS (params)); + } + + static const struct pw_stream_events stream_events = { + PW_VERSION_STREAM_EVENTS, + .state_changed = on_stream_state_changed, +- .format_changed = on_stream_format_changed, ++ .param_changed = on_stream_param_changed, + }; + + static struct pw_stream * +@@ -652,8 +634,6 @@ create_pipewire_stream (MetaScreenCastStreamSrc *src, + uint8_t buffer[1024]; + struct spa_pod_builder pod_builder = + SPA_POD_BUILDER_INIT (buffer, sizeof (buffer)); +- MetaSpaType *spa_type = &priv->spa_type; +- struct pw_type *pipewire_type = priv->pipewire_type; + float frame_rate; + MetaFraction frame_rate_fraction; + struct spa_fraction max_framerate; +@@ -661,7 +641,9 @@ create_pipewire_stream (MetaScreenCastStreamSrc *src, + const struct spa_pod *params[1]; + int result; + +- pipewire_stream = pw_stream_new (priv->pipewire_remote, ++ priv->node_id = SPA_ID_INVALID; ++ ++ pipewire_stream = pw_stream_new (priv->pipewire_core, + "meta-screen-cast-src", + NULL); + if (!pipewire_stream) +@@ -682,17 +664,17 @@ create_pipewire_stream (MetaScreenCastStreamSrc *src, + max_framerate = SPA_FRACTION (frame_rate_fraction.num, + frame_rate_fraction.denom); + +- params[0] = spa_pod_builder_object ( ++ params[0] = spa_pod_builder_add_object ( + &pod_builder, +- pipewire_type->param.idEnumFormat, pipewire_type->spa_format, +- "I", spa_type->media_type.video, +- "I", spa_type->media_subtype.raw, +- ":", spa_type->format_video.format, "I", spa_type->video_format.BGRx, +- ":", spa_type->format_video.size, "R", &SPA_RECTANGLE (priv->stream_width, +- priv->stream_height), +- ":", spa_type->format_video.framerate, "F", &SPA_FRACTION (0, 1), +- ":", spa_type->format_video.max_framerate, "Fru", &max_framerate, +- PROP_RANGE (&min_framerate, ++ SPA_TYPE_OBJECT_Format, SPA_PARAM_EnumFormat, ++ SPA_FORMAT_mediaType, SPA_POD_Id (SPA_MEDIA_TYPE_video), ++ SPA_FORMAT_mediaSubtype, SPA_POD_Id (SPA_MEDIA_SUBTYPE_raw), ++ SPA_FORMAT_VIDEO_format, SPA_POD_Id (SPA_VIDEO_FORMAT_BGRx), ++ SPA_FORMAT_VIDEO_size, SPA_POD_Rectangle (&SPA_RECTANGLE (priv->stream_width, ++ priv->stream_height)), ++ SPA_FORMAT_VIDEO_framerate, SPA_POD_Fraction (&SPA_FRACTION (0, 1)), ++ SPA_FORMAT_VIDEO_maxFramerate, SPA_POD_CHOICE_RANGE_Fraction (&max_framerate, ++ &min_framerate, + &max_framerate)); + + pw_stream_add_listener (pipewire_stream, +@@ -702,7 +684,7 @@ create_pipewire_stream (MetaScreenCastStreamSrc *src, + + result = pw_stream_connect (pipewire_stream, + PW_DIRECTION_OUTPUT, +- NULL, ++ SPA_ID_INVALID, + (PW_STREAM_FLAG_DRIVER | + PW_STREAM_FLAG_MAP_BUFFERS), + params, G_N_ELEMENTS (params)); +@@ -717,40 +699,18 @@ create_pipewire_stream (MetaScreenCastStreamSrc *src, + } + + static void +-on_state_changed (void *data, +- enum pw_remote_state old, +- enum pw_remote_state state, +- const char *error_message) ++on_core_error (void *data, ++ uint32_t id, ++ int seq, ++ int res, ++ const char *message) + { + MetaScreenCastStreamSrc *src = data; +- MetaScreenCastStreamSrcPrivate *priv = +- meta_screen_cast_stream_src_get_instance_private (src); +- struct pw_stream *pipewire_stream; +- GError *error = NULL; + +- switch (state) +- { +- case PW_REMOTE_STATE_ERROR: +- g_warning ("pipewire remote error: %s\n", error_message); +- meta_screen_cast_stream_src_notify_closed (src); +- break; +- case PW_REMOTE_STATE_CONNECTED: +- pipewire_stream = create_pipewire_stream (src, &error); +- if (!pipewire_stream) +- { +- g_warning ("Could not create pipewire stream: %s", error->message); +- g_error_free (error); +- meta_screen_cast_stream_src_notify_closed (src); +- } +- else +- { +- priv->pipewire_stream = pipewire_stream; +- } +- break; +- case PW_REMOTE_STATE_UNCONNECTED: +- case PW_REMOTE_STATE_CONNECTING: +- break; +- } ++ g_warning ("pipewire remote error: id:%u %s", id, message); ++ ++ if (id == PW_ID_CORE && res == -EPIPE) ++ meta_screen_cast_stream_src_notify_closed (src); + } + + static gboolean +@@ -793,17 +753,6 @@ static GSourceFuncs pipewire_source_funcs = + pipewire_loop_source_finalize + }; + +-static void +-init_spa_type (MetaSpaType *type, +- struct spa_type_map *map) +-{ +- spa_type_media_type_map (map, &type->media_type); +- spa_type_media_subtype_map (map, &type->media_subtype); +- spa_type_format_video_map (map, &type->format_video); +- spa_type_video_format_map (map, &type->video_format); +- type->meta_cursor = spa_type_map_get_id(map, SPA_TYPE_META__Cursor); +-} +- + static MetaPipeWireSource * + create_pipewire_source (void) + { +@@ -829,9 +778,9 @@ create_pipewire_source (void) + return pipewire_source; + } + +-static const struct pw_remote_events remote_events = { +- PW_VERSION_REMOTE_EVENTS, +- .state_changed = on_state_changed, ++static const struct pw_core_events core_events = { ++ PW_VERSION_CORE_EVENTS, ++ .error = on_core_error, + }; + + static gboolean +@@ -851,37 +800,31 @@ meta_screen_cast_stream_src_initable_init (GInitable *initable, + return FALSE; + } + +- priv->pipewire_core = pw_core_new (priv->pipewire_source->pipewire_loop, +- NULL); +- if (!priv->pipewire_core) ++ priv->pipewire_context = pw_context_new (priv->pipewire_source->pipewire_loop, ++ NULL, 0); ++ if (!priv->pipewire_context) + { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Failed to create pipewire core"); ++ "Failed to create pipewire context"); + return FALSE; + } + +- priv->pipewire_remote = pw_remote_new (priv->pipewire_core, NULL, 0); +- if (!priv->pipewire_remote) ++ priv->pipewire_core = pw_context_connect (priv->pipewire_context, NULL, 0); ++ if (!priv->pipewire_core) + { + g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Couldn't creat pipewire remote"); ++ "Couldn't connect pipewire context"); + return FALSE; + } + +- pw_remote_add_listener (priv->pipewire_remote, +- &priv->pipewire_remote_listener, +- &remote_events, +- src); ++ pw_core_add_listener (priv->pipewire_core, ++ &priv->pipewire_core_listener, ++ &core_events, ++ src); + +- priv->pipewire_type = pw_core_get_type (priv->pipewire_core); +- init_spa_type (&priv->spa_type, priv->pipewire_type->map); +- +- if (pw_remote_connect (priv->pipewire_remote) != 0) +- { +- g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, +- "Couldn't connect pipewire remote"); +- return FALSE; +- } ++ priv->pipewire_stream = create_pipewire_stream (src, error); ++ if (!priv->pipewire_stream) ++ return FALSE; + + return TRUE; + } +@@ -912,8 +855,8 @@ meta_screen_cast_stream_src_finalize (GObject *object) + meta_screen_cast_stream_src_disable (src); + + g_clear_pointer (&priv->pipewire_stream, pw_stream_destroy); +- g_clear_pointer (&priv->pipewire_remote, pw_remote_destroy); +- g_clear_pointer (&priv->pipewire_core, pw_core_destroy); ++ g_clear_pointer (&priv->pipewire_core, pw_core_disconnect); ++ g_clear_pointer (&priv->pipewire_context, pw_context_destroy); + g_source_destroy (&priv->pipewire_source->base); + + G_OBJECT_CLASS (meta_screen_cast_stream_src_parent_class)->finalize (object); diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 4e0bd32b67d..806a3bef9f0 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,7 +1,7 @@ # Template file for 'mutter' pkgname=mutter version=3.34.1 -revision=2 +revision=3 build_helper="gir" build_style=meson configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true From e68a3a22d714dfe0bec8f4216298ffd896518a45 Mon Sep 17 00:00:00 2001 From: Nafis Date: Wed, 29 Apr 2020 15:49:16 +0600 Subject: [PATCH 06/41] gnome-desktop: update to 3.36.2. [ci skip] --- common/shlibs | 2 +- srcpkgs/gnome-desktop/template | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index 0b58777db72..7e93ace253f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1177,7 +1177,7 @@ libgstbasecamerabinsrc-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstcodecparsers-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstplayer-1.0.so.0 gst-plugins-bad1-1.0.0_1 libgstgl-1.0.so.0 gst-plugins-base1-1.14.0_1 -libgnome-desktop-3.so.18 gnome-desktop-3.34.0_1 +libgnome-desktop-3.so.19 gnome-desktop-3.36.2_1 libsecret-1.so.0 libsecret-0.10_1 libgweather-3.so.16 libgweather-3.34.0_1 libgnomekbd.so.8 libgnomekbd-3.6.0_1 diff --git a/srcpkgs/gnome-desktop/template b/srcpkgs/gnome-desktop/template index 992cb1ff16a..c1a7408c207 100644 --- a/srcpkgs/gnome-desktop/template +++ b/srcpkgs/gnome-desktop/template @@ -1,11 +1,11 @@ # Template file for 'gnome-desktop' pkgname=gnome-desktop -version=3.34.1 +version=3.36.2 revision=1 build_style=meson build_helper="gir" -configure_args="-Dgnome-distributor=VoidLinux -Dudev=enabled - -Dintrospection=$(vopt_if gir true false)" +configure_args="-Dgnome_distributor=VoidLinux -Dudev=enabled + -Dsystemd=disabled -Dintrospection=$(vopt_if gir true false)" hostmakedepends="gettext itstool pkg-config glib-devel" makedepends="eudev-libudev-devel gsettings-desktop-schemas-devel gtk+3-devel iso-codes libglib-devel libseccomp-devel libX11-devel libXext-devel @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-desktop" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c1dbeb5666dad27166c769e48e2ab41dd5ed74718ea35eb57c8488790662dc5a +checksum=38f994dcb1e1ae093d1c929c7acc4f88e39111e43b5fdc13125b0f6e2311c789 build_options="gir" build_options_default="gir" From 14a51a6be3cbdc5f3ad62d8a2dbcd3cf5d663da4 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 12:20:15 +0600 Subject: [PATCH 07/41] nautilus: update to 3.36.2. [ci skip] --- srcpkgs/nautilus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/nautilus/template b/srcpkgs/nautilus/template index 537a851973f..1010873f4f0 100644 --- a/srcpkgs/nautilus/template +++ b/srcpkgs/nautilus/template @@ -1,6 +1,6 @@ # Template file for 'nautilus' pkgname=nautilus -version=3.36.1.1 +version=3.36.2 revision=1 build_style=meson build_helper="gir" @@ -16,8 +16,8 @@ short_desc="GNOME file manager" maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Nautilus" -distfiles="${GNOME_SITE}/${pkgname}/${version::4}/${pkgname}-${version}.tar.xz" -checksum=f9252f508211d9f368a49db697890f895d080f09590aecaf33803a519def7bde +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=26673c9599502452cf299358729be8b554066a9b670d89b24e245160d15776fa build_options="gir" build_options_default="gir" From a1e0947c27d6f0759c969742e3d74e7a929f0b0c Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 12:26:04 +0600 Subject: [PATCH 08/41] gnome-2048: update to 3.36.2. [ci skip] --- srcpkgs/gnome-2048/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-2048/template b/srcpkgs/gnome-2048/template index b59ccf6de46..989b6ff125b 100644 --- a/srcpkgs/gnome-2048/template +++ b/srcpkgs/gnome-2048/template @@ -1,6 +1,6 @@ # Template file for 'gnome-2048' pkgname=gnome-2048 -version=3.36.0 +version=3.36.2 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config vala" @@ -11,4 +11,4 @@ maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/2048" distfiles="${GNOME_SITE}/gnome-2048/${version%.*}/gnome-2048-${version}.tar.xz" -checksum=1b790f145d0bd67a5339c16a70674807344ed11831e8c0245ed31956b4b38281 +checksum=29da7499c89ee74f9834e8de2b85633239a66e5c53d956a8e95a987bdb4b3321 From 5c4418986b974edf10efc66148c4a189f67bc10d Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 12:43:02 +0600 Subject: [PATCH 09/41] gnome-music: update to 3.36.2. [ci skip] --- srcpkgs/gnome-music/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-music/template b/srcpkgs/gnome-music/template index 12511736407..802bcea891f 100644 --- a/srcpkgs/gnome-music/template +++ b/srcpkgs/gnome-music/template @@ -1,6 +1,6 @@ # Template file for 'gnome-music' pkgname=gnome-music -version=3.36.1 +version=3.36.2 revision=1 build_helper="gir" build_style=meson @@ -15,5 +15,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Music" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=7b80f630d158334935a8760296550cc91b50d604fa68b402fe5165b1531ec332 +checksum=abad413aebfa8f8141abc7164809e8c4677f8b6538f892128193e097e0e982a5 lib32disabled=yes From 14e6c34acb6f81a766e6ff4ced1d486c1b8bfd50 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 13:02:47 +0600 Subject: [PATCH 10/41] devhelp: update to 3.36.2. [ci skip] --- srcpkgs/devhelp/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/devhelp/template b/srcpkgs/devhelp/template index a1c2dcbb762..ba75dffdce7 100644 --- a/srcpkgs/devhelp/template +++ b/srcpkgs/devhelp/template @@ -1,6 +1,6 @@ # Template file for 'devhelp' pkgname=devhelp -version=3.36.1 +version=3.36.2 revision=1 build_helper="gir" build_style=meson @@ -11,7 +11,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Devhelp" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=4cf8ec9302bc4a79e01ac53bd9c8b95a596f71f35351f48b63263227f09a8a3d +checksum=8b5a84319efbb2ef1bc4022ee3ed2d6678794eba2dfa993e50e03d6e7b930c5e devhelp-devel_package() { short_desc+=" - development files" From 439b8a86d07fcd5577e254b720c759741530644a Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 13:17:42 +0600 Subject: [PATCH 11/41] eog: update to 3.36.2. [ci skip] --- srcpkgs/eog/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/eog/template b/srcpkgs/eog/template index f5340000eb5..276399ca2cc 100644 --- a/srcpkgs/eog/template +++ b/srcpkgs/eog/template @@ -1,6 +1,6 @@ # Template file for 'eog' pkgname=eog -version=3.36.1 +version=3.36.2 revision=1 build_helper="gir" build_style=meson @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/EyeOfGnome" distfiles="${GNOME_SITE}/eog/${version%.*}/eog-${version}.tar.xz" -checksum=e454a1a7aa5e3a3321eab0116778110e5a7a7b63bcf21676eda1a7be187c9c95 +checksum=5c056b0295a8e06d093b8fc60b10e2a8c19abdb7beae1c7e7e0595ece2e1b78c shlib_provides="libeog.so" lib32disabled=yes From 670b878de25f16fe0ee7bf3701d7834a8a8465f9 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 13:30:56 +0600 Subject: [PATCH 12/41] gnome-maps: update to 3.36.2. [ci skip] --- srcpkgs/gnome-maps/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-maps/template b/srcpkgs/gnome-maps/template index 0300be60599..9fdd27db3bd 100644 --- a/srcpkgs/gnome-maps/template +++ b/srcpkgs/gnome-maps/template @@ -1,6 +1,6 @@ # Template file for 'gnome-maps' pkgname=gnome-maps -version=3.36.1 +version=3.36.2 revision=1 build_style=meson hostmakedepends="glib-devel gobject-introspection intltool pkg-config AppStream" @@ -12,5 +12,5 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Maps" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=1a32efd96ad898f77a636d2d0463d757009b4b812259c89ffdcb91d6afc052f9 +checksum=5ba219b9de98678cefa5848f6538db8dbd07f6c747fd43a99167a266878a9784 nocross="evolution-dataserver cross gir doesn't work" From 3f5b05f2d6fcd84f293995b0bc118dec0727bfcc Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 14:27:10 +0600 Subject: [PATCH 13/41] gedit: update to 3.36.2. [ci skip] --- srcpkgs/gedit/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gedit/template b/srcpkgs/gedit/template index 4e273aaf182..e3ebea05ea7 100644 --- a/srcpkgs/gedit/template +++ b/srcpkgs/gedit/template @@ -1,6 +1,6 @@ # Template file for 'gedit' pkgname=gedit -version=3.36.1 +version=3.36.2 revision=1 build_helper="gir" build_style=meson @@ -17,7 +17,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Gedit" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=6dc38eda227d1c368e039e9bff485d0bee9a49d5f9560c387ee08f5818a4e387 +checksum=6887554643c5b1b3862ac364d97b7b50224bff95e6758aeaa08f4a482b554197 shlib_provides="libgedit-3.36.so" python_version=3 From ad0517e92f2f7436ed1fe095d3ed26c67432d578 Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 15:02:14 +0600 Subject: [PATCH 14/41] gnome-contacts: update to 3.36.1. [ci skip] --- srcpkgs/gnome-contacts/template | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-contacts/template b/srcpkgs/gnome-contacts/template index 2a8213a7240..71d15c8e3f7 100644 --- a/srcpkgs/gnome-contacts/template +++ b/srcpkgs/gnome-contacts/template @@ -1,7 +1,7 @@ # Template file for 'gnome-contacts' pkgname=gnome-contacts -version=3.34.0 -revision=2 +version=3.36.1 +revision=1 wrksrc="gnome-contacts-${version%.*}" build_style=meson hostmakedepends="docbook-xsl gettext glib-devel libxslt pkg-config vala" @@ -13,4 +13,8 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Contacts" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version%.*}.tar.xz" -checksum=99602ec8d660c1f3c92cae6356f64f72fb6db58e55bce27a599330bf7b622f12 +checksum=eecbd2209d93c8d31df92f6ccf79183b456c6e07a28ae0155cbda18aabd36f7b + +if [ "$CROSS_BUILD" ]; then + hostmakedepends+=" folks-devel" +fi From 88785c54e22807a39d91e146f0f43b22a0276bbf Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 15:29:30 +0600 Subject: [PATCH 15/41] gnome-epub-thumbnailer: update to 1.6. [ci skip] --- srcpkgs/gnome-epub-thumbnailer/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-epub-thumbnailer/template b/srcpkgs/gnome-epub-thumbnailer/template index b16e705475f..d67b77f1e43 100644 --- a/srcpkgs/gnome-epub-thumbnailer/template +++ b/srcpkgs/gnome-epub-thumbnailer/template @@ -1,13 +1,13 @@ # Template file for 'gnome-epub-thumbnailer' pkgname=gnome-epub-thumbnailer -version=1.5 +version=1.6 revision=1 build_style=gnu-configure hostmakedepends="pkg-config" makedepends="gdk-pixbuf-devel libarchive-devel libxml2-devel" short_desc="Thumbnailer for EPub and MOBI books" maintainer="Alif Rachmawadi " -license="GPL-3" +license="GPL-2.0-or-later" homepage="https://git.gnome.org/browse/gnome-epub-thumbnailer" distfiles="${GNOME_SITE}/${pkgname}/${version}/${pkgname}-${version}.tar.xz" -checksum=308210f5800219f64cae4828e59bb8e6e4c53b888048cf487221aeb4337d791a +checksum=b502420d9b02ea0b0fc7986ef5a091a12b2286be14fed9e47594fe9fa0c5898e From 270da823ae4be967d589cb236bde6a62bc5edabe Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 16:12:06 +0600 Subject: [PATCH 16/41] vte3: update to 0.60.2. [ci skip] --- srcpkgs/vte3/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/vte3/template b/srcpkgs/vte3/template index 2ab15918d3b..85f4d2db9cd 100644 --- a/srcpkgs/vte3/template +++ b/srcpkgs/vte3/template @@ -1,6 +1,6 @@ # Template file for 'vte3' pkgname=vte3 -version=0.60.1 +version=0.60.2 revision=1 wrksrc="vte-${version}" build_style=meson @@ -16,7 +16,7 @@ maintainer="Enno Boland " license="GPL-3.0-or-later, LGPL-2.1-or-later, LGPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Terminal/VTE" distfiles="${GNOME_SITE}/vte/${version%.*}/vte-${version}.tar.xz" -checksum=5e25807233f8a7e15204be7ff694bbcf6facbb0136092b5ba12584a7b70cf0c4 +checksum=35a0280e3f12feeb3096da05699191373c47a4a20c55cb7081e828e6015f8ca5 # Suppress warnings as errors for NULL format strings (musl libc) CXXFLAGS="-Wno-error=format=" From 8b792d45c404117c3b4b258386f365af8dfe5f1a Mon Sep 17 00:00:00 2001 From: Nafis Date: Mon, 27 Apr 2020 16:23:46 +0600 Subject: [PATCH 17/41] gnome-terminal: update to 3.36.2. [ci skip] --- srcpkgs/gnome-terminal/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-terminal/template b/srcpkgs/gnome-terminal/template index bf3d5bcdd42..22dbc11bada 100644 --- a/srcpkgs/gnome-terminal/template +++ b/srcpkgs/gnome-terminal/template @@ -1,6 +1,6 @@ # Template file for 'gnome-terminal' pkgname=gnome-terminal -version=3.36.1.1 +version=3.36.2 revision=1 build_style=gnu-configure configure_args="--disable-static --with-nautilus-extension" @@ -13,8 +13,8 @@ short_desc="GNOME terminal emulator application" maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.3-only" homepage="https://wiki.gnome.org/Apps/Terminal" -distfiles="${GNOME_SITE}/${pkgname}/${version:0:4}/${pkgname}-${version}.tar.xz" -checksum=f3d708a1e76d77c1c85b126f6e003220a15d4a46a50fd8070e1a3aabe678a376 +distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" +checksum=41d1b6a3dc97c066e294acdb7f36931e81668638dcc92ffa25bca3ddebacdf46 lib32disabled=yes if [ "$CROSS_BUILD" ]; then From 268aa06c075fa6639d246e6a048dd23251eb4d9f Mon Sep 17 00:00:00 2001 From: Nafis Date: Tue, 28 Apr 2020 18:18:00 +0600 Subject: [PATCH 18/41] gnome-podcasts: update to 0.4.7. [ci skip] --- .../gnome-podcasts/patches/fix-build.patch | 21 ---------------- srcpkgs/gnome-podcasts/template | 24 ++++++++++--------- 2 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 srcpkgs/gnome-podcasts/patches/fix-build.patch diff --git a/srcpkgs/gnome-podcasts/patches/fix-build.patch b/srcpkgs/gnome-podcasts/patches/fix-build.patch deleted file mode 100644 index aeb9581bd79..00000000000 --- a/srcpkgs/gnome-podcasts/patches/fix-build.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- podcasts-gtk/src/widgets/episode.rs.orig 2019-06-09 15:54:59.793451047 +0200 -+++ podcasts-gtk/src/widgets/episode.rs 2019-06-09 15:55:19.191311512 +0200 -@@ -559,7 +559,7 @@ - .total_size - .get_text() - .as_ref() -- .map(|s| s.trim_right_matches(" MB")) -+ .map(|s| s.trim_end_matches(" MB")) - .and_then(|s| s.parse::().ok()) - .is_none() - { ---- podcasts-gtk/src/widgets/shows_view.rs.orig 2019-06-09 15:54:00.320878867 +0200 -+++ podcasts-gtk/src/widgets/shows_view.rs 2019-06-09 15:54:13.151786563 +0200 -@@ -80,7 +80,6 @@ - } - - fn on_child_activate(child: >k::FlowBoxChild, sender: &Sender) -> Result<(), Error> { -- use gtk::WidgetExt; - - // This is such an ugly hack... - let id = WidgetExt::get_name(child) diff --git a/srcpkgs/gnome-podcasts/template b/srcpkgs/gnome-podcasts/template index 72e2db6b109..3c239df8424 100644 --- a/srcpkgs/gnome-podcasts/template +++ b/srcpkgs/gnome-podcasts/template @@ -1,26 +1,28 @@ # Template file for 'gnome-podcasts' pkgname=gnome-podcasts -version=0.4.6 -revision=3 +version=0.4.7 +revision=1 wrksrc="podcasts-${version}" build_style=meson -hostmakedepends="cargo gettext-devel glib-devel pkg-config" +build_helper="rust" +hostmakedepends="cargo gettext glib-devel pkg-config sqlite-devel" makedepends="gstreamer1-devel gst-plugins-bad1-devel gst-plugins-base1-devel - gtk+3-devel libhandy-devel libressl-devel sqlite-devel texinfo" + gtk+3-devel libhandy-devel libressl-devel sqlite-devel rust-std" short_desc="Listen to your favorite podcasts" maintainer="Enno Boland " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Apps/Podcasts" distfiles="https://gitlab.gnome.org/World/podcasts/-/archive/${version}/podcasts-${version}.tar.gz" -checksum=953c63e8184ca1f748418d8a8262d40eaa41047f81e2d2c874a3035d9d9d0e4a -nocross="rustc cant be crosscompiled as of now" -broken="gettext-rs hash does not exists, if fixed build fails in gio 0.5.0" +checksum=a9a1b62dd3567e3cca38ee29df2fadd82e2fb5e837b0a2a26ecac74e9305161c export GETTEXT_BIN_DIR=/usr/bin export GETTEXT_LIB_DIR="${XBPS_CROSS_BASE}/usr/lib/gettext" export GETTEXT_INCLUDE_DIR="${XBPS_CROSS_BASE}/usr/include" -pre_build() { - cargo update --package openssl-sys --precise 0.9.46 - cargo update --package openssl --precise 0.10.22 -} +if [ "$CROSS_BUILD" ]; then + post_patch() { + vsed -i scripts/cargo.sh \ + -e 's%"$CARGO_TARGET_DIR"/%&${RUST_TARGET}/%' \ + -e '/CARGO_HOME/d' + } +fi From 1d1148d041809ed53e8c875c3c3f47e9e574176d Mon Sep 17 00:00:00 2001 From: Nafis Date: Wed, 29 Apr 2020 14:41:32 +0600 Subject: [PATCH 19/41] gnome-control-center: update to 3.36.1. [ci skip] --- srcpkgs/gnome-control-center/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/gnome-control-center/template b/srcpkgs/gnome-control-center/template index 0e2787898ae..b1913f66a8b 100644 --- a/srcpkgs/gnome-control-center/template +++ b/srcpkgs/gnome-control-center/template @@ -1,6 +1,6 @@ # Template file for 'gnome-control-center' pkgname=gnome-control-center -version=3.34.1 +version=3.36.1 revision=1 build_style=meson build_helper="gir" @@ -24,7 +24,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-control-center" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=5f82ecd5554136c462248ec5363b82d95358b39dfd6787006d8307b4504e515e +checksum=f3e32d1cff7ec2fc42c2db2c7f61274d476d3a49aae10040f57217ee25d7c690 build_options="cheese" desc_option_cheese="Add support for adding user account images with your webcam" From 7c0c81b9043717f4aa837438ec0489d336307c58 Mon Sep 17 00:00:00 2001 From: Nafis Date: Fri, 1 May 2020 10:11:54 +0600 Subject: [PATCH 20/41] gnome-user-docs: update to 3.36.2. [ci skip] --- srcpkgs/gnome-user-docs/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/gnome-user-docs/template b/srcpkgs/gnome-user-docs/template index 4cb55396e37..ca993346e3a 100644 --- a/srcpkgs/gnome-user-docs/template +++ b/srcpkgs/gnome-user-docs/template @@ -1,6 +1,6 @@ # Template file for 'gnome-user-docs' pkgname=gnome-user-docs -version=3.34.0 +version=3.36.2 revision=1 archs=noarch build_style=gnu-configure @@ -10,7 +10,7 @@ depends="yelp" short_desc="User documentation for GNOME" maintainer="Enno Boland " license="CC-BY-3.0" -homepage="https://github.com/GNOME/gnome-user-docs" -#changelog="https://raw.githubusercontent.com/GNOME/gnome-user-docs/master/NEWS" +homepage="https://gitlab.gnome.org/GNOME/gnome-user-docs" +changelog="https://gitlab.gnome.org/GNOME/gnome-user-docs/-/raw/3.36.2/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=8f9907ff15fff97da75ece645cc86766703ac54d716d25563ba67ffed1af24ed +checksum=198fe4c836775a5dc2543a6a520dfb0ac5bf292cdcb358a57c86f35f705e9958 From 786f9fcfc3d8bd07bec4307166b09a3a172eb0f6 Mon Sep 17 00:00:00 2001 From: Nafis Date: Fri, 1 May 2020 08:38:15 +0600 Subject: [PATCH 21/41] evolution-data-server: update to 3.36.2. [ci skip] --- srcpkgs/evolution-data-server/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template index 885a115f49b..dec72e7c424 100644 --- a/srcpkgs/evolution-data-server/template +++ b/srcpkgs/evolution-data-server/template @@ -1,6 +1,6 @@ # Template file for 'evolution-data-server' pkgname=evolution-data-server -version=3.36.1 +version=3.36.2 revision=1 build_style=cmake build_helper=gir @@ -17,7 +17,7 @@ license="LGPL-2.1-only" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution-data-server/gnome-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=13122b2edddb98306207d2a35d5ccae25a90702769ca0a0b51653b5984986796 +checksum=98e274cfec16cee6a4b3b9c7897f6e1136d00e4f31a0d66214925abbac76e97b build_options="gir" if [ -z "$CROSS_BUILD" ]; then From a23666d5174dcad3dfed91b308b5b2c912af2b15 Mon Sep 17 00:00:00 2001 From: Nafis Date: Fri, 1 May 2020 08:38:23 +0600 Subject: [PATCH 22/41] evolution: update to 3.36.2. [ci skip] --- srcpkgs/evolution/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution/template b/srcpkgs/evolution/template index 560ed93da02..c9c3afb7f6f 100644 --- a/srcpkgs/evolution/template +++ b/srcpkgs/evolution/template @@ -1,6 +1,6 @@ # Template file for 'evolution' pkgname=evolution -version=3.36.1 +version=3.36.2 revision=1 build_style=cmake configure_args="-DENABLE_AUTOAR=OFF -DENABLE_LIBCRYPTUI=OFF -DENABLE_GTKSPELL=OFF @@ -19,7 +19,7 @@ license="LGPL-2.1-or-later, LGPL-3.0-or-later, GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution/gnome-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=873acf1dbec38e67e169064645ac3a9b9a944bd2b633161df6e5f05700e36cb8 +checksum=c50948c1a3ddb39b72acd93de77f94787cdc1bef330b967bbb8b6c723343318a shlib_provides="libevolution-calendar.so libevolution-util.so libemail-engine.so libevolution-mail.so libevolution-shell.so" From 04dbe2eccf7c4678d213119d24358a30cbe6f352 Mon Sep 17 00:00:00 2001 From: Nafis Date: Fri, 1 May 2020 08:38:27 +0600 Subject: [PATCH 23/41] evolution-ews: update to 3.36.2. [ci skip] --- srcpkgs/evolution-ews/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/evolution-ews/template b/srcpkgs/evolution-ews/template index 4ff8116466c..a171f4c4a08 100644 --- a/srcpkgs/evolution-ews/template +++ b/srcpkgs/evolution-ews/template @@ -1,6 +1,6 @@ # Template file for 'evolution-ews' pkgname=evolution-ews -version=3.36.1 +version=3.36.2 revision=1 build_style=cmake configure_args="-DLIBEXEC_INSTALL_DIR=/usr/lib/evolution" @@ -12,4 +12,4 @@ license="LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Apps/Evolution" changelog="https://raw.githubusercontent.com/GNOME/evolution-ews/gnome-3-36/NEWS" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=d0883c7d227827cc5c4468b7e31a3ee370bcd7d41a4dbb950ab5db36c9551ac1 +checksum=2e42e4890487f8c7f9d776a4444df6efd5299ca003a30002eb5f022091dc359d From 1e8c535c7e13f0c400eb4ea8abf37fb31a6558f3 Mon Sep 17 00:00:00 2001 From: Nafis Date: Fri, 1 May 2020 08:41:56 +0600 Subject: [PATCH 24/41] file-roller: update to 3.36.2. [ci skip] --- srcpkgs/file-roller/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/file-roller/template b/srcpkgs/file-roller/template index 5fb76d97307..6a0c280f0d5 100644 --- a/srcpkgs/file-roller/template +++ b/srcpkgs/file-roller/template @@ -1,6 +1,6 @@ # Template file for 'file-roller' pkgname=file-roller -version=3.36.0 +version=3.36.2 revision=1 build_style=meson hostmakedepends="gettext glib-devel itstool pkg-config" @@ -12,4 +12,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/FileRoller" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=b9144de8f536f583ec29d703c2c170bf2d00c6c166cd5e3f7efabda551f10478 +checksum=268f7fdad8d2a78dfed5e82eb8710bad389c311b720666d6f07a04ed51056bd2 From a96a4c6943b3286d41a7fe6422bcc96fe0f3c15d Mon Sep 17 00:00:00 2001 From: Nafis Date: Fri, 1 May 2020 09:14:10 +0600 Subject: [PATCH 25/41] polari: update to 3.36.2. [ci skip] --- srcpkgs/polari/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/polari/template b/srcpkgs/polari/template index 5d1c71b0f91..68a0eb1eaae 100644 --- a/srcpkgs/polari/template +++ b/srcpkgs/polari/template @@ -1,6 +1,6 @@ # Template file for 'polari' pkgname=polari -version=3.36.1 +version=3.36.2 revision=1 build_style=meson hostmakedepends="pkg-config itstool gobject-introspection gettext" @@ -13,5 +13,5 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Apps/Polari" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c4c2aaa66b202eec3ab7dbfe08b8bb730e40cafc77cb0a9eae190bf1c8c1b5e6 +checksum=acfcdb1653bf2e47bd5ab891e38a0002c2f93c160397119c3a0b5c3ec57d208a nocross="telepathy-idle: File '../tools/glib-ginterface-gen.py', line 791 SyntaxError: invalid syntax" From 5ddc4cfa7dcd4d4743c8c6f00394f889715b55cc Mon Sep 17 00:00:00 2001 From: Nafis Date: Sun, 19 Apr 2020 16:51:42 +0600 Subject: [PATCH 26/41] gnome-panel: update to 3.36.1. [ci skip] --- common/shlibs | 3 ++- srcpkgs/gnome-panel/template | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/common/shlibs b/common/shlibs index 7e93ace253f..f9bb4b20f70 100644 --- a/common/shlibs +++ b/common/shlibs @@ -566,7 +566,8 @@ libpackagekit-glib2.so.18 PackageKit-1.1.12_1 libpsl.so.5 libpsl-0.20.2_1 libsoup-2.4.so.1 libsoup-2.34.0_1 libsoup-gnome-2.4.so.1 libsoup-gnome-2.34.0_1 -libpanel-applet.so.3 gnome-panel-3.30.0_1 +libgnome-panel.so.0 gnome-panel-3.36.1_1 +libpanel-applet.so.3 gnome-panel-3.36.1_1 libuninum.so.5 libuninum-2.7_1 libunique-3.0.so.0 libunique-2.91.4_1 libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1 diff --git a/srcpkgs/gnome-panel/template b/srcpkgs/gnome-panel/template index 70f23b8b551..9b00bfab658 100644 --- a/srcpkgs/gnome-panel/template +++ b/srcpkgs/gnome-panel/template @@ -1,7 +1,7 @@ # Template file for 'gnome-panel' pkgname=gnome-panel -version=3.34.1 -revision=3 +version=3.36.1 +revision=1 build_style=gnu-configure configure_args="ax_cv_zoneinfo_tzdir=/usr/share/zoneinfo" hostmakedepends="gettext-devel glib-devel itstool pkg-config tzdata gettext" @@ -14,7 +14,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, GFDL-1.1-or-later, LGPL-2.1-or-later" homepage="https://wiki.gnome.org/Projects/GnomePanel" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=a6bc0255252eeb4b964bcbe55fd7908b69f914c062c5ec8dff5ac0262d29b90d +checksum=1e21b726dd397523ae79d29eb538bcae09e3427e23ccd63f28eb25ef3552abd3 patch_args="-Np1" gnome-panel-devel_package() { From c1fed7df0789060f3954bf516dcc4c683d973aad Mon Sep 17 00:00:00 2001 From: Nafis Date: Sun, 19 Apr 2020 17:26:36 +0600 Subject: [PATCH 27/41] metacity: update to 3.36.1. [ci skip] --- common/shlibs | 1 + srcpkgs/metacity/template | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index f9bb4b20f70..badedf8a9fa 100644 --- a/common/shlibs +++ b/common/shlibs @@ -568,6 +568,7 @@ libsoup-2.4.so.1 libsoup-2.34.0_1 libsoup-gnome-2.4.so.1 libsoup-gnome-2.34.0_1 libgnome-panel.so.0 gnome-panel-3.36.1_1 libpanel-applet.so.3 gnome-panel-3.36.1_1 +libmetacity.so.1 metacity-3.36.1_1 libuninum.so.5 libuninum-2.7_1 libunique-3.0.so.0 libunique-2.91.4_1 libwebkit2gtk-4.0.so.37 webkit2gtk-2.6.2_1 diff --git a/srcpkgs/metacity/template b/srcpkgs/metacity/template index 1d419267668..bb7dfc0bfc9 100644 --- a/srcpkgs/metacity/template +++ b/srcpkgs/metacity/template @@ -1,9 +1,9 @@ # Template file for 'metacity' pkgname=metacity -version=3.30.1 +version=3.36.1 revision=1 build_style=gnu-configure -hostmakedepends="gettext-devel glib-devel itstool pkg-config yelp-tools zenity" +hostmakedepends="gettext glib-devel itstool pkg-config yelp-tools zenity" makedepends="gsettings-desktop-schemas-devel gtk+3-devel libcanberra-devel libglib-devel libgtop-devel libSM-devel libXcomposite-devel libXdamage-devel libXfixes-devel libXinerama-devel libXrender-devel libX11-devel pango-devel @@ -14,4 +14,4 @@ maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/metacity" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=0f1311b7aa38de71c66080bd2b744de2cd9580afcaee9c6097a7d3f5c421798a +checksum=11f07693e2b266840759063a4bc807346070e8e7fec8f53cd0757f6662c1b323 From 032928e1a3fde7f92df6a16f77e4f8079b1498e6 Mon Sep 17 00:00:00 2001 From: Nafis Date: Wed, 29 Apr 2020 05:32:10 +0600 Subject: [PATCH 28/41] gnome-menus: update to 3.36.0. [ci skip] --- srcpkgs/gnome-menus/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-menus/template b/srcpkgs/gnome-menus/template index 29102129c38..e787fb8de6b 100644 --- a/srcpkgs/gnome-menus/template +++ b/srcpkgs/gnome-menus/template @@ -1,7 +1,7 @@ # Template file for 'gnome-menus' pkgname=gnome-menus -version=3.32.0 -revision=2 +version=3.36.0 +revision=1 build_style=gnu-configure build_helper="gir" configure_args="--disable-static" @@ -12,7 +12,7 @@ maintainer="Enno Boland " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://gitlab.gnome.org/GNOME/gnome-menus" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=c850c64b2074265fe59e099a340b8689cf3dd4658dc9feddd2ab5e95f1a74b74 +checksum=d9348f38bde956fc32753b28c1cde19c175bfdbf1f4d5b06003b3aa09153bb1f build_options="gir" build_options_default="gir" From a4e74bb0d9ae7dc693477ff95edf1dcca900e037 Mon Sep 17 00:00:00 2001 From: Nafis Date: Fri, 1 May 2020 06:03:55 +0600 Subject: [PATCH 29/41] gnome-flashback: update to 3.36.1. [ci skip] --- .../gnome-flashback/patches/compiz-0.8.patch | 28 +++++++++++++++++++ srcpkgs/gnome-flashback/template | 20 +++++++------ 2 files changed, 40 insertions(+), 8 deletions(-) create mode 100644 srcpkgs/gnome-flashback/patches/compiz-0.8.patch diff --git a/srcpkgs/gnome-flashback/patches/compiz-0.8.patch b/srcpkgs/gnome-flashback/patches/compiz-0.8.patch new file mode 100644 index 00000000000..2a00dceff70 --- /dev/null +++ b/srcpkgs/gnome-flashback/patches/compiz-0.8.patch @@ -0,0 +1,28 @@ +diff --git configure configure +index 26cea51..d2463cc 100755 +--- configure ++++ configure +@@ -20842,8 +20842,8 @@ fi + if test "x$with_compiz_session" != "xno"; then : + + if test -n "$PKG_CONFIG" && \ +- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcompizconfig >= 0.9.14.0\""; } >&5 +- ($PKG_CONFIG --exists --print-errors "libcompizconfig >= 0.9.14.0") 2>&5 ++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libcompizconfig >= 0.8.18.0\""; } >&5 ++ ($PKG_CONFIG --exists --print-errors "libcompizconfig >= 0.8.16.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then +diff --git configure.ac configure.ac +index b6e1470..d28a70b 100644 +--- configure.ac ++++ configure.ac +@@ -340,7 +340,7 @@ AC_ARG_WITH([compiz-session], + [with_compiz_session="$withval"], [with_compiz_session="auto"]) + + AS_IF([test "x$with_compiz_session" != "xno"], [ +- PKG_CHECK_EXISTS([libcompizconfig >= 0.9.14.0], ++ PKG_CHECK_EXISTS([libcompizconfig >= 0.8.16.0], + [found_compiz="yes"], [found_compiz="no"]) + + AS_IF([test "x$found_compiz" = "xyes"], [ diff --git a/srcpkgs/gnome-flashback/template b/srcpkgs/gnome-flashback/template index d32120cab6f..d11df407257 100644 --- a/srcpkgs/gnome-flashback/template +++ b/srcpkgs/gnome-flashback/template @@ -1,20 +1,24 @@ # Template file for 'gnome-flashback' pkgname=gnome-flashback -version=3.34.2 +version=3.36.1 revision=1 build_helper=gir build_style=gnu-configure -configure_args="--enable-compile-warnings=minimum" +configure_args="--with-compiz-session --enable-compile-warnings=minimum" hostmakedepends="pkg-config automake glib-devel gettext" -makedepends="gtk+3-devel gsettings-desktop-schemas-devel - libglib-devel gdk-pixbuf-devel upower-devel ibus-devel polkit-devel - pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel pango-devel - libxkbfile-devel gnome-bluetooth-devel gnome-desktop-devel" +makedepends="gtk+3-devel pam-devel gsettings-desktop-schemas-devel elogind-devel + gdm-devel libcompizconfig-devel libglib-devel gdk-pixbuf-devel upower-devel ibus-devel + polkit-devel pulseaudio-devel libcanberra-devel libxcb-devel libX11-devel pango-devel + libxkbfile-devel gnome-bluetooth-devel gnome-desktop-devel gnome-panel-devel" depends="gnome-bluetooth gnome-session gnome-settings-daemon - gnome-panel gnome-themes-standard metacity" + gnome-panel gnome-themes-extra metacity" short_desc="GNOME 3 session with similar user experience to the GNOME 2.x series" maintainer="shizonic " license="GPL-3.0-or-later" homepage="https://wiki.gnome.org/Projects/GnomeFlashback" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=3be65388cd2c8f39741bcc05da87ef40035183a9a39502d67696242c2aeb469c +checksum=5d289390d754639f737ab7bf173f6d5c8388459259314bb7463109598bb5f399 + +pre_configure() { + autoreconf -vfi +} From 4094b9da643d3cc56d2b1e5e269414b4fc084c39 Mon Sep 17 00:00:00 2001 From: Nafis Date: Wed, 29 Apr 2020 06:59:40 +0600 Subject: [PATCH 30/41] graphene: update to 1.10.0. [ci skip] --- srcpkgs/graphene/template | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/srcpkgs/graphene/template b/srcpkgs/graphene/template index f2fe81a3f47..cb7385fedb7 100644 --- a/srcpkgs/graphene/template +++ b/srcpkgs/graphene/template @@ -1,10 +1,10 @@ # Template file for 'graphene' pkgname=graphene -version=1.8.2 -revision=2 +version=1.10.0 +revision=1 build_style=meson build_helper="gir" -configure_args="-Dtests=false -Dbenchmarks=false +configure_args="-Dtests=false -Darm_neon=false -Dintrospection=$(vopt_if gir true false)" hostmakedepends="pkg-config" makedepends="libglib-devel" @@ -13,13 +13,13 @@ maintainer="Enno Boland " license="MIT" homepage="https://github.com/ebassi/graphene" distfiles="${GNOME_SITE}/graphene/${version%.*}/graphene-${version}.tar.xz" -checksum=b3fcf20996e57b1f4df3941caac10f143bb29890a42f7a65407cd19271fc89f7 +checksum=406d97f51dd4ca61e91f84666a00c3e976d3e667cd248b76d92fdb35ce876499 build_options="gir" build_options_default="gir" post_install() { - vlicense LICENSE + vlicense LICENSE.txt LICENSE } graphene-devel_package() { From da532fa0ed558278d1fa2e05389e8443f3e02140 Mon Sep 17 00:00:00 2001 From: Nafis Date: Thu, 30 Apr 2020 11:53:29 +0600 Subject: [PATCH 31/41] mutter: update to 3.36.1. [ci skip] --- common/shlibs | 18 ++++++++--------- .../patches/fix-cogl-egl-includes.patch | 11 ---------- srcpkgs/mutter/template | 20 +++++++++---------- 3 files changed, 19 insertions(+), 30 deletions(-) delete mode 100644 srcpkgs/mutter/patches/fix-cogl-egl-includes.patch diff --git a/common/shlibs b/common/shlibs index badedf8a9fa..66320bd3c21 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2928,15 +2928,15 @@ libdecoration.so.0 compiz-core-0.8.14_1 libcompizconfig.so.0 libcompizconfig-0.8.14_1 libemeraldengine.so.0 emerald-0.8.14_1 libhangul.so.1 libhangul-0.1.0_1 -libmutter-5.so.0 mutter-3.34.1_1 -libmutter-clutter-5.so mutter-3.34.1_1 -libmutter-clutter-5.so.0 mutter-3.34.1_1 -libmutter-cogl-path-5.so mutter-3.34.1_1 -libmutter-cogl-path-5.so.0 mutter-3.34.1_1 -libmutter-cogl-5.so mutter-3.34.1_1 -libmutter-cogl-5.so.0 mutter-3.34.1_1 -libmutter-cogl-pango-5.so mutter-3.34.1_1 -libmutter-cogl-pango-5.so.0 mutter-3.34.1_1 +libmutter-6.so.0 mutter-3.36.1_1 +libmutter-clutter-6.so mutter-3.36.1_1 +libmutter-clutter-6.so.0 mutter-3.36.1_1 +libmutter-cogl-path-6.so mutter-3.36.1_1 +libmutter-cogl-path-6.so.0 mutter-3.36.1_1 +libmutter-cogl-6.so mutter-3.36.1_1 +libmutter-cogl-6.so.0 mutter-3.36.1_1 +libmutter-cogl-pango-6.so mutter-3.36.1_1 +libmutter-cogl-pango-6.so.0 mutter-3.36.1_1 libgeoclue-2.so.0 geoclue2-2.4.4_1 libgepub.so.0 libgepub-0.4_1 libslopy.so.7.5 slop-7.5_1 diff --git a/srcpkgs/mutter/patches/fix-cogl-egl-includes.patch b/srcpkgs/mutter/patches/fix-cogl-egl-includes.patch deleted file mode 100644 index d90988887c3..00000000000 --- a/srcpkgs/mutter/patches/fix-cogl-egl-includes.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cogl/cogl/meson.build 2019-10-08 19:15:10.000000000 +0200 -+++ cogl/cogl/meson.build 2019-12-16 15:45:44.037640548 +0100 -@@ -48,7 +48,7 @@ - built_headers += [cogl_gl_header_h] - - if have_egl -- cogl_egl_includes_string = '#include \n#include ' -+ cogl_egl_includes_string = '#include \n#include \n#include ' - else - cogl_egl_includes_string = '' - endif diff --git a/srcpkgs/mutter/template b/srcpkgs/mutter/template index 806a3bef9f0..7c4d4c66319 100644 --- a/srcpkgs/mutter/template +++ b/srcpkgs/mutter/template @@ -1,25 +1,25 @@ # Template file for 'mutter' pkgname=mutter -version=3.34.1 -revision=3 +version=3.36.1 +revision=1 build_helper="gir" build_style=meson configure_args="-Degl_device=true -Dudev=true -Dnative_backend=true -Dprofiler=false -Dintrospection=true -Dxwayland_path=/usr/bin/Xwayland" hostmakedepends="gettext glib-devel pkg-config zenity wayland-devel xorg-server" -makedepends="elogind-devel glib-devel gnome-desktop-devel json-glib-devel - libglib-devel libSM-devel libXtst-devel libcanberra-devel libinput-devel - MesaLib-devel pipewire-devel startup-notification-devel wayland-protocols - gnome-settings-daemon-devel" +makedepends="elogind-devel glib-devel gnome-desktop-devel graphene-devel + json-glib-devel libglib-devel libSM-devel libXtst-devel libcanberra-devel + libinput-devel MesaLib-devel pipewire-devel startup-notification-devel + wayland-protocols gnome-settings-daemon-devel" depends="desktop-file-utils zenity" short_desc="Lightweight GTK+3 window manager" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="https://wiki.gnome.org/Projects/Mutter/" distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz" -checksum=ba1826cf88bdb81e63943cac014a8e8bcf35ec178c53264401f9c72fdeab758e -shlib_provides="libmutter-clutter-5.so libmutter-cogl-5.so - libmutter-cogl-pango-5.so libmutter-cogl-path-5.so" +checksum=3582454ea1bab0e8d2fa3c3f44c5b1bc2ced1c9e7a45a1806107b40250d2d825 +shlib_provides="libmutter-clutter-6.so libmutter-cogl-6.so + libmutter-cogl-pango-6.so libmutter-cogl-path-6.so" mutter-devel_package() { depends="gsettings-desktop-schemas gtk+3-devel clutter-devel libX11-devel @@ -28,7 +28,7 @@ mutter-devel_package() { pkg_install() { vmove usr/include vmove usr/lib/pkgconfig - vmove "usr/lib/mutter-5/*.gir" + vmove "usr/lib/mutter-6/*.gir" vmove "usr/lib/*.so" } } From d9cfcf406153554d5df163ba6c82c67db1e89d8f Mon Sep 17 00:00:00 2001 From: Nafis Date: Thu, 30 Apr 2020 12:53:16 +0600 Subject: [PATCH 32/41] budgie-desktop: rebuild against libgnome-desktop-3.so.19 [ci skip] --- srcpkgs/budgie-desktop/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/budgie-desktop/template b/srcpkgs/budgie-desktop/template index b32e7734d3b..ae5a9d5f769 100644 --- a/srcpkgs/budgie-desktop/template +++ b/srcpkgs/budgie-desktop/template @@ -1,7 +1,7 @@ # Template file for 'budgie-desktop' pkgname=budgie-desktop version=10.5.1 -revision=3 +revision=4 build_style=meson build_helper=gir configure_args="-Dwith-gtk-doc=false -Dwith-desktop-icons=none" From 43408e55b03960f54c5b586557e310a05967e187 Mon Sep 17 00:00:00 2001 From: Nafis Date: Thu, 30 Apr 2020 02:49:13 +0600 Subject: [PATCH 33/41] cheese: rebuild against libgnome-desktop-3.so.19 [ci skip] --- srcpkgs/cheese/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/cheese/template b/srcpkgs/cheese/template index 7a56ba039fb..037cda49c98 100644 --- a/srcpkgs/cheese/template +++ b/srcpkgs/cheese/template @@ -1,7 +1,7 @@ # Template file for 'cheese' pkgname=cheese version=3.34.0 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Dgtk_doc=$(vopt_if gtk_doc 'true' 'false') From c9a1c8c09a2d77e594dff81853e8ad6802964cb5 Mon Sep 17 00:00:00 2001 From: Nafis Date: Thu, 30 Apr 2020 02:34:54 +0600 Subject: [PATCH 34/41] gnome-books: rebuild against libgnome-desktop-3.so.19 [ci skip] --- srcpkgs/gnome-books/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-books/template b/srcpkgs/gnome-books/template index 114b9e034c2..1d4974fe183 100644 --- a/srcpkgs/gnome-books/template +++ b/srcpkgs/gnome-books/template @@ -1,7 +1,7 @@ # Template file for 'gnome-books' pkgname=gnome-books version=3.34.0 -revision=1 +revision=2 build_helper="gir" build_style=meson hostmakedepends="pkg-config vala glib-devel librsvg docbook-xsl libxslt From aca55d19dd6d7bf5d26137834d53aab904bac960 Mon Sep 17 00:00:00 2001 From: Nafis Date: Thu, 30 Apr 2020 02:47:31 +0600 Subject: [PATCH 35/41] gnome-characters: rebuild against libgnome-desktop-3.so.19 [ci skip] --- srcpkgs/gnome-characters/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-characters/template b/srcpkgs/gnome-characters/template index 89868f4bc04..ac264e51a6a 100644 --- a/srcpkgs/gnome-characters/template +++ b/srcpkgs/gnome-characters/template @@ -1,7 +1,7 @@ # Template file for 'gnome-characters' pkgname=gnome-characters version=3.34.0 -revision=2 +revision=3 build_style=meson build_helper="gir" hostmakedepends="gettext gjs glib-devel itstool pkg-config" From 8d9cb395b9440089696a59ee417a1f0616d71e37 Mon Sep 17 00:00:00 2001 From: Nafis Date: Thu, 30 Apr 2020 02:52:12 +0600 Subject: [PATCH 36/41] gnome-clocks: rebuild against libgnome-desktop-3.so.19 [ci skip] --- srcpkgs/gnome-clocks/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-clocks/template b/srcpkgs/gnome-clocks/template index 3e049b42fb1..c67fb634cb8 100644 --- a/srcpkgs/gnome-clocks/template +++ b/srcpkgs/gnome-clocks/template @@ -1,7 +1,7 @@ # Template file for 'gnome-clocks' pkgname=gnome-clocks version=3.36.0 -revision=1 +revision=2 build_helper="gir" build_style=meson hostmakedepends="pkg-config intltool itstool glib-devel vala" From f9d12b486ed473f10812c5c0b8ca8bb0b562ce1c Mon Sep 17 00:00:00 2001 From: Nafis Date: Thu, 30 Apr 2020 02:55:18 +0600 Subject: [PATCH 37/41] gnome-documents: rebuild against libgnome-desktop-3.so.19 [ci skip] --- srcpkgs/gnome-documents/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-documents/template b/srcpkgs/gnome-documents/template index 97b53d635d7..7e45b825e71 100644 --- a/srcpkgs/gnome-documents/template +++ b/srcpkgs/gnome-documents/template @@ -1,7 +1,7 @@ # Template file for 'gnome-documents' pkgname=gnome-documents version=3.34.0 -revision=1 +revision=2 build_helper="gir" build_style=meson hostmakedepends="docbook-xsl gettext itstool pkg-config glib-devel libxslt gdk-pixbuf From 7c5d487a6ac39c2d290d086d4ea6874330c8320d Mon Sep 17 00:00:00 2001 From: Nafis Date: Thu, 30 Apr 2020 02:56:56 +0600 Subject: [PATCH 38/41] gnome-font-viewer: rebuild against libgnome-desktop-3.so.19 [ci skip] --- srcpkgs/gnome-font-viewer/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-font-viewer/template b/srcpkgs/gnome-font-viewer/template index 6d035366d44..f74fcbcb000 100644 --- a/srcpkgs/gnome-font-viewer/template +++ b/srcpkgs/gnome-font-viewer/template @@ -1,7 +1,7 @@ # Template file for 'gnome-font-viewer' pkgname=gnome-font-viewer version=3.34.0 -revision=1 +revision=2 build_style=meson hostmakedepends="pkg-config glib-devel" makedepends="fontconfig-devel freetype-devel glib-devel gtk+3-devel From abe3c250a7b74ca365ae3686b774b685c7c2a888 Mon Sep 17 00:00:00 2001 From: Nafis Date: Thu, 30 Apr 2020 02:57:57 +0600 Subject: [PATCH 39/41] totem: rebuild against libgnome-desktop-3.so.19 [ci skip] --- srcpkgs/totem/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/totem/template b/srcpkgs/totem/template index 81522b31488..e4186632153 100644 --- a/srcpkgs/totem/template +++ b/srcpkgs/totem/template @@ -1,7 +1,7 @@ # Template file for 'totem' pkgname=totem version=3.34.1 -revision=1 +revision=2 build_style=meson build_helper="gir" configure_args="-Denable-python=no -Denable-nautilus=yes From 7f76b9275d2641fe8bca92cea0f8f2afc58a33a8 Mon Sep 17 00:00:00 2001 From: Nafis Date: Thu, 30 Apr 2020 03:04:07 +0600 Subject: [PATCH 40/41] lutris: rebuild against libgnome-desktop-3.so.19 [ci skip] --- srcpkgs/lutris/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/lutris/template b/srcpkgs/lutris/template index f801844c77a..396229ae627 100644 --- a/srcpkgs/lutris/template +++ b/srcpkgs/lutris/template @@ -1,7 +1,7 @@ # Template file for 'lutris' pkgname=lutris version=0.5.6 -revision=1 +revision=2 archs=noarch build_style=python3-module build_helper="gir" From 67eed9f22fd47d19f16cf01739cd260cf2e2e878 Mon Sep 17 00:00:00 2001 From: Nafis Date: Wed, 29 Apr 2020 16:08:23 +0600 Subject: [PATCH 41/41] evince: rebuild against libgnome-desktop-3.so.19 [ci skip] --- srcpkgs/evince/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/evince/template b/srcpkgs/evince/template index c337a266ce0..173071a9cad 100644 --- a/srcpkgs/evince/template +++ b/srcpkgs/evince/template @@ -1,7 +1,7 @@ # Template file for 'evince' pkgname=evince version=3.36.0 -revision=1 +revision=2 build_helper="gir" build_style=gnu-configure configure_args="$(vopt_enable gir introspection) --disable-schemas-compile