From 7d10c2b713ffe1d904a00e1f9cdf4e5b418765d2 Mon Sep 17 00:00:00 2001 From: BlackNoxis Date: Thu, 12 Mar 2015 17:35:09 +0200 Subject: Corrected plymouth 0.9.0 --- sys-boot/plymouth/Manifest | 1 + ...8.3-drm-reduce-minimum-build-requirements.patch | 422 +++++++++++++++++++++ sys-boot/plymouth/files/0.8.3-gentoo-fb-path.patch | 25 ++ ...-image-replace-deprecated-libpng-function.patch | 24 ++ .../files/0.9_pre20111013-gentoo-fb-path.patch | 25 ++ .../files/plymouth-kogaion-defaults-2.patch | 9 + sys-boot/plymouth/plymouth-0.9.0.ebuild | 100 +++++ 7 files changed, 606 insertions(+) create mode 100644 sys-boot/plymouth/files/0.8.3-drm-reduce-minimum-build-requirements.patch create mode 100644 sys-boot/plymouth/files/0.8.3-gentoo-fb-path.patch create mode 100644 sys-boot/plymouth/files/0.8.3-image-replace-deprecated-libpng-function.patch create mode 100644 sys-boot/plymouth/files/0.9_pre20111013-gentoo-fb-path.patch create mode 100644 sys-boot/plymouth/files/plymouth-kogaion-defaults-2.patch create mode 100644 sys-boot/plymouth/plymouth-0.9.0.ebuild (limited to 'sys-boot') diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest index e9eb462d..ef42be36 100644 --- a/sys-boot/plymouth/Manifest +++ b/sys-boot/plymouth/Manifest @@ -1 +1,2 @@ DIST plymouth-0.8.8.tar.bz2 1143549 SHA256 1bada4e1d3a31a5a99adc2db83f5452d9818839cda51a6e430f044f6281d759b SHA512 97a20a8622c7ea51000e9b6d88a25fd84d7001fb2727527a72344b555f389c74954bd0be0bffd9cc9175b5c5a0d28e95af058fce79ec7531f736619ee74d8d94 WHIRLPOOL badb44a6c1eb004772e67cfe3cda601d22590d813ebd4bce5f0fcb325c445246916ba30e083c6aa98b73b460ddf4f2caf9bf2727d22bbbc5414f11a5cf0e5ddf +DIST plymouth-0.9.0.tar.bz2 1159218 SHA256 d3e22e750a8a83de7377e9fa88975f146f875bbd030055411a2faf74c2e6cd4d SHA512 046e7fb20d3a65cc2b8b378026fae6619417557502426d944e4f06078eacfa37cb5fcf886d8bdb598921bbef87ce3ec92daa16a57075a180d5f427443100c232 WHIRLPOOL 3b2e327a02c18cd436f895aa38719acd07ed06f3cbd846181190144784325e8561c1ebd97516beaa396733e9981e76f3029dc29b27f3ae32f646c087529ada0d diff --git a/sys-boot/plymouth/files/0.8.3-drm-reduce-minimum-build-requirements.patch b/sys-boot/plymouth/files/0.8.3-drm-reduce-minimum-build-requirements.patch new file mode 100644 index 00000000..8c9bb5ab --- /dev/null +++ b/sys-boot/plymouth/files/0.8.3-drm-reduce-minimum-build-requirements.patch @@ -0,0 +1,422 @@ +drm: reduce minimum build requirements + +This patch adds the respective configure options to make it possible to disable +libdrm_intel, libdrm_radeon, libdrm_nouveau independently from each other. + +NOTE: + +The patch is based on work of Lucian Muresan +that fixes bug report: + + https://bugs.freedesktop.org/show_bug.cgi?id=29804 + +This one is adjusted to version 0.8.3 which doesn't support libkms yet. + +--- +diff -Naur plymouth-0.8.3/configure.ac plymouth-0.8.3.new/configure.ac +--- plymouth-0.8.3/configure.ac 2010-05-06 19:32:20.000000000 +0200 ++++ plymouth-0.8.3.new/configure.ac 2011-02-03 18:45:11.749557708 +0100 +@@ -56,49 +56,150 @@ + AC_SUBST(GTK_CFLAGS) + AC_SUBST(GTK_LIBS) + +-PKG_CHECK_MODULES(DRM, [libdrm libdrm_intel libdrm_radeon libdrm_nouveau]) ++AC_ARG_ENABLE(libdrm_intel, AS_HELP_STRING([--enable-libdrm_intel],[enable building with libdrm_intel support]),enable_libdrm_intel=$enableval,enable_libdrm_intel=yes) ++AM_CONDITIONAL(ENABLE_LIBDRM_INTEL, [test "$enable_libdrm_intel" = yes]) + +-OLD_CFLAGS="$CFLAGS" +-CFLAGS="$CFLAGS $DRM_CFLAGS" +-AC_MSG_CHECKING([if i915_drm.h, radeon_drm.h and nouveau_drm.h are in include path]) +-AC_COMPILE_IFELSE(AC_LANG_PROGRAM( +-[[ +- #include +- #include +- #include "i915_drm.h" +- #include "radeon_drm.h" +- #include "nouveau_drm.h" +-]],[[]]),[found_drm_kernel_headers=yes],[found_drm_kernel_headers=no]) +- +-if test "$found_drm_kernel_headers" = "yes"; then +- AC_MSG_RESULT([yes]) +-else +- AC_MSG_RESULT([no]) +- AC_MSG_CHECKING([if we can find them anyway]) ++if test x$enable_libdrm_intel = xyes; then ++ PKG_CHECK_MODULES(DRM_INTEL, [libdrm libdrm_intel]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $DRM_INTEL_CFLAGS" ++ AC_MSG_CHECKING([if i915_drm.h is in include path]) ++ AC_COMPILE_IFELSE(AC_LANG_PROGRAM( ++ [[ ++ #include ++ #include ++ #include "i915_drm.h" ++ ]],[[]]),[found_drm_intel_kernel_headers=yes],[found_drm_intel_kernel_headers=no]) ++ ++ if test "$found_drm_intel_kernel_headers" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ AC_MSG_CHECKING([if we can find them anyway]) ++ ++ MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm" ++ CFLAGS="$CFLAGS $MORE_DRM_CFLAGS" ++ AC_COMPILE_IFELSE(AC_LANG_PROGRAM( ++ [[ ++ #include ++ #include ++ #include "i915_drm.h" ++ ]],[[]]),[found_drm_intel_kernel_headers=yes],[found_drm_intel_kernel_headers=no]) ++ ++ if test "$found_drm_intel_kernel_headers" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ DRM_INTEL_CFLAGS="$DRM_INTEL_CFLAGS $MORE_DRM_CFLAGS" ++ else ++ AC_MSG_RESULT([no]) ++ AC_MSG_ERROR([Could not find i915_drm.h]) ++ fi ++ fi ++ ++ AC_SUBST(DRM_INTEL_CFLAGS) ++ AC_SUBST(DRM_INTEL_LIBS) ++ AC_DEFINE(PLY_ENABLE_LIBDRM_INTEL, 1, [Enable support for libdrm_intel driver]) ++fi ++ ++AC_ARG_ENABLE(libdrm_radeon, AS_HELP_STRING([--enable-libdrm_radeon],[enable building with libdrm_radeon support]),enable_libdrm_radeon=$enableval,enable_libdrm_radeon=yes) ++AM_CONDITIONAL(ENABLE_LIBDRM_RADEON, [test "$enable_libdrm_radeon" = yes]) + +- MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm" +- CFLAGS="$CFLAGS $MORE_DRM_CFLAGS" ++if test x$enable_libdrm_radeon = xyes; then ++ PKG_CHECK_MODULES(DRM_RADEON, [libdrm libdrm_radeon]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $DRM_RADEON_CFLAGS" ++ AC_MSG_CHECKING([if radeon_drm.h is in include path]) + AC_COMPILE_IFELSE(AC_LANG_PROGRAM( + [[ + #include + #include + #include "i915_drm.h" + #include "radeon_drm.h" ++ ]],[[]]),[found_drm_radeon_kernel_headers=yes],[found_drm_radeon_kernel_headers=no]) ++ ++ if test "$found_drm_radeon_kernel_headers" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ AC_MSG_CHECKING([if we can find them anyway]) ++ ++ MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm" ++ CFLAGS="$CFLAGS $MORE_DRM_RADEON_CFLAGS" ++ AC_COMPILE_IFELSE(AC_LANG_PROGRAM( ++ [[ ++ #include ++ #include ++ #include "radeon_drm.h" ++ ]],[[]]),[found_drm_radeon_kernel_headers=yes],[found_drm_radeon_kernel_headers=no]) ++ ++ if test "$found_drm_radeon_kernel_headers" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ DRM_RADEON_CFLAGS="$DRM_RADEON_CFLAGS $MORE_DRM_CFLAGS" ++ else ++ AC_MSG_RESULT([no]) ++ AC_MSG_ERROR([Could not find radeon_drm.h]) ++ fi ++ fi ++ ++ AC_SUBST(DRM_RADEON_CFLAGS) ++ AC_SUBST(DRM_RADEON_LIBS) ++ AC_DEFINE(PLY_ENABLE_LIBDRM_RADEON, 1, [Enable support for libdrm_radeon driver]) ++fi ++ ++AC_ARG_ENABLE(libdrm_nouveau, AS_HELP_STRING([--enable-libdrm_nouveau],[enable building with libdrm_nouveau support]),enable_libdrm_nouveau=$enableval,enable_libdrm_nouveau=yes) ++AM_CONDITIONAL(ENABLE_LIBDRM_NOUVEAU, [test "$enable_libdrm_nouveau" = yes]) ++ ++if test x$enable_libdrm_nouveau = xyes; then ++ PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm libdrm_nouveau]) ++ OLD_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS $DRM_NOUVEAU_CFLAGS" ++ AC_MSG_CHECKING([if nouveau_drm.h is in include path]) ++ AC_COMPILE_IFELSE(AC_LANG_PROGRAM( ++ [[ ++ #include ++ #include + #include "nouveau_drm.h" +- ]],[[]]),[found_drm_kernel_headers=yes],[found_drm_kernel_headers=no]) ++ ]],[[]]),[found_drm_nouveau_kernel_headers=yes],[found_drm_nouveau_kernel_headers=no]) + +- if test "$found_drm_kernel_headers" = "yes"; then ++ if test "$found_drm_nouveau_kernel_headers" = "yes"; then + AC_MSG_RESULT([yes]) + DRM_CFLAGS="$DRM_CFLAGS $MORE_DRM_CFLAGS" + else + AC_MSG_RESULT([no]) +- AC_MSG_ERROR([Could not find i915_drm.h, radeon_drm.h and/or nouveau_drm.h]) ++ AC_MSG_CHECKING([if we can find them anyway]) ++ ++ MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm" ++ CFLAGS="$CFLAGS $MORE_DRM_CFLAGS" ++ AC_COMPILE_IFELSE(AC_LANG_PROGRAM( ++ [[ ++ #include ++ #include ++ #include "nouveau_drm.h" ++ ]],[[]]),[found_drm_nouveau_kernel_headers=yes],[found_drm_nouveau_kernel_headers=no]) ++ ++ if test "$found_drm_nouveau_kernel_headers" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ DRM_NOUVEAU_CFLAGS="$DRM_NOUVEAU_CFLAGS $MORE_DRM_CFLAGS" ++ else ++ AC_MSG_RESULT([no]) ++ AC_MSG_ERROR([Could not find nouveau_drm.h]) ++ fi + fi ++ ++ AC_SUBST(DRM_NOUVEAU_CFLAGS) ++ AC_SUBST(DRM_NOUVEAU_LIBS) ++ AC_DEFINE(PLY_ENABLE_LIBDRM_NOUVEAU, 1, [Enable support for libdrm_nouveau driver]) + fi +-CFLAGS="$OLD_CFLAGS" ++ ++DRM_CFLAGS="$DRM_INTEL_CFLAGS $DRM_RADEON_CFLAGS $DRM_NOUVEAU_CFLAGS" ++DRM_LIBS="$DRM_INTEL_LIBS $DRM_RADEON_LIBS $DRM_NOUVEAU_LIBS" + AC_SUBST(DRM_CFLAGS) + AC_SUBST(DRM_LIBS) + ++AM_CONDITIONAL(ENABLE_DRM_RENDERER, ++ [test x$enable_libdrm_intel = xyes \ ++ -o x$enable_libdrm_radeon = xyes \ ++ -o x$enable_libdrm_nouveau = xyes]) ++ + AC_ARG_ENABLE(tracing, AS_HELP_STRING([--enable-tracing],[enable verbose tracing code]),enable_tracing=$enableval,enable_tracing=yes) + + if test x$enable_tracing = xyes; then +diff -Naur plymouth-0.8.3/scripts/plymouth-populate-initrd.in plymouth-0.8.3.new/scripts/plymouth-populate-initrd.in +--- plymouth-0.8.3/scripts/plymouth-populate-initrd.in 2010-05-06 19:32:20.000000000 +0200 ++++ plymouth-0.8.3.new/scripts/plymouth-populate-initrd.in 2011-02-03 19:14:06.316946754 +0100 +@@ -97,7 +97,7 @@ + + inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR + +-inst ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so $INITRDDIR ++[ -f "${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so" ] && inst ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so $INITRDDIR + inst ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so $INITRDDIR + + if [ -d ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then +diff -Naur plymouth-0.8.3/scripts/plymouth-populate-initrd.in.orig plymouth-0.8.3.new/scripts/plymouth-populate-initrd.in.orig +--- plymouth-0.8.3/scripts/plymouth-populate-initrd.in.orig 1970-01-01 01:00:00.000000000 +0100 ++++ plymouth-0.8.3.new/scripts/plymouth-populate-initrd.in.orig 2010-05-06 19:32:20.000000000 +0200 +@@ -0,0 +1,114 @@ ++#!/bin/bash ++ ++[ -z "$DESTDIR" ] || exit 0 ++ ++[ -z "$PLYMOUTH_LIBEXECDIR" ] && PLYMOUTH_LIBEXECDIR="@PLYMOUTH_LIBEXECDIR@" ++[ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="@PLYMOUTH_DATADIR@" ++[ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)" ++[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@" ++[ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme) ++[ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@" ++[ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@" ++ ++if [ -z "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then ++ ++ if [ -f "${PLYMOUTH_LIBEXECDIR}/initrd-functions" ]; then ++ PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${PLYMOUTH_LIBEXECDIR}/initrd-functions" ++ fi ++ ++ if [ -f "${PLYMOUTH_DATADIR}/dracut/dracut-functions" ]; then ++ PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${PLYMOUTH_DATADIR}/dracut/dracut-functions" ++ fi ++fi ++ ++if [ -n "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then ++ source $PLYMOUTH_POPULATE_SOURCE_FUNCTIONS ++fi ++ ++if [ " $(type -t inst) " != " function " ]; then ++ echo "Need 'inst' function, try setting PLYMOUTH_POPULATE_SOURCE_FUNCTIONS to a file that defines it" 1>&2 ++ exit 1 ++fi ++ ++if [ " $(type -t set_verbose) " != " function " ]; then ++ function set_verbose { true; } ++fi ++ ++function usage() { ++ local output="/dev/stdout" ++ local rc=0 ++ if [ "$1" == "error" ]; then ++ output="/dev/stderr" ++ rc=1 ++ fi ++ ++ echo "usage: plymouth [ --verbose | -v ] { --targetdir | -t } " > $output ++ exit $rc ++} ++ ++verbose=false ++INITRDDIR="" ++while [ $# -gt 0 ]; do ++ case $1 in ++ --verbose|-v) ++ verbose=true ++ ;; ++ --targetdir|-t) ++ shift ++ INITRDDIR="$1" ++ ;; ++ --help|-h) ++ usage normal ++ ;; ++ *) ++ usage error ++ break ++ ;; ++ esac ++ shift ++done ++set_verbose $verbose || : ++ ++[ -z "$INITRDDIR" ] && usage error ++ ++mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes ++inst /sbin/plymouthd $INITRDDIR /bin/plymouthd ++inst /bin/plymouth $INITRDDIR ++inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR ++inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR ++inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR ++inst ${PLYMOUTH_PLUGIN_PATH}/details.so $INITRDDIR ++inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR ++inst @RELEASE_FILE@ $INITRDDIR ++inst ${PLYMOUTH_POLICYDIR}/plymouthd.defaults $INITRDDIR ++inst ${PLYMOUTH_CONFDIR}/plymouthd.conf $INITRDDIR ++ ++if [ -z "$PLYMOUTH_THEME_NAME" ]; then ++ echo "No default plymouth plugin is set" > /dev/stderr ++ exit 1 ++fi ++ ++PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//') ++ ++if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then ++ echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr ++ exit 1 ++fi ++ ++inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR ++ ++inst ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so $INITRDDIR ++inst ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so $INITRDDIR ++ ++if [ -d ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then ++ for x in ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ; do ++ [ ! -f "$x" ] && break ++ inst $x $INITRDDIR ++ done ++fi ++ ++if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then ++ cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes ++fi ++ ++# vim:ts=8:sw=4:sts=4:et +diff -Naur plymouth-0.8.3/src/plugins/renderers/drm/Makefile.am plymouth-0.8.3.new/src/plugins/renderers/drm/Makefile.am +--- plymouth-0.8.3/src/plugins/renderers/drm/Makefile.am 2010-05-06 19:32:20.000000000 +0200 ++++ plymouth-0.8.3.new/src/plugins/renderers/drm/Makefile.am 2011-02-03 19:07:04.811686193 +0100 +@@ -1,3 +1,4 @@ ++if ENABLE_DRM_RENDERER + INCLUDES = -I$(top_srcdir) \ + -I$(srcdir)/../../../libply \ + -I$(srcdir)/../../../libply-splash-core \ +@@ -16,12 +17,22 @@ + ../../../libply/libply.la \ + ../../../libply-splash-core/libply-splash-core.la + drm_la_SOURCES = $(srcdir)/plugin.c \ +- $(srcdir)/ply-renderer-driver.h \ +- $(srcdir)/ply-renderer-i915-driver.h \ +- $(srcdir)/ply-renderer-i915-driver.c \ +- $(srcdir)/ply-renderer-radeon-driver.h \ +- $(srcdir)/ply-renderer-radeon-driver.c \ +- $(srcdir)/ply-renderer-nouveau-driver.h \ +- $(srcdir)/ply-renderer-nouveau-driver.c ++ $(srcdir)/ply-renderer-driver.h ++if ENABLE_LIBDRM_INTEL ++drm_la_SOURCES += $(srcdir)/ply-renderer-i915-driver.h \ ++ $(srcdir)/ply-renderer-i915-driver.c ++endif ++ ++if ENABLE_LIBDRM_RADEON ++drm_la_SOURCES += $(srcdir)/ply-renderer-radeon-driver.h \ ++ $(srcdir)/ply-renderer-radeon-driver.c ++endif ++ ++if ENABLE_LIBDRM_NOUVEAU ++drm_la_SOURCES += $(srcdir)/ply-renderer-nouveau-driver.h \ ++ $(srcdir)/ply-renderer-nouveau-driver.c ++endif ++ ++endif + + MAINTAINERCLEANFILES = Makefile.in +diff -Naur plymouth-0.8.3/src/plugins/renderers/drm/plugin.c plymouth-0.8.3.new/src/plugins/renderers/drm/plugin.c +--- plymouth-0.8.3/src/plugins/renderers/drm/plugin.c 2010-05-06 19:32:20.000000000 +0200 ++++ plymouth-0.8.3.new/src/plugins/renderers/drm/plugin.c 2011-02-03 19:13:35.083078444 +0100 +@@ -57,9 +57,15 @@ + #include "ply-renderer.h" + #include "ply-renderer-plugin.h" + #include "ply-renderer-driver.h" ++#ifdef PLY_ENABLE_LIBDRM_INTEL + #include "ply-renderer-i915-driver.h" ++#endif ++#ifdef PLY_ENABLE_LIBDRM_RADEON + #include "ply-renderer-radeon-driver.h" ++#endif ++#ifdef PLY_ENABLE_LIBDRM_NOUVEAU + #include "ply-renderer-nouveau-driver.h" ++#endif + + #define BYTES_PER_PIXEL (4) + +@@ -443,22 +449,29 @@ + free (driver_name); + return false; + } +- +- if (strcmp (driver_name, "i915") == 0) ++ backend->driver_interface = NULL; ++#ifdef PLY_ENABLE_LIBDRM_INTEL ++ if (backend->driver_interface == NULL && strcmp (driver_name, "i915") == 0) + { + backend->driver_interface = ply_renderer_i915_driver_get_interface (); + backend->driver_supports_mapping_console = true; + } +- else if (strcmp (driver_name, "radeon") == 0) ++#endif ++#ifdef PLY_ENABLE_LIBDRM_RADEON ++ if (backend->driver_interface == NULL && strcmp (driver_name, "radeon") == 0) + { + backend->driver_interface = ply_renderer_radeon_driver_get_interface (); + backend->driver_supports_mapping_console = false; + } +- else if (strcmp (driver_name, "nouveau") == 0) ++#endif ++#ifdef PLY_ENABLE_LIBDRM_NOUVEAU ++ if (backend->driver_interface == NULL && strcmp (driver_name, "nouveau") == 0) + { + backend->driver_interface = ply_renderer_nouveau_driver_get_interface (); + backend->driver_supports_mapping_console = false; + } ++#endif ++ + free (driver_name); + + if (backend->driver_interface == NULL) +diff -Naur plymouth-0.8.3/src/plugins/renderers/Makefile.am plymouth-0.8.3.new/src/plugins/renderers/Makefile.am +--- plymouth-0.8.3/src/plugins/renderers/Makefile.am 2010-05-06 19:32:20.000000000 +0200 ++++ plymouth-0.8.3.new/src/plugins/renderers/Makefile.am 2011-02-03 19:14:06.316946754 +0100 +@@ -1,2 +1,3 @@ +-SUBDIRS = frame-buffer drm x11 ++SUBDIRS = frame-buffer x11 drm ++ + MAINTAINERCLEANFILES = Makefile.in diff --git a/sys-boot/plymouth/files/0.8.3-gentoo-fb-path.patch b/sys-boot/plymouth/files/0.8.3-gentoo-fb-path.patch new file mode 100644 index 00000000..cb0f0d5a --- /dev/null +++ b/sys-boot/plymouth/files/0.8.3-gentoo-fb-path.patch @@ -0,0 +1,25 @@ +From 5fd3ed5a1f661eb1d99e1d4df5edad8410cc54e3 Mon Sep 17 00:00:00 2001 +From: root +Date: Sun, 25 Oct 2009 03:55:54 +0100 +Subject: [PATCH] Gentoo does not have /dev/fb, but /dev/fb0 (at least on i915 KMS) + +--- + src/plugins/renderers/frame-buffer/plugin.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/libply/ply-frame-buffer.c b/src/libply/ply-frame-buffer.c +index a1e4fcd..19aab4b 100644 +--- a/src/plugins/renderers/frame-buffer/plugin.c ++++ b/src/plugins/renderers/frame-buffer/plugin.c +@@ -46,7 +46,7 @@ + #include + + #ifndef PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME +-#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb" ++#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb0" + #endif + + struct _ply_frame_buffer +-- +1.6.5 + diff --git a/sys-boot/plymouth/files/0.8.3-image-replace-deprecated-libpng-function.patch b/sys-boot/plymouth/files/0.8.3-image-replace-deprecated-libpng-function.patch new file mode 100644 index 00000000..42985c5b --- /dev/null +++ b/sys-boot/plymouth/files/0.8.3-image-replace-deprecated-libpng-function.patch @@ -0,0 +1,24 @@ +From 07329b72687ccc7a9015de4a48fae297d6d5ff96 Mon Sep 17 00:00:00 2001 +From: Brett Witherspoon +Date: Tue, 12 Oct 2010 03:23:47 +0000 +Subject: image: replace deprecated libpng function + +The png_set_gray_1_2_4_to_8 function is deprecated and has been removed +from libpng14. Now png_set_expand_gray_1_2_4_to_8 is used instead which +is compatible with libpng-1.2.9 and greater. +--- +diff --git a/src/libply-splash-graphics/ply-image.c b/src/libply-splash-graphics/ply-image.c +index 9369242..4b16783 100644 +--- a/src/libply-splash-graphics/ply-image.c ++++ b/src/libply-splash-graphics/ply-image.c +@@ -151,7 +151,7 @@ ply_image_load (ply_image_t *image) + png_set_palette_to_rgb (png); + + if ((color_type == PNG_COLOR_TYPE_GRAY) && (bits_per_pixel < 8)) +- png_set_gray_1_2_4_to_8 (png); ++ png_set_expand_gray_1_2_4_to_8 (png); + + if (png_get_valid (png, info, PNG_INFO_tRNS)) + png_set_tRNS_to_alpha (png); +-- +cgit v0.8.3-6-g21f6 diff --git a/sys-boot/plymouth/files/0.9_pre20111013-gentoo-fb-path.patch b/sys-boot/plymouth/files/0.9_pre20111013-gentoo-fb-path.patch new file mode 100644 index 00000000..cb0f0d5a --- /dev/null +++ b/sys-boot/plymouth/files/0.9_pre20111013-gentoo-fb-path.patch @@ -0,0 +1,25 @@ +From 5fd3ed5a1f661eb1d99e1d4df5edad8410cc54e3 Mon Sep 17 00:00:00 2001 +From: root +Date: Sun, 25 Oct 2009 03:55:54 +0100 +Subject: [PATCH] Gentoo does not have /dev/fb, but /dev/fb0 (at least on i915 KMS) + +--- + src/plugins/renderers/frame-buffer/plugin.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/libply/ply-frame-buffer.c b/src/libply/ply-frame-buffer.c +index a1e4fcd..19aab4b 100644 +--- a/src/plugins/renderers/frame-buffer/plugin.c ++++ b/src/plugins/renderers/frame-buffer/plugin.c +@@ -46,7 +46,7 @@ + #include + + #ifndef PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME +-#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb" ++#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb0" + #endif + + struct _ply_frame_buffer +-- +1.6.5 + diff --git a/sys-boot/plymouth/files/plymouth-kogaion-defaults-2.patch b/sys-boot/plymouth/files/plymouth-kogaion-defaults-2.patch new file mode 100644 index 00000000..3642009e --- /dev/null +++ b/sys-boot/plymouth/files/plymouth-kogaion-defaults-2.patch @@ -0,0 +1,9 @@ +--- a/src/plymouthd.defaults ++++ b/src/plymouthd.defaults +@@ -1,5 +1,5 @@ + # Distribution defaults. Changes to this file will get overwritten during + # upgrades. + [Daemon] +-Theme=spinner ++Theme=kogaion + ShowDelay=5 diff --git a/sys-boot/plymouth/plymouth-0.9.0.ebuild b/sys-boot/plymouth/plymouth-0.9.0.ebuild new file mode 100644 index 00000000..ec792e37 --- /dev/null +++ b/sys-boot/plymouth/plymouth-0.9.0.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=5 + +SRC_URI="" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="git://anongit.freedesktop.org/plymouth" + AUTOTOOLS_AUTORECONF="1" + inherit git-r3 +else + SRC_URI="${SRC_URI} http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2" +fi + +inherit autotools-utils readme.gentoo systemd toolchain-funcs + +DESCRIPTION="Graphical boot animation (splash) and logger" +HOMEPAGE="http://cgit.freedesktop.org/plymouth/" + +LICENSE="GPL-2" +SLOT="0" +[[ ${PV} == 9999 ]] || \ +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="debug gdm +gtk +libkms +pango static-libs" + +CDEPEND=" + >=media-libs/libpng-1.2.16 + gtk? ( + dev-libs/glib:2 + >=x11-libs/gtk+-2.12:2 ) + libkms? ( x11-libs/libdrm[libkms] ) + pango? ( >=x11-libs/pango-1.21 ) +" +DEPEND="${CDEPEND} + virtual/pkgconfig +" +# Block due bug #383067 +RDEPEND="${CDEPEND} + virtual/udev + >=x11-themes/kogaion-artwork-core-1 + !