From patchwork Sat Mar 2 02:50:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 159520 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1449735jad; Fri, 1 Mar 2019 18:50:54 -0800 (PST) X-Google-Smtp-Source: APXvYqwJr62ZFSakEFWY+VTXdSXmpxnqgp2o2IW+kT45m0G5EyFjVWqRuJcQ84HifQ57OFnUbzEn X-Received: by 2002:a17:902:20e2:: with SMTP id v31mr8911415plg.307.1551495054646; Fri, 01 Mar 2019 18:50:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551495054; cv=none; d=google.com; s=arc-20160816; b=JU4FWcu4xAJSxVaVs7yxrD2bYp3rYNX4068KJ/AUkmtpAtuYcr83A77S4nV/I3NI/K o2qGY8xEGvgI4V8bbm+2PNH2h5SHP/tOg13Q9x10rs5UulGsOGIuz5xnfl8z95nESaJx XBSYyKk0FDO0S4Epnp1ZNQ8kVU21wiVPLKi+rWwRVCJXYa+lXZe7gLpXfWBT0EYmC0kL WBgPGNyO7qXRK6xAcY4EZeCRDLSDyWQum8+qjNS2F743IECYcOYriy5nMhNHVojzTptz RUzC8RJDpWit64hNDTn49lL8OypbnjONDjbN3EAdBes5Ca4Fpd+WxxDySlx7FLWIBbjq EEAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=hgB3xACS6V7bSxc90lTXM6LO2b+/xbZURDlVGCnGj+k=; b=r9sxWlBWiloSi4gCP91izgMjAdXJWGY0EJihiJ8jwkAstu4OvYWijBTMi98ssg2+yO OkT+2mUZARCpeyU9B06EVS6ZPtqe5SDQZ/SAjx4KP4R10bXO0r5MvG+6gRMISSgcTIsb ZxdoAqZmaMzFK3Dw8Ds/SBhd4F4v9lzkwrgLFeGNUgMZr4iw+eO3vghAsIh928kDoP2X 40urQfgJ5/+NhODul9mXdod+ad0UhtF6LGBSF6uCML6f+GMJfCJYJ7+zkuDICaM6lU8q XxBwCM7cZIzKWWAswd1xv3W+pTpo3etm9G2QGUhdZATyuLT51X/b8eMiZn4Pi82Jy0E1 SOIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=iM+uIAdn; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id p1si21813865plk.260.2019.03.01.18.50.54; Fri, 01 Mar 2019 18:50:54 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=iM+uIAdn; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 85BD87CDDC; Sat, 2 Mar 2019 02:50:49 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by mail.openembedded.org (Postfix) with ESMTP id 9C3BB7C711 for ; Sat, 2 Mar 2019 02:50:45 +0000 (UTC) Received: by mail-pg1-f195.google.com with SMTP id q206so12327124pgq.4 for ; Fri, 01 Mar 2019 18:50:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Fz02L0stCsPplG8FZao1GW0NPiYFbqoYwNhINTd88fU=; b=iM+uIAdniMDV1bAI31h+qc/yWSsGpyvBb5Mf6YsoA8aETna49o0MUAA8ewIPI9ixJS CGMFtK47BkFXfRW/ikrn3Md+PSgi7dCwljVOuKf/hg2Pajs7Q0OVI3CgUJ3IyWt/YdX7 xKZ6nBsEAWwvCFKAMQ235Wbid86C36dHltEVn7E+l181AExHY7aEvQHYwKycTDWuYkqC PM3wDTu+98Eg9WZOMWoJizkz7uNMsqCK0//qkzo3v890PZhFrUYcxnPAzSKBkLWq8pnF 0m1rZRorWfqFmzLPjiECRDrIxPnuD8xyDwkNTiz4fzYH2vXcDcbe8LIvkBajMZrWBNjb NP2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=Fz02L0stCsPplG8FZao1GW0NPiYFbqoYwNhINTd88fU=; b=p5xeUE2HZDCSzpMPjaxTG/Q5xLhADTVCfPxSwJ0H0fm2GAKPfr1ReUvUAbtLEZJo/s B+vtfQctzCe/FEjjmLogSTLTo5o3npWTT80+oREpZmOhYnQvpeaHofsfZgYN02itwdso wWGgWmDnVsJn2EhAcScO+FoNT0TJ1adkubgMws7woqtdObR/ZZOp64w9+tNB1uwYBgm7 Du1/ZP/h/nG/6OjTWwdIzO+EWS5MBVAFpEH2VTVSo+YJo3OPc9FPnqaGrwZiOwqOGDfh 4ILysM/OIHp5uTA5bs5lgFMDgJ68kY5jPDcdcPkxrKVMMVxVMzf6af5bHzFIqoEFXMwv QuDg== X-Gm-Message-State: APjAAAUgNzZKyLodow6WIE4vNtSY9nciskNDvkUeEvEylZpCfCRRpnhq H9ePBbH9CdYlJB5kaM0Ov6Xa9qAd X-Received: by 2002:a63:61c9:: with SMTP id v192mr8227201pgb.120.1551495045851; Fri, 01 Mar 2019 18:50:45 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::5fa3]) by smtp.gmail.com with ESMTPSA id z7sm46600905pfl.4.2019.03.01.18.50.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2019 18:50:45 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 1 Mar 2019 18:50:32 -0800 Message-Id: <20190302025034.10954-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 1/3] glm: Upgrade to 0.9.9.3 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Drop local patches, they were not accepted upstream Fix build with clang while here Signed-off-by: Khem Raj Cc: Andreas Müller --- ...E_EXPERIMENTAL-a-configurable-option.patch | 860 ------------------ .../files/0002-glm-install-headers-only.patch | 46 - ...-Remove-redundant-double-semi-colons.patch | 120 +++ .../glm/{glm_0.9.9-a2.bb => glm_0.9.9.3.bb} | 8 +- 4 files changed, 123 insertions(+), 911 deletions(-) delete mode 100644 meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch delete mode 100644 meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch create mode 100644 meta-oe/recipes-graphics/glm/glm/0001-glm-Remove-redundant-double-semi-colons.patch rename meta-oe/recipes-graphics/glm/{glm_0.9.9-a2.bb => glm_0.9.9.3.bb} (72%) diff --git a/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch b/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch deleted file mode 100644 index d69c5af3af..0000000000 --- a/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch +++ /dev/null @@ -1,860 +0,0 @@ -From 99a9676a0193f6291d7202d7af72e24580abe565 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 16 Mar 2018 13:55:29 +0100 -Subject: [PATCH 1/2] Make GLM_ENABLE_EXPERIMENTAL a configurable option -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It seems that erroring out if GLM_ENABLE_EXPERIMENTAL is not set turns into -packagers nightmare: There are packages around expecting glx headers. E.g -libgltf [1] fails during configure checking for usable headers AND during -compile. Paticularly fixing configure for those packages is time-consuming: -The only way (correct me if I am wrong) is creating a patch adding - -AC_DEFINE([GLM_ENABLE_EXPERIMENTAL], [1], [glm needs this for gtx headers]) - -By adding a configure option 'GLM_ENABLE_EXPERIMENTAL', the decision to use -glm/glx is done at one (and the right) place. - -Signed-off-by: Andreas Müller - -[1] https://gerrit.libreoffice.org/gitweb?p=libgltf.git - -Uptream-Status: Submitted [2] - -[2] https://github.com/g-truc/glm/pull/741 ---- - CMakeLists.txt | 6 ++++++ - glm/CMakeLists.txt | 2 ++ - glm/experimental.hpp.in | 1 + - glm/ext.hpp | 1 + - glm/gtx/associated_min_max.hpp | 1 + - glm/gtx/bit.hpp | 1 + - glm/gtx/closest_point.hpp | 1 + - glm/gtx/color_space.hpp | 1 + - glm/gtx/color_space_YCoCg.hpp | 1 + - glm/gtx/common.hpp | 1 + - glm/gtx/compatibility.hpp | 1 + - glm/gtx/component_wise.hpp | 1 + - glm/gtx/dual_quaternion.hpp | 1 + - glm/gtx/euler_angles.hpp | 1 + - glm/gtx/extend.hpp | 1 + - glm/gtx/extended_min_max.hpp | 1 + - glm/gtx/fast_exponential.hpp | 1 + - glm/gtx/fast_square_root.hpp | 1 + - glm/gtx/fast_trigonometry.hpp | 1 + - glm/gtx/gradient_paint.hpp | 1 + - glm/gtx/handed_coordinate_space.hpp | 1 + - glm/gtx/hash.hpp | 1 + - glm/gtx/integer.hpp | 1 + - glm/gtx/intersect.hpp | 1 + - glm/gtx/io.hpp | 1 + - glm/gtx/log_base.hpp | 1 + - glm/gtx/matrix_cross_product.hpp | 1 + - glm/gtx/matrix_decompose.hpp | 1 + - glm/gtx/matrix_factorisation.hpp | 1 + - glm/gtx/matrix_interpolation.hpp | 1 + - glm/gtx/matrix_major_storage.hpp | 1 + - glm/gtx/matrix_operation.hpp | 1 + - glm/gtx/matrix_query.hpp | 1 + - glm/gtx/matrix_transform_2d.hpp | 1 + - glm/gtx/mixed_product.hpp | 1 + - glm/gtx/norm.hpp | 1 + - glm/gtx/normal.hpp | 1 + - glm/gtx/normalize_dot.hpp | 1 + - glm/gtx/number_precision.hpp | 1 + - glm/gtx/optimum_pow.hpp | 1 + - glm/gtx/orthonormalize.hpp | 1 + - glm/gtx/perpendicular.hpp | 1 + - glm/gtx/polar_coordinates.hpp | 1 + - glm/gtx/projection.hpp | 1 + - glm/gtx/quaternion.hpp | 1 + - glm/gtx/range.hpp | 1 + - glm/gtx/raw_data.hpp | 1 + - glm/gtx/rotate_normalized_axis.hpp | 1 + - glm/gtx/rotate_vector.hpp | 1 + - glm/gtx/scalar_multiplication.hpp | 1 + - glm/gtx/scalar_relational.hpp | 1 + - glm/gtx/spline.hpp | 1 + - glm/gtx/std_based_type.hpp | 1 + - glm/gtx/string_cast.hpp | 1 + - glm/gtx/texture.hpp | 1 + - glm/gtx/transform.hpp | 1 + - glm/gtx/transform2.hpp | 1 + - glm/gtx/type_aligned.hpp | 1 + - glm/gtx/type_trait.hpp | 1 + - glm/gtx/vec_swizzle.hpp | 1 + - glm/gtx/vector_angle.hpp | 1 + - glm/gtx/vector_query.hpp | 1 + - glm/gtx/wrap.hpp | 1 + - 63 files changed, 69 insertions(+) - create mode 100644 glm/experimental.hpp.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5159b0f..bd4dd654 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -82,6 +82,11 @@ option(GLM_TEST_ENABLE_SIMD_AVX "Enable AVX optimizations" OFF) - option(GLM_TEST_ENABLE_SIMD_AVX2 "Enable AVX2 optimizations" OFF) - option(GLM_TEST_FORCE_PURE "Force 'pure' instructions" OFF) - -+option(GLM_ENABLE_EXPERIMENTAL "Enable experimental GLM_GTX" OFF) -+configure_file(glm/experimental.hpp.in experimental.hpp @ONLY) -+include_directories(${CMAKE_BINARY_DIR}/glm) -+include_directories(${CMAKE_BINARY_DIR}) -+ - if(GLM_TEST_FORCE_PURE) - add_definitions(-DGLM_FORCE_PURE) - -@@ -167,6 +172,7 @@ option(GLM_INSTALL_ENABLE "GLM install" ON) - set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm") - if (GLM_INSTALL_ENABLE) - install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/experimental.hpp" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glm) - endif() - - write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" VERSION ${GLM_VERSION} COMPATIBILITY AnyNewerVersion) -diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt -index df9c9ee5..dc5db4bc 100644 ---- a/glm/CMakeLists.txt -+++ b/glm/CMakeLists.txt -@@ -43,6 +43,8 @@ source_group("SIMD Files" FILES ${SIMD_INLINE}) - source_group("SIMD Files" FILES ${SIMD_HEADER}) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) -+# make out-of tree builds find experimental.hpp -+include_directories(${CMAKE_BINARY_DIR}/glm) - - if(GLM_STATIC_LIBRARY_ENABLE OR GLM_DYNAMIC_LIBRARY_ENABLE) - if(GLM_STATIC_LIBRARY_ENABLE) -diff --git a/glm/experimental.hpp.in b/glm/experimental.hpp.in -new file mode 100644 -index 00000000..bfab5138 ---- /dev/null -+++ b/glm/experimental.hpp.in -@@ -0,0 +1 @@ -+#cmakedefine GLM_ENABLE_EXPERIMENTAL -diff --git a/glm/ext.hpp b/glm/ext.hpp -index d085bfd5..a2948447 100644 ---- a/glm/ext.hpp -+++ b/glm/ext.hpp -@@ -39,6 +39,7 @@ - # include "./gtc/type_aligned.hpp" - #endif - -+#include "experimental.hpp" - #ifdef GLM_ENABLE_EXPERIMENTAL - #include "./gtx/associated_min_max.hpp" - #include "./gtx/bit.hpp" -diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp -index 0c9935f3..d00c2bc4 100644 ---- a/glm/gtx/associated_min_max.hpp -+++ b/glm/gtx/associated_min_max.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GTX_associated_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp -index 1447fa00..31957083 100644 ---- a/glm/gtx/bit.hpp -+++ b/glm/gtx/bit.hpp -@@ -15,6 +15,7 @@ - // Dependencies - #include "../gtc/bitfield.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_bit is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp -index 6859bb96..ebd9fe5a 100644 ---- a/glm/gtx/closest_point.hpp -+++ b/glm/gtx/closest_point.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp -index d1e655c3..51416819 100644 ---- a/glm/gtx/color_space.hpp -+++ b/glm/gtx/color_space.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_color_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp -index e82cbd8b..7ae71041 100644 ---- a/glm/gtx/color_space_YCoCg.hpp -+++ b/glm/gtx/color_space_YCoCg.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_color_space_YCoCg is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/common.hpp b/glm/gtx/common.hpp -index 8081bff7..57a68a8d 100644 ---- a/glm/gtx/common.hpp -+++ b/glm/gtx/common.hpp -@@ -18,6 +18,7 @@ - #include "../vec4.hpp" - #include "../gtc/vec1.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_common is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp -index e5b60399..9876669c 100644 ---- a/glm/gtx/compatibility.hpp -+++ b/glm/gtx/compatibility.hpp -@@ -16,6 +16,7 @@ - #include "../glm.hpp" - #include "../gtc/quaternion.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_compatibility is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp -index 39bab5d5..4fe0e4e2 100644 ---- a/glm/gtx/component_wise.hpp -+++ b/glm/gtx/component_wise.hpp -@@ -18,6 +18,7 @@ - #include "../detail/setup.hpp" - #include "../detail/qualifier.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp -index c4343e9d..d59fb459 100644 ---- a/glm/gtx/dual_quaternion.hpp -+++ b/glm/gtx/dual_quaternion.hpp -@@ -20,6 +20,7 @@ - #include "../gtc/constants.hpp" - #include "../gtc/quaternion.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_dual_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp -index e66e9281..ad5988c1 100644 ---- a/glm/gtx/euler_angles.hpp -+++ b/glm/gtx/euler_angles.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_euler_angles is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp -index eda4e470..cde6db63 100644 ---- a/glm/gtx/extend.hpp -+++ b/glm/gtx/extend.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/extended_min_max.hpp b/glm/gtx/extended_min_max.hpp -index 3e767b0c..0bcffcc6 100644 ---- a/glm/gtx/extended_min_max.hpp -+++ b/glm/gtx/extended_min_max.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_extented_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp -index 2d4918e7..e6d11f0a 100644 ---- a/glm/gtx/fast_exponential.hpp -+++ b/glm/gtx/fast_exponential.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_fast_exponential is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp -index 1e1ec3cf..f758aeef 100644 ---- a/glm/gtx/fast_square_root.hpp -+++ b/glm/gtx/fast_square_root.hpp -@@ -19,6 +19,7 @@ - #include "../exponential.hpp" - #include "../geometric.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_fast_square_root is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp -index 739065fb..f1332958 100644 ---- a/glm/gtx/fast_trigonometry.hpp -+++ b/glm/gtx/fast_trigonometry.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../gtc/constants.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_fast_trigonometry is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp -index 2713cec0..d4703991 100644 ---- a/glm/gtx/gradient_paint.hpp -+++ b/glm/gtx/gradient_paint.hpp -@@ -17,6 +17,7 @@ - #include "../glm.hpp" - #include "../gtx/optimum_pow.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_gradient_paint is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp -index 1d0d4104..3a52ddcf 100644 ---- a/glm/gtx/handed_coordinate_space.hpp -+++ b/glm/gtx/handed_coordinate_space.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_handed_coordinate_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp -index fe8a3efd..92bfc9b2 100644 ---- a/glm/gtx/hash.hpp -+++ b/glm/gtx/hash.hpp -@@ -12,6 +12,7 @@ - - #pragma once - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_hash is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp -index 96637a13..5d1a16c6 100644 ---- a/glm/gtx/integer.hpp -+++ b/glm/gtx/integer.hpp -@@ -16,6 +16,7 @@ - #include "../glm.hpp" - #include "../gtc/integer.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_integer is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp -index 61e2226a..4895ba93 100644 ---- a/glm/gtx/intersect.hpp -+++ b/glm/gtx/intersect.hpp -@@ -21,6 +21,7 @@ - #include "../gtx/closest_point.hpp" - #include "../gtx/vector_query.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp -index 49a1ec11..ae39cd60 100644 ---- a/glm/gtx/io.hpp -+++ b/glm/gtx/io.hpp -@@ -23,6 +23,7 @@ - #include "../glm.hpp" - #include "../gtx/quaternion.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_io is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp -index e873e356..45b8d53c 100644 ---- a/glm/gtx/log_base.hpp -+++ b/glm/gtx/log_base.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_log_base is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp -index 967743b8..52d6c173 100644 ---- a/glm/gtx/matrix_cross_product.hpp -+++ b/glm/gtx/matrix_cross_product.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_cross_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_decompose.hpp b/glm/gtx/matrix_decompose.hpp -index b7ec0e83..6793fee2 100644 ---- a/glm/gtx/matrix_decompose.hpp -+++ b/glm/gtx/matrix_decompose.hpp -@@ -20,6 +20,7 @@ - #include "../gtc/quaternion.hpp" - #include "../gtc/matrix_transform.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_decompose is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_factorisation.hpp b/glm/gtx/matrix_factorisation.hpp -index e30a7746..79c293be 100644 ---- a/glm/gtx/matrix_factorisation.hpp -+++ b/glm/gtx/matrix_factorisation.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_factorisation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp -index 89c4596c..799983bb 100644 ---- a/glm/gtx/matrix_interpolation.hpp -+++ b/glm/gtx/matrix_interpolation.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_interpolation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp -index 7f264a59..e68467cd 100644 ---- a/glm/gtx/matrix_major_storage.hpp -+++ b/glm/gtx/matrix_major_storage.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_major_storage is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp -index bce938bb..1e85bb5e 100644 ---- a/glm/gtx/matrix_operation.hpp -+++ b/glm/gtx/matrix_operation.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_operation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp -index 5df5f52f..eec1eec0 100644 ---- a/glm/gtx/matrix_query.hpp -+++ b/glm/gtx/matrix_query.hpp -@@ -18,6 +18,7 @@ - #include "../gtx/vector_query.hpp" - #include - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_transform_2d.hpp b/glm/gtx/matrix_transform_2d.hpp -index 239ab9f4..3ca8d2f2 100644 ---- a/glm/gtx/matrix_transform_2d.hpp -+++ b/glm/gtx/matrix_transform_2d.hpp -@@ -17,6 +17,7 @@ - #include "../mat3x3.hpp" - #include "../vec2.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_transform_2d is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp -index 58562aab..5c7460d5 100644 ---- a/glm/gtx/mixed_product.hpp -+++ b/glm/gtx/mixed_product.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_mixed_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp -index 46474e07..3cf2c3ea 100644 ---- a/glm/gtx/norm.hpp -+++ b/glm/gtx/norm.hpp -@@ -17,6 +17,7 @@ - #include "../geometric.hpp" - #include "../gtx/quaternion.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_norm is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp -index 15cec9c2..7bb4c096 100644 ---- a/glm/gtx/normal.hpp -+++ b/glm/gtx/normal.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_normal is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp -index 86048e70..c6604da4 100644 ---- a/glm/gtx/normalize_dot.hpp -+++ b/glm/gtx/normalize_dot.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../gtx/fast_square_root.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_normalize_dot is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp -index 3732a56c..b48845f7 100644 ---- a/glm/gtx/number_precision.hpp -+++ b/glm/gtx/number_precision.hpp -@@ -18,6 +18,7 @@ - #include "../glm.hpp" - #include "../gtc/type_precision.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_number_precision is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp -index eb09f1c3..94a6bbb2 100644 ---- a/glm/gtx/optimum_pow.hpp -+++ b/glm/gtx/optimum_pow.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_optimum_pow is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp -index 2a684ee4..4ff47e53 100644 ---- a/glm/gtx/orthonormalize.hpp -+++ b/glm/gtx/orthonormalize.hpp -@@ -18,6 +18,7 @@ - #include "../mat3x3.hpp" - #include "../geometric.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_orthonormalize is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp -index 35601ac7..17251ebe 100644 ---- a/glm/gtx/perpendicular.hpp -+++ b/glm/gtx/perpendicular.hpp -@@ -17,6 +17,7 @@ - #include "../glm.hpp" - #include "../gtx/projection.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_perpendicular is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp -index b8421db4..5125215d 100644 ---- a/glm/gtx/polar_coordinates.hpp -+++ b/glm/gtx/polar_coordinates.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_polar_coordinates is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp -index 9a24abf9..4d5bf76f 100644 ---- a/glm/gtx/projection.hpp -+++ b/glm/gtx/projection.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../geometric.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_projection is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp -index c3d99a5c..808ba0fd 100644 ---- a/glm/gtx/quaternion.hpp -+++ b/glm/gtx/quaternion.hpp -@@ -19,6 +19,7 @@ - #include "../gtc/quaternion.hpp" - #include "../gtx/norm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/range.hpp b/glm/gtx/range.hpp -index e0ef46af..03c797c3 100644 ---- a/glm/gtx/range.hpp -+++ b/glm/gtx/range.hpp -@@ -15,6 +15,7 @@ - // Dependencies - #include "../detail/setup.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_range is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp -index fb34c8cb..0084fec6 100644 ---- a/glm/gtx/raw_data.hpp -+++ b/glm/gtx/raw_data.hpp -@@ -16,6 +16,7 @@ - #include "../detail/setup.hpp" - #include "../detail/type_int.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_raw_data is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp -index eee90d6e..82612928 100644 ---- a/glm/gtx/rotate_normalized_axis.hpp -+++ b/glm/gtx/rotate_normalized_axis.hpp -@@ -19,6 +19,7 @@ - #include "../gtc/epsilon.hpp" - #include "../gtc/quaternion.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_rotate_normalized_axis is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp -index c8ace89e..e954b041 100644 ---- a/glm/gtx/rotate_vector.hpp -+++ b/glm/gtx/rotate_vector.hpp -@@ -17,6 +17,7 @@ - #include "../glm.hpp" - #include "../gtx/transform.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_rotate_vector is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp -index b73edf67..22baa52a 100644 ---- a/glm/gtx/scalar_multiplication.hpp -+++ b/glm/gtx/scalar_multiplication.hpp -@@ -16,6 +16,7 @@ - - #include "../detail/setup.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_scalar_multiplication is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/scalar_relational.hpp b/glm/gtx/scalar_relational.hpp -index 7fc8c1cc..f21f3b2b 100644 ---- a/glm/gtx/scalar_relational.hpp -+++ b/glm/gtx/scalar_relational.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp -index f96d7e07..76359cfd 100644 ---- a/glm/gtx/spline.hpp -+++ b/glm/gtx/spline.hpp -@@ -16,6 +16,7 @@ - #include "../glm.hpp" - #include "../gtx/optimum_pow.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_spline is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp -index 55a2f074..92532b9e 100644 ---- a/glm/gtx/std_based_type.hpp -+++ b/glm/gtx/std_based_type.hpp -@@ -17,6 +17,7 @@ - #include "../glm.hpp" - #include - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_std_based_type is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp -index 4b4e280f..dfcd5085 100644 ---- a/glm/gtx/string_cast.hpp -+++ b/glm/gtx/string_cast.hpp -@@ -24,6 +24,7 @@ - #include - #include - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/texture.hpp b/glm/gtx/texture.hpp -index 312bf398..7af185f6 100644 ---- a/glm/gtx/texture.hpp -+++ b/glm/gtx/texture.hpp -@@ -17,6 +17,7 @@ - #include "../gtc/integer.hpp" - #include "../gtx/component_wise.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_texture is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp -index d23b99ce..5a5d9619 100644 ---- a/glm/gtx/transform.hpp -+++ b/glm/gtx/transform.hpp -@@ -19,6 +19,7 @@ - #include "../glm.hpp" - #include "../gtc/matrix_transform.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_transform is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp -index 85f5bea4..5d7c83fc 100644 ---- a/glm/gtx/transform2.hpp -+++ b/glm/gtx/transform2.hpp -@@ -17,6 +17,7 @@ - #include "../glm.hpp" - #include "../gtx/transform.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_transform2 is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/type_aligned.hpp b/glm/gtx/type_aligned.hpp -index 6ff9f276..6ad92fad 100644 ---- a/glm/gtx/type_aligned.hpp -+++ b/glm/gtx/type_aligned.hpp -@@ -18,6 +18,7 @@ - // Dependency: - #include "../gtc/type_precision.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_type_aligned is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp -index 637bbd19..65519cab 100644 ---- a/glm/gtx/type_trait.hpp -+++ b/glm/gtx/type_trait.hpp -@@ -12,6 +12,7 @@ - - #pragma once - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_type_trait is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/vec_swizzle.hpp b/glm/gtx/vec_swizzle.hpp -index daebac38..13d523dc 100644 ---- a/glm/gtx/vec_swizzle.hpp -+++ b/glm/gtx/vec_swizzle.hpp -@@ -14,6 +14,7 @@ - - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_vec_swizzle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp -index 401a47eb..98c9d110 100644 ---- a/glm/gtx/vector_angle.hpp -+++ b/glm/gtx/vector_angle.hpp -@@ -20,6 +20,7 @@ - #include "../gtx/quaternion.hpp" - #include "../gtx/rotate_vector.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_vector_angle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp -index 6560eaa5..5ab1ffda 100644 ---- a/glm/gtx/vector_query.hpp -+++ b/glm/gtx/vector_query.hpp -@@ -17,6 +17,7 @@ - #include - #include - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_vector_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp -index 2c4b55df..5bf26a33 100644 ---- a/glm/gtx/wrap.hpp -+++ b/glm/gtx/wrap.hpp -@@ -16,6 +16,7 @@ - #include "../glm.hpp" - #include "../gtc/vec1.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_wrap is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif --- -2.14.3 - diff --git a/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch b/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch deleted file mode 100644 index 1be3318cc1..0000000000 --- a/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7fdd36d7496238e03e43fcc32839f75588116c5d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Fri, 16 Mar 2018 15:44:48 +0100 -Subject: [PATCH 2/2] glm: install headers only -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Plausibility check in root source path - -$ find glm -type f ! -name '*.hpp' ! -name '*.h' ! -name '*.inl' -glm/detail/glm.cpp -glm/detail/dummy.cpp -glm/experimental.hpp.in -glm/CMakeLists.txt - -Signed-off-by: Andreas Müller - -Uptream-Status: Submitted [1] - -[1] https://github.com/g-truc/glm/pull/741 ---- - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd4dd654..113dd735 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -171,7 +171,12 @@ option(GLM_INSTALL_ENABLE "GLM install" ON) - - set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm") - if (GLM_INSTALL_ENABLE) -- install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+ install(DIRECTORY glm -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -+ FILES_MATCHING -+ PATTERN "*.h" -+ PATTERN "*.hpp" -+ PATTERN "*.inl") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/experimental.hpp" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glm) - endif() - --- -2.14.3 - diff --git a/meta-oe/recipes-graphics/glm/glm/0001-glm-Remove-redundant-double-semi-colons.patch b/meta-oe/recipes-graphics/glm/glm/0001-glm-Remove-redundant-double-semi-colons.patch new file mode 100644 index 0000000000..6e50f2cf23 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/0001-glm-Remove-redundant-double-semi-colons.patch @@ -0,0 +1,120 @@ +From 3f6869e392b061f2932f3df155b6cc37e3e7d342 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 1 Mar 2019 10:56:05 -0800 +Subject: [PATCH] glm: Remove redundant double semi-colons + +Make clang happy +/glm/gtc/../ext/../detail/../simd/common.h:106:45: error: empty expression statement has no effect; remove unnecessary ';' to silence this warning [-Werror,-Wextra-semi-stmt] +| glm_vec4 const or0 = _mm_or_ps(and0, and1);; +| ^ +| 1 error generated. + +Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/874] + +Signed-off-by: Khem Raj +--- + glm/gtx/associated_min_max.inl | 8 ++++---- + glm/simd/common.h | 2 +- + test/core/core_func_exponential.cpp | 6 +++--- + test/gtx/gtx_easing.cpp | 4 ++-- + 4 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/glm/gtx/associated_min_max.inl b/glm/gtx/associated_min_max.inl +index 1a459add..5186c471 100644 +--- a/glm/gtx/associated_min_max.inl ++++ b/glm/gtx/associated_min_max.inl +@@ -86,7 +86,7 @@ GLM_FUNC_QUALIFIER U associatedMin + ) + { + T Test1 = min(x, y); +- T Test2 = min(z, w);; ++ T Test2 = min(z, w); + U Result1 = x < y ? a : b; + U Result2 = z < w ? c : d; + U Result = Test1 < Test2 ? Result1 : Result2; +@@ -152,7 +152,7 @@ GLM_FUNC_QUALIFIER vec associatedMin + for(length_t i = 0, n = Result.length(); i < n; ++i) + { + T Test1 = min(x[i], y[i]); +- T Test2 = min(z[i], w[i]);; ++ T Test2 = min(z[i], w[i]); + U Result1 = x[i] < y[i] ? a : b; + U Result2 = z[i] < w[i] ? c : d; + Result[i] = Test1 < Test2 ? Result1 : Result2; +@@ -278,7 +278,7 @@ GLM_FUNC_QUALIFIER U associatedMax + ) + { + T Test1 = max(x, y); +- T Test2 = max(z, w);; ++ T Test2 = max(z, w); + U Result1 = x > y ? a : b; + U Result2 = z > w ? c : d; + U Result = Test1 > Test2 ? Result1 : Result2; +@@ -344,7 +344,7 @@ GLM_FUNC_QUALIFIER vec associatedMax + for(length_t i = 0, n = Result.length(); i < n; ++i) + { + T Test1 = max(x[i], y[i]); +- T Test2 = max(z[i], w[i]);; ++ T Test2 = max(z[i], w[i]); + U Result1 = x[i] > y[i] ? a : b; + U Result2 = z[i] > w[i] ? c : d; + Result[i] = Test1 > Test2 ? Result1 : Result2; +diff --git a/glm/simd/common.h b/glm/simd/common.h +index d07920a3..9b017cb4 100644 +--- a/glm/simd/common.h ++++ b/glm/simd/common.h +@@ -103,7 +103,7 @@ GLM_FUNC_QUALIFIER glm_vec4 glm_vec4_sign(glm_vec4 x) + glm_vec4 const cmp1 = _mm_cmpgt_ps(x, zro0); + glm_vec4 const and0 = _mm_and_ps(cmp0, _mm_set1_ps(-1.0f)); + glm_vec4 const and1 = _mm_and_ps(cmp1, _mm_set1_ps(1.0f)); +- glm_vec4 const or0 = _mm_or_ps(and0, and1);; ++ glm_vec4 const or0 = _mm_or_ps(and0, and1); + return or0; + } + +diff --git a/test/core/core_func_exponential.cpp b/test/core/core_func_exponential.cpp +index a414a4e9..380cdfb1 100644 +--- a/test/core/core_func_exponential.cpp ++++ b/test/core/core_func_exponential.cpp +@@ -153,13 +153,13 @@ static int test_inversesqrt() + float A = glm::inversesqrt(16.f) * glm::sqrt(16.f); + Error += glm::equal(A, 1.f, 0.01f) ? 0 : 1; + +- glm::vec1 B = glm::inversesqrt(glm::vec1(16.f)) * glm::sqrt(16.f);; ++ glm::vec1 B = glm::inversesqrt(glm::vec1(16.f)) * glm::sqrt(16.f); + Error += glm::all(glm::equal(B, glm::vec1(1.f), 0.01f)) ? 0 : 1; + +- glm::vec2 C = glm::inversesqrt(glm::vec2(16.f)) * glm::sqrt(16.f);; ++ glm::vec2 C = glm::inversesqrt(glm::vec2(16.f)) * glm::sqrt(16.f); + Error += glm::all(glm::equal(C, glm::vec2(1.f), 0.01f)) ? 0 : 1; + +- glm::vec3 D = glm::inversesqrt(glm::vec3(16.f)) * glm::sqrt(16.f);; ++ glm::vec3 D = glm::inversesqrt(glm::vec3(16.f)) * glm::sqrt(16.f); + Error += glm::all(glm::equal(D, glm::vec3(1.f), 0.01f)) ? 0 : 1; + + glm::vec4 E = glm::inversesqrt(glm::vec4(16.f)) * glm::sqrt(16.f); +diff --git a/test/gtx/gtx_easing.cpp b/test/gtx/gtx_easing.cpp +index b3e13997..0e98cd53 100644 +--- a/test/gtx/gtx_easing.cpp ++++ b/test/gtx/gtx_easing.cpp +@@ -34,7 +34,7 @@ namespace + r = glm::circularEaseOut(a); + r = glm::circularEaseInOut(a); + +- r = glm::exponentialEaseIn(a);; ++ r = glm::exponentialEaseIn(a); + r = glm::exponentialEaseOut(a); + r = glm::exponentialEaseInOut(a); + +@@ -46,7 +46,7 @@ namespace + r = glm::backEaseOut(a); + r = glm::backEaseInOut(a); + +- r = glm::bounceEaseIn(a);; ++ r = glm::bounceEaseIn(a); + r = glm::bounceEaseOut(a); + r = glm::bounceEaseInOut(a); + } +-- +2.21.0 + diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.3.bb similarity index 72% rename from meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb rename to meta-oe/recipes-graphics/glm/glm_0.9.9.3.bb index 7f16708edb..2a26a5bc71 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.3.bb @@ -10,17 +10,15 @@ LIC_FILES_CHKSUM = "file://readme.md;beginline=21;endline=22;md5=3075b5727d36f29 SRC_URI = " \ git://github.com/g-truc/glm;branch=master \ - file://0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch \ - file://0002-glm-install-headers-only.patch \ + file://0001-glm-Remove-redundant-double-semi-colons.patch \ " -SRCREV = "fcbedf5058ef8613dd02aac62ef00d55dcfeadd7" +# v0.9.9.3 +SRCREV = "9749727c2db4742369219e1d452f43e918734b4e" S = "${WORKDIR}/git" inherit cmake -EXTRA_OECMAKE = "-DGLM_ENABLE_EXPERIMENTAL=ON" - RDEPENDS_${PN}-dev = "" BBCLASSEXTEND = "native" From patchwork Sat Mar 2 02:50:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 159521 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1450132jad; Fri, 1 Mar 2019 18:51:31 -0800 (PST) X-Google-Smtp-Source: APXvYqziAaoPLzi17GMVRoTxsgJuATlYldTn0W3ElCGawn7FXcz3N9CQbntGGidWFFbQHw19Ys0+ X-Received: by 2002:a62:1752:: with SMTP id 79mr8829556pfx.127.1551495091318; Fri, 01 Mar 2019 18:51:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551495091; cv=none; d=google.com; s=arc-20160816; b=ztmcmlUYRI9WZsENG5hFpHAK+LfXoMIzkYS26nBjQYnwJOfuXeV0FnTnfHjZ5q7Aza n2WXAFri7UiuvpYLogIFmfh0DBCzFWElRfav6H1Kjaior7PCgyV+U6mIkf6zBdduHJ6b iesmUUpP3RnhPOvim8Q7tg5jSKOw6SHxRA0gH5iJJkAw/hVXnYAGDUbRTCq0cfnHIykZ u7RKfZDN+M+Eng3dyLVzS4pOLMJdZmFXBs/nSSBUvooMOIi9kr63XRFjS355x8d1D0Ap bJ/QPZjs8RXzYrHNTaFsdzf6oSXo7jm8tZWfghoo/nU8Z/QeuulFQJvxsyOhlsvfrRd2 SzjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=laveRZsbuh5cryqKRCBzvAhE32UPwHtwPKNGz2P/TTE=; b=AelorFzlMEUXPfEYistsT7fl3vIMIASuaKKK+hpPXolkQLayj/7Ekr1GpGUcX6odgf h7nu1Vp609zlKuZwFADXPa72Yv7RcolT3n1nzXAC0Lusqkeloj1MzhsS+dVo4HR479JG Ev58DMIKSFxa9hl8l00pecrM2IRRPiTM47/mhFphqy+Esonzt/BaQUcJyDGFoP2J3mkc 3LG60ntEEwO8nm+EDyfi0IxZZhGOKPaGcVclF263z5dianpk3l70EkfFLZc8FtEfnAFQ H6tqLnBytqZx1CR3LEyWGXFctwESMg2VPal5OrXqartWDLLUxZgm+ZiM3xcOujqh/x2P 4E+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=B5R0pp44; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id q7si2456842pgc.190.2019.03.01.18.51.31; Fri, 01 Mar 2019 18:51:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=B5R0pp44; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 86FC07CDEC; Sat, 2 Mar 2019 02:51:27 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by mail.openembedded.org (Postfix) with ESMTP id 9D4EB7CDDC for ; Sat, 2 Mar 2019 02:50:46 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id r14so12341615pls.12 for ; Fri, 01 Mar 2019 18:50:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M84q0Y5bC7ZRbInZx2L871XJu64Voxzzb+z/7B7etWk=; b=B5R0pp44yrGjuSqs4RrHqnLGh1XufbHXnJN/yJOloPq2gyKHQtDVfj0Y7lOQiKRgUC ODB/HSavHuEcpf26TqjiER1RcDZpPV31NR52mON/HnjeAdDlhhlBWSgF1pVI9JG+GDlx /AITSqMtnL3JjQRL0z6hKoHuz9E6A4S7qzzVB48tAVQJXRlY//ThUmrNDV8XrwEAQ2F4 nmB9oDOopSH7ItEXMKwlXK+9Jg9UKW9fNUiCnPBgw+KN1cPsyjaVq1ri1MBwMkHE7Sai W7Dd8F1ben14EhzG8WHsirvjjBAOYPiD1Sjk+ObBDyRkSNbnNkVkkUz0Ks09CFr3BmrM eu+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=M84q0Y5bC7ZRbInZx2L871XJu64Voxzzb+z/7B7etWk=; b=j5Y0HpKwny775172KKHZgxTC1/dAnmUMO5PwItORZ3bAJcMRsO9P1rRTx4mbnsRQRB pQAldjSZhhmE8eDIR7WETkaP6EsywmgHlGsz9/X6PRSspHonXLVN2WjPfLdRFkgtNlgt +1FOM7AaSDyaDNjgno+K9JO6ua6+aR7DvWdJ2K02YojCdf/1//sdPT0cdPLa9QruHPTK F27DGtpeZ21QEel9EzkUxQhwCB7G2Co2JwuEJXnS2iDVoRlIDo+f3jzC6WDZBXvsF32n hY2Ox9WQqN31EwWajAUaVOiG1SdyX9wFH5nb+55nsVA0e4qKoFjCiBEdTLn9AYfwCY4s 2k/w== X-Gm-Message-State: APjAAAXGFCc99gCKTxLsVnITWIYE6yjaWglpzGCRL3oW4i5tYeWylqC7 TPwhwjIIHoNa2y8eVwRu0PPC2QP9 X-Received: by 2002:a17:902:7889:: with SMTP id q9mr9047639pll.305.1551495046757; Fri, 01 Mar 2019 18:50:46 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::5fa3]) by smtp.gmail.com with ESMTPSA id z7sm46600905pfl.4.2019.03.01.18.50.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2019 18:50:46 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 1 Mar 2019 18:50:33 -0800 Message-Id: <20190302025034.10954-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190302025034.10954-1-raj.khem@gmail.com> References: <20190302025034.10954-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-multimedia][PATCH 2/3] vlc: Upgrade to 3.0.6 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Drop upstreamed patches or fixed differently upstream Signed-off-by: Khem Raj --- .../recipes-multimedia/vlc/vlc.inc | 18 +- .../vlc/vlc/0001-enable-subdir-objects.patch | 13 - .../0002-glibc-does-not-provide-strlcpy.patch | 12 +- .../vlc/vlc/0003-use-am-path-libgcrypt.patch | 46 --- ...04-modules-gui-qt4-out-of-tree-build.patch | 19 -- .../vlc/0005-libpostproc-header-check.patch | 12 +- .../vlc/vlc/0008-fix-luaL-checkint.patch | 234 ++++++-------- ...-swscale-use-AV_PIX_FMT-consistently.patch | 293 ------------------ ...010-SWSCALE-fix-compilation-with-4.x.patch | 45 --- .../recipes-multimedia/vlc/vlc_2.2.2.bb | 19 -- .../recipes-multimedia/vlc/vlc_3.0.6.bb | 14 + 11 files changed, 127 insertions(+), 598 deletions(-) delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0001-enable-subdir-objects.patch delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch delete mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb create mode 100644 meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index f13c0ead6e..19ac8206c6 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -5,7 +5,7 @@ SECTION = "multimedia" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "fribidi libtool libgcrypt libgcrypt-native \ +DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ dbus dbus-glib libxml2 gnutls \ tremor faad2 ffmpeg flac fluidsynth alsa-lib \ lua-native lua libidn \ @@ -21,12 +21,12 @@ SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz" inherit autotools gettext pkgconfig distro_features_check ARM_INSTRUCTION_SET = "arm" - +export BUILDCC = "${BUILD_CC}" EXTRA_OECONF = "\ --enable-run-as-root \ --enable-xvideo \ --disable-screen --disable-caca \ - --enable-httpd --enable-vlm \ + --enable-vlm \ --enable-freetype \ --enable-tremor \ --enable-v4l2 --disable-aa --disable-faad \ @@ -35,22 +35,22 @@ EXTRA_OECONF = "\ --without-kde-solid \ --enable-realrtsp \ --disable-libtar \ + --enable-avcodec \ ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ " -PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 sdl vdpau', '', d)}" +PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" + PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" -PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,virtual/libsdl libsdl-image " PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" PACKAGECONFIG[live555] = "--enable-live555,--disable-live555,live555" PACKAGECONFIG[libass] = "--enable-libass,--disable-libass,libass" -PACKAGECONFIG[mkv] = "--enable-mkv,--disable-mkv,libmatroska libebml" PACKAGECONFIG[postproc] = "--enable-postproc,--disable-postproc,libpostproc" +PACKAGECONFIG[libva] = "--enable-libva,--disable-libva,libva" PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv" -PACKAGECONFIG[libva] = "--enable-libva --enable-avcodec,--disable-libva --disable-avcodec,libva libav" PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex" PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad" PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx" @@ -81,7 +81,6 @@ do_configure_prepend() { } do_configure_append() { - sed -i -e s:'$(MOC) $(DEFS) $(CPPFLAGS)':'$(MOC) $(DEFS)'\ -I${B}/include\ -DSYS_LINUX:g ${B}/modules/gui/qt4/Makefile sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool } @@ -94,10 +93,11 @@ FILES_libvlc = "${libdir}/lib*.so.*" FILES_${PN} += "\ ${bindir}/vlc \ + ${libdir}/vlc/vlc/libvlc_vdpau.so \ ${datadir}/applications \ ${datadir}/vlc/ \ ${datadir}/icons \ - ${lindir}/vlc/vlc/libvlc_vdpau.so \ + ${datadir}/metainfo/vlc.appdata.xml \ " FILES_${PN}-dbg += "\ diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-enable-subdir-objects.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-enable-subdir-objects.patch deleted file mode 100644 index 9f0e708ed7..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-enable-subdir-objects.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: vlc-2.1.2/configure.ac -=================================================================== ---- vlc-2.1.2.orig/configure.ac -+++ vlc-2.1.2/configure.ac -@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD - AC_CANONICAL_HOST - AC_PRESERVE_HELP_ORDER - --AM_INIT_AUTOMAKE(tar-ustar color-tests foreign) -+AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects) - AC_CONFIG_HEADERS([config.h]) - - # Disable with "./configure --disable-silent-rules" or "make V=1" diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch index 6d2a46fb3c..3db3df34b2 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-glibc-does-not-provide-strlcpy.patch @@ -1,8 +1,6 @@ -Index: vlc-2.1.2/src/input/subtitles.c -=================================================================== ---- vlc-2.1.2.orig/src/input/subtitles.c -+++ vlc-2.1.2/src/input/subtitles.c -@@ -44,6 +44,12 @@ +--- a/src/input/subtitles.c ++++ b/src/input/subtitles.c +@@ -42,6 +42,12 @@ #include "input_internal.h" /** @@ -12,6 +10,6 @@ Index: vlc-2.1.2/src/input/subtitles.c +#define strlcpy(dst, src, n) *((char* ) mempcpy(dst, src, n)) = '\0' + +/** - * We are not going to autodetect more subtitle files than this. + * The possible extensions for subtitle files we support */ - #define MAX_SUBTITLE_FILES 128 + static const char *const sub_exts[] = { SLAVE_SPU_EXTENSIONS, "" }; diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch deleted file mode 100644 index 8e881d0935..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0003-use-am-path-libgcrypt.patch +++ /dev/null @@ -1,46 +0,0 @@ -* The upstream tests for libgcrypt are awkward and not working. - - Requires libgcrypt-config, which seems broken? -* AM_PATH_LIBGCRYPT exists for a reason, why not use it? KISS. -* Upstream abandoned AM_PATH_LIBGCRYPT in the past...newer automake ok? - -Upstream status: Pending - -Index: vlc-2.2.1/configure.ac -=================================================================== ---- vlc-2.2.1.orig/configure.ac -+++ vlc-2.2.1/configure.ac -@@ -4017,25 +4017,19 @@ PKG_ENABLE_MODULES_VLC([LIBXML2], [xml], - dnl - dnl libgcrypt - dnl -+GCRYPT_LIBVER=1 -+GCRYPT_REQ=1.1.94 - AC_ARG_ENABLE(libgcrypt, - [ --disable-libgcrypt gcrypt support (default enabled)]) - AS_IF([test "${enable_libgcrypt}" != "no"], [ -- AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [ -- libgcrypt-config --version >/dev/null || \ -- AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found]) -- AC_CHECK_LIB(gcrypt, gcry_control, [ -- have_libgcrypt="yes" -- GCRYPT_CFLAGS="`libgcrypt-config --cflags`" -- GCRYPT_LIBS="`libgcrypt-config --libs`" -- ], [ -- AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or pass --disable-libgcrypt.]) -- ], [`libgcrypt-config --libs`]) -- ], [ -- AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or pass --disable-libgcrypt.]) -- ], [#include ] -- ) -+ AM_PATH_LIBGCRYPT($GCRYPT_LIBVER:$GCRYPT_REQ, -+ [ -+ GCRYPT_CFLAGS="$LIBGCRYPT_CFLAGS" -+ GCRYPT_LIBS="$LIBGCRYPT_LIBS" -+ ],[ -+ AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or use --disable-libgcrypt. Have a nice day.]) -+ ]) - ]) -- - AC_SUBST(GCRYPT_CFLAGS) - AC_SUBST(GCRYPT_LIBS) - AM_CONDITIONAL([HAVE_GCRYPT], [test "${have_libgcrypt}" = "yes"]) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch deleted file mode 100644 index 53df1c6ebf..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0004-modules-gui-qt4-out-of-tree-build.patch +++ /dev/null @@ -1,19 +0,0 @@ -* modules/gui/qt4/Makefile.am not B!=S friendly -* Simple solution to missing directories in ${B} - -Upstream status: Pending - -Signed-off-by: Tim Orling - -Index: vlc-2.2.1/modules/gui/qt4/Makefile.am -=================================================================== ---- vlc-2.2.1.orig/modules/gui/qt4/Makefile.am -+++ vlc-2.2.1/modules/gui/qt4/Makefile.am -@@ -127,6 +127,7 @@ moc_verbose_0 = @echo " MOC " $@; - moc_verbose__0 = $(moc_verbose_0) - - .hpp.moc.cpp: -+ [ -d $(dir $@) ] || mkdir -p $(dir $@) - $(moc_verbose)$(MOC) $(MOC_CPPFLAGS) -o $@ $< - - # These MOC files depend on the configure settings: diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch index 2d84ffd2f4..77a7d61730 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-libpostproc-header-check.patch @@ -2,16 +2,14 @@ Upstream-status: Pending -Index: vlc-2.1.4/configure.ac -=================================================================== ---- vlc-2.1.4.orig/configure.ac -+++ vlc-2.1.4/configure.ac -@@ -2444,7 +2444,7 @@ then +--- a/configure.ac ++++ b/configure.ac +@@ -2589,7 +2589,7 @@ then VLC_SAVE_FLAGS CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}" CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}" - AC_CHECK_HEADERS(postproc/postprocess.h) + AC_CHECK_HEADERS(postproc/postprocess.h,[],[AC_CHECK_HEADERS(libpostproc/postprocess.h)]) VLC_ADD_PLUGIN([postproc]) - VLC_ADD_LIBS([postproc],[$POSTPROC_LIBS $AVUTIL_LIBS]) - VLC_ADD_CFLAGS([postproc],[$POSTPROC_CFLAGS $AVUTIL_CFLAGS]) + VLC_RESTORE_FLAGS + ],[ diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch index 145e1ab821..96b5d2d246 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch +++ b/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch @@ -5,46 +5,29 @@ Upstream-status: Pending Signed-off-by: Tim Orling -Index: vlc-2.2.1/modules/lua/demux.c -=================================================================== ---- vlc-2.2.1.orig/modules/lua/demux.c -+++ vlc-2.2.1/modules/lua/demux.c -@@ -52,7 +52,7 @@ struct demux_sys_t +--- a/modules/lua/demux.c ++++ b/modules/lua/demux.c +@@ -52,7 +52,7 @@ struct vlclua_playlist static int vlclua_demux_peek( lua_State *L ) { - demux_t *p_demux = (demux_t *)vlclua_get_this( L ); + stream_t *s = (stream_t *)vlclua_get_this(L); - int n = luaL_checkint( L, 1 ); + int n = luaL_checkinteger( L, 1 ); const uint8_t *p_peek; - int i_peek = stream_Peek( p_demux->s, &p_peek, n ); -@@ -67,7 +67,7 @@ static int vlclua_demux_read( lua_State + ssize_t val = vlc_stream_Peek(s->p_source, &p_peek, n); +@@ -66,7 +66,7 @@ static int vlclua_demux_peek( lua_State + static int vlclua_demux_read( lua_State *L ) { - demux_t *p_demux = (demux_t *)vlclua_get_this( L ); - const uint8_t *p_read; + stream_t *s = (stream_t *)vlclua_get_this(L); - int n = luaL_checkint( L, 1 ); + int n = luaL_checkinteger( L, 1 ); - int i_read = stream_Peek( p_demux->s, &p_read, n ); + char *buf = malloc(n); - if( i_read > 0 ) -Index: vlc-2.2.1/modules/lua/libs/configuration.c -=================================================================== ---- vlc-2.2.1.orig/modules/lua/libs/configuration.c -+++ vlc-2.2.1/modules/lua/libs/configuration.c -@@ -84,7 +84,7 @@ static int vlclua_config_set( lua_State - break; - - case VLC_VAR_INTEGER: -- config_PutInt( p_this, psz_name, luaL_checkint( L, 2 ) ); -+ config_PutInt( p_this, psz_name, luaL_checkinteger( L, 2 ) ); - break; - - case VLC_VAR_BOOL: -Index: vlc-2.2.1/modules/lua/libs/net.c -=================================================================== ---- vlc-2.2.1.orig/modules/lua/libs/net.c -+++ vlc-2.2.1/modules/lua/libs/net.c -@@ -202,7 +202,7 @@ static int vlclua_net_listen_tcp( lua_St + if (buf != NULL) +--- a/modules/lua/libs/net.c ++++ b/modules/lua/libs/net.c +@@ -179,7 +179,7 @@ static int vlclua_net_listen_tcp( lua_St { vlc_object_t *p_this = vlclua_get_this( L ); const char *psz_host = luaL_checkstring( L, 1 ); @@ -53,16 +36,16 @@ Index: vlc-2.2.1/modules/lua/libs/net.c int *pi_fd = net_ListenTCP( p_this, psz_host, i_port ); if( pi_fd == NULL ) return luaL_error( L, "Cannot listen on %s:%d", psz_host, i_port ); -@@ -274,7 +274,7 @@ static int vlclua_net_connect_tcp( lua_S +@@ -251,7 +251,7 @@ static int vlclua_net_connect_tcp( lua_S { vlc_object_t *p_this = vlclua_get_this( L ); const char *psz_host = luaL_checkstring( L, 1 ); - int i_port = luaL_checkint( L, 2 ); + int i_port = luaL_checkinteger( L, 2 ); - int i_fd = net_Connect( p_this, psz_host, i_port, SOCK_STREAM, IPPROTO_TCP ); + int i_fd = net_ConnectTCP( p_this, psz_host, i_port ); lua_pushinteger( L, vlclua_fd_map_safe( L, i_fd ) ); return 1; -@@ -282,26 +282,26 @@ static int vlclua_net_connect_tcp( lua_S +@@ -259,14 +259,14 @@ static int vlclua_net_connect_tcp( lua_S static int vlclua_net_close( lua_State *L ) { @@ -79,22 +62,25 @@ Index: vlc-2.2.1/modules/lua/libs/net.c size_t i_len; const char *psz_buffer = luaL_checklstring( L, 2, &i_len ); -- i_len = luaL_optint( L, 3, i_len ); -+ i_len = luaL_optinteger( L, 3, i_len ); - lua_pushinteger( L, (fd != -1) ? send( fd, psz_buffer, i_len, 0 ) : -1 ); - return 1; - } +@@ -278,7 +278,7 @@ static int vlclua_net_send( lua_State *L static int vlclua_net_recv( lua_State *L ) { - int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); -- size_t i_len = luaL_optint( L, 2, 1 ); + int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); -+ size_t i_len = luaL_optinteger( L, 2, 1 ); + size_t i_len = (size_t)luaL_optinteger( L, 2, 1 ); char psz_buffer[i_len]; - ssize_t i_ret = (fd != -1) ? recv( fd, psz_buffer, i_len, 0 ) : -1; -@@ -382,19 +382,19 @@ static int vlclua_fd_open( lua_State *L +@@ -312,7 +312,7 @@ static int vlclua_net_poll( lua_State *L + lua_pushnil( L ); + for( int i = 0; lua_next( L, 1 ); i++ ) + { +- luafds[i] = luaL_checkint( L, -2 ); ++ luafds[i] = luaL_checkinteger( L, -2 ); + p_fds[i].fd = vlclua_fd_get( L, luafds[i] ); + p_fds[i].events = luaL_checkinteger( L, -1 ); + p_fds[i].events &= POLLIN | POLLOUT | POLLPRI; +@@ -360,7 +360,7 @@ static int vlclua_fd_open( lua_State *L #ifndef _WIN32 static int vlclua_fd_write( lua_State *L ) { @@ -103,47 +89,18 @@ Index: vlc-2.2.1/modules/lua/libs/net.c size_t i_len; const char *psz_buffer = luaL_checklstring( L, 2, &i_len ); -- i_len = luaL_optint( L, 3, i_len ); -+ i_len = luaL_optinteger( L, 3, i_len ); - lua_pushinteger( L, (fd != -1) ? write( fd, psz_buffer, i_len ) : -1 ); - return 1; - } +@@ -371,7 +371,7 @@ static int vlclua_fd_write( lua_State *L static int vlclua_fd_read( lua_State *L ) { - int fd = vlclua_fd_get( L, luaL_checkint( L, 1 ) ); -- size_t i_len = luaL_optint( L, 2, 1 ); + int fd = vlclua_fd_get( L, luaL_checkinteger( L, 1 ) ); -+ size_t i_len = luaL_optinteger( L, 2, 1 ); + size_t i_len = (size_t)luaL_optinteger( L, 2, 1 ); char psz_buffer[i_len]; - ssize_t i_ret = (fd != -1) ? read( fd, psz_buffer, i_len ) : -1; -Index: vlc-2.2.1/modules/lua/libs/osd.c -=================================================================== ---- vlc-2.2.1.orig/modules/lua/libs/osd.c -+++ vlc-2.2.1/modules/lua/libs/osd.c -@@ -67,7 +67,7 @@ static int vlclua_osd_icon( lua_State *L - { - const char *psz_icon = luaL_checkstring( L, 1 ); - int i_icon = vlc_osd_icon_from_string( psz_icon ); -- int i_chan = luaL_optint( L, 2, SPU_DEFAULT_CHANNEL ); -+ int i_chan = luaL_optinteger( L, 2, SPU_DEFAULT_CHANNEL ); - if( !i_icon ) - return luaL_error( L, "\"%s\" is not a valid osd icon.", psz_icon ); - -@@ -114,9 +114,9 @@ static int vlc_osd_position_from_string( - static int vlclua_osd_message( lua_State *L ) - { - const char *psz_message = luaL_checkstring( L, 1 ); -- int i_chan = luaL_optint( L, 2, SPU_DEFAULT_CHANNEL ); -+ int i_chan = luaL_optinteger( L, 2, SPU_DEFAULT_CHANNEL ); - const char *psz_position = luaL_optstring( L, 3, "top-right" ); -- mtime_t duration = luaL_optint( L, 4, 1000000 ); -+ mtime_t duration = luaL_optinteger( L, 4, 1000000 ); - - input_thread_t *p_input = vlclua_get_input_internal( L ); - if( p_input ) -@@ -154,10 +154,10 @@ static int vlc_osd_slider_type_from_stri +--- a/modules/lua/libs/osd.c ++++ b/modules/lua/libs/osd.c +@@ -154,7 +154,7 @@ static int vlc_osd_slider_type_from_stri static int vlclua_osd_slider( lua_State *L ) { @@ -151,11 +108,7 @@ Index: vlc-2.2.1/modules/lua/libs/osd.c + int i_position = luaL_checkinteger( L, 1 ); const char *psz_type = luaL_checkstring( L, 2 ); int i_type = vlc_osd_slider_type_from_string( psz_type ); -- int i_chan = luaL_optint( L, 3, SPU_DEFAULT_CHANNEL ); -+ int i_chan = luaL_optinteger( L, 3, SPU_DEFAULT_CHANNEL ); - if( !i_type ) - return luaL_error( L, "\"%s\" is not a valid slider type.", - psz_type ); + int i_chan = (int)luaL_optinteger( L, 3, VOUT_SPU_CHANNEL_OSD ); @@ -198,7 +198,7 @@ static int vlclua_spu_channel_register( static int vlclua_spu_channel_clear( lua_State *L ) @@ -165,10 +118,8 @@ Index: vlc-2.2.1/modules/lua/libs/osd.c input_thread_t *p_input = vlclua_get_input_internal( L ); if( !p_input ) return luaL_error( L, "Unable to find input." ); -Index: vlc-2.2.1/modules/lua/libs/playlist.c -=================================================================== ---- vlc-2.2.1.orig/modules/lua/libs/playlist.c -+++ vlc-2.2.1/modules/lua/libs/playlist.c +--- a/modules/lua/libs/playlist.c ++++ b/modules/lua/libs/playlist.c @@ -69,7 +69,7 @@ static int vlclua_playlist_next( lua_Sta static int vlclua_playlist_skip( lua_State * L ) @@ -186,17 +137,17 @@ Index: vlc-2.2.1/modules/lua/libs/playlist.c + int i_id = luaL_checkinteger( L, 1 ); playlist_t *p_playlist = vlclua_get_playlist_internal( L ); PL_LOCK; - int i_ret = playlist_Control( p_playlist, PLAYLIST_VIEWPLAY, -@@ -139,7 +139,7 @@ static int vlclua_playlist_gotoitem( lua + playlist_ViewPlay( p_playlist, NULL, +@@ -138,7 +138,7 @@ static int vlclua_playlist_gotoitem( lua static int vlclua_playlist_delete( lua_State * L ) { - int i_id = luaL_checkint( L, 1 ); + int i_id = luaL_checkinteger( L, 1 ); playlist_t *p_playlist = vlclua_get_playlist_internal( L ); + PL_LOCK; - playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_id ); -@@ -155,8 +155,8 @@ static int vlclua_playlist_delete( lua_S +@@ -152,8 +152,8 @@ static int vlclua_playlist_delete( lua_S static int vlclua_playlist_move( lua_State * L ) { @@ -207,11 +158,9 @@ Index: vlc-2.2.1/modules/lua/libs/playlist.c playlist_t *p_playlist = vlclua_get_playlist_internal( L ); PL_LOCK; playlist_item_t *p_item = playlist_ItemGetById( p_playlist, i_item ); -Index: vlc-2.2.1/modules/lua/libs/stream.c -=================================================================== ---- vlc-2.2.1.orig/modules/lua/libs/stream.c -+++ vlc-2.2.1/modules/lua/libs/stream.c -@@ -101,7 +101,7 @@ static int vlclua_stream_read( lua_State +--- a/modules/lua/libs/stream.c ++++ b/modules/lua/libs/stream.c +@@ -123,7 +123,7 @@ static int vlclua_stream_read( lua_State { int i_read; stream_t **pp_stream = (stream_t **)luaL_checkudata( L, 1, "stream" ); @@ -220,23 +169,8 @@ Index: vlc-2.2.1/modules/lua/libs/stream.c uint8_t *p_read = malloc( n ); if( !p_read ) return vlclua_error( L ); -Index: vlc-2.2.1/modules/lua/libs/variables.c -=================================================================== ---- vlc-2.2.1.orig/modules/lua/libs/variables.c -+++ vlc-2.2.1/modules/lua/libs/variables.c -@@ -103,7 +103,7 @@ static int vlclua_tovalue( lua_State *L, - val->b_bool = luaL_checkboolean( L, -1 ); - break; - case VLC_VAR_INTEGER: -- val->i_int = luaL_checkint( L, -1 ); -+ val->i_int = luaL_checkinteger( L, -1 ); - break; - case VLC_VAR_STRING: - val->psz_string = (char*)luaL_checkstring( L, -1 ); /* XXX: Beware, this only stays valid as long as (L,-1) stays in the stack */ -Index: vlc-2.2.1/modules/lua/libs/volume.c -=================================================================== ---- vlc-2.2.1.orig/modules/lua/libs/volume.c -+++ vlc-2.2.1/modules/lua/libs/volume.c +--- a/modules/lua/libs/volume.c ++++ b/modules/lua/libs/volume.c @@ -48,7 +48,7 @@ static int vlclua_volume_set( lua_State *L ) { @@ -246,34 +180,54 @@ Index: vlc-2.2.1/modules/lua/libs/volume.c if( i_volume < 0 ) i_volume = 0; int i_ret = playlist_VolumeSet( p_this, i_volume/(float)AOUT_VOLUME_DEFAULT ); -@@ -68,7 +68,7 @@ static int vlclua_volume_up( lua_State * - playlist_t *p_this = vlclua_get_playlist_internal( L ); - float volume; - -- playlist_VolumeUp( p_this, luaL_optint( L, 1, 1 ), &volume ); -+ playlist_VolumeUp( p_this, luaL_optinteger( L, 1, 1 ), &volume ); - lua_pushnumber( L, lroundf(volume * AOUT_VOLUME_DEFAULT) ); - return 1; - } -@@ -78,7 +78,7 @@ static int vlclua_volume_down( lua_State - playlist_t *p_this = vlclua_get_playlist_internal( L ); - float volume; - -- playlist_VolumeDown( p_this, luaL_optint( L, 1, 1 ), &volume ); -+ playlist_VolumeDown( p_this, luaL_optinteger( L, 1, 1 ), &volume ); - lua_pushnumber( L, lroundf(volume * AOUT_VOLUME_DEFAULT) ); - return 1; +--- a/modules/lua/libs/dialog.c ++++ b/modules/lua/libs/dialog.c +@@ -382,7 +382,7 @@ static int lua_GetDialogUpdate( lua_Stat + /* Read entry in the Lua registry */ + lua_pushlightuserdata( L, (void*) &key_update ); + lua_gettable( L, LUA_REGISTRYINDEX ); +- return luaL_checkint( L, -1 ); ++ return luaL_checkinteger( L, -1 ); } -Index: vlc-2.2.1/modules/lua/libs/win.c -=================================================================== ---- vlc-2.2.1.orig/modules/lua/libs/win.c -+++ vlc-2.2.1/modules/lua/libs/win.c -@@ -123,7 +123,7 @@ static int vlclua_console_init( lua_Stat - static int vlclua_console_wait( lua_State *L ) - { -- int i_timeout = luaL_optint( L, 1, 0 ); -+ int i_timeout = luaL_optinteger( L, 1, 0 ); - DWORD status = WaitForSingleObject( GetConsole( L ), i_timeout ); - lua_pushboolean( L, status == WAIT_OBJECT_0 ); - return 1; + /** Manually update a dialog +@@ -573,22 +573,22 @@ static int vlclua_create_widget_inner( l + + /* Set common arguments: col, row, hspan, vspan, width, height */ + if( lua_isnumber( L, arg ) ) +- p_widget->i_column = luaL_checkint( L, arg ); ++ p_widget->i_column = luaL_checkinteger( L, arg ); + else goto end_of_args; + if( lua_isnumber( L, ++arg ) ) +- p_widget->i_row = luaL_checkint( L, arg ); ++ p_widget->i_row = luaL_checkinteger( L, arg ); + else goto end_of_args; + if( lua_isnumber( L, ++arg ) ) +- p_widget->i_horiz_span = luaL_checkint( L, arg ); ++ p_widget->i_horiz_span = luaL_checkinteger( L, arg ); + else goto end_of_args; + if( lua_isnumber( L, ++arg ) ) +- p_widget->i_vert_span = luaL_checkint( L, arg ); ++ p_widget->i_vert_span = luaL_checkinteger( L, arg ); + else goto end_of_args; + if( lua_isnumber( L, ++arg ) ) +- p_widget->i_width = luaL_checkint( L, arg ); ++ p_widget->i_width = luaL_checkinteger( L, arg ); + else goto end_of_args; + if( lua_isnumber( L, ++arg ) ) +- p_widget->i_height = luaL_checkint( L, arg ); ++ p_widget->i_height = luaL_checkinteger( L, arg ); + else goto end_of_args; + + end_of_args: +--- a/modules/lua/libs/io.c ++++ b/modules/lua/libs/io.c +@@ -139,7 +139,7 @@ static int vlclua_io_file_seek( lua_Stat + const char* psz_mode = luaL_optstring( L, 2, NULL ); + if ( psz_mode != NULL ) + { +- long i_offset = luaL_optlong( L, 3, 0 ); ++ long i_offset = (long)luaL_optinteger( L, 3, 0 ); + int i_mode; + if ( !strcmp( psz_mode, "set" ) ) + i_mode = SEEK_SET; diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch deleted file mode 100644 index cb3ba71dd6..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch +++ /dev/null @@ -1,293 +0,0 @@ -From 427732a379893491eac27aeadff0e0b3e252d158 Mon Sep 17 00:00:00 2001 -From: Jean-Baptiste Kempf -Date: Mon, 31 Aug 2015 08:19:00 +0200 -Subject: [PATCH] Avcodec/swscale: use AV_PIX_FMT consistently -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit faa7bd357b1f9e07a6ffbc451a188773fad7a275) -Signed-off-by: Rafaël Carré - -Conflicts: - modules/codec/avcodec/chroma.c - modules/codec/avcodec/video.c ---- - modules/codec/avcodec/chroma.c | 104 ++++++++++++++++++++--------------------- - modules/codec/avcodec/video.c | 10 ++-- - modules/video_chroma/swscale.c | 28 +++++------ - 3 files changed, 71 insertions(+), 71 deletions(-) - -diff --git a/modules/codec/avcodec/chroma.c b/modules/codec/avcodec/chroma.c -index 393364b..c31f93d 100644 ---- a/modules/codec/avcodec/chroma.c -+++ b/modules/codec/avcodec/chroma.c -@@ -62,77 +62,77 @@ static const struct - } chroma_table[] = - { - /* Planar YUV formats */ -- {VLC_CODEC_I444, PIX_FMT_YUV444P, 0, 0, 0 }, -- {VLC_CODEC_J444, PIX_FMT_YUVJ444P, 0, 0, 0 }, -- -- {VLC_CODEC_I440, PIX_FMT_YUV440P, 0, 0, 0 }, -- {VLC_CODEC_J440, PIX_FMT_YUVJ440P, 0, 0, 0 }, -- -- {VLC_CODEC_I422, PIX_FMT_YUV422P, 0, 0, 0 }, -- {VLC_CODEC_J422, PIX_FMT_YUVJ422P, 0, 0, 0 }, -- -- {VLC_CODEC_I420, PIX_FMT_YUV420P, 0, 0, 0 }, -- {VLC_CODEC_YV12, PIX_FMT_YUV420P, 0, 0, 0 }, -- {VLC_FOURCC('I','Y','U','V'), PIX_FMT_YUV420P, 0, 0, 0 }, -- {VLC_CODEC_J420, PIX_FMT_YUVJ420P, 0, 0, 0 }, -- {VLC_CODEC_I411, PIX_FMT_YUV411P, 0, 0, 0 }, -- {VLC_CODEC_I410, PIX_FMT_YUV410P, 0, 0, 0 }, -- {VLC_FOURCC('Y','V','U','9'), PIX_FMT_YUV410P, 0, 0, 0 }, -- -- {VLC_FOURCC('N','V','1','2'), PIX_FMT_NV12, 0, 0, 0 }, -- {VLC_FOURCC('N','V','2','1'), PIX_FMT_NV21, 0, 0, 0 }, -- -- {VLC_CODEC_I420_9L, PIX_FMT_YUV420P9LE, 0, 0, 0 }, -- {VLC_CODEC_I420_9B, PIX_FMT_YUV420P9BE, 0, 0, 0 }, -- {VLC_CODEC_I420_10L, PIX_FMT_YUV420P10LE, 0, 0, 0 }, -- {VLC_CODEC_I420_10B, PIX_FMT_YUV420P10BE, 0, 0, 0 }, -+ {VLC_CODEC_I444, AV_PIX_FMT_YUV444P, 0, 0, 0 }, -+ {VLC_CODEC_J444, AV_PIX_FMT_YUVJ444P, 0, 0, 0 }, -+ -+ {VLC_CODEC_I440, AV_PIX_FMT_YUV440P, 0, 0, 0 }, -+ {VLC_CODEC_J440, AV_PIX_FMT_YUVJ440P, 0, 0, 0 }, -+ -+ {VLC_CODEC_I422, AV_PIX_FMT_YUV422P, 0, 0, 0 }, -+ {VLC_CODEC_J422, AV_PIX_FMT_YUVJ422P, 0, 0, 0 }, -+ -+ {VLC_CODEC_I420, AV_PIX_FMT_YUV420P, 0, 0, 0 }, -+ {VLC_CODEC_YV12, AV_PIX_FMT_YUV420P, 0, 0, 0 }, -+ {VLC_FOURCC('I','Y','U','V'), AV_PIX_FMT_YUV420P, 0, 0, 0 }, -+ {VLC_CODEC_J420, AV_PIX_FMT_YUVJ420P, 0, 0, 0 }, -+ {VLC_CODEC_I411, AV_PIX_FMT_YUV411P, 0, 0, 0 }, -+ {VLC_CODEC_I410, AV_PIX_FMT_YUV410P, 0, 0, 0 }, -+ {VLC_FOURCC('Y','V','U','9'), AV_PIX_FMT_YUV410P, 0, 0, 0 }, -+ -+ {VLC_FOURCC('N','V','1','2'), AV_PIX_FMT_NV12, 0, 0, 0 }, -+ {VLC_FOURCC('N','V','2','1'), AV_PIX_FMT_NV21, 0, 0, 0 }, -+ -+ {VLC_CODEC_I420_9L, AV_PIX_FMT_YUV420P9LE, 0, 0, 0 }, -+ {VLC_CODEC_I420_9B, AV_PIX_FMT_YUV420P9BE, 0, 0, 0 }, -+ {VLC_CODEC_I420_10L, AV_PIX_FMT_YUV420P10LE, 0, 0, 0 }, -+ {VLC_CODEC_I420_10B, AV_PIX_FMT_YUV420P10BE, 0, 0, 0 }, - #if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,13,0) -- {VLC_CODEC_I422_9L, PIX_FMT_YUV422P9LE, 0, 0, 0 }, -- {VLC_CODEC_I422_9B, PIX_FMT_YUV422P9BE, 0, 0, 0 }, -+ {VLC_CODEC_I422_9L, AV_PIX_FMT_YUV422P9LE, 0, 0, 0 }, -+ {VLC_CODEC_I422_9B, AV_PIX_FMT_YUV422P9BE, 0, 0, 0 }, - #endif -- {VLC_CODEC_I422_10L, PIX_FMT_YUV422P10LE, 0, 0, 0 }, -- {VLC_CODEC_I422_10B, PIX_FMT_YUV422P10BE, 0, 0, 0 }, -+ {VLC_CODEC_I422_10L, AV_PIX_FMT_YUV422P10LE, 0, 0, 0 }, -+ {VLC_CODEC_I422_10B, AV_PIX_FMT_YUV422P10BE, 0, 0, 0 }, - -- {VLC_CODEC_YUV420A, PIX_FMT_YUVA420P, 0, 0, 0 }, -+ {VLC_CODEC_YUV420A, AV_PIX_FMT_YUVA420P, 0, 0, 0 }, - #if LIBAVUTIL_VERSION_CHECK( 51, 45, 0, 74, 100 ) - {VLC_CODEC_YUV422A, AV_PIX_FMT_YUVA422P, 0, 0, 0 }, - #endif - -- {VLC_CODEC_I444_9L, PIX_FMT_YUV444P9LE, 0, 0, 0 }, -- {VLC_CODEC_I444_9B, PIX_FMT_YUV444P9BE, 0, 0, 0 }, -- {VLC_CODEC_I444_10L, PIX_FMT_YUV444P10LE, 0, 0, 0 }, -- {VLC_CODEC_I444_10B, PIX_FMT_YUV444P10BE, 0, 0, 0 }, -- {VLC_CODEC_I444_16L, PIX_FMT_YUV444P16LE, 0, 0, 0 }, -- {VLC_CODEC_I444_16B, PIX_FMT_YUV444P16BE, 0, 0, 0 }, -+ {VLC_CODEC_I444_9L, AV_PIX_FMT_YUV444P9LE, 0, 0, 0 }, -+ {VLC_CODEC_I444_9B, AV_PIX_FMT_YUV444P9BE, 0, 0, 0 }, -+ {VLC_CODEC_I444_10L, AV_PIX_FMT_YUV444P10LE, 0, 0, 0 }, -+ {VLC_CODEC_I444_10B, AV_PIX_FMT_YUV444P10BE, 0, 0, 0 }, -+ {VLC_CODEC_I444_16L, AV_PIX_FMT_YUV444P16LE, 0, 0, 0 }, -+ {VLC_CODEC_I444_16B, AV_PIX_FMT_YUV444P16BE, 0, 0, 0 }, - - /* Packed YUV formats */ -- {VLC_CODEC_YUYV, PIX_FMT_YUYV422, 0, 0, 0 }, -- {VLC_FOURCC('Y','U','Y','V'), PIX_FMT_YUYV422, 0, 0, 0 }, -- {VLC_CODEC_UYVY, PIX_FMT_UYVY422, 0, 0, 0 }, -- {VLC_FOURCC('Y','4','1','1'), PIX_FMT_UYYVYY411, 0, 0, 0 }, -+ {VLC_CODEC_YUYV, AV_PIX_FMT_YUYV422, 0, 0, 0 }, -+ {VLC_FOURCC('Y','U','Y','V'), AV_PIX_FMT_YUYV422, 0, 0, 0 }, -+ {VLC_CODEC_UYVY, AV_PIX_FMT_UYVY422, 0, 0, 0 }, -+ {VLC_FOURCC('Y','4','1','1'), AV_PIX_FMT_UYYVYY411, 0, 0, 0 }, - - /* Packed RGB formats */ -- VLC_RGB( VLC_FOURCC('R','G','B','4'), PIX_FMT_RGB4, PIX_FMT_BGR4, 0x10, 0x06, 0x01 ) -- VLC_RGB( VLC_FOURCC('R','G','B','8'), PIX_FMT_RGB8, PIX_FMT_BGR8, 0xC0, 0x38, 0x07 ) -+ VLC_RGB( VLC_FOURCC('R','G','B','4'), AV_PIX_FMT_RGB4, AV_PIX_FMT_BGR4, 0x10, 0x06, 0x01 ) -+ VLC_RGB( VLC_FOURCC('R','G','B','8'), AV_PIX_FMT_RGB8, AV_PIX_FMT_BGR8, 0xC0, 0x38, 0x07 ) - -- VLC_RGB( VLC_CODEC_RGB15, PIX_FMT_RGB555, PIX_FMT_BGR555, 0x7c00, 0x03e0, 0x001f ) -- VLC_RGB( VLC_CODEC_RGB16, PIX_FMT_RGB565, PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f ) -- VLC_RGB( VLC_CODEC_RGB24, PIX_FMT_BGR24, PIX_FMT_RGB24, 0xff0000, 0x00ff00, 0x0000ff ) -+ VLC_RGB( VLC_CODEC_RGB15, AV_PIX_FMT_RGB555, AV_PIX_FMT_BGR555, 0x7c00, 0x03e0, 0x001f ) -+ VLC_RGB( VLC_CODEC_RGB16, AV_PIX_FMT_RGB565, AV_PIX_FMT_BGR565, 0xf800, 0x07e0, 0x001f ) -+ VLC_RGB( VLC_CODEC_RGB24, AV_PIX_FMT_BGR24, AV_PIX_FMT_RGB24, 0xff0000, 0x00ff00, 0x0000ff ) - -- VLC_RGB( VLC_CODEC_RGB32, PIX_FMT_RGB32, PIX_FMT_BGR32, 0x00ff0000, 0x0000ff00, 0x000000ff ) -- VLC_RGB( VLC_CODEC_RGB32, PIX_FMT_RGB32_1, PIX_FMT_BGR32_1, 0xff000000, 0x00ff0000, 0x0000ff00 ) -+ VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_RGB32, AV_PIX_FMT_BGR32, 0x00ff0000, 0x0000ff00, 0x000000ff ) -+ VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_RGB32_1, AV_PIX_FMT_BGR32_1, 0xff000000, 0x00ff0000, 0x0000ff00 ) - - #ifdef AV_PIX_FMT_0BGR32 - VLC_RGB( VLC_CODEC_RGB32, AV_PIX_FMT_0BGR32, AV_PIX_FMT_0RGB32, 0x000000ff, 0x0000ff00, 0x00ff0000 ) - #endif - -- {VLC_CODEC_RGBA, PIX_FMT_RGBA, 0, 0, 0 }, -- {VLC_CODEC_ARGB, PIX_FMT_ARGB, 0, 0, 0 }, -- {VLC_CODEC_BGRA, PIX_FMT_BGRA, 0, 0, 0 }, -- {VLC_CODEC_GREY, PIX_FMT_GRAY8, 0, 0, 0}, -+ {VLC_CODEC_RGBA, AV_PIX_FMT_RGBA, 0, 0, 0 }, -+ {VLC_CODEC_ARGB, AV_PIX_FMT_ARGB, 0, 0, 0 }, -+ {VLC_CODEC_BGRA, AV_PIX_FMT_BGRA, 0, 0, 0 }, -+ {VLC_CODEC_GREY, AV_PIX_FMT_GRAY8, 0, 0, 0}, - - /* Paletized RGB */ -- {VLC_CODEC_RGBP, PIX_FMT_PAL8, 0, 0, 0}, -+ {VLC_CODEC_RGBP, AV_PIX_FMT_PAL8, 0, 0, 0}, - - #if LIBAVUTIL_VERSION_CHECK(51, 42, 0, 74,100) - {VLC_CODEC_GBR_PLANAR, AV_PIX_FMT_GBRP, 0, 0, 0 }, -@@ -201,5 +201,5 @@ int FindFfmpegChroma( vlc_fourcc_t fourcc ) - for( int i = 0; chroma_table[i].i_chroma != 0; i++ ) - if( chroma_table[i].i_chroma == fourcc ) - return chroma_table[i].i_chroma_id; -- return PIX_FMT_NONE; -+ return AV_PIX_FMT_NONE; - } -diff --git a/modules/codec/avcodec/video.c b/modules/codec/avcodec/video.c -index c115db9..ae600e8 100644 ---- a/modules/codec/avcodec/video.c -+++ b/modules/codec/avcodec/video.c -@@ -1004,7 +1004,7 @@ static picture_t *lavc_dr_GetFrame(struct AVCodecContext *ctx, - if (GetVlcChroma(&dec->fmt_out.video, ctx->pix_fmt) != VLC_SUCCESS) - return NULL; - dec->fmt_out.i_codec = dec->fmt_out.video.i_chroma; -- if (ctx->pix_fmt == PIX_FMT_PAL8) -+ if (ctx->pix_fmt == AV_PIX_FMT_PAL8) - return NULL; - - int width = frame->width; -@@ -1180,7 +1180,7 @@ static picture_t *ffmpeg_dr_GetFrameBuf(struct AVCodecContext *p_context) - if (GetVlcChroma(&p_dec->fmt_out.video, p_context->pix_fmt) != VLC_SUCCESS) - goto no_dr; - -- if (p_context->pix_fmt == PIX_FMT_PAL8) -+ if (p_context->pix_fmt == AV_PIX_FMT_PAL8) - goto no_dr; - - p_dec->fmt_out.i_codec = p_dec->fmt_out.video.i_chroma; -@@ -1215,7 +1215,7 @@ static picture_t *ffmpeg_dr_GetFrameBuf(struct AVCodecContext *p_context) - goto no_dr; - } - -- if( p_context->pix_fmt == PIX_FMT_YUV422P ) -+ if( p_context->pix_fmt == AV_PIX_FMT_YUV422P ) - { - if( 2 * p_pic->p[1].i_pitch != p_pic->p[0].i_pitch || - 2 * p_pic->p[2].i_pitch != p_pic->p[0].i_pitch ) -@@ -1325,7 +1325,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, - - /* Enumerate available formats */ - bool can_hwaccel = false; -- for( size_t i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ ) -+ for( size_t i = 0; pi_fmt[i] != AV_PIX_FMT_NONE; i++ ) - { - const AVPixFmtDescriptor *dsc = av_pix_fmt_desc_get(pi_fmt[i]); - if (dsc == NULL) -@@ -1352,7 +1352,7 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, - if( p_va == NULL ) - goto end; - -- for( size_t i = 0; pi_fmt[i] != PIX_FMT_NONE; i++ ) -+ for( size_t i = 0; pi_fmt[i] != AV_PIX_FMT_NONE; i++ ) - { - if( p_va->pix_fmt != pi_fmt[i] ) - continue; -diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c -index 569e0f5..4e0ecf1 100644 ---- a/modules/video_chroma/swscale.c -+++ b/modules/video_chroma/swscale.c -@@ -257,35 +257,35 @@ static void FixParameters( int *pi_fmt, bool *pb_has_a, bool *pb_swap_uv, vlc_fo - switch( fmt ) - { - case VLC_CODEC_YUV422A: -- *pi_fmt = PIX_FMT_YUV422P; -+ *pi_fmt = AV_PIX_FMT_YUV422P; - *pb_has_a = true; - break; - case VLC_CODEC_YUV420A: -- *pi_fmt = PIX_FMT_YUV420P; -+ *pi_fmt = AV_PIX_FMT_YUV420P; - *pb_has_a = true; - break; - case VLC_CODEC_YUVA: -- *pi_fmt = PIX_FMT_YUV444P; -+ *pi_fmt = AV_PIX_FMT_YUV444P; - *pb_has_a = true; - break; - case VLC_CODEC_RGBA: -- *pi_fmt = PIX_FMT_BGR32; -+ *pi_fmt = AV_PIX_FMT_BGR32; - *pb_has_a = true; - break; - case VLC_CODEC_ARGB: -- *pi_fmt = PIX_FMT_BGR32_1; -+ *pi_fmt = AV_PIX_FMT_BGR32_1; - *pb_has_a = true; - break; - case VLC_CODEC_BGRA: -- *pi_fmt = PIX_FMT_RGB32; -+ *pi_fmt = AV_PIX_FMT_RGB32; - *pb_has_a = true; - break; - case VLC_CODEC_YV12: -- *pi_fmt = PIX_FMT_YUV420P; -+ *pi_fmt = AV_PIX_FMT_YUV420P; - *pb_swap_uv = true; - break; - case VLC_CODEC_YV9: -- *pi_fmt = PIX_FMT_YUV410P; -+ *pi_fmt = AV_PIX_FMT_YUV410P; - *pb_swap_uv = true; - break; - default: -@@ -314,7 +314,7 @@ static int GetParameters( ScalerConfiguration *p_cfg, - { - if( p_fmti->i_chroma == VLC_CODEC_YUVP && ALLOW_YUVP ) - { -- i_fmti = i_fmto = PIX_FMT_GRAY8; -+ i_fmti = i_fmto = AV_PIX_FMT_GRAY8; - i_sws_flags = SWS_POINT; - } - } -@@ -327,9 +327,9 @@ static int GetParameters( ScalerConfiguration *p_cfg, - * Without SWS_ACCURATE_RND the quality is really bad for some conversions */ - switch( i_fmto ) - { -- case PIX_FMT_ARGB: -- case PIX_FMT_RGBA: -- case PIX_FMT_ABGR: -+ case AV_PIX_FMT_ARGB: -+ case AV_PIX_FMT_RGBA: -+ case AV_PIX_FMT_ABGR: - i_sws_flags |= SWS_ACCURATE_RND; - break; - } -@@ -403,8 +403,8 @@ static int Init( filter_t *p_filter ) - const unsigned i_fmto_visible_width = p_fmto->i_visible_width * p_sys->i_extend_factor; - for( int n = 0; n < (cfg.b_has_a ? 2 : 1); n++ ) - { -- const int i_fmti = n == 0 ? cfg.i_fmti : PIX_FMT_GRAY8; -- const int i_fmto = n == 0 ? cfg.i_fmto : PIX_FMT_GRAY8; -+ const int i_fmti = n == 0 ? cfg.i_fmti : AV_PIX_FMT_GRAY8; -+ const int i_fmto = n == 0 ? cfg.i_fmto : AV_PIX_FMT_GRAY8; - struct SwsContext *ctx; - - ctx = sws_getContext( i_fmti_visible_width, p_fmti->i_visible_height, i_fmti, --- -2.5.0 - diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch deleted file mode 100644 index 56744e7de8..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc/0010-SWSCALE-fix-compilation-with-4.x.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6fa8a4a9bb64ff34328aae46acd600f8502b2c05 Mon Sep 17 00:00:00 2001 -From: Jean-Baptiste Kempf -Date: Mon, 31 Aug 2015 09:07:39 +0200 -Subject: [PATCH] SWSCALE: fix compilation with 4.x -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -(cherry picked from commit 2b23857c68622edda76b72b74aeb3d943ee277c9) -Signed-off-by: Rafaël Carré ---- - modules/video_chroma/swscale.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c -index 4e0ecf1..26d0d6f 100644 ---- a/modules/video_chroma/swscale.c -+++ b/modules/video_chroma/swscale.c -@@ -36,6 +36,7 @@ - #include - - #include -+#include - - #ifdef __APPLE__ - # include -@@ -235,6 +236,7 @@ static int GetSwsCpuMask(void) - { - int i_sws_cpu = 0; - -+#if LIBSWSCALE_VERSION_MAJOR < 4 - #if defined(__i386__) || defined(__x86_64__) - if( vlc_CPU_MMX() ) - i_sws_cpu |= SWS_CPU_CAPS_MMX; -@@ -248,6 +250,7 @@ static int GetSwsCpuMask(void) - if( vlc_CPU_ALTIVEC() ) - i_sws_cpu |= SWS_CPU_CAPS_ALTIVEC; - #endif -+#endif - - return i_sws_cpu; - } --- -2.5.0 - diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb deleted file mode 100644 index b5be04cb91..0000000000 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb +++ /dev/null @@ -1,19 +0,0 @@ -require ${BPN}.inc - -# work around build failure -EXTRA_OECONF += " --enable-libxml2=no" - -SRC_URI += "file://0001-enable-subdir-objects.patch \ - file://0002-glibc-does-not-provide-strlcpy.patch \ - file://0003-use-am-path-libgcrypt.patch \ - file://0004-modules-gui-qt4-out-of-tree-build.patch \ - file://0005-libpostproc-header-check.patch \ - file://0006-make-opencv-configurable.patch \ - file://0007-use-vorbisidec.patch \ - file://0008-fix-luaL-checkint.patch \ - file://0009-Avcodec-swscale-use-AV_PIX_FMT-consistently.patch \ - file://0010-SWSCALE-fix-compilation-with-4.x.patch \ -" - -SRC_URI[md5sum] = "f98d60f0f59ef72b6e3407f2ff09bda6" -SRC_URI[sha256sum] = "9ad23128be16f9b40ed772961272cb0748ed8e4aa1bc79c129e589feebea5fb5" diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb new file mode 100644 index 0000000000..95b6779fde --- /dev/null +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.6.bb @@ -0,0 +1,14 @@ +require ${BPN}.inc + +# work around build failure +EXTRA_OECONF += " --enable-libxml2=no" + +SRC_URI += " \ + file://0002-glibc-does-not-provide-strlcpy.patch \ + file://0005-libpostproc-header-check.patch \ + file://0006-make-opencv-configurable.patch \ + file://0007-use-vorbisidec.patch \ + file://0008-fix-luaL-checkint.patch \ +" +SRC_URI[md5sum] = "4ff71d262e070fd19f86a1c3542c7b4e" +SRC_URI[sha256sum] = "18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3" From patchwork Sat Mar 2 02:50:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 159522 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1450219jad; Fri, 1 Mar 2019 18:51:39 -0800 (PST) X-Google-Smtp-Source: APXvYqw7lMVF9moB9Y9B0BaJVvqrloQf3yeAgbUI5K6kMuOV4yOWASU24SPEd/6Xht7/91ne64N0 X-Received: by 2002:a63:f412:: with SMTP id g18mr8099712pgi.444.1551495099567; Fri, 01 Mar 2019 18:51:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551495099; cv=none; d=google.com; s=arc-20160816; b=Gi1CFYo5i5rJP79rLXjktkVrmCCbUUcLE8qG1iQdvDbp5uw88C1sYbyawVnG1aa4Aw u6WTQSAwiTCsVTRxWVUMvg5XbolDntKRek6ycuxkpn3AgpCmo8OUdrC/jt7vBoM55aSD x8UvQv4fQ0vEdIQEKx47CLV5KasgOz+3RmE1hNOdVh8vZlwjG8DhiuQq6wgfkTjh+cpO BKCgzFG+lzRK/FXYjgoeu9bBKXPQisRtjiHZmvAjFGsCNKKX+7CXDlynIarSl0i1wjhx qmDvJ14JnNbECY9bPXlq73VWRODv51Bhq0nWH/dRPAmZSe9l28y5YcaCS1ttaM5E2w/q eg+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:references:in-reply-to:message-id:date:to:from :dkim-signature:delivered-to; bh=KkeVJyqlZAqgs2cyLgdFjq/gXodtl+jRYfeh1+6Ir/s=; b=uaOtoCjNr4zA6TGWyYpl0JzHFgdVmhIDSgtMYNGJaX7zwuIHilziWtsU2oeyv7qvDn JjurSCmbBPJ3ETueWdjUJXyMY5scxz0DzgjarYIAUWYdw/QO4/ErsQJq6V6a9PY7xda3 SGXMNVpY9NEmbdc9xXCeoIkw4qo6Jmy8uD1AuzT/tUyXdWycYNIDcqgd1qT/u1kTxkXg fnFEAKQJcIDphOt1IYMD99jukz3RYjlTNcBa3JfNED216mYZ9YVImDPZTkQOhl8CYYBo vn3Zj7pv7LrZ1qXCyuGQxvgz6FTqcnr6DQrm5oC6wd4+lOaKWOZLQN0wpF9gs38LiQoB O42w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NApWBeCX; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 102si21828815plb.176.2019.03.01.18.51.39; Fri, 01 Mar 2019 18:51:39 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NApWBeCX; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 208F97CE02; Sat, 2 Mar 2019 02:51:29 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mail.openembedded.org (Postfix) with ESMTP id 171387C711 for ; Sat, 2 Mar 2019 02:50:46 +0000 (UTC) Received: by mail-pg1-f172.google.com with SMTP id y4so12296418pgc.12 for ; Fri, 01 Mar 2019 18:50:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=FVN9Fh/Z1jL5cv+qAqzWT6OVvH87k8mzaaXfd8fuUcs=; b=NApWBeCXw2RYCZgqFEj1jAUdyDYluws4EFurXSpzxnBBGyLFTSR1Yo3NBq4ElGqWUd wXVTp0uPJ6/dE+6G4yoihn9TukvD4RmW3SD8917ZnaDy84YmmK66WclYDM4RmyYxN/i7 cfDGNH4gBfVzYvZcMW6tf1HqwI25DVBCTZZSlByqh1xDktFwYuF8aLJ2ENDEfvA+eb5z uo0XR8XDrDfWuWvd/glAKhyFf91He1X+SVwMp/w4UsB/VilAFy3bziWN5qLpUf3v93Sr h2dNSaTicbIJqJNEd+BtnYSePdkWj7ew3Z8OJQlAX6AnfoC+Rz3MhmJ17fvqy+MBufWw WmgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=FVN9Fh/Z1jL5cv+qAqzWT6OVvH87k8mzaaXfd8fuUcs=; b=KfODov5OBZVBBGaTZYcmaohZRc8aYAx1ZyZr48yjxFLNjal5GdAxO1FAzGA/NkH15q tZfnpWjTqkGnuVR2r4kq1vqZsQNukcSrns3QTzA1KV2fibfaSK+QVEL0WzloQxVDFh7f EDKFVearZEIF+dcO87hpeOEvvSjS8e8twf84Nv0MJSDaZqqy8EAF0WK7BV/jvr1Q1Zue QjY3JxU8hv2fsywm876fQK/ygM1DqlHr2M2+9vCA9DFOFyhQXq3MC39iK/kixrEAE1UP U1DNd3EZRol5pue7heyUMt/Bn76gZN5xwKa1OkpIZmptizaHjmOhcWwIB994E3WqVdo4 4S2Q== X-Gm-Message-State: APjAAAUEbq+TaKd9GbWy7NT7D22v7J62QlwigL+jJrVm8OkJidxiSIQ7 Uh+XYOM+KTo1reeB52rM1A1JF8Oc X-Received: by 2002:a63:8948:: with SMTP id v69mr8232107pgd.140.1551495047684; Fri, 01 Mar 2019 18:50:47 -0800 (PST) Received: from apollo.hsd1.ca.comcast.net ([2601:646:8500:6bc6::5fa3]) by smtp.gmail.com with ESMTPSA id z7sm46600905pfl.4.2019.03.01.18.50.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Mar 2019 18:50:47 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Fri, 1 Mar 2019 18:50:34 -0800 Message-Id: <20190302025034.10954-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190302025034.10954-1-raj.khem@gmail.com> References: <20190302025034.10954-1-raj.khem@gmail.com> MIME-Version: 1.0 Subject: [oe] [meta-oe][PATCH 3/3] uftrace: Upgrade to 0.9.2 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Drop pathes which are upstreamed Signed-off-by: Khem Raj --- ...001-include-dlfcn.h-for-RTLD_DEFAULT.patch | 39 ------------------- .../{uftrace_0.8.3.bb => uftrace_0.9.2.bb} | 5 +-- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch rename meta-oe/recipes-devtools/uftrace/{uftrace_0.8.3.bb => uftrace_0.9.2.bb} (89%) -- 2.21.0 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel diff --git a/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch b/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch deleted file mode 100644 index fe7aac9318..0000000000 --- a/meta-oe/recipes-devtools/uftrace/uftrace/0001-include-dlfcn.h-for-RTLD_DEFAULT.patch +++ /dev/null @@ -1,39 +0,0 @@ -From cdf7f2e394fcfb93a61f509ae3388f29540a6b35 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 8 Sep 2018 11:56:13 -0700 -Subject: [PATCH] include dlfcn.h for RTLD_DEFAULT - -Fixes -plthook.c:128:41: error: use of undeclared identifier 'RTLD_DEFAULT' - -Upstream-Status: Submitted [https://github.com/namhyung/uftrace/pull/487] -Signed-off-by: Khem Raj ---- - libmcount/plthook.c | 1 + - utils/debug.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libmcount/plthook.c b/libmcount/plthook.c -index d9d84f0..d54f5e8 100644 ---- a/libmcount/plthook.c -+++ b/libmcount/plthook.c -@@ -6,6 +6,7 @@ - #include - #include - #include -+#include - - /* This should be defined before #include "utils.h" */ - #define PR_FMT "mcount" -diff --git a/utils/debug.c b/utils/debug.c -index 2134b09..5460def 100644 ---- a/utils/debug.c -+++ b/utils/debug.c -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #include "utils/utils.h" - diff --git a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb similarity index 89% rename from meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb rename to meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb index 5963e5d690..4f4016895d 100644 --- a/meta-oe/recipes-devtools/uftrace/uftrace_0.8.3.bb +++ b/meta-oe/recipes-devtools/uftrace/uftrace_0.9.2.bb @@ -10,10 +10,9 @@ DEPENDS_append_libc-musl = " argp-standalone" inherit autotools -# v0.8.3 -SRCREV = "8b723a6fae2ef30495cd6279774fba9c95cd9c88" +# v0.9.2 +SRCREV = "66fc1fb973f4a44aecd216541405ffe05196f11e" SRC_URI = "git://github.com/namhyung/${BPN} \ - file://0001-include-dlfcn.h-for-RTLD_DEFAULT.patch \ " S = "${WORKDIR}/git"