Hello community, here is the log from the commit of package splashy for openSUSE:12.1:Update:Test checked in at 2011-12-09 18:47:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.1:Update:Test/splashy (Old) and /work/SRC/openSUSE:12.1:Update:Test/.splashy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "splashy", Maintainer is "[email protected]" Changes: -------- New Changes file: --- /dev/null 2010-08-26 16:28:41.000000000 +0200 +++ /work/SRC/openSUSE:12.1:Update:Test/.splashy.new/splashy.changes 2011-12-09 18:47:38.000000000 +0100 @@ -0,0 +1,295 @@ +------------------------------------------------------------------- +Tue Jul 26 12:42:05 UTC 2011 - [email protected] + +- setup-splashy.sh: Drop the hardcoded list of libraries, let + mkinitrd figure it out itself (bnc#649150). + +------------------------------------------------------------------- +Wed Jul 13 11:42:10 UTC 2011 - [email protected] + +- libglib moved to /usr, adjust update-splashy.sh. +- Fix branding spec file rules. +- Replace deprecated run_ldconfig macro with direct call. + +------------------------------------------------------------------- +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 + +------------------------------------------------------------------- +Tue Jan 25 12:08:55 CET 2011 - [email protected] + +- Revert previous fix, always use the symbolic link + /usr/lib/libglib-2.0.so.0 (bnc#664793) + +------------------------------------------------------------------- +Wed Oct 27 08:16:45 UTC 2010 - [email protected] + +- Fix path for libglib. + +------------------------------------------------------------------- +Mon Oct 25 15:00:11 UTC 2010 - [email protected] + +- Update for new libfusion and glib versions. + +------------------------------------------------------------------- +Mon Sep 27 11:58:40 CEST 2010 - [email protected] + +- update libpng to libpng14 in setup-splashy.sh (bnc#634667) + +------------------------------------------------------------------- +Fri Jun 18 00:48:45 UTC 2010 - [email protected] + +- Updated splashy-branding-openSUSE.tar.bz2 with artwork for 11.3 + +------------------------------------------------------------------- +Mon Apr 19 07:53:25 UTC 2010 - [email protected] + +- Require DirectFB for directfb-config (bnc#597667). + +------------------------------------------------------------------- +Wed Feb 24 08:46:47 UTC 2010 - [email protected] + +- Update for new libfusion major version. + +------------------------------------------------------------------- +Tue Oct 13 16:31:43 CEST 2009 - [email protected] + +- update openSUSE branding (bnc#533989) + +------------------------------------------------------------------- +Fri Jul 17 09:19:11 CEST 2009 - [email protected] + +- add fix_autogen_version.diff to enable autogen to find automake 1.11 + +------------------------------------------------------------------- +Wed Apr 15 14:07:27 CEST 2009 - [email protected] + +- add splashy-0.3.13-fix-theme-path.patch to fix + /etc/splashy/config.xml +- update to 0.3.13: + * adds default theme to initramfs so we can fall back in case of + problems with a newer theme + * fixes font problem with libdirectfb + * fixes LSB script issue that prevented some applications to install + correctly if Splashy was removed/missing (mysql server, etc...) + * no major C changes, minor bug fixes + * closes a number of bugs from bugs.debian.org/splashy which apply to + other distros also + * fixes problems with uswsusp + * fixes problems with kdm + * no major C changes, mostly scripts + * implements chroot() as a command passed from splashy_update + * works better with resume-from-RAM/Disk when uswsusp is used from + initramfs + * suggests to run update-initramfs -u when a theme is changed with + splashy_config + * removes boot dependency argument $all from initrc script (for LSB) + * turns off cursor in TTY consoles to avoid showing artifacts when X + starts + * other bug fixes + * plenty of bug fixes (Thanks Niko Araya for helping us sort them out) + (See ChangeLog) + * Splashy works better with encrypted hard disk (LUKS) and + getstring/getpass prompts early at boot + * lots of bug/thinko fixes from John Hughes, for which we are very glad! + * fixes issues with progress bar during shutdown (Thanks to Matthijs + Kooijman) + * lsb-base-logging.sh LSB functions are a bit more complete + * clears TTYs properly whenever Splashy is about to exit + * detects display managers better (gdm, kdm, xdm) + * hu translation added (Thanks Miklos Vajna) + * br translation added (Thanks Amadeu Andrade Barbosa Júnior) + * added more checks at initramfs to ensure Splashy can be started + (Thanks Luca Capello) + +------------------------------------------------------------------- +Fri Dec 19 14:02:56 CET 2008 - [email protected] + +- fix splash screen during resume (link /etc/splashy/themes added) + +------------------------------------------------------------------- +Sun Nov 30 00:00:31 CET 2008 - [email protected] + +- check if binary really exists in postinstall scripts + (needed with possibly cyclic deps) + +------------------------------------------------------------------- +Wed Nov 5 11:12:15 CET 2008 - [email protected] + +- split off splashy-branding-* packages (bnc#440898) + +------------------------------------------------------------------- +Tue Sep 30 20:30:37 CEST 2008 - [email protected] + +- disable DirectFB-x11input module, it triggers a segfault in + DirectFB (bnc#430235) + +------------------------------------------------------------------- +Mon Sep 29 17:04:37 CEST 2008 - [email protected] + +- adjust library paths in setup-splashy.sh due to DirectFB update + (bnc#430130) + +------------------------------------------------------------------- +Wed May 21 16:00:07 CEST 2008 - [email protected] + +- package old openSUSE theme as openSUSE-zz in splashy-themes package +- add new openSUSE theme to core package and adjust + splashy-default-theme.patch accordingly (bnc#387647) + +------------------------------------------------------------------- +Fri Feb 1 17:29:47 CET 2008 - [email protected] + +- adjust paths and libraries in setup-splashy.sh (mkinitrd) + +------------------------------------------------------------------- +Tue Jan 29 14:38:55 CET 2008 - [email protected] + +- (bnc#354982) + - remove link /etc/splashy/themes and add README.themes instead + - patch splashy configuration to look at /usr/share/splashy/themes for + themes instead + - package openSUSE theme in splashy.rpm and upstream default theme in + splashy-themes.rpm + +------------------------------------------------------------------- +Mon Jan 28 12:14:17 CET 2008 - [email protected] + +- /etc/splashy/themes was a directory and is now a link, so remove + the directory on update (b.n.c. 354982) + +------------------------------------------------------------------- +Tue Jan 15 15:23:05 CET 2008 - [email protected] + +- update to 0.3.8: + - remove splashy-static.patch + - add patch splashy-0.3.8-glib.patch + - Changes between 0.3.7 and 0.3.8 + * Bug fixes: + - Changes between 0.3.6 and 0.3.7 + * all static build dropped in favor of shared libraries. If your + distribution does not support initramfs shared binaries, or you are + using Splashy from a thin-client server, you will need to re-enable + static on your own. Please refer to configure.ac and src/Makefile.am + * scrolls text during boot (splashy_update "scroll text to display") + * splashy_update commands print_scroll is now just scroll. Same for + its alias "TEXT_SCROLL->SCROLL) + * splashy_update command clrprint is now just "clear" + * adds verbose text when pressing F2 (again). This time is done using + LSB scripts not reading the console files (/dev/vcs*) + * LSB script writes splashy PID to /var/run/sendsigs.omit which is + used by /etc/init.d/sendsigs to killall5 all processes at + shutdown/reboot. This tells the system to ignore killing splashy during + shutdown/reboot. + * adds international support. Translators needed! + http://splashy.alioth.debian.org/i18n/ + * uses the real size of the screen and not that reported by the + surface (Thanks to DeX77 from #frugalware for helping to get this + fixed) + - Changes between 0.3.5 and 0.3.6 + * Documentation updates ++++ 98 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.1:Update:Test/.splashy.new/splashy.changes New: ---- README.themes _link fix_autogen_version.diff gcc46-build-fixes.patch pm-utils-splashy.sh setup-splashy.sh splashy-0.3.13-fix-theme-path.patch splashy-0.3.13.tar.gz splashy-0.3.8-fix-compiler-warnings.patch splashy-0.3.8-glib.patch splashy-branding-SLED.tar.bz2 splashy-branding-openSUSE.tar.bz2 splashy-disable-x11input.patch splashy-exits-prematurely-fix.patch splashy.changes splashy.spec themes.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ splashy.spec ++++++ # # spec file for package splashy # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: splashy Summary: A complete user-space boot splash system Version: 0.3.13 Release: 27 License: GPLv2+ Group: System/Boot Url: http://splashy.alioth.debian.org/wiki/doku.php PreReq: mkinitrd coreutils Source: %{name}-%{version}.tar.gz Source1: setup-splashy.sh Source2: pm-utils-splashy.sh Source3: themes.tar.bz2 Source4: README.themes Source5: splashy-branding-openSUSE.tar.bz2 Source6: splashy-branding-SLED.tar.bz2 # Werror breaks build when used with fortify (we could also empty the _fortify_cflags macro) #Patch0: splashy.diff Patch1: splashy-0.3.8-fix-compiler-warnings.patch Patch2: splashy-0.3.8-glib.patch 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 #BuildRequires: procps-devel BuildRequires: libpng-devel BuildRequires: libjpeg-devel BuildRequires: freetype2-devel # For directfb-config Requires: DirectFB BuildRoot: %{_tmppath}/%{name}-%{version}-build %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 with Splashy! Some of Splashy´s most noticeable features include: * Require zero kernel patches/full functionality in user-space * Boot/halt/reboot/runlevel-switch support * Progressbar support (with optional border) * Verbose mode (with F2/ESC keys) * Configuration file in XML * Cope with any video-mode resolution/size * Cope with 8, 16, and 24 bit framebuffers * Alpha channel (transparency) support * Video mode detection * Initramfs support * TrueType2 fonts support * Lots of image/animation file formats supported: jpg, png, gif, mpg, swf * Low dependencies and code in C to best perform * Full LSB support * Multiple themes support * Really easy to create new themes * X detection on exit * Smooth progressbar movement * Animations support * Fade in/out effects * Totally configurable %package -n splashy-devel License: GPLv2+ Summary: Development tools for programs using libsplashy Group: Development/Languages/C and C++ Requires: splashy = %{version} %description -n splashy-devel This package contains the header files and libraries needed for developing programs using libsplashy. %package -n splashy-themes License: GPLv2+ Summary: Additional themes for splashy Requires: %{name} = %{version}-%{release} AutoReqProv: on Group: System/Boot %description -n splashy-themes Available themes: - fingerprint - aqua - mepis baghira - default splashy theme %package branding-openSUSE License: GPLv2+ Summary: Splashy branding for openSUSE Supplements: packageand(splashy:branding-openSUSE) Provides: splashy-branding = %{version} Conflicts: otherproviders(splashy-branding) Group: System/Boot Requires: splashy >= 0.3.8 PreReq: splashy >= 0.3.8 %description branding-openSUSE Splashy branding for openSUSE %package branding-SLED License: GPLv2+ Summary: Splashy branding for SLED Supplements: packageand(splashy:branding-SLED) Provides: splashy-branding = %{version} Conflicts: otherproviders(splashy-branding) AutoReqProv: on Group: System/Boot Requires: splashy >= 0.3.8 PreReq: splashy >= 0.3.8 %description branding-SLED Splashy branding for SLED %post branding-openSUSE if [ -x %{_sbindir}/splashy_config ] ; then %{_sbindir}/splashy_config --set-theme openSUSE fi %postun branding-openSUSE if [ -x %{_sbindir}/splashy_config ] ; then %{_sbindir}/splashy_config --set-theme default fi %post branding-SLED if [ -x %{_sbindir}/splashy_config ] ; then %{_sbindir}/splashy_config --set-theme SLED fi %postun branding-SLED if [ -x %{_sbindir}/splashy_config ] ; then %{_sbindir}/splashy_config --set-theme default fi %prep %setup -q %setup -T -D -a 5 %setup -T -D -a 6 %patch1 %patch2 %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 rm -f src/libglib-2.0.la %build NOCONFIGURE=1 ./autogen.sh %configure --prefix=/ --disable-static CFLAGS="$RPM_OPT_FLAGS" make %pre if test -d %{_sysconfdir}/splashy/themes -a ! -L %{_sysconfdir}/splashy/themes; then mv %{_sysconfdir}/splashy/themes %{_sysconfdir}/splashy/themes.bak fi %install export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL="1" %makeinstall cp -r themes $RPM_BUILD_ROOT/usr/share/splashy/ rm %{buildroot}/usr/lib*/libsplashy*.la # remove Debian-specific files cd %{buildroot} rm -f .%{_sysconfdir}/lsb-base-logging.sh rm -rf .%{_sysconfdir}/console-tools rm -rf .%{_datadir}/initramfs-tools #remove splashy init script for now, it's not working anyway #TODO, fixup init-script, install with chmod +x, link to /usr/sbin/rcsplash rm -f .%{_sysconfdir}/init.d/splashy mkdir -p $RPM_BUILD_ROOT/lib/mkinitrd/scripts install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/lib/mkinitrd/scripts/ tar xvf %{SOURCE3} -C $RPM_BUILD_ROOT/usr/share/splashy/ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/etc/splashy/ #mkdir -p $RPM_BUILD_ROOT/usr/lib/pm-utils/sleep.d/ #cp %{SOURCE2} $RPM_BUILD_ROOT/usr/lib/pm-utils/sleep.d/99splashy # remove translations for now TODO: #%find_lang %name rm %{buildroot}/%{_datadir}/locale/*/LC_MESSAGES/splashy.mo %clean rm -rf %{buildroot} %post /sbin/ldconfig /sbin/mkinitrd_setup %postun /sbin/ldconfig /sbin/mkinitrd_setup %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README TODO %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/default/* %dir %{_sysconfdir}/splashy %config(noreplace) %{_sysconfdir}/splashy/config.xml %{_sbindir}/* %{_mandir}/man1/* %{_mandir}/man5/* /lib/mkinitrd/scripts/setup-splashy.sh %dir %{_datadir}/splashy %{_libdir}/lib%{name}*.so.* %{_datadir}/splashy/schemas # this is a symbolic link to /usr/share/splashy/themes %{_sysconfdir}/splashy/README.themes %{_sysconfdir}/splashy/themes %dir %{_datadir}/splashy/themes /usr/share/splashy/themes/default %files -n splashy-devel %defattr(-,root,root) %{_includedir}/%{name}*.h %{_libdir}/lib%{name}*.so %{_libdir}/pkgconfig/splashy.pc %files -n splashy-themes %defattr(-,root,root) %dir %{_datadir}/splashy/themes /usr/share/splashy/themes/fingerprint /usr/share/splashy/themes/mepis_baghira /usr/share/splashy/themes/aqua /usr/share/splashy/themes/openSUSE-zz %files branding-openSUSE %defattr(-,root,root) %dir %{_datadir}/splashy/themes /usr/share/splashy/themes/openSUSE %files branding-SLED %defattr(-,root,root) %dir %{_datadir}/splashy/themes /usr/share/splashy/themes/SLED %changelog ++++++ README.themes ++++++ The theme directory has moved to /usr/share/splashy/themes ++++++ _link ++++++ <link project="openSUSE:12.1" package="splashy" baserev="be0414ca07dcc4381c5c3481879c70fb"> <patches> <branch/> </patches> </link> ++++++ fix_autogen_version.diff ++++++ --- autogen.sh.orig 2009-07-16 16:58:14.000000000 +0200 +++ autogen.sh 2009-07-17 09:15:22.000000000 +0200 @@ -261,12 +261,13 @@ case $REQUIRED_AUTOMAKE_VERSION in 1.4*) automake_progs="automake-1.4" ;; - 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;; - 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;; - 1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9 automake-1.10" ;; - 1.8*) automake_progs="automake-1.8 automake-1.9 automake-1.10" ;; - 1.9*) automake_progs="automake-1.9 automake-1.10" ;; - 1.10*) automake_progs="automake-1.10" ;; + 1.5*) automake_progs="automake-1.5 automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; + 1.6*) automake_progs="automake-1.6 automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; + 1.7*) automake_progs="automake-1.7 automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; + 1.8*) automake_progs="automake-1.8 automake-1.9 automake-1.10 automake-1.11" ;; + 1.9*) automake_progs="automake-1.9 automake-1.10 automake-1.11" ;; + 1.10*) automake_progs="automake-1.10 automake-1.11" ;; + 1.11*) automake_progs="automake-1.11" ;; esac version_check automake AUTOMAKE "$automake_progs" $REQUIRED_AUTOMAKE_VERSION \ "http://ftp.gnu.org/pub/gnu/automake/automake-$REQUIRED_AUTOMAKE_VERSION.tar.gz"; || DIE=1 ++++++ 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 ++++++ pm-utils-splashy.sh ++++++ #!/bin/bash # # Copyright (C) 2007 SUSE Linux Products GmbH # # Author: Holger Macht <[email protected]> # # This file is released under the GPLv2. # WTTYHX=/usr/lib/powersave/wttyhx IMG=splashy_suspend_screenshot get_x_user(){ [ -n "$X_USER" -a -n "$DISP" ] && return 0 local DUMMY read DUMMY X_USER DISP DUMMY < <($WTTYHX -v) return 0 } create_snapshot() { get_x_user if [ -z "$X_USER" -o -z "$DISP" ]; then echo "Could not get X_USER" exit 1 fi if [ ! -x "`which convert`" ]; then echo "convert from ImageMagick package not found" exit 1 fi su - $X_USER -c "DISPLAY=$DISP xwd -root -silent > /tmp/$IMG" convert /tmp/$IMG -blur 20 -separate /tmp/${IMG}.png cp /etc/splashy/themes/default/suspend.png /etc/splashy/themes/default/suspend.png.bak cp /tmp/${IMG}-0.png /etc/splashy/themes/default/suspend.png } restore_snapshot() { [ -e "/etc/splashy/themes/default/suspend.png.bak" ] || exit 0 mv /etc/splashy/themes/default/suspend.png.bak /etc/splashy/themes/default/suspend.png rm /etc/splashy/themes/default/suspend.png.bak rm /tmp/${IMG}*.png } case "$1" in hibernate) RES=`grep '^ *splash *= *n' /etc/suspend.conf` [ -z "$RES" ] && create_snapshot ;; thaw) RES=`grep '^ *splash *= *n' /etc/suspend.conf` [ -z "$RES" ] && restore_snapshot ;; *) ;; esac ++++++ setup-splashy.sh ++++++ #!/bin/bash # # Copyright (C) 2007 SUSE Linux Products GmbH # # Author: Holger Macht <[email protected]> # # This file is released under the GPLv2. # #%stage: setup # # never even 'return' from a mkinitrd script, which would result in an # aborted initrd build process if [ -d /etc/splashy ] && [ -f /usr/sbin/resume ]; then # find the current theme DUMMY=$(cat /etc/splashy/config.xml) THEME=$(echo $DUMMY | perl -p -e 's/<!--.*?-->//g;s/^.*<current_theme>//;s/<\/current_theme>.*$//;') if [ -z $THEME -o ! -d /usr/share/splashy/themes/$THEME ]; then echo "$0: warning, splashy theme not found in config file, using 'openSUSE'" THEME=openSUSE fi SPLASHY_FILES=" /etc/splashy/config.xml \ /usr/share/splashy/themes/$THEME/*" for I in `directfb-config --libs --input=keyboard --imageprovider=jpeg,gif,png --font=ft2,default`; do F=`dirname -- $I`/`basename -- $I .o`.so if [ -f $F ]; then if [ ! -d $tmp_mnt/`dirname $F` ]; then mkdir -p $tmp_mnt/`dirname $F` fi cp_bin $F $tmp_mnt/$F fi done for I in $SPLASHY_FILES; do [ ! -d $tmp_mnt/`dirname $I` ] && mkdir -p $tmp_mnt/`dirname $I` cp $I $tmp_mnt/$I done [ ! -d $tmp_mnt/etc/splashy/themes ] && \ ln -s /usr/share/splashy/themes $tmp_mnt/etc/splashy/ fi # never exit with nonzero, so we never cause mkinitrd to abort # - not having splash during resume is ugly, not booting is evil. # do not exit here - this script is sourced! true ++++++ splashy-0.3.13-fix-theme-path.patch ++++++ Index: splashy-0.3.13/doc/config.xml.in =================================================================== --- splashy-0.3.13.orig/doc/config.xml.in +++ splashy-0.3.13/doc/config.xml.in @@ -2,10 +2,10 @@ <!-- Automatically generated by splashy_config. Do not edit --> <splashy> <!-- themes directory: conventional path @datarootdir@/splashy/themes --> - <themes>@datarootdir@/splashy/themes</themes> + <themes>/usr/share/splashy/themes</themes> <!-- current theme could be relative the themes defined above or full path --> <current_theme>default</current_theme> <!-- full path to theme to fall back in case of problems. DO NOT CHANGE --> - <default_theme>@datarootdir@/splashy/themes/default</default_theme> + <default_theme>/usr/share/splashy/themes/default</default_theme> <pid>/etc/splashy/splashy.pid</pid> </splashy> Index: splashy-0.3.13/src/xml_format.h.in =================================================================== --- splashy-0.3.13.orig/src/xml_format.h.in +++ splashy-0.3.13/src/xml_format.h.in @@ -23,12 +23,12 @@ #define CONFIG_XML_FORMAT "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\ <!-- Automatically generated by splashy_config. Do not edit -->\n\ <splashy>\n\ - <!-- themes directory: conventional path @datarootdir@/splashy/themes -->\n\ + <!-- themes directory: conventional path /usr/share/splashy/themes -->\n\ <themes>%s</themes>\n\ <!-- current theme could be relative the themes defined above or full path -->\n\ <current_theme>%s</current_theme>\n\ <!-- full path to theme to fall back in case of problems. DO NOT CHANGE -->\n\ - <default_theme>@datarootdir@/splashy/themes/default</default_theme>\n\ + <default_theme>/usr/share/splashy/themes/default</default_theme>\n\ <pid>%s</pid>\n\ </splashy>\n" ++++++ splashy-0.3.8-fix-compiler-warnings.patch ++++++ Index: src/splashy_functions.c =================================================================== --- src/splashy_functions.c.orig +++ src/splashy_functions.c @@ -214,14 +214,22 @@ search_pattern (const gchar * perr_patte buffer = g_try_malloc (max_buf); if (buffer && (fp = g_fopen (filename, "r"))) { - fread_unlocked (buffer, max_buf, 1, fp); /* *_unlocked - * are a GNU - * extension: - * makes - * function - * fread() - * thread - * safe (to use, but with care) */ + /* *_unlocked + * are a GNU + * extension: + * makes + * function + * fread() + * thread + * safe */ + if (fread_unlocked (buffer, max_buf, 1, fp) == 0) { + ERROR_PRINT ("Cannot read from file %s\n", filename); + fclose (fp); + if (buffer) + g_free (buffer); + return FALSE; + } + fclose (fp); buffer[max_buf - 1] = '\0'; ret = search_pattern (perr_pattern, buffer, use_ignore); @@ -422,8 +430,15 @@ cmd_chroot (void **args) return 1; } - chdir (dir); - chroot (dir); + if (chdir (dir) == -1) { + ERROR_PRINT ("Cannot chroot to non existing directory %s\n", dir); + return 1; + } + + if (chroot (dir) == -1) { + ERROR_PRINT ("Cannot chroot to non existing directory %s\n", dir); + return 1; + } return 0; } ++++++ splashy-0.3.8-glib.patch ++++++ --- src/splashy.h +++ src/splashy.h @@ -20,6 +20,8 @@ #ifndef _LIBSPLASHY_H #define _LIBSPLASHY_H +#include <glib.h> + /* * public functions */ ++++++ splashy-disable-x11input.patch ++++++ Index: src/splashy_video.c =================================================================== --- src/splashy_video.c.orig +++ src/splashy_video.c @@ -1144,6 +1144,8 @@ splashy_start_splash () */ DirectFBSetOption ("disable-module", "linux_input"); + /* segfaults with 1.2.3 */ + DirectFBSetOption ("disable-module", "x11input"); /* * TODO doesn't solve anything: DirectFBSetOption ("dont-catch", ++++++ 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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
