From 579cd30427b0cb2941eca06bc0b0b9b1573d0e50 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 15 Aug 2014 18:09:22 +0100 Subject: gstreamer-vaapi: fix builds against GStreamer 1.4 Take a patch from upstream to fix configure when building against GStreamer 1.4. Signed-off-by: Ross Burton Signed-off-by: Tom Zanussi --- .../gstreamer/gstreamer-vaapi-1.0_0.5.8.bb | 2 +- .../gstreamer/gstreamer-vaapi.inc | 4 ++- .../gstreamer/gstreamer-vaapi/gstreamer14.patch | 36 ++++++++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 common/recipes-multimedia/gstreamer/gstreamer-vaapi/gstreamer14.patch (limited to 'common/recipes-multimedia') diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.8.bb b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.8.bb index 886b3c16..c1c4f5ac 100644 --- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.8.bb +++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi-1.0_0.5.8.bb @@ -2,4 +2,4 @@ require gstreamer-vaapi.inc DEPENDS += "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" -GST_API_VERSION = "1.2" +GST_API_VERSION = "1.4" diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc b/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc index 2f5b6f16..3614fbc7 100644 --- a/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc +++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi.inc @@ -12,7 +12,9 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libva" SRC_URI = "http://www.freedesktop.org/software/vaapi/releases/${REALPN}/${REALPN}-${PV}.tar.bz2 \ - file://install-tests.patch" + file://install-tests.patch \ + file://gstreamer14.patch \ + " SRC_URI[md5sum] = "375ddbab556e53ccc311b792f2c649a7" SRC_URI[sha256sum] = "24fee8a1ca4cb99ed7739d876b17a4085e81b28550350867dee5105300d343c6" diff --git a/common/recipes-multimedia/gstreamer/gstreamer-vaapi/gstreamer14.patch b/common/recipes-multimedia/gstreamer/gstreamer-vaapi/gstreamer14.patch new file mode 100644 index 00000000..7b54b316 --- /dev/null +++ b/common/recipes-multimedia/gstreamer/gstreamer-vaapi/gstreamer14.patch @@ -0,0 +1,36 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 580100d7498f861b04e6e727a4fc71bd29df46b6 Mon Sep 17 00:00:00 2001 +From: Gwenole Beauchesne +Date: Mon, 28 Jul 2014 14:20:33 +0200 +Subject: [PATCH] configure: fix build with GStreamer 1.4.0 release. + +--- + configure.ac | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c98d08c..b41d483 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -220,7 +220,7 @@ case $GST_API_VERSION in + GST_PLUGINS_BASE_VERSION_REQUIRED=gst12_plugins_base_version + GST_PLUGINS_BAD_VERSION_REQUIRED=gst12_plugins_bad_version + ;; +-1.3) ++1.[[3-4]]) + GST_VERSION_REQUIRED=gst14_version + GST_PLUGINS_BASE_VERSION_REQUIRED=gst14_plugins_base_version + GST_PLUGINS_BAD_VERSION_REQUIRED=gst14_plugins_bad_version +@@ -473,7 +473,7 @@ case $GST_API_VERSION in + 0.10) lt_bias=gst0_vaapi_lt_current_bias;; + 1.0) lt_bias=gst1_vaapi_lt_current_bias;; + 1.2) lt_bias=gst2_vaapi_lt_current_bias;; +-1.3) lt_bias=gst4_vaapi_lt_current_bias;; ++1.[[3-4]]) lt_bias=gst4_vaapi_lt_current_bias;; + esac + GST_VAAPI_MAJOR_VERSION=`expr gst_vaapi_lt_current - "$lt_bias"` + AC_SUBST(GST_VAAPI_MAJOR_VERSION) +-- +1.7.1 -- cgit v1.2.3-54-g00ecf