From f3fb2472f2593a065786d32c2bf9917653a156ca53e3dfe7a6cd37bc74096235 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 6 Oct 2015 11:26:01 +0000 Subject: [PATCH] Accepting request 335983 from KDE:Qt5 1 OBS-URL: https://build.opensuse.org/request/show/335983 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libqt5-qtwebengine?expand=0&rev=7 --- gyp-arm64.patch | 87 +++++++++++++++++++++++---- libqt5-qtwebengine.changes | 6 ++ libqt5-qtwebengine.spec | 2 + sandbox-linux-arm64.patch | 117 +++++++++++++++++++++++++++++++++++++ 4 files changed, 200 insertions(+), 12 deletions(-) create mode 100644 sandbox-linux-arm64.patch diff --git a/gyp-arm64.patch b/gyp-arm64.patch index ab20a46..198a29d 100644 --- a/gyp-arm64.patch +++ b/gyp-arm64.patch @@ -1,8 +1,8 @@ -Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h +Index: qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h =================================================================== --- /dev/null -+++ qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h -@@ -0,0 +1,1743 @@ ++++ qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h +@@ -0,0 +1,1806 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H +#define FFMPEG_CONFIG_H @@ -18,6 +18,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define BUILDSUF "" +#define SLIBSUF ".so" +#define HAVE_MMX2 HAVE_MMXEXT ++#define SWS_MAX_FILTER_SIZE 256 +#define ARCH_AARCH64 1 +#define ARCH_ALPHA 0 +#define ARCH_ARM 0 @@ -49,10 +50,12 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define HAVE_NEON 1 +#define HAVE_VFP 1 +#define HAVE_VFPV3 0 ++#define HAVE_SETEND 0 +#define HAVE_ALTIVEC 0 +#define HAVE_DCBZL 1 +#define HAVE_LDBRX 1 +#define HAVE_PPC4XX 0 ++#define HAVE_VSX 0 +#define HAVE_AMD3DNOW 0 +#define HAVE_AMD3DNOWEXT 0 +#define HAVE_AVX 0 @@ -82,10 +85,12 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define HAVE_NEON_EXTERNAL 1 +#define HAVE_VFP_EXTERNAL 1 +#define HAVE_VFPV3_EXTERNAL 0 ++#define HAVE_SETEND_EXTERNAL 0 +#define HAVE_ALTIVEC_EXTERNAL 0 +#define HAVE_DCBZL_EXTERNAL 0 +#define HAVE_LDBRX_EXTERNAL 0 +#define HAVE_PPC4XX_EXTERNAL 0 ++#define HAVE_VSX_EXTERNAL 0 +#define HAVE_AMD3DNOW_EXTERNAL 0 +#define HAVE_AMD3DNOWEXT_EXTERNAL 0 +#define HAVE_AVX_EXTERNAL 0 @@ -115,10 +120,12 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define HAVE_NEON_INLINE 1 +#define HAVE_VFP_INLINE 1 +#define HAVE_VFPV3_INLINE 0 ++#define HAVE_SETEND_INLINE 0 +#define HAVE_ALTIVEC_INLINE 0 +#define HAVE_DCBZL_INLINE 0 +#define HAVE_LDBRX_INLINE 0 +#define HAVE_PPC4XX_INLINE 0 ++#define HAVE_VSX_INLINE 0 +#define HAVE_AMD3DNOW_INLINE 0 +#define HAVE_AMD3DNOWEXT_INLINE 0 +#define HAVE_AVX_INLINE 0 @@ -148,6 +155,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define HAVE_LOCAL_ALIGNED_8 0 +#define HAVE_LOCAL_ALIGNED_16 0 +#define HAVE_LOCAL_ALIGNED_32 0 ++#define HAVE_SIMD_ALIGN_16 1 +#define HAVE_ATOMICS_GCC 1 +#define HAVE_ATOMICS_SUNCC 0 +#define HAVE_ATOMICS_WIN32 0 @@ -203,6 +211,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define HAVE_UNISTD_H 1 +#define HAVE_WINDOWS_H 0 +#define HAVE_WINSOCK2_H 0 ++#define HAVE_INTRINSICS_NEON 1 +#define HAVE_ATANF 1 +#define HAVE_ATAN2F 1 +#define HAVE_CBRT 1 @@ -211,6 +220,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define HAVE_EXP2 1 +#define HAVE_EXP2F 1 +#define HAVE_EXPF 1 ++#define HAVE_FMINF 1 +#define HAVE_ISINF 1 +#define HAVE_ISNAN 1 +#define HAVE_LDEXPF 1 @@ -281,6 +291,8 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define HAVE_PTHREADS 1 +#define HAVE_OS2THREADS 0 +#define HAVE_W32THREADS 0 ++#define HAVE_AS_DN_DIRECTIVE 0 ++#define HAVE_AS_FUNC 1 +#define HAVE_ASM_MOD_Q 0 +#define HAVE_ATTRIBUTE_MAY_ALIAS 1 +#define HAVE_ATTRIBUTE_PACKED 1 @@ -320,6 +332,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define HAVE_LIBDC1394_1 0 +#define HAVE_LIBDC1394_2 0 +#define HAVE_MAKEINFO 0 ++#define HAVE_MAKEINFO_HTML 0 +#define HAVE_PERL 1 +#define HAVE_POD2MAN 1 +#define HAVE_SDL 0 @@ -346,6 +359,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_AVIO_READING_EXAMPLE 1 +#define CONFIG_DECODING_ENCODING_EXAMPLE 1 +#define CONFIG_DEMUXING_DECODING_EXAMPLE 1 ++#define CONFIG_EXTRACT_MVS_EXAMPLE 1 +#define CONFIG_FILTER_AUDIO_EXAMPLE 0 +#define CONFIG_FILTERING_AUDIO_EXAMPLE 0 +#define CONFIG_FILTERING_VIDEO_EXAMPLE 0 @@ -377,6 +391,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_LIBFLITE 0 +#define CONFIG_LIBFONTCONFIG 0 +#define CONFIG_LIBFREETYPE 0 ++#define CONFIG_LIBFRIBIDI 0 +#define CONFIG_LIBGME 0 +#define CONFIG_LIBGSM 0 +#define CONFIG_LIBIEC61883 0 @@ -394,6 +409,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_LIBRTMP 0 +#define CONFIG_LIBSCHROEDINGER 0 +#define CONFIG_LIBSHINE 0 ++#define CONFIG_LIBSMBCLIENT 0 +#define CONFIG_LIBSOXR 0 +#define CONFIG_LIBSPEEX 0 +#define CONFIG_LIBSSH 0 @@ -415,6 +431,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_LIBXVID 0 +#define CONFIG_LIBZMQ 0 +#define CONFIG_LIBZVBI 0 ++#define CONFIG_LZMA 0 +#define CONFIG_OPENAL 0 +#define CONFIG_OPENCL 0 +#define CONFIG_OPENGL 0 @@ -429,7 +446,6 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_SAFE_BITSTREAM_READER 1 +#define CONFIG_SHARED 1 +#define CONFIG_SMALL 0 -+#define CONFIG_SRAM 0 +#define CONFIG_STATIC 0 +#define CONFIG_SWSCALE_ALPHA 1 +#define CONFIG_DXVA2 0 @@ -456,11 +472,13 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_DCT 0 +#define CONFIG_DWT 0 +#define CONFIG_ERROR_RESILIENCE 0 ++#define CONFIG_FAAN 1 +#define CONFIG_FAST_UNALIGNED 1 +#define CONFIG_FFT 1 +#define CONFIG_LSP 0 +#define CONFIG_LZO 0 +#define CONFIG_MDCT 1 ++#define CONFIG_PIXELUTILS 0 +#define CONFIG_NETWORK 0 +#define CONFIG_RDFT 1 +#define CONFIG_FONTCONFIG 0 @@ -476,9 +494,15 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_AANDCTTABLES 0 +#define CONFIG_AC3DSP 0 +#define CONFIG_AUDIO_FRAME_QUEUE 0 ++#define CONFIG_AUDIODSP 0 ++#define CONFIG_BLOCKDSP 0 ++#define CONFIG_BSWAPDSP 0 +#define CONFIG_CABAC 0 -+#define CONFIG_DSPUTIL 0 ++#define CONFIG_DVPROFILE 0 +#define CONFIG_EXIF 0 ++#define CONFIG_FAANDCT 0 ++#define CONFIG_FAANIDCT 0 ++#define CONFIG_FDCTDSP 0 +#define CONFIG_FRAME_THREAD_ENCODER 0 +#define CONFIG_GCRYPT 0 +#define CONFIG_GOLOMB 1 @@ -490,24 +514,35 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_H264QPEL 0 +#define CONFIG_HPELDSP 1 +#define CONFIG_HUFFMAN 0 ++#define CONFIG_HUFFYUVDSP 0 ++#define CONFIG_HUFFYUVENCDSP 0 ++#define CONFIG_IDCTDSP 0 ++#define CONFIG_IIRFILTER 0 +#define CONFIG_INTRAX8 0 +#define CONFIG_LGPLV3 0 ++#define CONFIG_LLAUDDSP 0 +#define CONFIG_LLVIDDSP 0 +#define CONFIG_LPC 0 ++#define CONFIG_ME_CMP 0 ++#define CONFIG_MPEG_ER 0 +#define CONFIG_MPEGAUDIO 0 +#define CONFIG_MPEGAUDIODSP 0 +#define CONFIG_MPEGVIDEO 0 +#define CONFIG_MPEGVIDEOENC 0 +#define CONFIG_NETTLE 0 ++#define CONFIG_PIXBLOCKDSP 0 ++#define CONFIG_QPELDSP 0 +#define CONFIG_RANGECODER 0 +#define CONFIG_RIFFDEC 1 +#define CONFIG_RIFFENC 0 +#define CONFIG_RTPDEC 0 +#define CONFIG_RTPENC_CHAIN 0 +#define CONFIG_SINEWIN 0 ++#define CONFIG_STARTCODE 0 +#define CONFIG_TPELDSP 0 +#define CONFIG_VIDEODSP 1 +#define CONFIG_VP3DSP 1 ++#define CONFIG_WMA_FREQS 0 +#define CONFIG_AAC_ADTSTOASC_BSF 0 +#define CONFIG_CHOMP_BSF 0 +#define CONFIG_DUMP_EXTRADATA_BSF 0 @@ -979,6 +1014,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_FLAC_DEMUXER 0 +#define CONFIG_FLIC_DEMUXER 0 +#define CONFIG_FLV_DEMUXER 0 ++#define CONFIG_LIVE_FLV_DEMUXER 0 +#define CONFIG_FOURXM_DEMUXER 0 +#define CONFIG_FRM_DEMUXER 0 +#define CONFIG_G722_DEMUXER 0 @@ -1013,6 +1049,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_LATM_DEMUXER 0 +#define CONFIG_LMLM4_DEMUXER 0 +#define CONFIG_LOAS_DEMUXER 0 ++#define CONFIG_LRC_DEMUXER 0 +#define CONFIG_LVF_DEMUXER 0 +#define CONFIG_LXF_DEMUXER 0 +#define CONFIG_M4V_DEMUXER 0 @@ -1093,6 +1130,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_SEGAFILM_DEMUXER 0 +#define CONFIG_SHORTEN_DEMUXER 0 +#define CONFIG_SIFF_DEMUXER 0 ++#define CONFIG_SLN_DEMUXER 0 +#define CONFIG_SMACKER_DEMUXER 0 +#define CONFIG_SMJPEG_DEMUXER 0 +#define CONFIG_SMUSH_DEMUXER 0 @@ -1124,6 +1162,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_W64_DEMUXER 0 +#define CONFIG_WAV_DEMUXER 1 +#define CONFIG_WC3_DEMUXER 0 ++#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0 +#define CONFIG_WEBVTT_DEMUXER 0 +#define CONFIG_WSAUD_DEMUXER 0 +#define CONFIG_WSVQA_DEMUXER 0 @@ -1135,6 +1174,17 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_XWMA_DEMUXER 0 +#define CONFIG_YOP_DEMUXER 0 +#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 ++#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 +#define CONFIG_LIBGME_DEMUXER 0 +#define CONFIG_LIBMODPLUG_DEMUXER 0 +#define CONFIG_LIBNUT_DEMUXER 0 @@ -1274,6 +1324,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_MOVTEXT_ENCODER 0 +#define CONFIG_SRT_ENCODER 0 +#define CONFIG_SUBRIP_ENCODER 0 ++#define CONFIG_WEBVTT_ENCODER 0 +#define CONFIG_XSUB_ENCODER 0 +#define CONFIG_LIBFAAC_ENCODER 0 +#define CONFIG_LIBFDK_AAC_ENCODER 0 @@ -1343,6 +1394,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_EARWAX_FILTER 0 +#define CONFIG_EBUR128_FILTER 0 +#define CONFIG_EQUALIZER_FILTER 0 ++#define CONFIG_FLANGER_FILTER 0 +#define CONFIG_HIGHPASS_FILTER 0 +#define CONFIG_JOIN_FILTER 0 +#define CONFIG_LADSPA_FILTER 0 @@ -1351,6 +1403,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_REPLAYGAIN_FILTER 0 +#define CONFIG_RESAMPLE_FILTER 0 +#define CONFIG_SILENCEDETECT_FILTER 0 ++#define CONFIG_SILENCEREMOVE_FILTER 0 +#define CONFIG_TREBLE_FILTER 0 +#define CONFIG_VOLUME_FILTER 0 +#define CONFIG_VOLUMEDETECT_FILTER 0 @@ -1367,6 +1420,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_BLACKFRAME_FILTER 0 +#define CONFIG_BLEND_FILTER 0 +#define CONFIG_BOXBLUR_FILTER 0 ++#define CONFIG_CODECVIEW_FILTER 0 +#define CONFIG_COLORBALANCE_FILTER 0 +#define CONFIG_COLORCHANNELMIXER_FILTER 0 +#define CONFIG_COLORMATRIX_FILTER 0 @@ -1401,12 +1455,14 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_HISTEQ_FILTER 0 +#define CONFIG_HISTOGRAM_FILTER 0 +#define CONFIG_HQDN3D_FILTER 0 ++#define CONFIG_HQX_FILTER 0 +#define CONFIG_HUE_FILTER 0 +#define CONFIG_IDET_FILTER 0 +#define CONFIG_IL_FILTER 0 +#define CONFIG_INTERLACE_FILTER 0 +#define CONFIG_INTERLEAVE_FILTER 0 +#define CONFIG_KERNDEINT_FILTER 0 ++#define CONFIG_LENSCORRECTION_FILTER 0 +#define CONFIG_LUT3D_FILTER 0 +#define CONFIG_LUT_FILTER 0 +#define CONFIG_LUTRGB_FILTER 0 @@ -1444,6 +1500,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_SETTB_FILTER 0 +#define CONFIG_SHOWINFO_FILTER 0 +#define CONFIG_SHUFFLEPLANES_FILTER 0 ++#define CONFIG_SIGNALSTATS_FILTER 0 +#define CONFIG_SMARTBLUR_FILTER 0 +#define CONFIG_SPLIT_FILTER 0 +#define CONFIG_SPP_FILTER 0 @@ -1465,6 +1522,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_W3FDIF_FILTER 0 +#define CONFIG_YADIF_FILTER 0 +#define CONFIG_ZMQ_FILTER 0 ++#define CONFIG_ZOOMPAN_FILTER 0 +#define CONFIG_CELLAUTO_FILTER 0 +#define CONFIG_COLOR_FILTER 0 +#define CONFIG_FREI0R_SRC_FILTER 0 @@ -1480,6 +1538,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_NULLSINK_FILTER 0 +#define CONFIG_AVECTORSCOPE_FILTER 0 +#define CONFIG_CONCAT_FILTER 0 ++#define CONFIG_SHOWCQT_FILTER 0 +#define CONFIG_SHOWSPECTRUM_FILTER 0 +#define CONFIG_SHOWWAVES_FILTER 0 +#define CONFIG_AMOVIE_FILTER 0 @@ -1577,6 +1636,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_IVF_MUXER 0 +#define CONFIG_JACOSUB_MUXER 0 +#define CONFIG_LATM_MUXER 0 ++#define CONFIG_LRC_MUXER 0 +#define CONFIG_M4V_MUXER 0 +#define CONFIG_MD5_MUXER 0 +#define CONFIG_MATROSKA_MUXER 0 @@ -1639,8 +1699,8 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_SMJPEG_MUXER 0 +#define CONFIG_SMOOTHSTREAMING_MUXER 0 +#define CONFIG_SOX_MUXER 0 ++#define CONFIG_SPX_MUXER 0 +#define CONFIG_SPDIF_MUXER 0 -+#define CONFIG_SPEEX_MUXER 0 +#define CONFIG_SRT_MUXER 0 +#define CONFIG_SWF_MUXER 0 +#define CONFIG_TEE_MUXER 0 @@ -1655,6 +1715,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_W64_MUXER 0 +#define CONFIG_WAV_MUXER 0 +#define CONFIG_WEBM_MUXER 0 ++#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 +#define CONFIG_WEBVTT_MUXER 0 +#define CONFIG_WTV_MUXER 0 +#define CONFIG_WV_MUXER 0 @@ -1721,6 +1782,7 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_HTTP_PROTOCOL 0 +#define CONFIG_HTTPPROXY_PROTOCOL 0 +#define CONFIG_HTTPS_PROTOCOL 0 ++#define CONFIG_ICECAST_PROTOCOL 0 +#define CONFIG_MMSH_PROTOCOL 0 +#define CONFIG_MMST_PROTOCOL 0 +#define CONFIG_MD5_PROTOCOL 0 @@ -1745,11 +1807,12 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define CONFIG_LIBRTMPT_PROTOCOL 0 +#define CONFIG_LIBRTMPTE_PROTOCOL 0 +#define CONFIG_LIBSSH_PROTOCOL 0 ++#define CONFIG_LIBSMBCLIENT_PROTOCOL 0 +#endif /* FFMPEG_CONFIG_H */ -Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/avconfig.h +Index: qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/avconfig.h =================================================================== --- /dev/null -+++ qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/avconfig.h ++++ qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/libavutil/avconfig.h @@ -0,0 +1,7 @@ +/* Generated by ffconf */ +#ifndef AVUTIL_AVCONFIG_H @@ -1758,11 +1821,11 @@ Index: qtwebengine-opensource-src-5.4.2/src/3rdparty/chromium/third_party/ffmpeg +#define AV_HAVE_FAST_UNALIGNED 1 +#define AV_HAVE_INCOMPATIBLE_LIBAV_ABI 0 +#endif /* AVUTIL_AVCONFIG_H */ -Index: qtwebengine-opensource-src-5.4.2/src/core/gyp_run.pro +Index: qtwebengine-opensource-src-5.5.0/src/core/gyp_run.pro =================================================================== ---- qtwebengine-opensource-src-5.4.2.orig/src/core/gyp_run.pro -+++ qtwebengine-opensource-src-5.4.2/src/core/gyp_run.pro -@@ -84,6 +84,7 @@ cross_compile { +--- qtwebengine-opensource-src-5.5.0.orig/src/core/gyp_run.pro ++++ qtwebengine-opensource-src-5.5.0/src/core/gyp_run.pro +@@ -83,6 +83,7 @@ cross_compile { contains(QT_ARCH, "x86_64"): GYP_ARGS += "-D target_arch=x64" contains(QT_ARCH, "i386"): GYP_ARGS += "-D target_arch=ia32" diff --git a/libqt5-qtwebengine.changes b/libqt5-qtwebengine.changes index 90f846c..4c37051 100644 --- a/libqt5-qtwebengine.changes +++ b/libqt5-qtwebengine.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 30 08:10:19 UTC 2015 - schwab@suse.de + +- gyp-arm64.patch: Update ffmpeg config +- sandbox-linux-arm64.patch: fix chromium build for aarch64 + ------------------------------------------------------------------- Sun Aug 16 08:32:10 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/libqt5-qtwebengine.spec b/libqt5-qtwebengine.spec index e0dfcde..b529480 100644 --- a/libqt5-qtwebengine.spec +++ b/libqt5-qtwebengine.spec @@ -38,6 +38,7 @@ Patch1: gyp_conf.patch # PATCH-FIX-OPENSUSE gcc50-fixes.diff -- Fix the detection of the Gcc 5.x compiler Patch2: gcc50-fixes.diff Patch3: gyp-arm64.patch +Patch4: sandbox-linux-arm64.patch BuildRequires: bison BuildRequires: fdupes BuildRequires: flac-devel @@ -139,6 +140,7 @@ Qt is a set of libraries for developing applications. %patch1 -p1 %patch2 -p0 %patch3 -p1 +%patch4 -p1 sed -i 's|$(STRIP)|strip|g' src/core/core_module.pro #pushd src/3rdparty/chromium/third_party/ diff --git a/sandbox-linux-arm64.patch b/sandbox-linux-arm64.patch new file mode 100644 index 0000000..4b255bc --- /dev/null +++ b/sandbox-linux-arm64.patch @@ -0,0 +1,117 @@ +From c37fb8efaecfd3ca87725466de4abdeae86ad343 Mon Sep 17 00:00:00 2001 +From: parkch98 +Date: Sat, 13 Dec 2014 09:47:10 -0800 +Subject: [PATCH] content: bpf: exclude the syscalls if arm64 + +__NR_open, __NR_access are not defined on arm64. So, I just blocked +the syscall to build properly on arm64. + +BUG=None + +Review URL: https://codereview.chromium.org/784733002 + +Cr-Commit-Position: refs/heads/master@{#308281} + +Index: qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc +=================================================================== +--- qtwebengine-opensource-src-5.5.0.orig/src/3rdparty/chromium/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc ++++ qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/content/common/sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc +@@ -46,7 +46,7 @@ inline bool IsChromeOS() { + } + + inline bool IsArchitectureArm() { +-#if defined(__arm__) ++#if defined(__arm__) || defined(__aarch64__) + return true; + #else + return false; +@@ -113,8 +113,11 @@ class CrosArmGpuBrokerProcessPolicy : pu + // openat allowed. + ResultExpr CrosArmGpuBrokerProcessPolicy::EvaluateSyscall(int sysno) const { + switch (sysno) { ++#if !defined(__aarch64__) + case __NR_access: + case __NR_open: ++#endif // !defined(__aarch64__) ++ case __NR_faccessat: + case __NR_openat: + return Allow(); + default: +@@ -130,13 +133,13 @@ CrosArmGpuProcessPolicy::CrosArmGpuProce + CrosArmGpuProcessPolicy::~CrosArmGpuProcessPolicy() {} + + ResultExpr CrosArmGpuProcessPolicy::EvaluateSyscall(int sysno) const { +-#if defined(__arm__) ++#if defined(__arm__) || defined(__aarch64__) + if (allow_shmat_ && sysno == __NR_shmat) + return Allow(); +-#endif // defined(__arm__) ++#endif // defined(__arm__) || defined(__aarch64__) + + switch (sysno) { +-#if defined(__arm__) ++#if defined(__arm__) || defined(__aarch64__) + // ARM GPU sandbox is started earlier so we need to allow networking + // in the sandbox. + case __NR_connect: +@@ -151,7 +154,7 @@ ResultExpr CrosArmGpuProcessPolicy::Eval + const Arg domain(0); + return If(domain == AF_UNIX, Allow()).Else(Error(EPERM)); + } +-#endif // defined(__arm__) ++#endif // defined(__arm__) || defined(__aarch64__) + default: + // Default to the generic GPU policy. + return GpuProcessPolicy::EvaluateSyscall(sysno); +Index: qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/content/common/sandbox_linux/bpf_gpu_policy_linux.cc +=================================================================== +--- qtwebengine-opensource-src-5.5.0.orig/src/3rdparty/chromium/content/common/sandbox_linux/bpf_gpu_policy_linux.cc ++++ qtwebengine-opensource-src-5.5.0/src/3rdparty/chromium/content/common/sandbox_linux/bpf_gpu_policy_linux.cc +@@ -92,6 +92,7 @@ intptr_t GpuSIGSYS_Handler(const struct + BrokerProcess* broker_process = + static_cast(aux_broker_process); + switch (args.nr) { ++#if !defined(__aarch64__) + case __NR_access: + return broker_process->Access(reinterpret_cast(args.args[0]), + static_cast(args.args[1])); +@@ -102,6 +103,15 @@ intptr_t GpuSIGSYS_Handler(const struct + #endif + return broker_process->Open(reinterpret_cast(args.args[0]), + static_cast(args.args[1])); ++#endif // !defined(__aarch64__) ++ case __NR_faccessat: ++ if (static_cast(args.args[0]) == AT_FDCWD) { ++ return ++ broker_process->Access(reinterpret_cast(args.args[1]), ++ static_cast(args.args[2])); ++ } else { ++ return -EPERM; ++ } + case __NR_openat: + // Allow using openat() as open(). + if (static_cast(args.args[0]) == AT_FDCWD) { +@@ -136,8 +146,11 @@ class GpuBrokerProcessPolicy : public Gp + // openat allowed. + ResultExpr GpuBrokerProcessPolicy::EvaluateSyscall(int sysno) const { + switch (sysno) { ++#if !defined(__aarch64__) + case __NR_access: + case __NR_open: ++#endif // !defined(__aarch64__) ++ case __NR_faccessat: + case __NR_openat: + return Allow(); + default: +@@ -201,8 +214,11 @@ ResultExpr GpuProcessPolicy::EvaluateSys + // TODO(jln): restrict prctl. + case __NR_prctl: + return Allow(); ++#if !defined(__aarch64__) + case __NR_access: + case __NR_open: ++#endif // !defined(__aarch64__) ++ case __NR_faccessat: + case __NR_openat: + DCHECK(broker_process_); + return Trap(GpuSIGSYS_Handler, broker_process_);