diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:28:33 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-04-05 22:31:28 +0300 |
commit | 193236933b0f4ab91b1625b64e2187e2db4e0e8f (patch) | |
tree | e12769d7c76d8b0517d6de3d3c72189753d253ed /poky/meta/recipes-graphics/libva | |
parent | bd93df9478f2f56ffcbc8cb88f1709c735dcd85b (diff) | |
download | openbmc-193236933b0f4ab91b1625b64e2187e2db4e0e8f.tar.xz |
reset upstream subtrees to HEAD
Reset the following subtrees on HEAD:
poky: 8217b477a1(master)
meta-xilinx: 64aa3d35ae(master)
meta-openembedded: 0435c9e193(master)
meta-raspberrypi: 490a4441ac(master)
meta-security: cb6d1c85ee(master)
Squashed patches:
meta-phosphor: drop systemd 239 patches
meta-phosphor: mrw-api: use correct install path
Change-Id: I268e2646d9174ad305630c6bbd3fbc1a6105f43d
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-graphics/libva')
-rw-r--r-- | poky/meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch | 35 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/libva/libva-utils_2.4.0.bb (renamed from poky/meta/recipes-graphics/libva/libva-utils_2.2.0.bb) | 9 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/libva/libva_2.4.0.bb (renamed from poky/meta/recipes-graphics/libva/libva_2.2.0.bb) | 4 |
3 files changed, 43 insertions, 5 deletions
diff --git a/poky/meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch b/poky/meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch new file mode 100644 index 000000000..01fb71913 --- /dev/null +++ b/poky/meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch @@ -0,0 +1,35 @@ +From 8fc14e4bc81885b80c3072e549c2e6f59533d7ef Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Fri, 8 Feb 2019 11:45:55 +0800 +Subject: [PATCH] Build sfcsample only when X11 backend is enabled + +See: https://github.com/intel/libva-utils/pull/149, and +https://github.com/intel/libva-utils/issues/150 + +Upstream-Status: Submitted + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index d28175a..e294e25 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,10 +24,11 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = common decode encode vainfo videoprocess vendor/intel vendor/intel/sfcsample ++SUBDIRS = common decode encode vainfo videoprocess vendor/intel + + if USE_X11 + SUBDIRS += putsurface ++SUBDIRS += vendor/intel/sfcsample + else + if USE_WAYLAND + SUBDIRS += putsurface +-- +2.17.1 + diff --git a/poky/meta/recipes-graphics/libva/libva-utils_2.2.0.bb b/poky/meta/recipes-graphics/libva/libva-utils_2.4.0.bb index e35085cb9..7b764314b 100644 --- a/poky/meta/recipes-graphics/libva/libva-utils_2.2.0.bb +++ b/poky/meta/recipes-graphics/libva/libva-utils_2.4.0.bb @@ -14,9 +14,12 @@ SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "93b58aa5b14c16f4bace8a45dc255ec9" -SRC_URI[sha256sum] = "ed7a6ed1fab657df4e83ea11f90310efcf31c27828f32d65351a28ca3c404dc0" +SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2 \ + file://0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch \ + " + +SRC_URI[md5sum] = "f5374c4c32ce136e50aea0267887aed5" +SRC_URI[sha256sum] = "5b7d1954b40fcb2c0544be20125c71a0852049715ab85a3e8aba60434a40c6b3" UPSTREAM_CHECK_URI = "https://github.com/intel/libva-utils/releases" diff --git a/poky/meta/recipes-graphics/libva/libva_2.2.0.bb b/poky/meta/recipes-graphics/libva/libva_2.4.0.bb index 11e57e0eb..ffa1ab8f7 100644 --- a/poky/meta/recipes-graphics/libva/libva_2.2.0.bb +++ b/poky/meta/recipes-graphics/libva/libva_2.4.0.bb @@ -19,8 +19,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "92d04ad1700136dc75b1e5f47516e704" -SRC_URI[sha256sum] = "6f6ca04c785544d30d315ef130a6aeb9435b75f934d7fbe0e4e9ba6084ce4ef2" +SRC_URI[md5sum] = "cfc69c2a5f526dd1858e098fb8eebfa6" +SRC_URI[sha256sum] = "99263056c21593a26f2ece812aee6fe60142b49e6cd46cb33c8dddf18fc19391" UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" |