pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

virtualbox-svn: Regenerate patches for upstream changes



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Tue Aug 16 00:34:49 2016 +0200
Changeset:	21b7a4800b884be677fc68c14945e1e33a28c4ad

Modified Files:
	virtualbox-svn/distinfo
	virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
	virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
Removed Files:
	virtualbox-svn/patches/patch-src_VBox_HostDrivers_Support_netbsd_Makefile.kup

Log Message:
virtualbox-svn: Regenerate patches for upstream changes

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=21b7a4800b884be677fc68c14945e1e33a28c4ad

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 virtualbox-svn/distinfo                                    |  5 ++---
 .../patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp       |  7 ++++---
 .../patch-src_VBox_HostDrivers_Support_netbsd_Makefile.kup |  0
 virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk | 14 +++++++-------
 4 files changed, 13 insertions(+), 13 deletions(-)

diffs:
diff --git a/virtualbox-svn/distinfo b/virtualbox-svn/distinfo
index 0baf817..bfc0001 100644
--- a/virtualbox-svn/distinfo
+++ b/virtualbox-svn/distinfo
@@ -8,7 +8,7 @@ SHA1 (patch-configure) = 32a205a07cacf12300cd718131153d7a601e48c1
 SHA1 (patch-include_iprt_types.h) = 33af52ca41f7d9555c45cc7dbf5bdc4b33384757
 SHA1 (patch-src_VBox_Additions_x11_Makefile.kmk) = 2afd3794e3df3d97db9743ee3b72159d747197fb
 SHA1 (patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk) = eae2633316f418e172215db90fad2d78cb41dce9
-SHA1 (patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp) = 8ec61f85d856d292c7907eafd8f20f13b1bda6d5
+SHA1 (patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp) = ac41bbf61e9b627fc91852f0039326a212d7580d
 SHA1 (patch-src_VBox_Devices_Network_lwip-new_src_include_lwip_sockets.h) = 772cf503bd67b4eec97e90f032d0a87f7fb99299
 SHA1 (patch-src_VBox_Devices_Storage_DrvHostBase.cpp) = d0bf9e0f6c5279ae048629d1ecfe8cda3ad6e691
 SHA1 (patch-src_VBox_Devices_Storage_DrvHostBase.h) = 9cdcfb390d3b3ada3e5fa6b3893ca25c475be5d6
@@ -21,7 +21,6 @@ SHA1 (patch-src_VBox_ExtPacks_VBoxDTrace_onnv_lib_libdtrace_common_dt__options.c
 SHA1 (patch-src_VBox_HostDrivers_Support_SUPDrvIDC.h) = df93779d885d4d661f7fbd3d2cfe02517f8ddac6
 SHA1 (patch-src_VBox_HostDrivers_Support_SUPR3HardenedMain.cpp) = 0e086dc3914c2993206cd0f6aa932f4ca5f93f00
 SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_Makefile) = acc98972409405fa7bcb68c61a724752723c22ff
-SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_Makefile.kup) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_SUPDrv-netbsd.c) = cd9943cd4304503614ffb29242742113024015f1
 SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_SUPDrv-netbsd.def) = 7b647e504679ff0e86e9591f0c42b3b87cc60fcc
 SHA1 (patch-src_VBox_HostDrivers_Support_netbsd_SUPLib-netbsd.cpp) = f3396d90a13877552ba3d5ec92edf7448f4d0873
@@ -34,7 +33,7 @@ SHA1 (patch-src_VBox_Main_glue_NativeEventQueue.cpp) = 58ff96858e861b03a495323fd
 SHA1 (patch-src_VBox_Main_include_ConsoleImpl.h) = 2af64e329ca18787d1f9db8746200f6557b951fa
 SHA1 (patch-src_VBox_Main_src-client_ConsoleImpl2.cpp) = 8b7bdd045d0c905c122c497d6b50197a02068c5f
 SHA1 (patch-src_VBox_NetworkServices_NAT_pxping.c) = 47ac337c6e46b0ae4dec3da2e987b94a16e478fc
-SHA1 (patch-src_VBox_Runtime_Makefile.kmk) = deaa4e4f3d2fcbf0de22b430b547f63d075ca670
+SHA1 (patch-src_VBox_Runtime_Makefile.kmk) = a89f5cb31a4b2e08a676d9f1a1b1a772f5f6ca2a
 SHA1 (patch-src_VBox_Runtime_r0drv_netbsd_the-netbsd-kernel.h) = 45e4d9f4a67449099651e96b54b7d108bebe606c
 SHA1 (patch-src_VBox_VMM_testcase_mkdsk.sh) = d949a78be396466636aa2c8d92e6ecf76725f336
 SHA1 (patch-src_libs_xpcom18a4_ipc_ipcd_shared_src_ipcConfig.cpp) = 6ea4110abb786937a69bf0feddcf641d604f7fad
diff --git a/virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp b/virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
index 22c3f21..d9a5032 100644
--- a/virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
+++ b/virtualbox-svn/patches/patch-src_VBox_Devices_Audio_DrvHostOSSAudio.cpp
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig	2016-08-12 18:06:09.000000000 +0000
+--- src/VBox/Devices/Audio/DrvHostOSSAudio.cpp.orig	2016-08-15 22:22:04.307068286 +0000
 +++ src/VBox/Devices/Audio/DrvHostOSSAudio.cpp
 @@ -137,6 +137,7 @@ static OSSAUDIOCFG s_OSSConf =
  };
@@ -10,15 +10,16 @@ $NetBSD$
  /* http://www.df.lth.se/~john_e/gems/gem002d.html */
  static uint32_t popcount(uint32_t u)
  {
-@@ -147,6 +148,7 @@ static uint32_t popcount(uint32_t u)
+@@ -147,7 +148,7 @@ static uint32_t popcount(uint32_t u)
      u = ( u&0x0000ffff) + (u>>16);
      return u;
  }
+-
 +#endif
  
  static uint32_t lsbindex(uint32_t u)
  {
-@@ -1149,4 +1151,3 @@ const PDMDRVREG g_DrvHostOSSAudio =
+@@ -1174,4 +1175,3 @@ const PDMDRVREG g_DrvHostOSSAudio =
      /* u32EndVersion */
      PDM_DRVREG_VERSION
  };
diff --git a/virtualbox-svn/patches/patch-src_VBox_HostDrivers_Support_netbsd_Makefile.kup b/virtualbox-svn/patches/patch-src_VBox_HostDrivers_Support_netbsd_Makefile.kup
deleted file mode 100644
index e69de29..0000000
diff --git a/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk b/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
index f383629..92710dd 100644
--- a/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
+++ b/virtualbox-svn/patches/patch-src_VBox_Runtime_Makefile.kmk
@@ -1,9 +1,9 @@
 $NetBSD$
 
---- src/VBox/Runtime/Makefile.kmk.orig	2016-08-12 18:06:15.000000000 +0000
+--- src/VBox/Runtime/Makefile.kmk.orig	2016-08-15 22:22:06.134606983 +0000
 +++ src/VBox/Runtime/Makefile.kmk
-@@ -1978,12 +1978,15 @@ RuntimeR0Drv_SDKS.win   = ReorderCompile
- RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS RT_NO_EXPORT_SYMBOL
+@@ -1979,12 +1979,15 @@ RuntimeR0Drv_SDKS.win   = ReorderCompile
+ RuntimeR0Drv_DEFS       = IN_RT_R0 RT_WITH_VBOX RT_WITHOUT_NOCRT_WRAPPERS RT_NO_EXPORT_SYMBOL NOFILEID
  RuntimeR0Drv_DEFS.win   = IN_SUP_R0 LDR_ONLY_PE
  RuntimeR0Drv_DEFS.linux = MODULE KBUILD_MODNAME=KBUILD_STR\(vboxdrv\) KBUILD_BASENAME=KBUILD_STR\(vboxdrv\) IN_SUP_R0
 +RuntimeR0Drv_DEFS.netbsd = _KERNEL
@@ -13,12 +13,12 @@ $NetBSD$
  	$(PATH_STAGE)/gen-sys-hdrs
  RuntimeR0Drv_INCS.linux = \
  	r0drv/linux
-+RuntimeR0Drv_INCS.netbsd  = \
++RuntimeR0Drv_INCS.netbsd = \
 +	/usr/src/sys
  RuntimeR0Drv_INCS.solaris = \
  	r0drv/solaris/vbi/i86pc \
  	r0drv/solaris/vbi/i86pc/sys
-@@ -2514,6 +2517,17 @@ RuntimeR0Drv_ORDERDEPS.freebsd = \
+@@ -2515,6 +2518,17 @@ RuntimeR0Drv_ORDERDEPS.freebsd = \
  	$(PATH_STAGE)/gen-sys-hdrs/bus_if.h \
  	$(PATH_STAGE)/gen-sys-hdrs/device_if.h
  
@@ -36,7 +36,7 @@ $NetBSD$
  
  #
  # RuntimeGuestR0 - Guest driver runtime.
-@@ -2830,6 +2844,56 @@ $$(FreeBSDGeneratedKernelHeaders_0_OUTDI
+@@ -2831,6 +2845,56 @@ $$(FreeBSDGeneratedKernelHeaders_0_OUTDI
  endif # FreeBSD
  
  
@@ -93,7 +93,7 @@ $NetBSD$
  #
  # Aliases for .cpp.h files so we can more easily do syntax checking from the editor.
  #
-@@ -3127,4 +3191,3 @@ taf-template.o taf-template.obj: taf-cor
+@@ -3128,4 +3192,3 @@ taf-template.o taf-template.obj: taf-cor
  tsp-template.o tsp-template.obj: tsp-core.o tsp-asn1-decoder.o tsp-sanity.o tsp-init.o
  x509-template.o x509-template.obj: x509-core.o x509-asn1-decoder.o x509-sanity.o x509-init.o
  pkcs7-template.o pkcs7-template.obj: pkcs7-core.o pkcs7-asn1-decoder.o pkcs7-sanity.o pkcs7-init.o


Home | Main Index | Thread Index | Old Index