Disable directfb hardware acceleration by default; allow to enable using debian-installer/hw-accel

r40853

debian/changelog

@@ -1,9 +1,9 @@
 rootskel-gtk (0.11) UNRELEASED; urgency=low
 
-  * Disable hardware acceleration for powerpc. For now it is hardcoded in
-    /etc/directfbrc.
+  * Disable directfb hardware acceleration by default; allow to enable using
+    debian-installer/hw-accel.
 
- -- Frans Pop <fjp@debian.org>  Fri, 22 Sep 2006 22:35:08 +0200
+ -- Frans Pop <fjp@debian.org>  Sat, 23 Sep 2006 14:16:53 +0200
 
 rootskel-gtk (0.10) unstable; urgency=low
 

debian/control

@@ -9,4 +9,4 @@ Package: rootskel-gtk
 XC-Package-Type: udeb
 Architecture: alpha amd64 arm hppa i386 ia64 mips mipsel powerpc ppc64 sparc kfreebsd-i386 kfreebsd-amd64
 Depends: rootskel, mouse-modules
-Description: Additions for graphical installation to skeleton root filesystem used by debian-installer
+Description: Additions for graphical installs to skeleton root filesystem (debian-installer)

debian/rules

@@ -1,8 +1,9 @@
 #!/usr/bin/make -f
 
-DESTDIR=$(CURDIR)/debian/rootskel-gtk/
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+#DESTDIR=$(CURDIR)/debian/rootskel-gtk/
 
-build: build-stamp
+build: build-stamp debian/templates
 build-stamp:
 	dh_testdir
 
@@ -10,12 +11,16 @@ build-stamp:
 
 	touch $@
 
+debian/templates: debian/templates-arch
+	debian/templates-build.pl $(DEB_HOST_ARCH) < $< > $@
+
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
 
 	$(MAKE) clean
+	rm -f debian/templates
 
 	dh_clean
 

debian/templates-arch

@@ -0,0 +1,4 @@
+Template: debian-installer/hw-accel
+Type: boolean
+Default: false
+Description: enable directfb hardware acceleration

debian/templates-build.pl

@@ -0,0 +1,58 @@
+#!/usr/bin/perl
+use strict;
+use warnings;
+
+die "must specify arch" if not defined $ARGV[0];
+my $arch = $ARGV[0];
+
+my %template;
+$template{Fields} = [];
+$template{'Description-Long'} = "";
+
+sub print_template {
+	foreach ( @{$template{Fields}} ) {
+		print $_ . ": ";
+		if ( ref $template{$_} eq "HASH" ) {
+			if ( defined $template{$_}->{$arch} ) {
+				print $template{$_}->{$arch};
+			} else {
+				print $template{$_}->{default};
+			}
+		} else {
+			print $template{$_};
+		}
+		print "\n";
+	}
+	print $template{'Description-Long'} . "\n";
+
+	%template = ();
+	$template{Fields} = [];
+	$template{'Description-Long'} = "";
+}
+
+while ( <STDIN> ) {
+	chomp;
+	if (m/^$/) {
+	    print_template;
+	} elsif ( m/^(\w+)(\[(\w+)\])?:\s+(.*)\s*$/ ) {
+		if ( defined $3 ) {
+			if ( defined $template{$1} and ref $template{$1} ne "HASH" ) {
+				local $_;
+				$_ = $template{$1};
+				$template{$1} = ();
+				$template{$1}->{default} = $_;
+			} elsif ( not defined $template{$1} ) {
+				push ( @{$template{Fields}}, $1 );
+			}
+			$template{$1}->{$3} = $4;
+		} else {
+			$template{$1} = $4;
+			push ( @{$template{Fields}}, $1 );
+		}
+	} else {
+		$template{'Description-Long'} .= $_ . "\n";
+	}
+}
+
+print_template;
+

src/etc/Makefile

@@ -1,28 +1,9 @@
 dir = etc
 
-DEB_HOST_ARCH_CPU   := $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU 2>/dev/null)
-DEB_HOST_ARCH_OS    := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS 2>/dev/null)
-
-# Take account of old dpkg-architecture output.
-ifeq ($(DEB_HOST_ARCH_CPU),)
-  DEB_HOST_ARCH_CPU   := $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
-  ifeq ($(DEB_HOST_ARCH_CPU),x86_64)
-    DEB_HOST_ARCH_CPU   := amd64
-  endif
-endif
-ifeq ($(DEB_HOST_ARCH_OS),)
-  DEB_HOST_ARCH_OS    := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
-endif
-
 subdirs = \
 	gtk-2.0
 
-ifneq ($(DEB_HOST_ARCH_CPU),powerpc)
-   files = \
+files = \
 	directfbrc
-else
-   files = \
-	directfbrc:directfbrc-powerpc
-endif
 
 include ../../Makefile.inc

src/etc/directfbrc

@@ -1,2 +1,3 @@
+no-hardware
 screenshot-dir=/var/log
 #disable-module=linux_input #needed for touchpads to work

src/etc/directfbrc-powerpc

@@ -1,3 +0,0 @@
-no-hardware
-screenshot-dir=/var/log
-#disable-module=linux_input #needed for touchpads to work

src/lib/debian-installer.d/Makefile

@@ -14,7 +14,8 @@ ifeq ($(DEB_HOST_ARCH_OS),)
   DEB_HOST_ARCH_OS    := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
 endif
 
-files = 
+files = \
+	S62hw-acceleration
 
 ifneq (,$(filter i386 amd64,$(DEB_HOST_ARCH_CPU)))
    files += \

src/lib/debian-installer.d/S62hw-acceleration

@@ -0,0 +1,5 @@
+debconf-get debian-installer/hw-accel
+
+if [ "$RET" = true ]; then
+	sed -i "s/^no-hardware/#no-hardware/" /etc/directfbrc
+fi