Patch is already merged, so not required anymore. Signed-off-by: Naveen Saini <[email protected]> --- ...oint-to-correct-location-of-spv-shad.patch | 30 ------------------- .../{libxcam_1.2.2.bb => libxcam_1.3.0.bb} | 5 ++-- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 recipes-core/libxcam/files/0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch rename recipes-core/libxcam/{libxcam_1.2.2.bb => libxcam_1.3.0.bb} (85%)
diff --git a/recipes-core/libxcam/files/0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch b/recipes-core/libxcam/files/0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch deleted file mode 100644 index 911d7aac..00000000 --- a/recipes-core/libxcam/files/0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 99f7a588ee827e25a153ac066a4f80f13a86e10e Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -Date: Mon, 29 Jul 2019 12:27:19 +0800 -Subject: [PATCH] modules/vulkan: point to correct location of spv shaders - -They are not generated and are present in source directory. - -Upstream-Status: Submitted [https://github.com/intel/libxcam/pull/654] - -Signed-off-by: Anuj Mittal <[email protected]> ---- - modules/vulkan/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/vulkan/Makefile.am b/modules/vulkan/Makefile.am -index 22763f0..56578ec 100644 ---- a/modules/vulkan/Makefile.am -+++ b/modules/vulkan/Makefile.am -@@ -5,7 +5,7 @@ XCAM_VK_CXXFLAGS = \ - $(LIBVULKAN_CFLAGS) \ - -I$(top_srcdir)/xcore \ - -I$(top_srcdir)/modules \ -- -I$(top_builddir)/shaders/spv \ -+ -I$(top_srcdir)/shaders/spv \ - $(NULL) - - XCAM_VK_LIBS = \ --- -2.7.4 - diff --git a/recipes-core/libxcam/libxcam_1.2.2.bb b/recipes-core/libxcam/libxcam_1.3.0.bb similarity index 85% rename from recipes-core/libxcam/libxcam_1.2.2.bb rename to recipes-core/libxcam/libxcam_1.3.0.bb index 80bef154..1bf00286 100644 --- a/recipes-core/libxcam/libxcam_1.2.2.bb +++ b/recipes-core/libxcam/libxcam_1.3.0.bb @@ -7,9 +7,8 @@ SECTION = "lib" inherit autotools pkgconfig S = "${WORKDIR}/git" -SRCREV = "28769ade4793006c8db9a1720359c310fa1e0d6a" -SRC_URI = "git://github.com/intel/libxcam.git;branch=1.2.2 \ - file://0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch \ +SRCREV = "90f386c44fdfc550d0c81697cf070b3249bef4dd" +SRC_URI = "git://github.com/intel/libxcam.git;branch=1.3.0 \ " COMPATIBLE_HOST_libc-musl = "null" -- 2.17.1 -- _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
