svn commit: r393620 - in head/www/chromium: . files

[Rene Ladan]

Author: rene
Date: Wed Aug  5 22:06:05 2015
New Revision: 393620
URL: https://svnweb.freebsd.org/changeset/ports/393620

Log:
  Drop support for FreeBSD 8.

Modified:
  head/www/chromium/Makefile
  head/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc
  head/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc
  head/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc

Modified: head/www/chromium/Makefile
==============================================================================
--- head/www/chromium/Makefile	Wed Aug  5 22:02:52 2015	(r393619)
+++ head/www/chromium/Makefile	Wed Aug  5 22:06:05 2015	(r393620)
@@ -138,8 +138,6 @@ PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PO
 
 TEST_DISTFILES=	${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX}
 
-BROKEN_FreeBSD_8=	Does not compile, missing locale
-
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCODECS}

Modified: head/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc
==============================================================================
--- head/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc	Wed Aug  5 22:02:52 2015	(r393619)
+++ head/www/chromium/files/patch-device__usb__usb_device_handle_impl.cc	Wed Aug  5 22:06:05 2015	(r393620)
@@ -1,11 +1,10 @@
 --- device/usb/usb_device_handle_impl.cc.orig	2014-10-10 08:54:15 UTC
 +++ device/usb/usb_device_handle_impl.cc
-@@ -19,7 +19,13 @@
+@@ -19,7 +19,12 @@
  #include "device/usb/usb_device_impl.h"
  #include "device/usb/usb_error.h"
  #include "device/usb/usb_service.h"
 +#if defined(OS_FREEBSD)
-+#include <osreldate.h>
 +#include "libusb.h"
 +#define LIBUSB_CALL
 +#else
@@ -14,22 +13,3 @@
  
  namespace device {
  
-@@ -105,6 +111,18 @@
- 
- }  // namespace
- 
-+// Define for FreeBSD < 9.3, thanks to db at freebsd.org
-+#if defined(OS_FREEBSD) && __FreeBSD_version < 903000
-+int libusb_get_string_descriptor(libusb_device_handle *dev,
-+  uint8_t descriptor_index, uint16_t lang_id, unsigned char* data, int length) {
-+  return libusb_control_transfer(dev,
-+    LIBUSB_ENDPOINT_IN | 0x0, /* Endpoint 0 IN */
-+    LIBUSB_REQUEST_GET_DESCRIPTOR,
-+    (LIBUSB_DT_STRING << 8) | descriptor_index,
-+    lang_id, data, (uint16_t)length, 1000);
-+}
-+#endif
-+
- class UsbDeviceHandleImpl::InterfaceClaimer
-     : public base::RefCountedThreadSafe<UsbDeviceHandleImpl::InterfaceClaimer> {
-  public:

Modified: head/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc
==============================================================================
--- head/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc	Wed Aug  5 22:02:52 2015	(r393619)
+++ head/www/chromium/files/patch-third_party__webrtc__base__thread_checker_impl.cc	Wed Aug  5 22:06:05 2015	(r393620)
@@ -1,6 +1,6 @@
 --- third_party/webrtc/base/thread_checker_impl.cc.orig	2015-04-19 18:30:59.000000000 +0200
 +++ third_party/webrtc/base/thread_checker_impl.cc	2015-04-19 18:51:43.000000000 +0200
-@@ -14,10 +14,16 @@
+@@ -14,10 +14,15 @@
  
  #include "webrtc/base/checks.h"
  
@@ -11,25 +11,18 @@
  
 +#if defined(WEBRTC_BSD)
 +#include <pthread_np.h>
-+#include <sys/param.h>
 +#include <sys/thr.h>
 +#endif
 +
  namespace rtc {
  
  PlatformThreadId CurrentThreadId() {
-@@ -27,6 +33,14 @@
+@@ -27,6 +32,8 @@
  #elif defined(WEBRTC_POSIX)
  #if defined(WEBRTC_MAC) || defined(WEBRTC_IOS)
    ret = pthread_mach_thread_np(pthread_self());
 +#elif defined(WEBRTC_BSD)
-+#  if __FreeBSD_version < 900031
-+  long lwpid;
-+  thr_self(&lwpid);
-+  ret = static_cast<int>(lwpid);
-+#  else
 +  ret = static_cast<int>(pthread_getthreadid_np());
-+#  endif
  #elif defined(WEBRTC_LINUX)
    ret =  syscall(__NR_gettid);
  #elif defined(WEBRTC_ANDROID)

Modified: head/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc
==============================================================================
--- head/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc	Wed Aug  5 22:02:52 2015	(r393619)
+++ head/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc	Wed Aug  5 22:06:05 2015	(r393620)
@@ -1,11 +1,10 @@
 --- v8/src/base/platform/platform-posix.cc.orig	2015-04-19 17:42:27.000000000 +0200
 +++ v8/src/base/platform/platform-posix.cc	2015-04-19 17:46:17.000000000 +0200
-@@ -55,6 +55,15 @@
+@@ -55,6 +55,14 @@
  #include <sys/prctl.h>  // NOLINT, for prctl
  #endif
  
 +#if V8_OS_FREEBSD && !defined(__DragonFly__)
-+#include <sys/param.h> // for __FreeBSD_version
 +#include <sys/thr.h>   // for thr_self
 +#endif
 +
@@ -16,20 +15,14 @@
  #if !defined(V8_OS_NACL) && !defined(_AIX)
  #include <sys/syscall.h>
  #endif
-@@ -271,6 +280,18 @@
+@@ -271,6 +279,12 @@
    return static_cast<int>(syscall(__NR_gettid));
  #elif V8_OS_ANDROID
    return static_cast<int>(gettid());
 +#elif V8_OS_DRAGONFLYBSD || defined(__DragonFly__)
 +  return static_cast<int>(lwp_gettid());
 +#elif V8_OS_FREEBSD
-+#  if __FreeBSD_version < 900031
-+  long lwpid;
-+  thr_self(&lwpid);
-+  return static_cast<int>(lwpid);
-+#  else
 +  return static_cast<int>(pthread_getthreadid_np());
-+#  endif
 +#elif V8_OS_NETBSD
 +  return static_cast<int>(_lwp_self());
  #elif V8_OS_AIX