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 1085607 - libvpx doesn't build on OS X with Apple clang from OS X 10.7 command line tools. r=giles

Browse Source
This commit is contained in:
Steven Michaud 2014-10-20 19:35:39 -05:00
parent d5a7043678
commit 605e6115a1
3 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
media/libvpx/apple-clang.patch Normal file
View File

@ -0,0 +1,29 @@
diff --git a/media/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c b/media/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c
--- a/media/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c
+++ b/media/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c
@@ -27,21 +27,24 @@ DECLARE_ALIGNED(32, static const uint8_t
4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12
};
DECLARE_ALIGNED(32, static const uint8_t, filt4_global_avx2[32]) = {
6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14,
6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13, 14
};
#if defined(__clang__)
# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ <= 3) || \
- (defined(__APPLE__) && __clang_major__ == 5 && __clang_minor__ == 0)
+ (defined(__APPLE__) && \
+ (__clang_major__ == 4 && __clang_minor__ >= 0 && \
+ __clang_minor__ <= 2) || \
+ (__clang_major__ == 5 && __clang_minor__ == 0))
# define MM256_BROADCASTSI128_SI256(x) \
_mm_broadcastsi128_si256((__m128i const *)&(x))
# else // clang > 3.3, and not 5.0 on macosx.
# define MM256_BROADCASTSI128_SI256(x) _mm256_broadcastsi128_si256(x)
# endif // clang <= 3.3
#elif defined(__GNUC__)
# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 6)
# define MM256_BROADCASTSI128_SI256(x) \
_mm_broadcastsi128_si256((__m128i const *)&(x))
# elif __GNUC__ == 4 && __GNUC_MINOR__ == 7

2
media/libvpx/update.py
View File

@ -530,6 +530,8 @@ def update_and_remove_files(prefix, libvpx_files, files):
def apply_patches():
# Patch to permit vpx users to specify their own <stdint.h> types.
os.system("patch -p0 < stdint.patch")
# Patch to allow older versions of Apple's clang to build libvpx.
os.system("patch -p3 < apple-clang.patch")
def update_readme(commit):
with open('README_MOZILLA') as f:

5
media/libvpx/vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c
View File

@ -34,7 +34,10 @@ DECLARE_ALIGNED(32, static const uint8_t, filt4_global_avx2[32]) = {
#if defined(__clang__)
# if __clang_major__ < 3 || (__clang_major__ == 3 && __clang_minor__ <= 3) || \
(defined(__APPLE__) && __clang_major__ == 5 && __clang_minor__ == 0)
(defined(__APPLE__) && \
(__clang_major__ == 4 && __clang_minor__ >= 0 && \
__clang_minor__ <= 2) || \
(__clang_major__ == 5 && __clang_minor__ == 0))
# define MM256_BROADCASTSI128_SI256(x) \
_mm_broadcastsi128_si256((__m128i const *)&(x))
# else // clang > 3.3, and not 5.0 on macosx.