Hello community, here is the log from the commit of package splashy for openSUSE:Factory checked in at Mon May 23 10:34:55 CEST 2011.
-------- --- splashy/splashy.changes 2011-01-25 12:08:54.000000000 +0100 +++ /mounts/work_src_done/STABLE/splashy/splashy.changes 2011-05-10 11:15:31.000000000 +0200 @@ -1,0 +2,11 @@ +Tue May 3 13:53:03 CEST 2011 - [email protected] + +- update description + +------------------------------------------------------------------- +Tue May 3 12:31:23 CEST 2011 - [email protected] + +- fix gcc 4.6 build +- splashy exits prematurely fix + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- gcc46-build-fixes.patch splashy-exits-prematurely-fix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ splashy.spec ++++++ --- /var/tmp/diff_new_pack.Yn8SCT/_old 2011-05-23 10:21:56.000000000 +0200 +++ /var/tmp/diff_new_pack.Yn8SCT/_new 2011-05-23 10:21:56.000000000 +0200 @@ -20,7 +20,7 @@ Name: splashy Summary: A complete user-space boot splash system Version: 0.3.13 -Release: 16 +Release: 23 License: GPLv2+ Group: System/Boot Url: http://splashy.alioth.debian.org/wiki/doku.php @@ -39,6 +39,8 @@ Patch3: splashy-disable-x11input.patch Patch4: splashy-0.3.13-fix-theme-path.patch Patch5: fix_autogen_version.diff +Patch6: gcc46-build-fixes.patch +Patch7: splashy-exits-prematurely-fix.patch BuildRequires: DirectFB-devel file-devel BuildRequires: glib2-devel BuildRequires: ImageMagick-devel @@ -53,10 +55,10 @@ %description Splashy is a next generation boot splashing system for Linux systems. Unlike other splashing systems, it needs no patches to the kernel and -it�s installed like a normal package. Make your boot process eye-candy +it´s installed like a normal package. Make your boot process eye-candy with Splashy! -Some of Splashy�s most noticeable features include: +Some of Splashy´s most noticeable features include: * Require zero kernel patches/full functionality in user-space @@ -101,22 +103,6 @@ * Totally configurable - - -Authors: --------- - Jacobo Vilella <[email protected]> - Luis Mondesi <[email protected]> - Otavio Salvador <[email protected]> - Tim Dijkstra <[email protected]> - Vicenzo Ampolo <[email protected]> - Vincent Amouret <[email protected]> - Andrew Williams <[email protected]> - Goedson Teixeira Paixao - Mario Izquierdo - Pat Suwalski <[email protected]> - Alban Browaeys <[email protected]> - %package -n splashy-devel License: GPLv2+ Summary: Development tools for programs using libsplashy @@ -127,22 +113,6 @@ This package contains the header files and libraries needed for developing programs using libsplashy. - - -Authors: --------- - Jacobo Vilella <[email protected]> - Luis Mondesi <[email protected]> - Otavio Salvador <[email protected]> - Tim Dijkstra <[email protected]> - Vicenzo Ampolo <[email protected]> - Vincent Amouret <[email protected]> - Andrew Williams <[email protected]> - Goedson Teixeira Paixao - Mario Izquierdo - Pat Suwalski <[email protected]> - Alban Browaeys <[email protected]> - %package -n splashy-themes License: GPLv2+ Summary: Additional themes for splashy @@ -173,12 +143,6 @@ %description branding-openSUSE Splashy branding for openSUSE - - -Authors: --------- - Jakub Steiner <[email protected]> - %package branding-SLED License: GPLv2+ Summary: Splashy branding for SLED @@ -192,12 +156,6 @@ %description branding-SLED Splashy branding for SLED - - -Authors: --------- - Jakub Steiner <[email protected]> - %post branding-openSUSE if [ -x %{_sbindir}/splashy_config ] ; then %{_sbindir}/splashy_config --set-theme openSUSE @@ -227,6 +185,8 @@ %patch3 %patch4 -p1 %patch5 +%patch6 -p1 +%patch7 -p1 find . -type f | xargs perl -pi -e "s|/usr/lib/|%{_libdir}/|g" find . -type f | xargs perl -pi -e "s|/lib/|/%{_lib}/|g" # build gets confused on x86_64 because of this .la file ++++++ gcc46-build-fixes.patch ++++++ --- src/common_macros.h | 2 +- src/splashy_functions.c | 15 +++++++++++---- src/splashy_main.c | 4 ++++ src/splashy_video.c | 4 ---- 4 files changed, 16 insertions(+), 9 deletions(-) --- a/src/common_macros.h +++ b/src/common_macros.h @@ -29,7 +29,7 @@ #define DEBUG_PRINT(str, args...) \ fprintf(stderr, "Splashy DEBUG %s (%d): " str "\n" , __FILE__, __LINE__, ## args) #else -#define DEBUG_PRINT(...) while(0){} /* NULL */ +static inline int DEBUG_PRINT(const char *str, ...) { return 0; } /* NULL */ #endif #define DFBCHECK(x...) \ --- a/src/splashy_functions.c +++ b/src/splashy_functions.c @@ -943,7 +943,6 @@ socket_loop (void *data) gboolean _preview = *(gboolean *) data; int err, i = 0; - struct timeval tv; struct timespec _sleep; struct pollfd pfd; @@ -995,9 +994,6 @@ socket_loop (void *data) _sleep.tv_sec = 0; _sleep.tv_nsec = 10; - tv.tv_sec = timeout; - tv.tv_usec = 0; - pfd.fd = sock; pfd.events = POLLIN; @@ -1301,6 +1297,11 @@ _splashy_child (const gchar * seq) thr_id_c = pthread_create (&p_thread_c, NULL, socket_loop, (void *) &_preview); + if (thr_id_c) { + ERROR_PRINT ("Couldn't pthread_create(C). Error %d\n", + thr_id_c); + return 1; + } /* * thread D @@ -1309,6 +1310,12 @@ _splashy_child (const gchar * seq) * F2 - puts splashy in verbose mode */ thr_id_d = pthread_create (&p_thread_d, NULL, keyevent_loop, NULL); + if (thr_id_d) { + ERROR_PRINT ("Couldn't pthread_create(D). Error %d\n", + thr_id_d); + return 1; + } + /* * thr_id_f = pthread_create (&p_thread_f, NULL, verbose_text_loop, --- a/src/splashy_main.c +++ b/src/splashy_main.c @@ -49,7 +49,11 @@ main (int argc, char *argv[]) */ FILE *fp; fp = freopen ("/dev/null", "r+", stdin); + if (fp == NULL) + ERROR_PRINT ("%s", "cannot reopen STDIN"); fp = freopen ("/dev/null", "r+", stdout); + if (fp == NULL) + ERROR_PRINT ("%s", "cannot reopen STDOUT"); DEBUG_PRINT ("main() invoked %d", argc); /* --- a/src/splashy_video.c +++ b/src/splashy_video.c @@ -550,8 +550,6 @@ splashy_update_progressbar (gint perc) */ if (perc < 0) return 1; - if (&video == NULL) - return 1; if (perc > 100) return 0; DEBUG_PRINT ("splashy_update_progressbar(%d) sanity checks passed", @@ -637,8 +635,6 @@ splashy_update_progressbar_quick (gint p */ if (perc < 0) return 1; - if (&video == NULL) - return 1; if (perc > 100) return 0; DEBUG_PRINT ++++++ splashy-exits-prematurely-fix.patch ++++++ >From e2292692229a4684be81087ece7bb4074c594316 Mon Sep 17 00:00:00 2001 From: Luis <[email protected]> Date: Fri, 11 Jun 2010 12:06:16 -0400 Subject: [PATCH] splashy exits prematurely on systems with intel framebuffers on newer 2.6.32* kernels --- .../initramfs-tools/scripts/local-premount/splashy | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/scripts/initramfs-tools/scripts/local-premount/splashy b/scripts/initramfs-tools/scripts/local-premount/splashy index fa3c556..2a42d48 100755 --- a/scripts/initramfs-tools/scripts/local-premount/splashy +++ b/scripts/initramfs-tools/scripts/local-premount/splashy @@ -32,6 +32,9 @@ done test $SINGLE = "false" || exit test $SPLASH = "true" || exit -grep -q '\(VESA\|VGA\)' /proc/fb || exit +# newer kernels use inteldrmfb. allowing splashy to fail +# if framebuffer is not set might be a better option: +# users can actually see an error and report this to us +#grep -q '\(VESA\|VGA\)' /proc/fb || exit /sbin/splashy boot -- 1.7.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
