wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 868629 - webvtt no longer needs -DWEBVTT_NO_CONFIG_H. r=rillian

Browse Source 
Bug 868629 - webvtt no longer needs -DWEBVTT_NO_CONFIG_H. r=rillian
This commit is contained in:
Caitlin Potter 2013-05-14 14:17:24 -04:00
parent 1751288e9a
commit 2f6b68ae57
4 changed files with 80 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
media/webvtt/868629.patch Normal file
View File

@ -0,0 +1,61 @@
# HG changeset patch
# User Caitlin Potter <snowball@defpixel.com>
# Date 1367954476 14400
# Node ID 2becb21900559e271175e08d7ec33ed35b034967
# Parent 41ff3b67b69232297191c8f8ef78e5facc1c1d19
Bug 868629 - webvtt no longer needs -DWEBVTT_NO_CONFIG_H. r=rillian
diff --git a/media/webvtt/include/webvtt/util.h b/media/webvtt/include/webvtt/util.h
--- a/media/webvtt/include/webvtt/util.h
+++ b/media/webvtt/include/webvtt/util.h
@@ -32,16 +32,21 @@
extern "C" {
#endif
-# if defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__) || defined(__WINDOWS__)
-# if !WEBVTT_NO_CONFIG_H
-# include "webvtt-config-win32.h"
-# endif
+# if !defined(_MSC_VER) || _MSC_VER >= 1600
+/**
+ * For non-MSVC compilers, or MSVC2010 or later, assume we have
+ * stdint.h
+ */
+# define WEBVTT_HAVE_STDINT 1
+# include <stdint.h>
+# endif
+
+# if defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__) ||\
+ defined(__WINDOWS__)
# define WEBVTT_OS_WIN32 1
# if defined(_WIN64)
# define WEBVTT_OS_WIN64 1
# endif
-# elif !WEBVTT_NO_CONFIG_H
-# include <webvtt/webvtt-config.h>
# endif
# if defined(_MSC_VER)
@@ -54,12 +59,8 @@
# else
# define WEBVTT_EXPORT
# endif
-# if _MSC_VER >= 1600
-# define WEBVTT_HAVE_STDINT 1
-# endif
# elif defined(__GNUC__)
# define WEBVTT_CC_GCC 1
-# define WEBVTT_HAVE_STDINT 1
# if WEBVTT_OS_WIN32
# if WEBVTT_BUILD_LIBRARY
# define WEBVTT_EXPORT __declspec(dllexport)
@@ -96,8 +97,7 @@
# define WEBVTT_INLINE __inline__
# endif
-# if WEBVTT_HAVE_STDINT
-# include <stdint.h>
+# ifdef WEBVTT_HAVE_STDINT
typedef int8_t webvtt_int8;
typedef int16_t webvtt_int16;
typedef int32_t webvtt_int32;

1
media/webvtt/README_MOZILLA
View File

@ -3,5 +3,4 @@ c93accafb2087df7c678748e25bca21f1173979f of the git repository at
https://github.com/mozilla/webvtt.
The following CPPFLAGS are used in order to build and link in Mozilla
-DWEBVTT_NO_CONFIG_H=1 -- Prevent inclusion of generated headers
-DWEBVTT_STATIC=1 -- Compile as a static library

24
media/webvtt/include/webvtt/util.h
View File

@ -32,16 +32,21 @@
extern "C" {
#endif
# if defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__) || defined(__WINDOWS__)
# if !WEBVTT_NO_CONFIG_H
# include "webvtt-config-win32.h"
# endif
# if !defined(_MSC_VER) || _MSC_VER >= 1600
/**
* For non-MSVC compilers, or MSVC2010 or later, assume we have
* stdint.h
*/
# define WEBVTT_HAVE_STDINT 1
# include <stdint.h>
# endif
# if defined(_WIN32) || defined(__WIN32__) || defined(__TOS_WIN__) ||\
defined(__WINDOWS__)
# define WEBVTT_OS_WIN32 1
# if defined(_WIN64)
# define WEBVTT_OS_WIN64 1
# endif
# elif !WEBVTT_NO_CONFIG_H
# include <webvtt/webvtt-config.h>
# endif
# if defined(_MSC_VER)
@ -54,12 +59,8 @@ extern "C" {
# else
# define WEBVTT_EXPORT
# endif
# if _MSC_VER >= 1600
# define WEBVTT_HAVE_STDINT 1
# endif
# elif defined(__GNUC__)
# define WEBVTT_CC_GCC 1
# define WEBVTT_HAVE_STDINT 1
# if WEBVTT_OS_WIN32
# if WEBVTT_BUILD_LIBRARY
# define WEBVTT_EXPORT __declspec(dllexport)
@ -96,8 +97,7 @@ extern "C" {
# define WEBVTT_INLINE __inline__
# endif
# if WEBVTT_HAVE_STDINT
# include <stdint.h>
# ifdef WEBVTT_HAVE_STDINT
typedef int8_t webvtt_int8;
typedef int16_t webvtt_int16;
typedef int32_t webvtt_int32;

8
media/webvtt/update.sh Normal file → Executable file
View File

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/bash
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
@ -77,3 +77,9 @@ rm -rf ${repo_dir}
if [ ${have_hg} -eq 0 -a -d ${start_dir}/.hg ]; then
hg addremove ${webvtt_dir}/
fi
# apply patches
cd ${webvtt_dir}
patch -p3 < 868629.patch
cd ${start_dir}