- Timestamp:
- Apr 2, 2009 4:34:28 PM (16 years ago)
- Location:
- trunk/src/VBox/Additions
- Files:
-
- 5 edited
-
common/crOpenGL/Makefile.kmk (modified) (1 diff)
-
solaris/Installer/makepackage.sh (modified) (1 diff)
-
solaris/Installer/postinstall.sh (modified) (1 diff)
-
solaris/Installer/preremove.sh (modified) (1 diff)
-
solaris/Makefile.kmk (modified) (7 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/common/crOpenGL/Makefile.kmk
r18542 r18653 49 49 if1of ($(KBUILD_TARGET),linux solaris) 50 50 #VBoxOGL_DRI = 1 51 VBoxOGL_FAKEDRI = 1 51 ifneq ($(KBUILD_TARGET),solaris) # No DRI on Solaris yet 52 VBoxOGL_FAKEDRI = 1 53 endif 52 54 VBOX_PATH_MESA_SOURCE = $(VBOX_PATH_X11_ROOT)/mesa-7.2 53 55 -
trunk/src/VBox/Additions/solaris/Installer/makepackage.sh
r18265 r18653 88 88 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/vboxfsmount=vboxfsmount"' '$3 = "etc/fs/vboxfs/mount=amd64/vboxfsmount"; $6="sys"' 89 89 90 # crogl 32-bit opengl fixup 91 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/VBoxOGL.so=VBoxOGL.so"' '$3 = "usr/lib/VBoxOGL.so=VBoxOGL.so"; $6="sys"' 92 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/VBoxOGLcrutil.so=VBoxOGLcrutil.so"' '$3 = "usr/lib/VBoxOGLcrutil.so=VBoxOGLcrutil.so"; $6="sys"' 93 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/VBoxOGLfeedbackspu.so=VBoxOGLfeedbackspu.so"' '$3 = "usr/lib/VBoxOGLfeedbackspu.so=VBoxOGLfeedbackspu.so"; $6="sys"' 94 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/VBoxOGLpassthroughspu.so=VBoxOGLpassthroughspu.so"' '$3 = "usr/lib/VBoxOGLpassthroughspu.so=VBoxOGLpassthroughspu.so"; $6="sys"' 95 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/VBoxOGLarrayspu.so=VBoxOGLarrayspu.so"' '$3 = "usr/lib/VBoxOGLarrayspu.so=VBoxOGLarrayspu.so"; $6="sys"' 96 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/VBoxOGLerrorspu.so=VBoxOGLerrorspu.so"' '$3 = "usr/lib/VBoxOGLerrorspu.so=VBoxOGLerrorspu.so"; $6="sys"' 97 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/VBoxOGLpackspu.so=VBoxOGLpackspu.so"' '$3 = "usr/lib/VBoxOGLpackspu.so=VBoxOGLpackspu.so"; $6="sys"' 98 99 # crogl 64-bit opengl fixup 100 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/VBoxOGL.so=amd64/VBoxOGL.so"' '$3 = "usr/lib/amd64/VBoxOGL.so=amd64/VBoxOGL.so"; $6="sys"' 101 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/VBoxOGLcrutil.so=amd64/VBoxOGLcrutil.so"' '$3 = "usr/lib/amd64//VBoxOGLcrutil.so=amd64/VBoxOGLcrutil.so"; $6="sys"' 102 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/VBoxOGLfeedbackspu.so=amd64/VBoxOGLfeedbackspu.so"' '$3 = "usr/lib/amd64//VBoxOGLfeedbackspu.so=amd64/VBoxOGLfeedbackspu.so"; $6="sys"' 103 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/VBoxOGLpassthroughspu.so=amd64/VBoxOGLpassthroughspu.so"' '$3 = "usr/lib/amd64//VBoxOGLpassthroughspu.so=amd64/VBoxOGLpassthroughspu.so"; $6="sys"' 104 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/VBoxOGLarrayspu.so=amd64/VBoxOGLarrayspu.so"' '$3 = "usr/lib/amd64//VBoxOGLarrayspu.so=amd64/VBoxOGLarrayspu.so"; $6="sys"' 105 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/VBoxOGLerrorspu.so=amd64/VBoxOGLerrorspu.so"' '$3 = "usr/lib/amd64//VBoxOGLerrorspu.so=amd64/VBoxOGLerrorspu.so"; $6="sys"' 106 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/VBoxOGLpackspu.so=amd64/VBoxOGLpackspu.so"' '$3 = "usr/lib/amd64//VBoxOGLpackspu.so=amd64/VBoxOGLpackspu.so"; $6="sys"' 107 90 108 91 109 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxservice.xml=vboxservice.xml"' '$3 = "var/svc/manifest/system/virtualbox/vboxservice.xml=vboxservice.xml"' -
trunk/src/VBox/Additions/solaris/Installer/postinstall.sh
r18363 r18653 264 264 265 265 266 # 32-bit crogl opengl library replacement 267 if test -f "/usr/lib/VBoxOGL.so"; then 268 cp -f /usr/x11/lib/mesa/libGL.so.1 /usr/X11/lib/mesa/libGL_original_.so.1 269 ln -sf /usr/lib/VBoxOGL.so /usr/X11/lib/mesa/libGL.so.1 270 fi 271 272 # 64-bit crogl opengl library replacement 273 if test -f "/usr/lib/amd64/VBoxOGL.so"; then 274 cp -f /usr/x11/lib/mesa/amd64/libGL.so.1 /usr/X11/lib/mesa/amd64/libGL_original_.so.1 275 ln -sf /usr/lib/amd64/VBoxOGL.so /usr/X11/lib/mesa/amd64/libGL.so.1 276 fi 277 266 278 # Finalize 267 279 /usr/sbin/removef -f $PKGINST -
trunk/src/VBox/Additions/solaris/Installer/preremove.sh
r18265 r18653 45 45 /opt/VirtualBoxAdditions/x11restore.pl 46 46 47 # Restore crogl symlink mess 48 # 32-bit crogl opengl library replacement 49 if test -f "/usr/lib/VBoxOGL.so" && test -f "/usr/X11/lib/mesa/libGL_original_.so.1"; then 50 cp -f /usr/X11/lib/mesa/libGL_original_.so.1 /usr/x11/lib/mesa/libGL.so.1 51 fi 52 53 # 64-bit crogl opengl library replacement 54 if test -f "/usr/lib/amd64/VBoxOGL.so" && test -f "/usr/X11/lib/mesa/amd64/libGL_original_.so.1"; then 55 cp -f /usr/X11/lib/mesa/amd64/libGL_original_.so.1 /usr/x11/lib/mesa/amd64/libGL.so.1 56 fi 57 58 47 59 echo "Done." 48 60 -
trunk/src/VBox/Additions/solaris/Makefile.kmk
r18085 r18653 55 55 # architectures otherwise use the one from $(PATH_BIN)/additions 56 56 # 57 VBOX_CROGL_FILES = \ 58 VBoxOGL.so \ 59 VBoxOGLcrutil.so \ 60 VBoxOGLfeedbackspu.so \ 61 VBoxOGLpassthroughspu.so \ 62 VBoxOGLarrayspu.so \ 63 VBoxOGLerrorspu.so \ 64 VBoxOGLpackspu.so 65 VBOX_CROGL_FILES_32 = $(addprefix $(SOLARIS_ADD_BIN_32)/,$(VBOX_CROGL_FILES)) 66 VBOX_CROGL_FILES_64 = $(addprefix $(SOLARIS_ADD_BIN_64)/,$(VBOX_CROGL_FILES)) 67 VBOX_CROGL_FILES_ISA = $(addprefix $(SOLARIS_ADD_BIN)/,$(VBOX_CROGL_FILES)) 68 VBOX_WITH_CROGL=1 69 57 70 ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE 58 71 SOLARIS_ADD_BIN_64 := $(PATH_OUT_BASE)/solaris.amd64/$(KBUILD_TYPE)/bin/additions … … 92 105 $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_70.so \ 93 106 $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_71.so 107 ifdef VBOX_WITH_CROGL 108 $(error herere) 109 VBOX_SOLPACKFILES += \ 110 $(VBOX_CROGL_FILES_32) \ 111 $(VBOX_CROGL_FILES_64) 112 endif 94 113 else 95 114 SOLARIS_ADD_BIN := $(PATH_BIN)/additions … … 118 137 $(SOLARIS_ADD_BIN)/vboxmouse_drv_70.so \ 119 138 $(SOLARIS_ADD_BIN)/vboxmouse_drv_71.so 139 ifdef VBOX_WITH_CROGL 140 VBOX_SOLPACKFILES += \ 141 $(VBOX_CROGL_FILES_ISA) 142 endif 120 143 endif 121 144 … … 173 196 ifdef VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE 174 197 $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_64)/vboxguest $(SOLARIS_ADD_INST_DIR_64)/vboxguest 175 $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_64)/vboxfs $(SOLARIS_ADD_INST_DIR_64)/vboxfs176 $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_64)/vboxfs_s10 $(SOLARIS_ADD_INST_DIR_64)/vboxfs_s10)198 $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_64)/vboxfs $(SOLARIS_ADD_INST_DIR_64)/vboxfs 199 $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_64)/vboxfs_s10 $(SOLARIS_ADD_INST_DIR_64)/vboxfs_s10) 177 200 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_64)/VBoxClient $(SOLARIS_ADD_INST_DIR_64)/VBoxClient 178 201 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_64)/VBoxService $(SOLARIS_ADD_INST_DIR_64)/VBoxService … … 189 212 $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxmouse_drv_70.so $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_70.so 190 213 $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_64)/vboxmouse_drv_71.so $(SOLARIS_ADD_INST_DIR_64)/vboxmouse_drv_71.so 214 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_64)/VBoxOGL.so $(SOLARIS_ADD_INST_DIR_64)/VBoxOGL.so 215 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_64)/VBoxOGLcrutil.so $(SOLARIS_ADD_INST_DIR_64)/VBoxOGLcrutil.so 216 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_64)/VBoxOGLfeedbackspu.so $(SOLARIS_ADD_INST_DIR_64)/VBoxOGLfeedbackspu.so 217 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxOGLpassthroughspu.so $(SOLARIS_ADD_INST_DIR_64)/VBoxOGLpassthroughspu.so 218 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_64)/VBoxOGLarrayspu.so $(SOLARIS_ADD_INST_DIR_64)/VBoxOGLarrayspu.so 219 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_64)/VBoxOGLerrorspu.so $(SOLARIS_ADD_INST_DIR_64)/VBoxOGLerrorspu.so 220 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_64)/VBoxOGLpackspu.so $(SOLARIS_ADD_INST_DIR_64)/VBoxOGLpackspu.so 191 221 $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_32)/vboxguest $(SOLARIS_ADD_INST_DIR_32)/vboxguest 192 $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_32)/vboxfs $(SOLARIS_ADD_INST_DIR_32)/vboxfs193 $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_32)/vboxfs_s10 $(SOLARIS_ADD_INST_DIR_32)/vboxfs_s10)194 $(QUIET)$(INSTALL) -m 0755 $(SOLARIS_ADD_BIN_32)/vboxfsmount $(SOLARIS_ADD_INST_DIR_32)/vboxfsmount222 $(QUIET)$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_32)/vboxfs $(SOLARIS_ADD_INST_DIR_32)/vboxfs 223 $(QUIET)$(if $(VBOX_OSE),,$(INSTALL) -m 0644 $(SOLARIS_ADD_BIN_32)/vboxfs_s10 $(SOLARIS_ADD_INST_DIR_32)/vboxfs_s10) 224 $(QUIET)$(INSTALL) -m 0755 $(SOLARIS_ADD_BIN_32)/vboxfsmount $(SOLARIS_ADD_INST_DIR_32)/vboxfsmount 195 225 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxClient $(SOLARIS_ADD_INST_DIR_32)/VBoxClient 196 226 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxService $(SOLARIS_ADD_INST_DIR_32)/VBoxService … … 207 237 $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_70.so $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_70.so 208 238 $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN_32)/vboxmouse_drv_71.so $(SOLARIS_ADD_INST_DIR_32)/vboxmouse_drv_71.so 239 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxOGL.so $(SOLARIS_ADD_INST_DIR_32)/VBoxOGL.so 240 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxOGLcrutil.so $(SOLARIS_ADD_INST_DIR_32)/VBoxOGLcrutil.so 241 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxOGLfeedbackspu.so $(SOLARIS_ADD_INST_DIR_32)/VBoxOGLfeedbackspu.so 242 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxOGLpassthroughspu.so $(SOLARIS_ADD_INST_DIR_32)/VBoxOGLpassthroughspu.so 243 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxOGLarrayspu.so $(SOLARIS_ADD_INST_DIR_32)/VBoxOGLarrayspu.so 244 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxOGLerrorspu.so $(SOLARIS_ADD_INST_DIR_32)/VBoxOGLerrorspu.so 245 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN_32)/VBoxOGLpackspu.so $(SOLARIS_ADD_INST_DIR_32)/VBoxOGLpackspu.so 209 246 ifdef VBOX_COMPRESS 210 247 # Compress binaries as we distribute uncompressed pkgs … … 257 294 $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_70.so $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_70.so 258 295 $(QUIET)$(BIN_COPY) $(SOLARIS_ADD_BIN)/vboxmouse_drv_71.so $(SOLARIS_ADD_INST_DIR_ISA)/vboxmouse_drv_71.so 296 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN)/VBoxOGL.so $(SOLARIS_ADD_INST_DIR_ISA)/VBoxOGL.so 297 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN)/VBoxOGLcrutil.so $(SOLARIS_ADD_INST_DIR_ISA)/VBoxOGLcrutil.so 298 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN)/VBoxOGLfeedbackspu.so $(SOLARIS_ADD_INST_DIR_ISA)/VBoxOGLfeedbackspu.so 299 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN)/VBoxOGLpassthroughspu.so $(SOLARIS_ADD_INST_DIR_ISA)/VBoxOGLpassthroughspu.so 300 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN)/VBoxOGLarrayspu.so $(SOLARIS_ADD_INST_DIR_ISA)/VBoxOGLarrayspu.so 301 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN)/VBoxOGLerrorspu.so $(SOLARIS_ADD_INST_DIR_ISA)/VBoxOGLerrorspu.so 302 $(QUIET)$(INSTALL) -s -m 0755 $(SOLARIS_ADD_BIN)/VBoxOGLpackspu.so $(SOLARIS_ADD_INST_DIR_ISA)/VBoxOGLpackspu.so 259 303 ifdef VBOX_COMPRESS 260 304 # Compress binaries as we distribute uncompressed pkgs
Note:
See TracChangeset
for help on using the changeset viewer.
