Changeset 41027 in vbox

Timestamp:

Apr 23, 2012 2:10:36 PM (12 years ago)

Author:

vboxsync

Message:

Additions/solaris: Build & ship vboxmouse, vboxvideo for Xorg 1.11 and Xorg 1.12.

Location:

trunk/src/VBox/Additions

Files:

• solaris/Installer/postinstall.sh (modified) (3 diffs)
• solaris/Makefile.kmk (modified) (2 diffs)
• x11/vboxmouse/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

@@ -65 +65 @@
     uncompress_file "$1" "vboxvideo_drv_19.so"
     uncompress_file "$1" "vboxvideo_drv_110.so"
+    uncompress_file "$1" "vboxvideo_drv_111.so"
+    uncompress_file "$1" "vboxvideo_drv_112.so"
     uncompress_file "$1" "vboxvideo_drv_70.so"
     uncompress_file "$1" "vboxvideo_drv_71.so"
@@ -77 +79 @@
     uncompress_file "$1" "vboxmouse_drv_19.so"
     uncompress_file "$1" "vboxmouse_drv_110.so"
+    uncompress_file "$1" "vboxmouse_drv_111.so"
+    uncompress_file "$1" "vboxmouse_drv_112.so"
     uncompress_file "$1" "vboxmouse_drv_70.so"
     uncompress_file "$1" "vboxmouse_drv_71.so"
@@ -188 +192 @@
             vboxmouse_src="vboxmouse_drv_110.so"
             vboxvideo_src="vboxvideo_drv_110.so"
+            ;;
+        1.11.*)
+            vboxmouse_src="vboxmouse_drv_111.so"
+            vboxvideo_src="vboxvideo_drv_111.so"
+            ;;
+        1.12.*)
+            vboxmouse_src="vboxmouse_drv_112.so"
+            vboxvideo_src="vboxvideo_drv_112.so"
             ;;
         7.1.* | *7.2.* )

trunk/src/VBox/Additions/solaris/Makefile.kmk

@@ -186 +186 @@
         vboxmouse_drv_19.so \
         vboxmouse_drv_110.so \
+        vboxmouse_drv_111.so \
+        vboxmouse_drv_112.so \
         vboxmouse_drv_70.so \
         vboxmouse_drv_71.so \
@@ -196 +198 @@
         vboxvideo_drv_19.so \
         vboxvideo_drv_110.so \
+        vboxvideo_drv_111.so \
+        vboxvideo_drv_112.so \
         vboxvideo_drv_70.so \
         vboxvideo_drv_71.so

trunk/src/VBox/Additions/x11/vboxmouse/Makefile.kmk

@@ -236 +236 @@
         vboxmouse.c
 
+DLLS += vboxmouse_drv_111
+vboxmouse_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_111_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxmouse_drv_111_INCS := \
+        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
+        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
+        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
+        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.11.0 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
+        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+        $(PATH_SUB_CURRENT)
+vboxmouse_drv_111_SOURCES = \
+        vboxmouse.c
+
+DLLS += vboxmouse_drv_112
+vboxmouse_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_112_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxmouse_drv_112_INCS := \
+        $(VBOX_PATH_X11_ROOT)/inputproto-1.9.99.902 \
+        $(VBOX_PATH_X11_ROOT)/libpciaccess-0.10.8 \
+        $(VBOX_PATH_X11_ROOT)/pixman-0.16.0 \
+        $(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.12.0 \
+        $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local \
+        $(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
+        $(PATH_SUB_CURRENT)
+vboxmouse_drv_112_SOURCES = \
+        vboxmouse.c
+
 endif # neq ($(KBUILD_TARGET),linux)
 
@@ -339 +371 @@
         $(QUIET)$(APPEND) -t "$@" "done"
 
+     TESTING += $(vboxmouse_drv_111_0_OUTDIR)/tstvboxmouse111.run
+     OTHERS += $(vboxmouse_drv_111_0_OUTDIR)/tstvboxmouse111.run
+$$(vboxmouse_drv_111_0_OUTDIR)/tstvboxmouse111.run: $$(vboxmouse_drv_111_1_STAGE_TARGET)
+        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+            $(vboxmouse_drv_111_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
+        $(QUIET)$(APPEND) -t "$@" "done"
+
+     TESTING += $(vboxmouse_drv_112_0_OUTDIR)/tstvboxmouse112.run
+     OTHERS += $(vboxmouse_drv_112_0_OUTDIR)/tstvboxmouse112.run
+$$(vboxmouse_drv_112_0_OUTDIR)/tstvboxmouse112.run: $$(vboxmouse_drv_112_1_STAGE_TARGET)
+        $(QUIET)$(call MSG_L1,Checking for unresolved symbols in $<)
+        $(QUIET)/bin/sh $(PATH_ROOT)/src/bldprogs/checkUndefined.sh $(KBUILD_TARGET)  \
+            $(vboxmouse_drv_112_1_STAGE_TARGET) $(VBOXMOUSE_SRC_PATH)/undefined
+        $(QUIET)$(APPEND) -t "$@" "done"
+
 endif # neq ($(KBUILD_TARGET),linux)