Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2017-06-16 10:48:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth" Fri Jun 16 10:48:39 2017 rev:55 rq:503783 version:0.9.2+git20170424.6fd5c6b Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2017-02-03 18:56:21.998224485 +0100 +++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2017-06-16 10:48:39.995162117 +0200 @@ -1,0 +2,21 @@ +Wed Jun 14 06:16:48 UTC 2017 - [email protected] + +- Update plymouth.spec: Add COPYING file in plymouth package file + list, This is for the law requirement (bsc#1043834). + +------------------------------------------------------------------- +Mon May 8 15:20:02 UTC 2017 - [email protected] + +- Update to version 0.9.2+git20170424.6fd5c6b: + * main: Look for config in runtime dir first + * main: Look for theme in runtime dir first + * Revert "Recreate boot log at each boot instead of appending" + * x11: implement get_display_name + * drm: implement get_display_name + * configure: don't look for libudev when --without-udev is passed + * renderer: export device name from plugin + * device-manager: handle NULL renderer better +- Remove 0001-device-manager-handle-NULL-renderer-better.patch + (upstreamed). + +------------------------------------------------------------------- Old: ---- 0001-device-manager-handle-NULL-renderer-better.patch plymouth-0.9.2+git20161215.18dd755.tar.xz New: ---- plymouth-0.9.2+git20170424.6fd5c6b.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.m8fae2/_old 2017-06-16 10:48:40.999020811 +0200 +++ /var/tmp/diff_new_pack.m8fae2/_new 2017-06-16 10:48:40.999020811 +0200 @@ -21,7 +21,7 @@ %define plymouth_libdir %{_libdir} %define plymouth_initrd_file /boot/initrd-plymouth.img Name: plymouth -Version: 0.9.2+git20161215.18dd755 +Version: 0.9.2+git20170424.6fd5c6b Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0+ @@ -41,8 +41,6 @@ Patch16: plymouth-correct-runtime-dir.patch # PATCH-FIX-UPSTREAM plymouth-manpages.patch [email protected] -- Fix man page installation Patch17: plymouth-manpages.patch -# PATCH-FIX-UPSTREAM 0001-device-manager-handle-NULL-renderer-better.patch [email protected] -- device-manager: handle NULL renderer better -Patch18: 0001-device-manager-handle-NULL-renderer-better.patch # PATCH-FIX-OPENSUSE only_use_fb_for_cirrus_bochs.patch [email protected] -- force fb for cirrus and bochs, force drm otherwise Patch26: only_use_fb_for_cirrus_bochs.patch # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch [email protected] -- add ability to output text in initrd @@ -344,7 +342,6 @@ %patch10 -p1 %patch16 -p1 %patch17 -p1 -%patch18 -p1 %patch26 -p1 %patch30 -p1 %patch31 -p1 @@ -497,7 +494,7 @@ %files %defattr(-, root, root) -%doc AUTHORS NEWS README +%doc AUTHORS NEWS README COPYING %dir %{_datadir}/plymouth %dir %{_datadir}/plymouth/themes %dir %{_datadir}/plymouth/themes/details ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.m8fae2/_old 2017-06-16 10:48:41.059012366 +0200 +++ /var/tmp/diff_new_pack.m8fae2/_new 2017-06-16 10:48:41.059012366 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">git://anongit.freedesktop.org/plymouth</param> - <param name="changesrevision">18dd75589bbdf0ddc07a61421f05078df88ee768</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">6fd5c6b260b89604f2ff7d65a4f1a011db23a726</param></service></servicedata> ++++++ plymouth-0.9.2+git20161215.18dd755.tar.xz -> plymouth-0.9.2+git20170424.6fd5c6b.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.2+git20161215.18dd755/configure.ac new/plymouth-0.9.2+git20170424.6fd5c6b/configure.ac --- old/plymouth-0.9.2+git20161215.18dd755/configure.ac 2016-12-15 20:24:40.000000000 +0100 +++ new/plymouth-0.9.2+git20170424.6fd5c6b/configure.ac 2017-04-24 22:16:47.000000000 +0200 @@ -39,11 +39,11 @@ AC_SUBST(IMAGE_LIBS) AC_ARG_WITH(udev, AS_HELP_STRING([--with-udev], [Add udev support]),, with_udev=yes) -PKG_CHECK_MODULES(UDEV, [libudev], have_udev=yes, have_udev=no) -AC_SUBST(UDEV_CFLAGS) -AC_SUBST(UDEV_LIBS) if test "x$with_udev" != "xno" ; then + PKG_CHECK_MODULES(UDEV, [libudev], have_udev=yes, have_udev=no) + AC_SUBST(UDEV_CFLAGS) + AC_SUBST(UDEV_LIBS) if test "x$have_udev" = "xyes"; then AC_DEFINE(HAVE_UDEV, 1, [Define if have udev support]) else @@ -269,6 +269,9 @@ plymouththemedir=$datadir/plymouth/themes AS_AC_EXPAND(PLYMOUTH_THEME_PATH, $plymouththemedir) +plymouthruntimethemedir=$plymouthruntimedir/themes +AS_AC_EXPAND(PLYMOUTH_RUNTIME_THEME_PATH, $plymouthruntimethemedir) + plymouthplugindir=$libdir/plymouth/ AS_AC_EXPAND(PLYMOUTH_PLUGIN_PATH, $plymouthplugindir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.2+git20161215.18dd755/src/Makefile.am new/plymouth-0.9.2+git20170424.6fd5c6b/src/Makefile.am --- old/plymouth-0.9.2+git20161215.18dd755/src/Makefile.am 2016-12-15 20:24:40.000000000 +0100 +++ new/plymouth-0.9.2+git20170424.6fd5c6b/src/Makefile.am 2017-04-24 22:16:47.000000000 +0200 @@ -20,7 +20,8 @@ -DPLYMOUTH_THEME_PATH=\"$(PLYMOUTH_THEME_PATH)/\" \ -DPLYMOUTH_POLICY_DIR=\"$(PLYMOUTH_POLICY_DIR)/\" \ -DPLYMOUTH_RUNTIME_DIR=\"$(PLYMOUTH_RUNTIME_DIR)\" \ - -DPLYMOUTH_CONF_DIR=\"$(PLYMOUTH_CONF_DIR)/\" + -DPLYMOUTH_CONF_DIR=\"$(PLYMOUTH_CONF_DIR)/\" \ + -DPLYMOUTH_RUNTIME_THEME_PATH=\"$(PLYMOUTH_RUNTIME_THEME_PATH)/\" plymouthd_LDADD = $(PLYMOUTH_LIBS) libply/libply.la libply-splash-core/libply-splash-core.la plymouthd_SOURCES = \ ply-boot-protocol.h \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.2+git20161215.18dd755/src/libply/ply-logger.c new/plymouth-0.9.2+git20170424.6fd5c6b/src/libply/ply-logger.c --- old/plymouth-0.9.2+git20161215.18dd755/src/libply/ply-logger.c 2016-12-15 20:24:40.000000000 +0100 +++ new/plymouth-0.9.2+git20170424.6fd5c6b/src/libply/ply-logger.c 2017-04-24 22:16:47.000000000 +0200 @@ -40,7 +40,7 @@ #include "ply-list.h" #ifndef PLY_LOGGER_OPEN_FLAGS -#define PLY_LOGGER_OPEN_FLAGS (O_WRONLY | O_TRUNC | O_CREAT | O_NOFOLLOW | O_CLOEXEC) +#define PLY_LOGGER_OPEN_FLAGS (O_WRONLY | O_APPEND | O_CREAT | O_NOFOLLOW | O_CLOEXEC) #endif #ifndef PLY_LOGGER_MAX_INJECTION_SIZE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.2+git20161215.18dd755/src/libply-splash-core/ply-device-manager.c new/plymouth-0.9.2+git20170424.6fd5c6b/src/libply-splash-core/ply-device-manager.c --- old/plymouth-0.9.2+git20161215.18dd755/src/libply-splash-core/ply-device-manager.c 2016-12-15 20:24:40.000000000 +0100 +++ new/plymouth-0.9.2+git20170424.6fd5c6b/src/libply-splash-core/ply-device-manager.c 2017-04-24 22:16:47.000000000 +0200 @@ -689,16 +689,18 @@ return; } - old_renderer = ply_hashtable_lookup (manager->renderers, - (void *) ply_renderer_get_device_name (renderer)); + if (renderer != NULL) { + old_renderer = ply_hashtable_lookup (manager->renderers, + (void *) ply_renderer_get_device_name (renderer)); - if (old_renderer != NULL) { - ply_trace ("ignoring device %s since it's alerady managed", - ply_renderer_get_device_name (renderer)); - ply_renderer_free (renderer); + if (old_renderer != NULL) { + ply_trace ("ignoring device %s since it's alerady managed", + ply_renderer_get_device_name (renderer)); + ply_renderer_free (renderer); - renderer = NULL; - return; + renderer = NULL; + return; + } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.2+git20161215.18dd755/src/libply-splash-core/ply-renderer-plugin.h new/plymouth-0.9.2+git20170424.6fd5c6b/src/libply-splash-core/ply-renderer-plugin.h --- old/plymouth-0.9.2+git20161215.18dd755/src/libply-splash-core/ply-renderer-plugin.h 2016-12-15 20:24:40.000000000 +0100 +++ new/plymouth-0.9.2+git20170424.6fd5c6b/src/libply-splash-core/ply-renderer-plugin.h 2017-04-24 22:16:47.000000000 +0200 @@ -66,6 +66,8 @@ void (*close_input_source)(ply_renderer_backend_t *backend, ply_renderer_input_source_t *input_source); + + const char * (*get_device_name)(ply_renderer_backend_t *backend); } ply_renderer_plugin_interface_t; #endif /* PLY_RENDERER_PLUGIN_H */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.2+git20161215.18dd755/src/libply-splash-core/ply-renderer.c new/plymouth-0.9.2+git20170424.6fd5c6b/src/libply-splash-core/ply-renderer.c --- old/plymouth-0.9.2+git20161215.18dd755/src/libply-splash-core/ply-renderer.c 2016-12-15 20:24:40.000000000 +0100 +++ new/plymouth-0.9.2+git20170424.6fd5c6b/src/libply-splash-core/ply-renderer.c 2017-04-24 22:16:47.000000000 +0200 @@ -155,6 +155,11 @@ return false; } + if (renderer->plugin_interface->get_device_name != NULL) { + free (renderer->device_name); + renderer->device_name = strdup (renderer->plugin_interface->get_device_name (renderer->backend)); + } + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.2+git20161215.18dd755/src/main.c new/plymouth-0.9.2+git20170424.6fd5c6b/src/main.c --- old/plymouth-0.9.2+git20161215.18dd755/src/main.c 2016-12-15 20:24:40.000000000 +0100 +++ new/plymouth-0.9.2+git20170424.6fd5c6b/src/main.c 2017-04-24 22:16:47.000000000 +0200 @@ -310,8 +310,16 @@ goto out; asprintf (theme_path, - PLYMOUTH_THEME_PATH "%s/%s.plymouth", + PLYMOUTH_RUNTIME_THEME_PATH "%s/%s.plymouth", splash_string, splash_string); + ply_trace ("Checking if %s exists", *theme_path); + if (!ply_file_exists (*theme_path)) { + ply_trace ("%s not found, fallbacking to " PLYMOUTH_THEME_PATH, + *theme_path); + asprintf (theme_path, + PLYMOUTH_THEME_PATH "%s/%s.plymouth", + splash_string, splash_string); + } if (isnan (state->splash_delay)) { const char *delay_string; @@ -426,8 +434,16 @@ ply_trace ("Splash is configured to be '%*.*s'", length, length, splash_string); asprintf (&state->override_splash_path, - PLYMOUTH_THEME_PATH "%*.*s/%*.*s.plymouth", + PLYMOUTH_RUNTIME_THEME_PATH "%*.*s/%*.*s.plymouth", length, length, splash_string, length, length, splash_string); + ply_trace ("Checking if %s exists", state->override_splash_path); + if (!ply_file_exists (state->override_splash_path)) { + ply_trace ("%s not found, fallbacking to " PLYMOUTH_THEME_PATH, + state->override_splash_path); + asprintf (&state->override_splash_path, + PLYMOUTH_THEME_PATH "%*.*s/%*.*s.plymouth", + length, length, splash_string, length, length, splash_string); + } } if (isnan (state->splash_delay)) { @@ -471,9 +487,12 @@ if (state->distribution_default_splash_path != NULL) return; - if (!load_settings (state, PLYMOUTH_POLICY_DIR "plymouthd.defaults", &state->distribution_default_splash_path)) { - ply_trace ("failed to load " PLYMOUTH_POLICY_DIR "plymouthd.defaults"); - return; + if (!load_settings (state, PLYMOUTH_RUNTIME_DIR "/plymouthd.defaults", &state->distribution_default_splash_path)) { + ply_trace ("failed to load " PLYMOUTH_RUNTIME_DIR "/plymouthd.defaults, trying " PLYMOUTH_POLICY_DIR); + if (!load_settings (state, PLYMOUTH_POLICY_DIR "plymouthd.defaults", &state->distribution_default_splash_path)) { + ply_trace ("failed to load " PLYMOUTH_POLICY_DIR "plymouthd.defaults"); + return; + } } ply_trace ("Distribution default theme file is '%s'", state->distribution_default_splash_path); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.2+git20161215.18dd755/src/plugins/renderers/drm/plugin.c new/plymouth-0.9.2+git20170424.6fd5c6b/src/plugins/renderers/drm/plugin.c --- old/plymouth-0.9.2+git20161215.18dd755/src/plugins/renderers/drm/plugin.c 2016-12-15 20:24:40.000000000 +0100 +++ new/plymouth-0.9.2+git20170424.6fd5c6b/src/plugins/renderers/drm/plugin.c 2017-04-24 22:16:47.000000000 +0200 @@ -621,6 +621,12 @@ return backend; } +static const char * +get_device_name (ply_renderer_backend_t *backend) +{ + return backend->device_name; +} + static void destroy_backend (ply_renderer_backend_t *backend) { @@ -1285,7 +1291,8 @@ .get_input_source = get_input_source, .open_input_source = open_input_source, .set_handler_for_input_source = set_handler_for_input_source, - .close_input_source = close_input_source + .close_input_source = close_input_source, + .get_device_name = get_device_name }; return &plugin_interface; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.2+git20161215.18dd755/src/plugins/renderers/frame-buffer/plugin.c new/plymouth-0.9.2+git20170424.6fd5c6b/src/plugins/renderers/frame-buffer/plugin.c --- old/plymouth-0.9.2+git20161215.18dd755/src/plugins/renderers/frame-buffer/plugin.c 2016-12-15 20:24:40.000000000 +0100 +++ new/plymouth-0.9.2+git20170424.6fd5c6b/src/plugins/renderers/frame-buffer/plugin.c 2017-04-24 22:16:47.000000000 +0200 @@ -365,6 +365,12 @@ return true; } +static const char * +get_device_name (ply_renderer_backend_t *backend) +{ + return backend->device_name; +} + static void close_device (ply_renderer_backend_t *backend) { @@ -732,7 +738,8 @@ .get_input_source = get_input_source, .open_input_source = open_input_source, .set_handler_for_input_source = set_handler_for_input_source, - .close_input_source = close_input_source + .close_input_source = close_input_source, + .get_device_name = get_device_name }; return &plugin_interface; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plymouth-0.9.2+git20161215.18dd755/src/plugins/renderers/x11/plugin.c new/plymouth-0.9.2+git20170424.6fd5c6b/src/plugins/renderers/x11/plugin.c --- old/plymouth-0.9.2+git20161215.18dd755/src/plugins/renderers/x11/plugin.c 2016-12-15 20:24:40.000000000 +0100 +++ new/plymouth-0.9.2+git20170424.6fd5c6b/src/plugins/renderers/x11/plugin.c 2017-04-24 22:16:47.000000000 +0200 @@ -170,6 +170,12 @@ return true; } +static const char * +get_device_name (ply_renderer_backend_t *backend) +{ + return gdk_display_get_name (gdk_display_get_default ()); +} + static void close_device (ply_renderer_backend_t *backend) { @@ -539,7 +545,8 @@ .get_input_source = get_input_source, .open_input_source = open_input_source, .set_handler_for_input_source = set_handler_for_input_source, - .close_input_source = close_input_source + .close_input_source = close_input_source, + .get_device_name = get_device_name }; return &plugin_interface;
