svn commit: r379329 - in head/emulators: virtualbox-ose-additions virtualbox-ose/files

[Jung-uk Kim]

Author: jkim
Date: Thu Feb 19 00:25:57 2015
New Revision: 379329
URL: https://svnweb.freebsd.org/changeset/ports/379329
QAT: https://qat.redports.org/buildarchive/r379329/

Log:
  Make the previous patch conditional as we always did.

Added:
  head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
     - copied unchanged from r379327, head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
Deleted:
  head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
Modified:
  head/emulators/virtualbox-ose-additions/Makefile

Modified: head/emulators/virtualbox-ose-additions/Makefile
==============================================================================
--- head/emulators/virtualbox-ose-additions/Makefile	Thu Feb 19 00:08:23 2015	(r379328)
+++ head/emulators/virtualbox-ose-additions/Makefile	Thu Feb 19 00:25:57 2015	(r379329)
@@ -106,7 +106,8 @@ KMK_ARCH=	freebsd.${ARCH}
 
 .if ${COMPILER_TYPE} == clang
 EXTRA_PATCHES=	${PATCHDIR}/extrapatch-Config.kmk \
-		${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
+		${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk \
+		${PATCHDIR}/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
 .if ${COMPILER_FEATURES:Mlibc++}
 EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
 .endif

Copied: head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h (from r379327, head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h	Thu Feb 19 00:25:57 2015	(r379329, copy of r379327, head/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h)
@@ -0,0 +1,51 @@
+--- src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h.orig	2015-02-12 11:08:51.000000000 -0500
++++ src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h	2015-02-18 17:44:16.919457000 -0500
+@@ -972,26 +972,26 @@
+ static __inline__ void
+ outb(unsigned short port, unsigned char val)
+ {
+-    __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port));
++    __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port));
+ }
+ 
+ static __inline__ void
+ outw(unsigned short port, unsigned short val)
+ {
+-    __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port));
++    __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port));
+ }
+ 
+ static __inline__ void
+ outl(unsigned short port, unsigned int val)
+ {
+-    __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port));
++    __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port));
+ }
+ 
+ static __inline__ unsigned int
+ inb(unsigned short port)
+ {
+     unsigned char ret;
+-    __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port));
++    __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port));
+ 
+     return ret;
+ }
+@@ -1000,7 +1000,7 @@
+ inw(unsigned short port)
+ {
+     unsigned short ret;
+-    __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port));
++    __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port));
+ 
+     return ret;
+ }
+@@ -1009,7 +1009,7 @@
+ inl(unsigned short port)
+ {
+     unsigned int ret;
+-    __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port));
++    __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port));
+ 
+     return ret;
+ }