I tried to rebuild plymouth 0.8.3-20 on powerpc, but dh_autoconfigure failed complaining about missing some of the libdrm libraries.
presumably this is due to the missing libdrm_intel, as reported earlier
in #611593.
The attached patch removes all attempts to build the intel-related
stuff, and at least the package build process completes successfully,
and i can get a powerpc G5 with an "ATI Technologies Inc RV350 AR
[Radeon 9600]" running linux-image-3.0.0-1-powerpc64 to boot with the
"text" theme (i'm unable to convince it to use spacefun however, not
sure how i should debug that). it's a step in the right direction, at
least.
Obviously, you wouldn't want to apply this patch on architectures where
libdrm-intel1 is available. Perhaps it could be made conditional somehow?
--dkg
Remove all mentions of i915 and libdrm_intel so this will build on powerpc (see http://bugs.debian.org/611593) --- plymouth-0.8.3.orig/configure +++ plymouth-0.8.3/configure @@ -13041,12 +13041,12 @@ if test -n "$DRM_CFLAGS"; then pkg_cv_DRM_CFLAGS="$DRM_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm libdrm_intel libdrm_radeon libdrm_nouveau\"") >&5 - ($PKG_CONFIG --exists --print-errors "libdrm libdrm_intel libdrm_radeon libdrm_nouveau") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm libdrm_radeon libdrm_nouveau\"") >&5 + ($PKG_CONFIG --exists --print-errors "libdrm libdrm_radeon libdrm_nouveau") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DRM_CFLAGS=`$PKG_CONFIG --cflags "libdrm libdrm_intel libdrm_radeon libdrm_nouveau" 2>/dev/null` + pkg_cv_DRM_CFLAGS=`$PKG_CONFIG --cflags "libdrm libdrm_radeon libdrm_nouveau" 2>/dev/null` else pkg_failed=yes fi @@ -13057,12 +13057,12 @@ if test -n "$DRM_LIBS"; then pkg_cv_DRM_LIBS="$DRM_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm libdrm_intel libdrm_radeon libdrm_nouveau\"") >&5 - ($PKG_CONFIG --exists --print-errors "libdrm libdrm_intel libdrm_radeon libdrm_nouveau") 2>&5 + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libdrm libdrm_radeon libdrm_nouveau\"") >&5 + ($PKG_CONFIG --exists --print-errors "libdrm libdrm_radeon libdrm_nouveau") 2>&5 ac_status=$? $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then - pkg_cv_DRM_LIBS=`$PKG_CONFIG --libs "libdrm libdrm_intel libdrm_radeon libdrm_nouveau" 2>/dev/null` + pkg_cv_DRM_LIBS=`$PKG_CONFIG --libs "libdrm libdrm_radeon libdrm_nouveau" 2>/dev/null` else pkg_failed=yes fi @@ -13080,14 +13080,14 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdrm libdrm_intel libdrm_radeon libdrm_nouveau" 2>&1` + DRM_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libdrm libdrm_radeon libdrm_nouveau" 2>&1` else - DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdrm libdrm_intel libdrm_radeon libdrm_nouveau" 2>&1` + DRM_PKG_ERRORS=`$PKG_CONFIG --print-errors "libdrm libdrm_radeon libdrm_nouveau" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$DRM_PKG_ERRORS" >&5 - { { $as_echo "$as_me:$LINENO: error: Package requirements (libdrm libdrm_intel libdrm_radeon libdrm_nouveau) were not met: + { { $as_echo "$as_me:$LINENO: error: Package requirements (libdrm libdrm_radeon libdrm_nouveau) were not met: $DRM_PKG_ERRORS @@ -13098,7 +13098,7 @@ Alternatively, you may set the environme and DRM_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. " >&5 -$as_echo "$as_me: error: Package requirements (libdrm libdrm_intel libdrm_radeon libdrm_nouveau) were not met: +$as_echo "$as_me: error: Package requirements (libdrm libdrm_radeon libdrm_nouveau) were not met: $DRM_PKG_ERRORS --- plymouth-0.8.3.orig/configure.ac +++ plymouth-0.8.3/configure.ac @@ -56,7 +56,7 @@ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.12 AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) -PKG_CHECK_MODULES(DRM, [libdrm libdrm_intel libdrm_radeon libdrm_nouveau]) +PKG_CHECK_MODULES(DRM, [libdrm libdrm_radeon libdrm_nouveau]) OLD_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $DRM_CFLAGS" --- plymouth-0.8.3.orig/src/plugins/renderers/drm/Makefile.am +++ plymouth-0.8.3/src/plugins/renderers/drm/Makefile.am @@ -17,8 +17,6 @@ drm_la_LIBADD = $(PLYMOUTH_LIBS) $(DRM_L ../../../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 \ --- plymouth-0.8.3.orig/src/plugins/renderers/drm/Makefile.in +++ plymouth-0.8.3/src/plugins/renderers/drm/Makefile.in @@ -73,7 +73,6 @@ drm_la_DEPENDENCIES = $(am__DEPENDENCIES ../../../libply/libply.la \ ../../../libply-splash-core/libply-splash-core.la am_drm_la_OBJECTS = drm_la-plugin.lo \ - drm_la-ply-renderer-i915-driver.lo \ drm_la-ply-renderer-radeon-driver.lo \ drm_la-ply-renderer-nouveau-driver.lo drm_la_OBJECTS = $(am_drm_la_OBJECTS) @@ -272,8 +271,6 @@ drm_la_LIBADD = $(PLYMOUTH_LIBS) $(DRM_L 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 \ @@ -355,7 +352,6 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drm_la-plugin.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drm_la-ply-renderer-i915-driver.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drm_la-ply-renderer-nouveau-driver.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drm_la-ply-renderer-radeon-driver.Plo@am__quote@ @@ -391,14 +387,6 @@ drm_la-plugin.lo: $(srcdir)/plugin.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(drm_la_CFLAGS) $(CFLAGS) -c -o drm_la-plugin.lo `test -f '$(srcdir)/plugin.c' || echo '$(srcdir)/'`$(srcdir)/plugin.c -drm_la-ply-renderer-i915-driver.lo: $(srcdir)/ply-renderer-i915-driver.c -@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(drm_la_CFLAGS) $(CFLAGS) -MT drm_la-ply-renderer-i915-driver.lo -MD -MP -MF $(DEPDIR)/drm_la-ply-renderer-i915-driver.Tpo -c -o drm_la-ply-renderer-i915-driver.lo `test -f '$(srcdir)/ply-renderer-i915-driver.c' || echo '$(srcdir)/'`$(srcdir)/ply-renderer-i915-driver.c -@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/drm_la-ply-renderer-i915-driver.Tpo $(DEPDIR)/drm_la-ply-renderer-i915-driver.Plo -@am__fastdepCC_FALSE@ $(AM_V_CC) @AM_BACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/ply-renderer-i915-driver.c' object='drm_la-ply-renderer-i915-driver.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(drm_la_CFLAGS) $(CFLAGS) -c -o drm_la-ply-renderer-i915-driver.lo `test -f '$(srcdir)/ply-renderer-i915-driver.c' || echo '$(srcdir)/'`$(srcdir)/ply-renderer-i915-driver.c - drm_la-ply-renderer-radeon-driver.lo: $(srcdir)/ply-renderer-radeon-driver.c @am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(drm_la_CFLAGS) $(CFLAGS) -MT drm_la-ply-renderer-radeon-driver.lo -MD -MP -MF $(DEPDIR)/drm_la-ply-renderer-radeon-driver.Tpo -c -o drm_la-ply-renderer-radeon-driver.lo `test -f '$(srcdir)/ply-renderer-radeon-driver.c' || echo '$(srcdir)/'`$(srcdir)/ply-renderer-radeon-driver.c @am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/drm_la-ply-renderer-radeon-driver.Tpo $(DEPDIR)/drm_la-ply-renderer-radeon-driver.Plo
signature.asc
Description: OpenPGP digital signature
