summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNaveen Saini <naveen.kumar.saini@intel.com>2019-10-14 05:43:10 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2019-10-20 23:18:55 (GMT)
commit62ac7ad8747118c3165e47707ae311282e6db77c (patch)
treed2967575004e7df00eb54da670372afd2a15bd8a
parentdd9437e9bebd028fcddff3a8e4e5ec70a6df16bd (diff)
downloadmeta-intel-62ac7ad8747118c3165e47707ae311282e6db77c.tar.gz
libxcam: upgrade 1.2.2 -> 1.3.0
Patch is already merged, so not required anymore. Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--recipes-core/libxcam/files/0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch30
-rw-r--r--recipes-core/libxcam/libxcam_1.3.0.bb (renamed from recipes-core/libxcam/libxcam_1.2.2.bb)5
2 files changed, 2 insertions, 33 deletions
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 911d7aa..0000000
--- a/recipes-core/libxcam/files/0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1From 99f7a588ee827e25a153ac066a4f80f13a86e10e Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Mon, 29 Jul 2019 12:27:19 +0800
4Subject: [PATCH] modules/vulkan: point to correct location of spv shaders
5
6They are not generated and are present in source directory.
7
8Upstream-Status: Submitted [https://github.com/intel/libxcam/pull/654]
9
10Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
11---
12 modules/vulkan/Makefile.am | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/modules/vulkan/Makefile.am b/modules/vulkan/Makefile.am
16index 22763f0..56578ec 100644
17--- a/modules/vulkan/Makefile.am
18+++ b/modules/vulkan/Makefile.am
19@@ -5,7 +5,7 @@ XCAM_VK_CXXFLAGS = \
20 $(LIBVULKAN_CFLAGS) \
21 -I$(top_srcdir)/xcore \
22 -I$(top_srcdir)/modules \
23- -I$(top_builddir)/shaders/spv \
24+ -I$(top_srcdir)/shaders/spv \
25 $(NULL)
26
27 XCAM_VK_LIBS = \
28--
292.7.4
30
diff --git a/recipes-core/libxcam/libxcam_1.2.2.bb b/recipes-core/libxcam/libxcam_1.3.0.bb
index 80bef15..1bf0028 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"
7inherit autotools pkgconfig 7inherit autotools pkgconfig
8 8
9S = "${WORKDIR}/git" 9S = "${WORKDIR}/git"
10SRCREV = "28769ade4793006c8db9a1720359c310fa1e0d6a" 10SRCREV = "90f386c44fdfc550d0c81697cf070b3249bef4dd"
11SRC_URI = "git://github.com/intel/libxcam.git;branch=1.2.2 \ 11SRC_URI = "git://github.com/intel/libxcam.git;branch=1.3.0 \
12 file://0001-modules-vulkan-point-to-correct-location-of-spv-shad.patch \
13 " 12 "
14 13
15COMPATIBLE_HOST_libc-musl = "null" 14COMPATIBLE_HOST_libc-musl = "null"