From f7f7f1446cee33fd5a401d8cc9d4eb5c03310ff8 Mon Sep 17 00:00:00 2001 From: Cyril Brulebois Date: Sun, 7 Feb 2010 23:17:38 +0000 Subject: [PATCH 1/2] Switch to X11 instead of DirectFB. --- packages/rootskel-gtk/debian/changelog | 10 ++++++++++ packages/rootskel-gtk/src/etc/Makefile | 3 --- packages/rootskel-gtk/src/etc/directfbrc | 7 ------- .../src/lib/debian-installer.d/Makefile | 9 ++------- .../src/lib/debian-installer.d/S62Xorg | 2 ++ .../S62directfb-cairo-workaround | 2 -- .../lib/debian-installer.d/S62directfb-hw-accel | 3 --- .../debian-installer.d/S62directfb-mouse-settings | 13 ------------- .../debian-installer.d/S63directfb-linux-powerpc | 10 ---------- 9 files changed, 14 insertions(+), 45 deletions(-) delete mode 100644 packages/rootskel-gtk/src/etc/directfbrc create mode 100644 packages/rootskel-gtk/src/lib/debian-installer.d/S62Xorg delete mode 100644 packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-cairo-workaround delete mode 100644 packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-hw-accel delete mode 100644 packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-mouse-settings delete mode 100644 packages/rootskel-gtk/src/lib/debian-installer.d/S63directfb-linux-powerpc diff --git a/packages/rootskel-gtk/debian/changelog b/packages/rootskel-gtk/debian/changelog index 0bbda6b..5f60227 100644 --- a/packages/rootskel-gtk/debian/changelog +++ b/packages/rootskel-gtk/debian/changelog @@ -1,3 +1,13 @@ +rootskel-gtk (1.20) UNRELEASED; urgency=low + + * Switch to X instead of DirectFB: + - src/lib/debian-installer.d/S??directfb-*: remove + - src/lib/debian-installer.d/S62Xorg: start the X server + - src/etc/directfbrc: remove + - not sure what to do with src/lib/debian-installer.d/S59check-vesa-x86 + + -- Julien Cristau Sun, 07 Feb 2010 23:09:01 +0000 + rootskel-gtk (1.17) unstable; urgency=low [ Colin Watson ] diff --git a/packages/rootskel-gtk/src/etc/Makefile b/packages/rootskel-gtk/src/etc/Makefile index d441ce0..7febcc0 100644 --- a/packages/rootskel-gtk/src/etc/Makefile +++ b/packages/rootskel-gtk/src/etc/Makefile @@ -3,7 +3,4 @@ dir = etc subdirs = \ gtk-2.0 -files = \ - directfbrc - include ../../Makefile.inc diff --git a/packages/rootskel-gtk/src/etc/directfbrc b/packages/rootskel-gtk/src/etc/directfbrc deleted file mode 100644 index 4306369..0000000 --- a/packages/rootskel-gtk/src/etc/directfbrc +++ /dev/null @@ -1,7 +0,0 @@ -quiet -no-hardware -bg-color=ffdcdad5 -screenshot-dir=/var/log -#disable-module=linux_input -#disable-module=keyboard -disable-module=ps2mouse diff --git a/packages/rootskel-gtk/src/lib/debian-installer.d/Makefile b/packages/rootskel-gtk/src/lib/debian-installer.d/Makefile index 9cf3938..a2b539a 100644 --- a/packages/rootskel-gtk/src/lib/debian-installer.d/Makefile +++ b/packages/rootskel-gtk/src/lib/debian-installer.d/Makefile @@ -15,11 +15,7 @@ ifeq ($(DEB_HOST_ARCH_OS),) endif files = \ - S62directfb-hw-accel \ - S62directfb-cairo-workaround - -files_exec = \ - S62directfb-mouse-settings + S62Xorg ifneq (,$(filter i386 amd64,$(DEB_HOST_ARCH_CPU))) files += \ @@ -28,8 +24,7 @@ ifneq (,$(filter i386 amd64,$(DEB_HOST_ARCH_CPU))) endif ifneq (,$(filter powerpc,$(DEB_HOST_ARCH_CPU))) files += \ - S61mouse-support-powerpc \ - S63directfb-linux-powerpc + S61mouse-support-powerpc endif include ../../../Makefile.inc diff --git a/packages/rootskel-gtk/src/lib/debian-installer.d/S62Xorg b/packages/rootskel-gtk/src/lib/debian-installer.d/S62Xorg new file mode 100644 index 0000000..f134a03 --- /dev/null +++ b/packages/rootskel-gtk/src/lib/debian-installer.d/S62Xorg @@ -0,0 +1,2 @@ +Xorg -retro -noreset & +export DISPLAY=:0 diff --git a/packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-cairo-workaround b/packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-cairo-workaround deleted file mode 100644 index 132dcea..0000000 --- a/packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-cairo-workaround +++ /dev/null @@ -1,2 +0,0 @@ -# Workaround for #477331; should be removed once cairo has been fixed -export CAIRO_DIRECTFB_NO_ACCEL=1 diff --git a/packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-hw-accel b/packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-hw-accel deleted file mode 100644 index 28968a5..0000000 --- a/packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-hw-accel +++ /dev/null @@ -1,3 +0,0 @@ -if [ "$(debconf-get directfb/hw-accel)" = true ]; then - sed -i "s/^no-hardware/#no-hardware/" /etc/directfbrc -fi diff --git a/packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-mouse-settings b/packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-mouse-settings deleted file mode 100644 index d751aac..0000000 --- a/packages/rootskel-gtk/src/lib/debian-installer.d/S62directfb-mouse-settings +++ /dev/null @@ -1,13 +0,0 @@ -#! /bin/sh - -proto=$(debconf-get mouse/protocol) -if [ "$proto" ]; then - echo "mouse-protocol=$proto" >>/etc/directfbrc -fi -dev=$(debconf-get mouse/device) -if [ "$dev" ]; then - echo "mouse-source=$dev" >>/etc/directfbrc -fi -if [ "$(debconf-get mouse/left)" = true ]; then - echo "lefty" >>/etc/directfbrc -fi diff --git a/packages/rootskel-gtk/src/lib/debian-installer.d/S63directfb-linux-powerpc b/packages/rootskel-gtk/src/lib/debian-installer.d/S63directfb-linux-powerpc deleted file mode 100644 index 9279576..0000000 --- a/packages/rootskel-gtk/src/lib/debian-installer.d/S63directfb-linux-powerpc +++ /dev/null @@ -1,10 +0,0 @@ -# Temporary hacks to work around directfb breakage on powerpc - -# Enable keyboard and ps2mouse DFB modules -#sed -i "s/^\(disable-module=keyboard\)/#\1/" /etc/directfbrc -sed -i "s/^\(disable-module=ps2mouse\)/#\1/" /etc/directfbrc - -# Disable linux_input DFB module except for "PowerBook6,7" -if ! grep -q "machine.*:.*PowerBook6,7" /proc/cpuinfo 2>/dev/null; then - sed -i "s/^#\(disable-module=linux_input\)/\1/" /etc/directfbrc -fi -- 1.6.6.1