Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libei for openSUSE:Factory checked
in at 2023-09-07 21:12:18
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libei (Old)
and /work/SRC/openSUSE:Factory/.libei.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libei"
Thu Sep 7 21:12:18 2023 rev:11 rq:1109460 version:1.1.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/libei/libei.changes 2023-09-06
18:56:34.548099121 +0200
+++ /work/SRC/openSUSE:Factory/.libei.new.1766/libei.changes 2023-09-07
21:12:37.829068239 +0200
@@ -1,0 +2,6 @@
+Thu Sep 7 06:04:28 UTC 2023 - Jan Engelhardt <jeng...@inai.de>
+
+- Update to release 1.1
+ * Correct documentation for ei_touch_(get|set)_user_data
+
+-------------------------------------------------------------------
Old:
----
libei-1.0.901.tar.gz
New:
----
libei-1.1.0.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libei.spec ++++++
--- /var/tmp/diff_new_pack.KxFGQm/_old 2023-09-07 21:12:38.785102414 +0200
+++ /var/tmp/diff_new_pack.KxFGQm/_new 2023-09-07 21:12:38.789102557 +0200
@@ -18,7 +18,7 @@
Name: libei
%define lname libei1
-Version: 1.0.901
+Version: 1.1.0
Release: 0
Summary: Library for emulated input in Wayland
License: MIT
++++++ libei-1.0.901.tar.gz -> libei-1.1.0.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libei-1.0.901/meson.build new/libei-1.1.0/meson.build
--- old/libei-1.0.901/meson.build 2023-08-31 06:06:49.000000000 +0200
+++ new/libei-1.1.0/meson.build 2023-09-07 07:07:54.000000000 +0200
@@ -1,5 +1,5 @@
project('libei', 'c',
- version: '1.0.901',
+ version: '1.1.0',
license: 'MIT',
default_options: [ 'c_std=gnu11', 'warning_level=2' ],
meson_version: '>= 0.56.0')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libei-1.0.901/src/libei.h new/libei-1.1.0/src/libei.h
--- old/libei-1.0.901/src/libei.h 2023-08-31 06:06:49.000000000 +0200
+++ new/libei-1.1.0/src/libei.h 2023-09-07 07:07:54.000000000 +0200
@@ -1698,8 +1698,9 @@
/**
* @ingroup libei-sender
*
- * Return the custom data pointer for this context. libei will not look at or
- * modify the pointer. Use ei_touch_set_user_data() to change the user data.
+ * Set a custom data pointer for this context. libei will not look at or
+ * modify the pointer. Use ei_touch_get_user_data() to retrieve a previously
+ * set user data.
*/
void
ei_touch_set_user_data(struct ei_touch *touch, void *user_data);
@@ -1707,9 +1708,8 @@
/**
* @ingroup libei-sender
*
- * Set a custom data pointer for this context. libei will not look at or
- * modify the pointer. Use ei_touch_get_user_data() to retrieve a previously
- * set user data.
+ * Return the custom data pointer for this context. libei will not look at or
+ * modify the pointer. Use ei_touch_set_user_data() to change the user data.
*/
void *
ei_touch_get_user_data(struct ei_touch *touch);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libei-1.0.901/tools/ei-debug-events.c
new/libei-1.1.0/tools/ei-debug-events.c
--- old/libei-1.0.901/tools/ei-debug-events.c 2023-08-31 06:06:49.000000000
+0200
+++ new/libei-1.1.0/tools/ei-debug-events.c 2023-09-07 07:07:54.000000000
+0200
@@ -152,20 +152,22 @@
printf(" type: %s\n", ei_device_get_type(device) ==
EI_DEVICE_TYPE_VIRTUAL ? "virtual" : "physical");
printf(" capabilities: [%s]\n", capabilities);
-
idx = 0;
struct ei_region *region;
while ((region = ei_device_get_region(device, idx++))) {
if (idx == 1)
printf(" regions:\n");
- uint32_t w = ei_region_get_width(region);
- uint32_t h = ei_region_get_height(region);
- uint32_t x = ei_region_get_x(region);
- uint32_t y = ei_region_get_y(region);
- double scale = ei_region_get_physical_scale(region);
+ uint32_t w = ei_region_get_width(region);
+ uint32_t h = ei_region_get_height(region);
+ uint32_t x = ei_region_get_x(region);
+ uint32_t y = ei_region_get_y(region);
+ double scale = ei_region_get_physical_scale(region);
- printf(" - %ux%u@%u,%u*%.2f\n", w, h, x, y, scale);
+ const char *mapping_id = ei_region_get_mapping_id(region);
+ printf(" - { x: %u, y: %u, w: %u, h: %u, scale: %.2f,
mapping_id: '%s' }\n",
+ x, y, w, h, scale,
+ mapping_id ? mapping_id : "<none>");
}
struct ei_keymap *keymap = ei_device_keyboard_get_keymap(device);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libei-1.0.901/tools/meson.build
new/libei-1.1.0/tools/meson.build
--- old/libei-1.0.901/tools/meson.build 2023-08-31 06:06:49.000000000 +0200
+++ new/libei-1.1.0/tools/meson.build 2023-09-07 07:07:54.000000000 +0200
@@ -34,6 +34,7 @@
if build_oeffis
executable('oeffis-demo-tool',
'oeffis-demo-tool.c',
+ c_args:
['-DMESON_BUILDDIR="@0@"'.format(meson.current_build_dir())],
include_directories: [inc_builddir],
dependencies: [dep_libutil, dep_liboeffis],
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libei-1.0.901/tools/oeffis-demo-tool.c
new/libei-1.1.0/tools/oeffis-demo-tool.c
--- old/libei-1.0.901/tools/oeffis-demo-tool.c 2023-08-31 06:06:49.000000000
+0200
+++ new/libei-1.1.0/tools/oeffis-demo-tool.c 2023-09-07 07:07:54.000000000
+0200
@@ -40,6 +40,10 @@
#include "liboeffis.h"
+#ifndef MESON_BUILDDIR
+#error MESON_BUILDDIR must be defined
+#endif
+
DEFINE_UNREF_CLEANUP_FUNC(oeffis);
static bool stop = false;
@@ -48,6 +52,21 @@
stop = true;
}
+static void start_debug_events(int fd)
+{
+ pid_t pid = fork();
+ assert(pid != -1);
+
+ if (pid == 0) {
+ _cleanup_free_ char *fdstr = xaprintf("%d", fd);
+ execl(MESON_BUILDDIR "/ei-debug-events",
+ "ei-debug-events",
+ "--socketfd", fdstr, NULL);
+ fprintf(stderr, "Failed to fork: %m\n");
+ exit(1);
+ }
+}
+
int main(int argc, char **argv)
{
_unref_(oeffis) *oeffis = oeffis_new(NULL);
@@ -71,7 +90,7 @@
break;
case OEFFIS_EVENT_CONNECTED_TO_EIS: {
_cleanup_close_ int eisfd = oeffis_get_eis_fd(oeffis);
- printf("We have an eisfd: lucky number %d\n", eisfd);
+ printf("# We have an eisfd: lucky number %d\n", eisfd);
/* Note: unless we get closed/disconnected, we are
* started now, or will be once the compositor is
* happy with it.
@@ -84,6 +103,7 @@
* cause the compositor or the portal to invalidate
* our EIS fd.
*/
+ start_debug_events(eisfd);
break;
}
case OEFFIS_EVENT_DISCONNECTED:
