From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- sys-boot/plymouth/Manifest | 4 + ...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.8.8-initrd-binaries-paths.patch | 32 ++ .../files/0.9.2-systemdsystemunitdir.patch | 18 + sys-boot/plymouth/metadata.xml | 25 ++ sys-boot/plymouth/plymouth-0.8.8-r4.ebuild | 90 +++++ sys-boot/plymouth/plymouth-0.8.8-r5.ebuild | 94 +++++ sys-boot/plymouth/plymouth-0.9.0.ebuild | 96 +++++ sys-boot/plymouth/plymouth-0.9.2.ebuild | 101 +++++ sys-boot/plymouth/plymouth-9999.ebuild | 97 +++++ 12 files changed, 1028 insertions(+) create mode 100644 sys-boot/plymouth/Manifest 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.8.8-initrd-binaries-paths.patch create mode 100644 sys-boot/plymouth/files/0.9.2-systemdsystemunitdir.patch create mode 100644 sys-boot/plymouth/metadata.xml create mode 100644 sys-boot/plymouth/plymouth-0.8.8-r4.ebuild create mode 100644 sys-boot/plymouth/plymouth-0.8.8-r5.ebuild create mode 100644 sys-boot/plymouth/plymouth-0.9.0.ebuild create mode 100644 sys-boot/plymouth/plymouth-0.9.2.ebuild create mode 100644 sys-boot/plymouth/plymouth-9999.ebuild (limited to 'sys-boot/plymouth') diff --git a/sys-boot/plymouth/Manifest b/sys-boot/plymouth/Manifest new file mode 100644 index 00000000000..8967184efea --- /dev/null +++ b/sys-boot/plymouth/Manifest @@ -0,0 +1,4 @@ +DIST gentoo-logo.png 14501 SHA256 79ebc1d66693371a90e218ad421cfed05066b51a6645bd967bb7da356a0881fa SHA512 059a555931b6d2a910bcd887f5ea0cc17c6edf2d2d45c03a1fec1bdda0138ba6bca6bdf90a65c6520a3f8f1b51ecf6f7956098f45ed6c1276f29c835e729163c WHIRLPOOL 65496223badb9a96cc72ba6a2432860af0756eea57f67946d2466ff1c3c1171c84568c502aa576613b77767c41cf251856728b509c72003567d4cebd1943375e +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 +DIST plymouth-0.9.2.tar.bz2 1231336 SHA256 2f0ce82042cf9c7eadd2517a1f74c8a85fa8699781d9f294a06eade29fbed57f SHA512 89356eb8326504fbf3155de262ce15de0847f0a0e6d157d873cf1dea9af464a6cb9e11d7143ee9a595b217a2487060b5835eba5ac142c3cd6d66689deb272e60 WHIRLPOOL 5f9e662dec633bb606cf4246611b442a0eb9eaa92942b37c53d1c48b6ca8ef96c5f4330d574b82de6a026ca175a770c1a45f52c7809c80d026126d805e707eba 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 00000000000..8c9bb5ab3f3 --- /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 00000000000..cb0f0d5af3b --- /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 00000000000..42985c5b04c --- /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.8.8-initrd-binaries-paths.patch b/sys-boot/plymouth/files/0.8.8-initrd-binaries-paths.patch new file mode 100644 index 00000000000..7416527b0f3 --- /dev/null +++ b/sys-boot/plymouth/files/0.8.8-initrd-binaries-paths.patch @@ -0,0 +1,32 @@ +From 2d85c8d0a3ad81268718344e0e72ebeeea851422 Mon Sep 17 00:00:00 2001 +From: Enrico Tagliavini +Date: Wed, 29 Jan 2014 14:18:22 +0000 +Subject: populate-initrd: install binaries to their configured location + +If plymouth is configured --with-system-root-install=no then the +systemd unitd files will write the paths of plymouth and plymouthd +relative to /usr . The script currently hardcodes installing them +to the initrd's / + +This commit makes sure they get placed on the same part of the of +the initrd filesystem as systemd expects to find them. + +https://bugs.freedesktop.org/show_bug.cgi?id=74174 +--- +diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in +index d25ab07..43c7f22 100755 +--- a/scripts/plymouth-populate-initrd.in ++++ b/scripts/plymouth-populate-initrd.in +@@ -373,8 +373,8 @@ done + [ -z "$INITRDDIR" ] && usage error + + mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes +-inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR /sbin/plymouthd +-inst ${PLYMOUTH_CLIENT_PATH} $INITRDDIR /bin/plymouth ++inst ${PLYMOUTH_DAEMON_PATH} $INITRDDIR ++inst ${PLYMOUTH_CLIENT_PATH} $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 +-- +cgit v0.9.0.2-2-gbebe diff --git a/sys-boot/plymouth/files/0.9.2-systemdsystemunitdir.patch b/sys-boot/plymouth/files/0.9.2-systemdsystemunitdir.patch new file mode 100644 index 00000000000..b5289244232 --- /dev/null +++ b/sys-boot/plymouth/files/0.9.2-systemdsystemunitdir.patch @@ -0,0 +1,18 @@ +diff --git a/configure.ac b/configure.ac +index aad673e..592be5f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -122,7 +122,12 @@ AM_CONDITIONAL(ENABLE_SYSTEMD_INTEGRATION, [test "$enable_systemd_integration" = + + if test x$enable_systemd_integration = xyes; then + AC_DEFINE(PLY_ENABLE_SYSTEMD_INTEGRATION, 1, [Coordinate boot up with systemd]) +- SYSTEMD_UNIT_DIR=$($PKG_CONFIG --variable=systemdsystemunitdir systemd) ++ AC_ARG_WITH([systemdsystemunitdir], AC_HELP_STRING([--with-systemdsystemunitdir=DIR], ++ [path to systemd service directory]), [path_systemdunit=${withval}], ++ [path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"]) ++ if (test -n "${path_systemdunit}"); then ++ SYSTEMD_UNIT_DIR="${path_systemdunit}" ++ fi + AC_SUBST(SYSTEMD_UNIT_DIR) + fi + diff --git a/sys-boot/plymouth/metadata.xml b/sys-boot/plymouth/metadata.xml new file mode 100644 index 00000000000..094f65df04d --- /dev/null +++ b/sys-boot/plymouth/metadata.xml @@ -0,0 +1,25 @@ + + + +proxy-maintainers + + enrico.tagliavini@gmail.com + Enrico Tagliavini + + + Enables smooth transition to GDM + Provides abstraction to the DRM drivers (intel, + nouveau and vmwgfx at this moment) + Adds support for printing text on splash screen and + text prompts, e.g. for password + + + Plymouth is an application that runs very early in the boot process + (even before the root filesystem is mounted!) that provides a graphical + boot animation while the boot process happens in the background. + + It is designed to work on systems with DRM modesetting drivers. Ideally, + the goal is to get rid of all flicker during startup. For systems that + don't have DRM mode settings drivers, plymouth falls back to text mode. + + diff --git a/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild new file mode 100644 index 00000000000..9f3c6e8cfb1 --- /dev/null +++ b/sys-boot/plymouth/plymouth-0.8.8-r4.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools-utils readme.gentoo systemd toolchain-funcs + +DESCRIPTION="Graphical boot animation (splash) and logger" +HOMEPAGE="http://cgit.freedesktop.org/plymouth/" +SRC_URI=" + http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2 + http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86" +IUSE_VIDEO_CARDS="video_cards_intel video_cards_radeon" +IUSE="${IUSE_VIDEO_CARDS} 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 ) + video_cards_intel? ( x11-libs/libdrm[video_cards_intel] ) + video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] ) +" +DEPEND="${CDEPEND} + virtual/pkgconfig +" +# Block due bug #383067 +RDEPEND="${CDEPEND} + virtual/udev +" + +DOC_CONTENTS=" + Follow the following instructions to set up Plymouth:\n + http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml +" + +src_prepare() { + sed -i 's:/bin/systemd-tty-ask-password-agent:/usr/bin/systemd-tty-ask-password-agent:g' \ + systemd-units/systemd-ask-password-plymouth.service.in || die \ + 'ask-password sed failed' + sed -i 's:/bin/udevadm:/usr/bin/udevadm:g' \ + systemd-units/plymouth-start.service.in || die 'udevadm sed failed' + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=( + --with-system-root-install=no + --localstatedir=/var + --without-rhgb-compat-link + --enable-systemd-integration + $(use_enable debug tracing) + $(use_enable gtk gtk) + $(use_enable libkms) + $(use_enable pango) + $(use_enable gdm gdm-transition) + $(use_enable video_cards_intel libdrm_intel) + $(use_enable video_cards_radeon libdrm_radeon) + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + insinto /usr/share/plymouth + newins "${DISTDIR}"/gentoo-logo.png bizcom.png + + # Install compatibility symlinks as some rdeps hardcode the paths + dosym /usr/bin/plymouth /bin/plymouth + dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme + dosym /usr/sbin/plymouthd /sbin/plymouthd + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + if ! has_version "sys-kernel/dracut[dracut_modules_plymouth]" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then + ewarn "If you want initramfs builder with plymouth support, please emerge" + ewarn "sys-kernel/dracut[dracut_modules_plymouth] or sys-kernel/genkernel-next[plymouth]." + fi +} diff --git a/sys-boot/plymouth/plymouth-0.8.8-r5.ebuild b/sys-boot/plymouth/plymouth-0.8.8-r5.ebuild new file mode 100644 index 00000000000..d2c0bb15ed7 --- /dev/null +++ b/sys-boot/plymouth/plymouth-0.8.8-r5.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools-utils readme.gentoo systemd toolchain-funcs + +DESCRIPTION="Graphical boot animation (splash) and logger" +HOMEPAGE="http://cgit.freedesktop.org/plymouth/" +SRC_URI=" + http://www.freedesktop.org/software/plymouth/releases/${P}.tar.bz2 + http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE_VIDEO_CARDS="video_cards_intel video_cards_radeon" +IUSE="${IUSE_VIDEO_CARDS} 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 ) + video_cards_intel? ( x11-libs/libdrm[video_cards_intel] ) + video_cards_radeon? ( x11-libs/libdrm[video_cards_radeon] ) +" +DEPEND="${CDEPEND} + virtual/pkgconfig +" +# Block due bug #383067 +RDEPEND="${CDEPEND} + virtual/udev +" + +DOC_CONTENTS=" + Follow the following instructions to set up Plymouth:\n + http://dev.gentoo.org/~aidecoe/doc/en/plymouth.xml +" + +PATCHES=( + "${FILESDIR}/0.8.8-initrd-binaries-paths.patch" +) + +src_prepare() { + sed -i 's:/bin/systemd-tty-ask-password-agent:/usr/bin/systemd-tty-ask-password-agent:g' \ + systemd-units/systemd-ask-password-plymouth.service.in || die \ + 'ask-password sed failed' + sed -i 's:/bin/udevadm:/usr/bin/udevadm:g' \ + systemd-units/plymouth-start.service.in || die 'udevadm sed failed' + autotools-utils_src_prepare +} + +src_configure() { + local myeconfargs=( + --with-system-root-install=no + --localstatedir=/var + --without-rhgb-compat-link + --enable-systemd-integration + $(use_enable debug tracing) + $(use_enable gtk gtk) + $(use_enable libkms) + $(use_enable pango) + $(use_enable gdm gdm-transition) + $(use_enable video_cards_intel libdrm_intel) + $(use_enable video_cards_radeon libdrm_radeon) + ) + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + insinto /usr/share/plymouth + newins "${DISTDIR}"/gentoo-logo.png bizcom.png + + # Install compatibility symlinks as some rdeps hardcode the paths + dosym /usr/bin/plymouth /bin/plymouth + dosym /usr/sbin/plymouth-set-default-theme /sbin/plymouth-set-default-theme + dosym /usr/sbin/plymouthd /sbin/plymouthd + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + if ! has_version "sys-kernel/dracut[dracut_modules_plymouth]" && ! has_version "sys-kernel/genkernel-next[plymouth]"; then + ewarn "If you want initramfs builder with plymouth support, please emerge" + ewarn "sys-kernel/dracut[dracut_modules_plymouth] or sys-kernel/genkernel-next[plymouth]." + fi +} 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 00000000000..15e9c4c75e3 --- /dev/null +++ b/sys-boot/plymouth/plymouth-0.9.0.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +SRC_URI=" + http://dev.gentoo.org/~aidecoe/distfiles/${CATEGORY}/${PN}/gentoo-logo.png" + +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 + x11-libs/cairo ) + libkms? ( x11-libs/libdrm[libkms] ) + pango? ( >=x11-libs/pango-1.21 ) +" +DEPEND="${CDEPEND} + virtual/pkgconfig +" +# Block due bug #383067 +RDEPEND="${CDEPEND} + virtual/udev + !