From 0c1decb55fd7f6b14ae4f5721a6d5931f799d418 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Tue, 24 Jun 2014 15:58:56 +0200
Subject: [PATCH] makedist-recordvm: support internal xorg.conf based on dummy
 driver

---
 Makefile               |  1 +
 bin/makedist-recordvm  |  5 ++-
 var/recordvm-xorg.conf | 95 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+), 2 deletions(-)
 create mode 100644 var/recordvm-xorg.conf

diff --git a/Makefile b/Makefile
index b3d98fd..56dfaf8 100644
--- a/Makefile
+++ b/Makefile
@@ -80,6 +80,7 @@ install: install-locales
 	install -d $(DESTDIR)$($recordvmstatedir);\
 	cp -a var/recordvm-xinitrc $(DESTDIR)$(recordvmstatedir)/.xinitrc;\
 	cp -a var/recordvm-xvidcaprc $(DESTDIR)$(recordvmstatedir)/.xvidcaprc;\
+	cp -a var/recordvm-xorg.conf $(DESTDIR)$(recordvmstatedir)/xorg.conf;\
 	install -d $(DESTDIR)$(sbindir);\
 	cp -a bin/makedist-recordvm $(DESTDIR)$(sbindir)/makedist-recordvm
 	cp -a bin/makedist-newrelease $(DESTDIR)$(sbindir)/makedist-newrelease
diff --git a/bin/makedist-recordvm b/bin/makedist-recordvm
index 0b0109c..ae97880 100755
--- a/bin/makedist-recordvm
+++ b/bin/makedist-recordvm
@@ -72,7 +72,7 @@ if [ ! "$ONLY_RECREATE_IMAGES" ]; then
    fi
    echo "Starting virtual machine for $ISO_PATH"
    export HOME=$RECORDVM_DATA
-   xinit -- :$X_DISPLAY &
+   xinit -- :$X_DISPLAY -config $RECORDVM_DATA/xorg.conf &
 
    if [ "$VBOX" ]; then
       trap "VBoxManage controlvm $VBOX_VMNAME poweroff" INT QUIT TSTP
@@ -114,7 +114,8 @@ if [ ! "$ONLY_RECREATE_IMAGES" ]; then
    if [ ! "$VIEWMODE" ]; then
       echo "Capturing window output"
       mkdir -p $ISO_DIR/preview/
-      DBUS_SESSION_BUS_ADDRESS= HOME=$RECORDVM_DATA DISPLAY=:$X_DISPLAY xvidcap \
+      #DBUS_SESSION_BUS_ADDRESS= 
+      HOME=$RECORDVM_DATA DISPLAY=:$X_DISPLAY dbus-launch --exit-with-session xvidcap \
          --cap_geometry 1024x768+0+$VOFFSET \
          --verbose 2 --gui no --audio no \
          --time $EXECUTION_TIME --file $ISO_DIR/preview/${ISO_NAME}${VIDEO_EXT} \
diff --git a/var/recordvm-xorg.conf b/var/recordvm-xorg.conf
new file mode 100644
index 0000000..e4d0f27
--- /dev/null
+++ b/var/recordvm-xorg.conf
@@ -0,0 +1,95 @@
+Section "ServerLayout"
+	Identifier     "X.org Configured"
+	Screen      0  "Screen0" 0 0
+        Option      "AllowMouseOpenFail"
+	InputDevice    "Mouse0" "CorePointer"
+#	InputDevice    "Keyboard0" "CoreKeyboard"
+EndSection
+
+Section "Files"
+	ModulePath   "/usr/lib64/xorg/modules"
+	FontPath     "/usr/share/fonts/X11/misc/"
+	FontPath     "/usr/share/fonts/X11/TTF/"
+	FontPath     "/usr/share/fonts/X11/OTF/"
+	FontPath     "/usr/share/fonts/X11/Type1/"
+	FontPath     "/usr/share/fonts/X11/100dpi/"
+	FontPath     "/usr/share/fonts/X11/75dpi/"
+EndSection
+
+Section "Module"
+	Load  "dri2"
+	Load  "glx"
+	Load  "record"
+	Load  "dri"
+	Load  "extmod"
+	Load  "dbe"
+EndSection
+
+Section "InputDevice"
+	Identifier  "Keyboard0"
+        Option      "XkbModel" "pc105"
+        Option      "XkbLayout" "it"
+        Option      "XKbOptions" ""
+	Driver      "kbd"
+EndSection
+
+Section "InputDevice"
+	Identifier  "Mouse0"
+	Driver      "mouse"
+	Option	    "Protocol" "auto"
+	Option	    "Device" "/dev/input/mice"
+	Option	    "ZAxisMapping" "4 5 6 7"
+EndSection
+
+Section "Monitor"
+	Identifier   "Monitor0"
+	VendorName   "Monitor Vendor"
+	ModelName    "Monitor Model"
+	HorizSync    10.0 - 300.0
+	VertRefresh  10.0 - 200.0
+EndSection
+
+Section "Device"
+	Identifier  "Card0"
+	Driver      "dummy"
+	VideoRam    32768
+EndSection
+
+Section "Screen"
+        DefaultColorDepth 24
+	Identifier "Screen0"
+	Device     "Card0"
+	Monitor    "Monitor0"
+	SubSection "Display"
+		Viewport   0 0
+		Depth     1
+	EndSubSection
+	SubSection "Display"
+		Viewport   0 0
+		Depth     4
+	EndSubSection
+	SubSection "Display"
+		Viewport   0 0
+		Depth     8
+	EndSubSection
+	SubSection "Display"
+		Viewport   0 0
+		Depth     15
+	EndSubSection
+	SubSection "Display"
+		Viewport   0 0
+		Depth     16
+	EndSubSection
+	SubSection "Display"
+		Viewport   0 0
+		Depth     24
+	EndSubSection
+EndSection
+
+Section "DRI"
+        Mode 0666
+EndSection
+
+Section "Extensions"
+        Option "Composite" "true"
+EndSection