Attachment #261459 for bug #274065




AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)

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])

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 <stdint.h>
    #include <stdlib.h>
    #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 <stdint.h>
      #include <stdlib.h>
      #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])

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 <stdint.h>
    #include <stdlib.h>
    #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 <stdint.h>
      #include <stdlib.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])
      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 <stdint.h>
    #include <stdlib.h>
    #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_CFLAGS="$DRM_CFLAGS $MORE_DRM_CFLAGS"
  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 <stdint.h>
      #include <stdlib.h>
      #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

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

Lines 97-103 Link Here

(-)plymouth-0.8.3/scripts/plymouth-populate-initrd.in (-1 / +1 lines)
97		97
98	inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR	98	inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
99		99
100	inst ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so $INITRDDIR	100	[ -f "${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so" ] && inst ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so $INITRDDIR
101	inst ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so $INITRDDIR	101	inst ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so $INITRDDIR
102		102
103	if [ -d ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then	103	if [ -d ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then




#!/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 } <initrd_directory>" > $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




if ENABLE_DRM_RENDERER
INCLUDES = -I$(top_srcdir)                                                    \
           -I$(srcdir)/../../../libply                                        \
           -I$(srcdir)/../../../libply-splash-core                            \

                         ../../../libply/libply.la                            \
                         ../../../libply-splash-core/libply-splash-core.la
drm_la_SOURCES = $(srcdir)/plugin.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

Lines 57-65 Link Here

(-)plymouth-0.8.3/src/plugins/renderers/drm/plugin.c (-4 / +17 lines)
57	#include "ply-renderer.h"	57	#include "ply-renderer.h"
58	#include "ply-renderer-plugin.h"	58	#include "ply-renderer-plugin.h"
59	#include "ply-renderer-driver.h"	59	#include "ply-renderer-driver.h"
		60	#ifdef PLY_ENABLE_LIBDRM_INTEL
60	#include "ply-renderer-i915-driver.h"	61	#include "ply-renderer-i915-driver.h"
		62	#endif
		63	#ifdef PLY_ENABLE_LIBDRM_RADEON
61	#include "ply-renderer-radeon-driver.h"	64	#include "ply-renderer-radeon-driver.h"
		65	#endif
		66	#ifdef PLY_ENABLE_LIBDRM_NOUVEAU
62	#include "ply-renderer-nouveau-driver.h"	67	#include "ply-renderer-nouveau-driver.h"
		68	#endif
63		69
64	#define BYTES_PER_PIXEL (4)	70	#define BYTES_PER_PIXEL (4)
65		71
Lines 443-464 Link Here
443	free (driver_name);	449	free (driver_name);
444	return false;	450	return false;
445	}	451	}
446		452	backend->driver_interface = NULL;
447	if (strcmp (driver_name, "i915") == 0)	453	#ifdef PLY_ENABLE_LIBDRM_INTEL
		454	if (backend->driver_interface == NULL && strcmp (driver_name, "i915") == 0)
448	{	455	{
449	backend->driver_interface = ply_renderer_i915_driver_get_interface ();	456	backend->driver_interface = ply_renderer_i915_driver_get_interface ();
450	backend->driver_supports_mapping_console = true;	457	backend->driver_supports_mapping_console = true;
451	}	458	}
452	else if (strcmp (driver_name, "radeon") == 0)	459	#endif
		460	#ifdef PLY_ENABLE_LIBDRM_RADEON
		461	if (backend->driver_interface == NULL && strcmp (driver_name, "radeon") == 0)
453	{	462	{
454	backend->driver_interface = ply_renderer_radeon_driver_get_interface ();	463	backend->driver_interface = ply_renderer_radeon_driver_get_interface ();
455	backend->driver_supports_mapping_console = false;	464	backend->driver_supports_mapping_console = false;
456	}	465	}
457	else if (strcmp (driver_name, "nouveau") == 0)	466	#endif
		467	#ifdef PLY_ENABLE_LIBDRM_NOUVEAU
		468	if (backend->driver_interface == NULL && strcmp (driver_name, "nouveau") == 0)
458	{	469	{
459	backend->driver_interface = ply_renderer_nouveau_driver_get_interface ();	470	backend->driver_interface = ply_renderer_nouveau_driver_get_interface ();
460	backend->driver_supports_mapping_console = false;	471	backend->driver_supports_mapping_console = false;
461	}	472	}
		473	#endif
		474
462	free (driver_name);	475	free (driver_name);
463		476
464	if (backend->driver_interface == NULL)	477	if (backend->driver_interface == NULL)

Lines 1-2 Link Here

(-)plymouth-0.8.3/src/plugins/renderers/Makefile.am (-1 / +2 lines)
1	SUBDIRS = frame-buffer drm x11	1	SUBDIRS = frame-buffer x11 drm
		2
2	MAINTAINERCLEANFILES = Makefile.in	3	MAINTAINERCLEANFILES = Makefile.in

Return to bug 274065

Lines 56-104 Link Here

(-)plymouth-0.8.3/configure.ac (-24 / +125 lines)
56	AC_SUBST(GTK_CFLAGS)	56	AC_SUBST(GTK_CFLAGS)
57	AC_SUBST(GTK_LIBS)	57	AC_SUBST(GTK_LIBS)
58		58
59	PKG_CHECK_MODULES(DRM, [libdrm libdrm_intel libdrm_radeon libdrm_nouveau])	59	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)
		60	AM_CONDITIONAL(ENABLE_LIBDRM_INTEL, [test "$enable_libdrm_intel" = yes])
60		61
61	OLD_CFLAGS="$CFLAGS"	62	if test x$enable_libdrm_intel = xyes; then
62	CFLAGS="$CFLAGS $DRM_CFLAGS"	63	PKG_CHECK_MODULES(DRM_INTEL, [libdrm libdrm_intel])
63	AC_MSG_CHECKING([if i915_drm.h, radeon_drm.h and nouveau_drm.h are in include path])	64	OLD_CFLAGS="$CFLAGS"
64	AC_COMPILE_IFELSE(AC_LANG_PROGRAM(	65	CFLAGS="$CFLAGS $DRM_INTEL_CFLAGS"
65	[[	66	AC_MSG_CHECKING([if i915_drm.h is in include path])
66	#include <stdint.h>	67	AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
67	#include <stdlib.h>	68	[[
68	#include "i915_drm.h"	69	#include <stdint.h>
69	#include "radeon_drm.h"	70	#include <stdlib.h>
70	#include "nouveau_drm.h"	71	#include "i915_drm.h"
71	]],[[]]),[found_drm_kernel_headers=yes],[found_drm_kernel_headers=no])	72	]],[[]]),[found_drm_intel_kernel_headers=yes],[found_drm_intel_kernel_headers=no])
72		73
73	if test "$found_drm_kernel_headers" = "yes"; then	74	if test "$found_drm_intel_kernel_headers" = "yes"; then
74	AC_MSG_RESULT([yes])	75	AC_MSG_RESULT([yes])
75	else	76	else
76	AC_MSG_RESULT([no])	77	AC_MSG_RESULT([no])
77	AC_MSG_CHECKING([if we can find them anyway])	78	AC_MSG_CHECKING([if we can find them anyway])
		79
		80	MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm"
		81	CFLAGS="$CFLAGS $MORE_DRM_CFLAGS"
		82	AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
		83	[[
		84	#include <stdint.h>
		85	#include <stdlib.h>
		86	#include "i915_drm.h"
		87	]],[[]]),[found_drm_intel_kernel_headers=yes],[found_drm_intel_kernel_headers=no])
		88
		89	if test "$found_drm_intel_kernel_headers" = "yes"; then
		90	AC_MSG_RESULT([yes])
		91	DRM_INTEL_CFLAGS="$DRM_INTEL_CFLAGS $MORE_DRM_CFLAGS"
		92	else
		93	AC_MSG_RESULT([no])
		94	AC_MSG_ERROR([Could not find i915_drm.h])
		95	fi
		96	fi
		97
		98	AC_SUBST(DRM_INTEL_CFLAGS)
		99	AC_SUBST(DRM_INTEL_LIBS)
		100	AC_DEFINE(PLY_ENABLE_LIBDRM_INTEL, 1, [Enable support for libdrm_intel driver])
		101	fi
		102
		103	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)
		104	AM_CONDITIONAL(ENABLE_LIBDRM_RADEON, [test "$enable_libdrm_radeon" = yes])
78		105
79	MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm"	106	if test x$enable_libdrm_radeon = xyes; then
80	CFLAGS="$CFLAGS $MORE_DRM_CFLAGS"	107	PKG_CHECK_MODULES(DRM_RADEON, [libdrm libdrm_radeon])
		108	OLD_CFLAGS="$CFLAGS"
		109	CFLAGS="$CFLAGS $DRM_RADEON_CFLAGS"
		110	AC_MSG_CHECKING([if radeon_drm.h is in include path])
81	AC_COMPILE_IFELSE(AC_LANG_PROGRAM(	111	AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
82	[[	112	[[
83	#include <stdint.h>	113	#include <stdint.h>
84	#include <stdlib.h>	114	#include <stdlib.h>
85	#include "i915_drm.h"	115	#include "i915_drm.h"
86	#include "radeon_drm.h"	116	#include "radeon_drm.h"
		117	]],[[]]),[found_drm_radeon_kernel_headers=yes],[found_drm_radeon_kernel_headers=no])
		118
		119	if test "$found_drm_radeon_kernel_headers" = "yes"; then
		120	AC_MSG_RESULT([yes])
		121	else
		122	AC_MSG_RESULT([no])
		123	AC_MSG_CHECKING([if we can find them anyway])
		124
		125	MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm"
		126	CFLAGS="$CFLAGS $MORE_DRM_RADEON_CFLAGS"
		127	AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
		128	[[
		129	#include <stdint.h>
		130	#include <stdlib.h>
		131	#include "radeon_drm.h"
		132	]],[[]]),[found_drm_radeon_kernel_headers=yes],[found_drm_radeon_kernel_headers=no])
		133
		134	if test "$found_drm_radeon_kernel_headers" = "yes"; then
		135	AC_MSG_RESULT([yes])
		136	DRM_RADEON_CFLAGS="$DRM_RADEON_CFLAGS $MORE_DRM_CFLAGS"
		137	else
		138	AC_MSG_RESULT([no])
		139	AC_MSG_ERROR([Could not find radeon_drm.h])
		140	fi
		141	fi
		142
		143	AC_SUBST(DRM_RADEON_CFLAGS)
		144	AC_SUBST(DRM_RADEON_LIBS)
		145	AC_DEFINE(PLY_ENABLE_LIBDRM_RADEON, 1, [Enable support for libdrm_radeon driver])
		146	fi
		147
		148	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)
		149	AM_CONDITIONAL(ENABLE_LIBDRM_NOUVEAU, [test "$enable_libdrm_nouveau" = yes])
		150
		151	if test x$enable_libdrm_nouveau = xyes; then
		152	PKG_CHECK_MODULES(DRM_NOUVEAU, [libdrm libdrm_nouveau])
		153	OLD_CFLAGS="$CFLAGS"
		154	CFLAGS="$CFLAGS $DRM_NOUVEAU_CFLAGS"
		155	AC_MSG_CHECKING([if nouveau_drm.h is in include path])
		156	AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
		157	[[
		158	#include <stdint.h>
		159	#include <stdlib.h>
87	#include "nouveau_drm.h"	160	#include "nouveau_drm.h"
88	]],[[]]),[found_drm_kernel_headers=yes],[found_drm_kernel_headers=no])	161	]],[[]]),[found_drm_nouveau_kernel_headers=yes],[found_drm_nouveau_kernel_headers=no])
89		162
90	if test "$found_drm_kernel_headers" = "yes"; then	163	if test "$found_drm_nouveau_kernel_headers" = "yes"; then
91	AC_MSG_RESULT([yes])	164	AC_MSG_RESULT([yes])
92	DRM_CFLAGS="$DRM_CFLAGS $MORE_DRM_CFLAGS"	165	DRM_CFLAGS="$DRM_CFLAGS $MORE_DRM_CFLAGS"
93	else	166	else
94	AC_MSG_RESULT([no])	167	AC_MSG_RESULT([no])
95	AC_MSG_ERROR([Could not find i915_drm.h, radeon_drm.h and/or nouveau_drm.h])	168	AC_MSG_CHECKING([if we can find them anyway])
		169
		170	MORE_DRM_CFLAGS="-I`$PKG_CONFIG --variable includedir libdrm`/drm"
		171	CFLAGS="$CFLAGS $MORE_DRM_CFLAGS"
		172	AC_COMPILE_IFELSE(AC_LANG_PROGRAM(
		173	[[
		174	#include <stdint.h>
		175	#include <stdlib.h>
		176	#include "nouveau_drm.h"
		177	]],[[]]),[found_drm_nouveau_kernel_headers=yes],[found_drm_nouveau_kernel_headers=no])
		178
		179	if test "$found_drm_nouveau_kernel_headers" = "yes"; then
		180	AC_MSG_RESULT([yes])
		181	DRM_NOUVEAU_CFLAGS="$DRM_NOUVEAU_CFLAGS $MORE_DRM_CFLAGS"
		182	else
		183	AC_MSG_RESULT([no])
		184	AC_MSG_ERROR([Could not find nouveau_drm.h])
		185	fi
96	fi	186	fi
		187
		188	AC_SUBST(DRM_NOUVEAU_CFLAGS)
		189	AC_SUBST(DRM_NOUVEAU_LIBS)
		190	AC_DEFINE(PLY_ENABLE_LIBDRM_NOUVEAU, 1, [Enable support for libdrm_nouveau driver])
97	fi	191	fi
98	CFLAGS="$OLD_CFLAGS"	192
		193	DRM_CFLAGS="$DRM_INTEL_CFLAGS $DRM_RADEON_CFLAGS $DRM_NOUVEAU_CFLAGS"
		194	DRM_LIBS="$DRM_INTEL_LIBS $DRM_RADEON_LIBS $DRM_NOUVEAU_LIBS"
99	AC_SUBST(DRM_CFLAGS)	195	AC_SUBST(DRM_CFLAGS)
100	AC_SUBST(DRM_LIBS)	196	AC_SUBST(DRM_LIBS)
101		197
		198	AM_CONDITIONAL(ENABLE_DRM_RENDERER,
		199	[test x$enable_libdrm_intel = xyes \
		200	-o x$enable_libdrm_radeon = xyes \
		201	-o x$enable_libdrm_nouveau = xyes])
		202
102	AC_ARG_ENABLE(tracing, AS_HELP_STRING([--enable-tracing],[enable verbose tracing code]),enable_tracing=$enableval,enable_tracing=yes)	203	AC_ARG_ENABLE(tracing, AS_HELP_STRING([--enable-tracing],[enable verbose tracing code]),enable_tracing=$enableval,enable_tracing=yes)
103		204
104	if test x$enable_tracing = xyes; then	205	if test x$enable_tracing = xyes; then

Line 0 Link Here

(-)plymouth-0.8.3/scripts/plymouth-populate-initrd.in.orig (+114 lines)
		1	#!/bin/bash
		2
		3	[ -z "$DESTDIR" ] \|\| exit 0
		4
		5	[ -z "$PLYMOUTH_LIBEXECDIR" ] && PLYMOUTH_LIBEXECDIR="@PLYMOUTH_LIBEXECDIR@"
		6	[ -z "$PLYMOUTH_DATADIR" ] && PLYMOUTH_DATADIR="@PLYMOUTH_DATADIR@"
		7	[ -z "$PLYMOUTH_PLUGIN_PATH" ] && PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
		8	[ -z "$PLYMOUTH_LOGO_FILE" ] && PLYMOUTH_LOGO_FILE="@logofile@"
		9	[ -z "$PLYMOUTH_THEME_NAME" ] && PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
		10	[ -z "$PLYMOUTH_CONFDIR" ] && PLYMOUTH_CONFDIR="@PLYMOUTH_CONF_DIR@"
		11	[ -z "$PLYMOUTH_POLICYDIR" ] && PLYMOUTH_POLICYDIR="@PLYMOUTH_POLICY_DIR@"
		12
		13	if [ -z "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then
		14
		15	if [ -f "${PLYMOUTH_LIBEXECDIR}/initrd-functions" ]; then
		16	PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${PLYMOUTH_LIBEXECDIR}/initrd-functions"
		17	fi
		18
		19	if [ -f "${PLYMOUTH_DATADIR}/dracut/dracut-functions" ]; then
		20	PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${PLYMOUTH_DATADIR}/dracut/dracut-functions"
		21	fi
		22	fi
		23
		24	if [ -n "$PLYMOUTH_POPULATE_SOURCE_FUNCTIONS" ]; then
		25	source $PLYMOUTH_POPULATE_SOURCE_FUNCTIONS
		26	fi
		27
		28	if [ " $(type -t inst) " != " function " ]; then
		29	echo "Need 'inst' function, try setting PLYMOUTH_POPULATE_SOURCE_FUNCTIONS to a file that defines it" 1>&2
		30	exit 1
		31	fi
		32
		33	if [ " $(type -t set_verbose) " != " function " ]; then
		34	function set_verbose { true; }
		35	fi
		36
		37	function usage() {
		38	local output="/dev/stdout"
		39	local rc=0
		40	if [ "$1" == "error" ]; then
		41	output="/dev/stderr"
		42	rc=1
		43	fi
		44
		45	echo "usage: plymouth [ --verbose \| -v ] { --targetdir \| -t } <initrd_directory>" > $output
		46	exit $rc
		47	}
		48
		49	verbose=false
		50	INITRDDIR=""
		51	while [ $# -gt 0 ]; do
		52	case $1 in
		53	--verbose\|-v)
		54	verbose=true
		55	;;
		56	--targetdir\|-t)
		57	shift
		58	INITRDDIR="$1"
		59	;;
		60	--help\|-h)
		61	usage normal
		62	;;
		63	*)
		64	usage error
65	break
66	;;
67	esac
68	shift
69	done
70	set_verbose $verbose \|\| :
71
72	[ -z "$INITRDDIR" ] && usage error
73
74	mkdir -p ${INITRDDIR}${PLYMOUTH_DATADIR}/plymouth/themes
75	inst /sbin/plymouthd $INITRDDIR /bin/plymouthd
76	inst /bin/plymouth $INITRDDIR
77	inst ${PLYMOUTH_DATADIR}/plymouth/themes/text/text.plymouth $INITRDDIR
78	inst ${PLYMOUTH_PLUGIN_PATH}/text.so $INITRDDIR
79	inst ${PLYMOUTH_DATADIR}/plymouth/themes/details/details.plymouth $INITRDDIR
80	inst ${PLYMOUTH_PLUGIN_PATH}/details.so $INITRDDIR
81	inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR
82	inst @RELEASE_FILE@ $INITRDDIR
83	inst ${PLYMOUTH_POLICYDIR}/plymouthd.defaults $INITRDDIR
84	inst ${PLYMOUTH_CONFDIR}/plymouthd.conf $INITRDDIR
85
86	if [ -z "$PLYMOUTH_THEME_NAME" ]; then
87	echo "No default plymouth plugin is set" > /dev/stderr
88	exit 1
89	fi
90
91	PLYMOUTH_MODULE_NAME=$(grep "ModuleName = " ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth \| sed 's/ModuleName = //')
92
93	if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
94	echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
95	exit 1
96	fi
97
98	inst ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so $INITRDDIR
99
100	inst ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so $INITRDDIR
101	inst ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so $INITRDDIR
102
103	if [ -d ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
104	for x in ${PLYMOUTH_DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/* ; do
105	[ ! -f "$x" ] && break
106	inst $x $INITRDDIR
107	done
108	fi
109
110	if [ -L ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth ]; then
111	cp -a ${PLYMOUTH_DATADIR}/plymouth/themes/default.plymouth $INITRDDIR${PLYMOUTH_DATADIR}/plymouth/themes
112	fi
113
114	# vim:ts=8:sw=4:sts=4:et

Lines 1-3 Link Here

(-)plymouth-0.8.3/src/plugins/renderers/drm/Makefile.am (-7 / +18 lines)
		1	if ENABLE_DRM_RENDERER
1	INCLUDES = -I$(top_srcdir) \	2	INCLUDES = -I$(top_srcdir) \
2	-I$(srcdir)/../../../libply \	3	-I$(srcdir)/../../../libply \
3	-I$(srcdir)/../../../libply-splash-core \	4	-I$(srcdir)/../../../libply-splash-core \
Lines 16-27 Link Here
16	../../../libply/libply.la \	17	../../../libply/libply.la \
17	../../../libply-splash-core/libply-splash-core.la	18	../../../libply-splash-core/libply-splash-core.la
18	drm_la_SOURCES = $(srcdir)/plugin.c \	19	drm_la_SOURCES = $(srcdir)/plugin.c \
19	$(srcdir)/ply-renderer-driver.h \	20	$(srcdir)/ply-renderer-driver.h
20	$(srcdir)/ply-renderer-i915-driver.h \	21	if ENABLE_LIBDRM_INTEL
21	$(srcdir)/ply-renderer-i915-driver.c \	22	drm_la_SOURCES += $(srcdir)/ply-renderer-i915-driver.h \
22	$(srcdir)/ply-renderer-radeon-driver.h \	23	$(srcdir)/ply-renderer-i915-driver.c
23	$(srcdir)/ply-renderer-radeon-driver.c \	24	endif
24	$(srcdir)/ply-renderer-nouveau-driver.h \	25
25	$(srcdir)/ply-renderer-nouveau-driver.c	26	if ENABLE_LIBDRM_RADEON
		27	drm_la_SOURCES += $(srcdir)/ply-renderer-radeon-driver.h \
		28	$(srcdir)/ply-renderer-radeon-driver.c
		29	endif
		30
		31	if ENABLE_LIBDRM_NOUVEAU
		32	drm_la_SOURCES += $(srcdir)/ply-renderer-nouveau-driver.h \
		33	$(srcdir)/ply-renderer-nouveau-driver.c
		34	endif
		35
		36	endif
26		37
27	MAINTAINERCLEANFILES = Makefile.in	38	MAINTAINERCLEANFILES = Makefile.in