* [PATCH 01/26] recipes-qt: remove all traces of qt4, no longer in oe-core
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 02/26] gstreamer: remove outdated 0.10.x version, " Denys Dmytriyenko
` (24 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/recipes-qt/qt4/arago-qt4.inc | 25 -
...-PATCH-make-demos-maximized-for-TISDK-use.patch | 48 -
.../qt4/files/0002-qwslock-messages.patch | 67 --
meta-arago-distro/recipes-qt/qt4/files/qte.sh | 11 -
.../qt4/nativesdk-qt4-tools_4.8.6.bbappend | 9 -
.../qt4/qt4-embedded-gles_4.8.6.bbappend | 12 -
.../recipes-qt/qt4/qt4-embedded_4.8.6.bbappend | 3 -
.../recipes-qt/qt-apps/quick-playground_1.0.bb | 39 -
...hanges-for-integrating-with-TI-graphics-S.patch | 719 ---------------
.../qt4-embedded-gles/0001-wsegl2-support.patch | 997 ---------------------
.../qt4/qt4-embedded-gles/002_pvrqwswsegl.c.patch | 11 -
.../qt4/qt4-embedded-gles/cursor-hack.diff | 34 -
.../recipes-qt/qt4/qt4-embedded-gles/linux.conf | 68 --
.../recipes-qt/qt4/qt4-embedded-gles_4.8.6.bb | 30 -
14 files changed, 2073 deletions(-)
delete mode 100644 meta-arago-distro/recipes-qt/qt4/arago-qt4.inc
delete mode 100644 meta-arago-distro/recipes-qt/qt4/files/0001-PATCH-make-demos-maximized-for-TISDK-use.patch
delete mode 100644 meta-arago-distro/recipes-qt/qt4/files/0002-qwslock-messages.patch
delete mode 100644 meta-arago-distro/recipes-qt/qt4/files/qte.sh
delete mode 100644 meta-arago-distro/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bbappend
delete mode 100644 meta-arago-distro/recipes-qt/qt4/qt4-embedded-gles_4.8.6.bbappend
delete mode 100644 meta-arago-distro/recipes-qt/qt4/qt4-embedded_4.8.6.bbappend
delete mode 100644 meta-arago-extras/recipes-qt/qt-apps/quick-playground_1.0.bb
delete mode 100644 meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/0001-Qt-4.x-v2-Changes-for-integrating-with-TI-graphics-S.patch
delete mode 100644 meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/0001-wsegl2-support.patch
delete mode 100644 meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/002_pvrqwswsegl.c.patch
delete mode 100644 meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/cursor-hack.diff
delete mode 100644 meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/linux.conf
delete mode 100644 meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles_4.8.6.bb
diff --git a/meta-arago-distro/recipes-qt/qt4/arago-qt4.inc b/meta-arago-distro/recipes-qt/qt4/arago-qt4.inc
deleted file mode 100644
index 57ced60..0000000
--- a/meta-arago-distro/recipes-qt/qt4/arago-qt4.inc
+++ /dev/null
@@ -1,25 +0,0 @@
-# Common file for patches or tweaks that are needed by qt4-embedded and
-# qt4-embedded-gles
-
-PR := "${PR}-arago8"
-
-# look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-python __anonymous () {
- d.setVar("RRECOMMENDS_libqt-embeddedcore4", "")
-}
-
-# Qt/E from Nokia is dual-licensed (LGPLv2.1 or GPLv3)
-# For our distribution purposes we only use LGPLv2.1
-LICENSE = "LGPLv2.1"
-
-SRC_URI += "file://0001-PATCH-make-demos-maximized-for-TISDK-use.patch \
- file://0002-qwslock-messages.patch \
- file://qte.sh \
-"
-
-# Rotate the display only for am37x_evm
-do_install_prepend_am37x-evm () {
- echo "export QWS_DISPLAY="transformed:Rot90" >> ${WORKDIR}/qte.sh
-}
diff --git a/meta-arago-distro/recipes-qt/qt4/files/0001-PATCH-make-demos-maximized-for-TISDK-use.patch b/meta-arago-distro/recipes-qt/qt4/files/0001-PATCH-make-demos-maximized-for-TISDK-use.patch
deleted file mode 100644
index 70f67fd..0000000
--- a/meta-arago-distro/recipes-qt/qt4/files/0001-PATCH-make-demos-maximized-for-TISDK-use.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d8d20f1a7b889ee28f786cc1dfaa65b610d63b13 Mon Sep 17 00:00:00 2001
-From: Franklin S. Cooper Jr <fcooper@ti.com>
-Date: Wed, 31 Oct 2012 21:06:01 -0500
-Subject: [PATCH] make demos maximized for TISDK use
-
-* Maximize the weatherinfo and imageviewer demos for use in the TISDK
-
-Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
----
- demos/embedded/weatherinfo/weatherinfo.cpp | 5 -----
- examples/widgets/imageviewer/main.cpp | 4 ----
- 2 files changed, 0 insertions(+), 9 deletions(-)
-
-diff --git a/demos/embedded/weatherinfo/weatherinfo.cpp b/demos/embedded/weatherinfo/weatherinfo.cpp
-index 0614149..c47504d 100644
---- a/demos/embedded/weatherinfo/weatherinfo.cpp
-+++ b/demos/embedded/weatherinfo/weatherinfo.cpp
-@@ -492,12 +492,7 @@ int main(int argc, char *argv[])
- QApplication app(argc, argv);
-
- WeatherInfo w;
--#if defined(Q_OS_SYMBIAN)
- w.showMaximized();
--#else
-- w.resize(520, 288);
-- w.show();
--#endif
-
- return app.exec();
- }
-diff --git a/examples/widgets/imageviewer/main.cpp b/examples/widgets/imageviewer/main.cpp
-index 8d1a068..35fb80d 100644
---- a/examples/widgets/imageviewer/main.cpp
-+++ b/examples/widgets/imageviewer/main.cpp
-@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
- {
- QApplication app(argc, argv);
- ImageViewer imageViewer;
--#if defined(Q_OS_SYMBIAN)
- imageViewer.showMaximized();
--#else
-- imageViewer.show();
--#endif
- return app.exec();
- }
---
-1.7.0.4
-
diff --git a/meta-arago-distro/recipes-qt/qt4/files/0002-qwslock-messages.patch b/meta-arago-distro/recipes-qt/qt4/files/0002-qwslock-messages.patch
deleted file mode 100644
index d1355a7..0000000
--- a/meta-arago-distro/recipes-qt/qt4/files/0002-qwslock-messages.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From f18e63824df6bcbadc99f8efa26aae6c425fd5bc Mon Sep 17 00:00:00 2001
-From: Jeff Lance <j-lance1@ti.com>
-Date: Thu, 13 Dec 2012 07:13:11 -0600
-Subject: [PATCH] Adding patch to fix QWSLOCK message issue
-
----
- src/gui/embedded/qwslock.cpp | 11 +++++++----
- src/gui/embedded/qwslock_p.h | 2 +-
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/gui/embedded/qwslock.cpp b/src/gui/embedded/qwslock.cpp
-index f9ea000..7d8b6c2 100644
---- a/src/gui/embedded/qwslock.cpp
-+++ b/src/gui/embedded/qwslock.cpp
-@@ -82,10 +82,12 @@ QWSLock::QWSLock(int id) : semId(id)
- #ifndef QT_NO_QWS_SIGNALHANDLER
- QWSSignalHandler::instance()->addWSLock(this);
- #endif
-+ owned = false;
-
- #ifndef QT_POSIX_IPC
- if (semId == -1) {
- semId = semget(IPC_PRIVATE, 3, IPC_CREAT | 0666);
-+ owned = true;
- if (semId == -1) {
- perror("QWSLock::QWSLock");
- qFatal("Unable to create semaphore");
-@@ -100,7 +102,6 @@ QWSLock::QWSLock(int id) : semId(id)
- }
- #else
- sems[0] = sems[1] = sems[2] = SEM_FAILED;
-- owned = false;
-
- if (semId == -1) {
- // ### generate really unique IDs
-@@ -134,9 +135,11 @@ QWSLock::~QWSLock()
-
- if (semId != -1) {
- #ifndef QT_POSIX_IPC
-- qt_semun semval;
-- semval.val = 0;
-- semctl(semId, 0, IPC_RMID, semval);
-+ if(owned) {
-+ qt_semun semval;
-+ semval.val = 0;
-+ semctl(semId, 0, IPC_RMID, semval);
-+ }
- semId = -1;
- #else
- // emulate the SEM_UNDO behavior for the BackingStore lock
-diff --git a/src/gui/embedded/qwslock_p.h b/src/gui/embedded/qwslock_p.h
-index 71a4cca..7a74710 100644
---- a/src/gui/embedded/qwslock_p.h
-+++ b/src/gui/embedded/qwslock_p.h
-@@ -86,8 +86,8 @@ private:
- int lockCount[2];
- #ifdef QT_POSIX_IPC
- sem_t *sems[3];
-- bool owned;
- #endif
-+ bool owned;
- };
-
- QT_END_NAMESPACE
---
-1.7.0.4
-
diff --git a/meta-arago-distro/recipes-qt/qt4/files/qte.sh b/meta-arago-distro/recipes-qt/qt4/files/qte.sh
deleted file mode 100644
index 3d656f3..0000000
--- a/meta-arago-distro/recipes-qt/qt4/files/qte.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-### QT Environment Variables ###
-export QWS_MOUSE_PROTO=Auto
-
-
-# Set the QWS_MOUSE_PROTO for touchscreen if it exists
-if [ -e /dev/input/touchscreen0 ]
-then
- export QWS_MOUSE_PROTO=Tslib:/dev/input/touchscreen0
-fi
diff --git a/meta-arago-distro/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bbappend b/meta-arago-distro/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bbappend
deleted file mode 100644
index 8391cdd..0000000
--- a/meta-arago-distro/recipes-qt/qt4/nativesdk-qt4-tools_4.8.6.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-PR_append = "-arago3"
-
-# Qt/E from Nokia is dual-licensed (LGPLv2.1 or GPLv3)
-# For our distribution purposes we only use LGPLv2.1
-LICENSE = "LGPLv2.1"
-
-DEPENDS := "${@oe_filter_out('nativesdk-libx11', '${DEPENDS}', d)}"
-
-EXTRA_OECONF += " -no-pch"
diff --git a/meta-arago-distro/recipes-qt/qt4/qt4-embedded-gles_4.8.6.bbappend b/meta-arago-distro/recipes-qt/qt4/qt4-embedded-gles_4.8.6.bbappend
deleted file mode 100644
index 827eaf8..0000000
--- a/meta-arago-distro/recipes-qt/qt4/qt4-embedded-gles_4.8.6.bbappend
+++ /dev/null
@@ -1,12 +0,0 @@
-require arago-qt4.inc
-
-PR := "${PR}.1"
-
-# Some deps are missing when sgx is not set, skip this package
-python __anonymous() {
- features = bb.data.getVar("MACHINE_FEATURES", d, 1)
- if not features:
- return
- if "sgx" not in features:
- raise bb.parse.SkipPackage('qt4-embedded-gles needs dependencies derived from "sgx" flag in MACHINE_FEATURES')
-}
diff --git a/meta-arago-distro/recipes-qt/qt4/qt4-embedded_4.8.6.bbappend b/meta-arago-distro/recipes-qt/qt4/qt4-embedded_4.8.6.bbappend
deleted file mode 100644
index f9e5810..0000000
--- a/meta-arago-distro/recipes-qt/qt4/qt4-embedded_4.8.6.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-require arago-qt4.inc
-
-PR := "${PR}.0"
diff --git a/meta-arago-extras/recipes-qt/qt-apps/quick-playground_1.0.bb b/meta-arago-extras/recipes-qt/qt-apps/quick-playground_1.0.bb
deleted file mode 100644
index f285ff1..0000000
--- a/meta-arago-extras/recipes-qt/qt-apps/quick-playground_1.0.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-DESCRIPTION = "Qt Quick Playground"
-HOMEPAGE = "http://arago-project.org/git/projects/?p=qt4-demos.git;a=summary"
-SECTION = "multimedia"
-LICENSE = "Nokia"
-LIC_FILES_CHKSUM = "file://Licence.txt;md5=7cc88160b55ec5db6c6c5bb8e3238c0b"
-
-require recipes-core/matrix/matrix-gui-paths.inc
-
-PR = "r3"
-
-BRANCH = "master"
-SRCREV = "b055cefbe2ecb9e8009c08abe2c9dcfe447cfc9d"
-
-SRC_URI = "git://arago-project.org/git/projects/qt4-demos.git;protocol=git;branch=${BRANCH}"
-
-S = "${WORKDIR}/git/qml_playground"
-
-inherit qt4e
-
-do_install() {
- install -d ${D}/usr/bin
- install -m 0755 runQMLplay.sh ${D}/usr/bin/
- install -d ${D}${MATRIX_APP_DIR}/qml_playground
- cp -r apps/qml_playground/* ${D}${MATRIX_APP_DIR}/qml_playground
- install -m 0755 qtquickplayground ${D}${MATRIX_APP_DIR}/qml_playground/
-}
-
-PACKAGES += "matrix-gui-apps-quick-playground"
-
-RDEPENDS_matrix-gui-apps-quick-playground = "matrix-gui-apps-images matrix-gui-submenus-qt4 ${PN}"
-
-# Add the matrix directory to the FILES
-FILES_${PN} = "${MATRIX_APP_DIR}/qml_playground/qtquickplayground \
- /usr/bin/runQMLplay.sh"
-
-# Add the .debug directory to the dbg package
-FILES_${PN}-dbg += "${MATRIX_APP_DIR}/qml_playground/.debug"
-
-FILES_matrix-gui-apps-quick-playground = "${MATRIX_APP_DIR}/*"
diff --git a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/0001-Qt-4.x-v2-Changes-for-integrating-with-TI-graphics-S.patch b/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/0001-Qt-4.x-v2-Changes-for-integrating-with-TI-graphics-S.patch
deleted file mode 100644
index 73ef094..0000000
--- a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/0001-Qt-4.x-v2-Changes-for-integrating-with-TI-graphics-S.patch
+++ /dev/null
@@ -1,719 +0,0 @@
-From c463092eb5465cf7a7f9f783425dd75ec48d5f89 Mon Sep 17 00:00:00 2001
-From: Prathap Srinivas <msprathap@ti.com>
-Date: Tue, 5 Nov 2013 07:52:34 -0600
-Subject: [PATCH] Qt 4.x v2: Changes for integrating with TI graphics SDK release 04.10.00.01
-
-This patch adds the changes required for Qt 4.x to work with 04.10 TI gfx sdk.
-04.10.00.01 TI gfx sdk is based on 1.10 Linux DDK from Imagination Technologies
-wsegl.h, pvr2d.h has been updated with 1.10 DDK.
-This patch includes the updated files and also makes the required changes.
-The changes are in QWSWSEGL to interface with updated wsegl.h.
-
-Version 2:
-Updated to apply cleanly
----
- src/3rdparty/powervr/wsegl2/pvr2d.h | 190 +++++++++++++-------
- src/3rdparty/powervr/wsegl2/wsegl.h | 172 ++++++++++++------
- .../gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c | 28 +++-
- 3 files changed, 269 insertions(+), 121 deletions(-)
-
-diff --git a/src/3rdparty/powervr/wsegl2/pvr2d.h b/src/3rdparty/powervr/wsegl2/pvr2d.h
-index 0f44833..d7e8123 100644
---- a/src/3rdparty/powervr/wsegl2/pvr2d.h
-+++ b/src/3rdparty/powervr/wsegl2/pvr2d.h
-@@ -1,39 +1,47 @@
--/**********************************************************************
--*
--* Copyright(c) Imagination Technologies Ltd.
--*
--* The contents of this file are subject to the MIT license as set out below.
--*
--* Permission is hereby granted, free of charge, to any person obtaining a copy
--* of this software and associated documentation files (the "Software"),
--* to deal in the Software without restriction, including without limitation
--* the rights to use, copy, modify, merge, publish, distribute, sublicense,
--* and/or sell copies of the Software, and to permit persons to whom the
--* Software is furnished to do so, subject to the following conditions:
--*
--* The above copyright notice and this permission notice shall be included
--* in all copies or substantial portions of the Software.
--*
--* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
--* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
--* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
--* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--*
--* This License is also included in this distribution in the file called
--* "COPYING".
--*
--******************************************************************************/
--
--
-+/*************************************************************************/ /*!
-+@Copyright Copyright (c) Imagination Technologies Ltd. All Rights Reserved
-+@License Dual MIT/GPLv2
-+
-+The contents of this file are subject to the MIT license as set out below.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+Alternatively, the contents of this file may be used under the terms of
-+the GNU General Public License Version 2 ("GPL") in which case the provisions
-+of GPL are applicable instead of those above.
-+
-+If you wish to allow use of your version of this file only under the terms of
-+GPL, and not to allow others to use your version of this file under the terms
-+of the MIT license, indicate your decision by deleting the provisions above
-+and replace them with the notice and other provisions required by GPL as set
-+out in the file called "GPL-COPYING" included in this distribution. If you do
-+not delete the provisions above, a recipient may use your version of this file
-+under the terms of either the MIT license or GPL.
-+
-+This License is also included in this distribution in the file called
-+"MIT-COPYING".
-+
-+EXCEPT AS OTHERWISE STATED IN A NEGOTIATED AGREEMENT: (A) THE SOFTWARE IS
-+PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-+PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR
-+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+*/ /**************************************************************************/
-
- /******************************************************************************
- Modifications :-
- $Log: pvr2d.h $
--
-- --- Revision Logs Removed ---
- ******************************************************************************/
-
- #ifndef _PVR2D_H_
-@@ -54,7 +62,7 @@ extern "C" {
-
- /* PVR2D header revision */
- #define PVR2D_REV_MAJOR 3
--#define PVR2D_REV_MINOR 5
-+#define PVR2D_REV_MINOR 6
-
- /* Basic types */
- typedef enum
-@@ -67,13 +75,20 @@ typedef void* PVR2D_HANDLE;
-
- typedef char PVR2D_CHAR, *PVR2D_PCHAR;
- typedef unsigned char PVR2D_UCHAR, *PVR2D_PUCHAR;
-+
- typedef int PVR2D_INT, *PVR2D_PINT;
- typedef unsigned int PVR2D_UINT, *PVR2D_PUINT;
-+
-+typedef unsigned short PVR2D_UINT16, *PVR2D_PUINT16;
-+typedef signed short PVR2D_INT16, *PVR2D_PINT16;
-+
- typedef long PVR2D_LONG, *PVR2D_PLONG;
- typedef unsigned long PVR2D_ULONG, *PVR2D_PULONG;
-
- typedef void PVR2D_VOID, *PVR2D_PVOID;
-
-+/* services/stream ID */
-+typedef unsigned int PVR2D_SID;
-
- /* error codes */
- typedef enum
-@@ -99,7 +114,7 @@ typedef unsigned long PVR2DFORMAT;
- #define PVR2D_1BPP 0x00UL // 1bpp mask surface or palletized 1 bit source with 2x32 bit CLUT
- #define PVR2D_RGB565 0x01UL // Common rgb 565 format
- #define PVR2D_ARGB4444 0x02UL // Common argb 4444 format
--#define PVR2D_RGB888 0x03UL // Common rgb 888 format (not supported)
-+#define PVR2D_RGB888 0x03UL // Common rgb 888 format
- #define PVR2D_ARGB8888 0x04UL // Common argb 8888 format
- #define PVR2D_ARGB1555 0x05UL // Common argb 1555 format
- #define PVR2D_ALPHA8 0x06UL // Alpha-only 8 bit per pixel (used with a constant fill colour)
-@@ -114,16 +129,18 @@ typedef unsigned long PVR2DFORMAT;
- #define PVR2D_YUV422_UYVY 0x14UL // YUV 422 low-high byte order UY0VY1
- #define PVR2D_YUV422_YVYU 0x15UL // YUV 422 low-high byte order Y0VY1U
- #define PVR2D_YUV422_VYUY 0x16UL // YUV 422 low-high byte order VY0UY1
--#define PVR2D_YUV420_2PLANE 0x17UL // YUV420 2 Plane
--#define PVR2D_YUV420_3PLANE 0x18UL // YUV420 3 Plane
--#define PVR2D_2101010ARGB 0x19UL // 32 bit 2 10 10 10
--#define PVR2D_888RSGSBS 0x1AUL
-+#define PVR2D_YUV420_2PLANE 0x17UL // YUV420 2 Plane with UV interleaved in plane 2
-+#define PVR2D_YVU420_3PLANE 0x18UL // YVU420 3 Plane
-+#define PVR2D_YUV420_3PLANE 0x21UL // YUV420 3 Plane
-+#define PVR2D_2101010ARGB 0x19UL // 32 bit 2 10 10 10
-+#define PVR2D_888RSGSBS 0x1AUL // 3 channel signed 8 bit
- #define PVR2D_16BPP_RAW 0x1BUL // 16 bit raw (no format conversion)
- #define PVR2D_32BPP_RAW 0x1CUL // 32 bit raw
- #define PVR2D_64BPP_RAW 0x1DUL // 64 bit raw
- #define PVR2D_128BPP_RAW 0x1EUL // 128 bit raw
--
--#define PVR2D_NO_OF_FORMATS 0x1FUL
-+#define PVR2D_AYUV8888 0x1FUL
-+#define PVR2D_F16 0x20UL
-+#define PVR2D_NO_OF_FORMATS 0x22UL
-
- /* Format modifier bit field (DstFormat and SrcFormat bits 16..23) */
- #define PVR2D_FORMAT_MASK 0x0000FFFFUL // PVR2D Format bits
-@@ -141,7 +158,8 @@ typedef unsigned long PVR2DFORMAT;
- This flag requests a surface pdump, to capture the pixel state after host writes.
- Not needed if the surface state has resulted from previous SGX 2D/3D core writes.
- */
--#define PVR2D_SURFACE_PDUMP 0x00100000UL // calls PVRSRVPDumpMem to capture the surface (pdump builds only)
-+#define PVR2D_SURFACE_PDUMP 0x00100000UL // calls PVRSRVPDumpMem to capture the surface (pdump builds only)
-+#define PVR2D_BLTRECT_PDUMP 0x00200000UL // calls PVRSRVPDumpMem to capture the blt rectangle (pdump builds only)
-
- /*
- Low level 3D format extension - for blts via the 3D core only.
-@@ -155,8 +173,7 @@ typedef unsigned long PVR2DFORMAT;
- typedef enum
- {
- PVR2D_WRAPFLAG_NONCONTIGUOUS = 0,
-- PVR2D_WRAPFLAG_CONTIGUOUS = 1,
--
-+ PVR2D_WRAPFLAG_CONTIGUOUS = 1
- }PVR2DWRAPFLAGS;
-
- #define PVR2D_CONTEXT_FLAGS_PRIORITY_MASK 0x00000003
-@@ -171,7 +188,7 @@ typedef enum
- PVR2D_BLIT_DISABLE_ALL = 0x00000000, /* disable all additional controls */
- PVR2D_BLIT_CK_ENABLE = 0x00000001, /* enable colour key */
- PVR2D_BLIT_GLOBAL_ALPHA_ENABLE = 0x00000002, /* enable standard global alpha */
-- PVR2D_BLIT_PERPIXEL_ALPHABLEND_ENABLE = 0x00000004, /* enable per-pixel alpha bleding */
-+ PVR2D_BLIT_PERPIXEL_ALPHABLEND_ENABLE = 0x00000004, /* enable per-pixel alpha blending */
- PVR2D_BLIT_PAT_SURFACE_ENABLE = 0x00000008, /* enable pattern surf (disable fill) */
- PVR2D_BLIT_FULLY_SPECIFIED_ALPHA_ENABLE = 0x00000010, /* enable fully specified alpha */
- PVR2D_BLIT_ROT_90 = 0x00000020, /* apply 90 degree rotation to the blt */
-@@ -186,11 +203,12 @@ typedef enum
- PVR2D_BLIT_COLKEY_MASKED = 0x00004000, /* Mask enabled for colour key */
- PVR2D_BLIT_COLKEY_OP_PASS = 0x00008000, /* Colour key op = pass */
- PVR2D_BLIT_COLKEY_OP_REJECT = 0x00010000, /* Colour key op = reject */
-+ PVR2D_BLIT_ROP4 = 0x00020000, /* rop4 pattern support */
- PVR2D_BLIT_PATH_2DCORE = 0x00100000, /* Blt via dedicated 2D Core or PTLA */
- PVR2D_BLIT_PATH_3DCORE = 0x00200000, /* Blt via 3D Core */
- PVR2D_BLIT_PATH_SWBLT = 0x00400000, /* Blt via host software */
- PVR2D_BLIT_NO_SRC_SYNC_INFO = 0x00800000, /* Dont send a source sync info*/
-- PVR2D_BLIT_ISSUE_STATUS_UPDATES = 0x01000000, /* Issue status updates */
-+ PVR2D_BLIT_ISSUE_STATUS_UPDATES = 0x01000000, /* Issue SyncInfo status updates */
-
- } PVR2DBLITFLAGS;
-
-@@ -288,6 +306,17 @@ typedef struct _PVR2MISCDISPLAYINFO
-
- }PVR2DMISCDISPLAYINFO;
-
-+typedef struct
-+{
-+ PVR2DMEMINFO *pSurfMemInfo; /* surface memory */
-+ PVR2D_ULONG SurfOffset; /* byte offset from start of allocation to destination surface pixel 0,0 */
-+ PVR2D_LONG Stride; /* signed stride */
-+ PVR2DFORMAT Format; /* format */
-+ PVR2D_ULONG SurfWidth; /* surface width in pixels */
-+ PVR2D_ULONG SurfHeight; /* surface height in pixels */
-+
-+} PVR2D_SURFACE, *PPVR2D_SURFACE;
-+
-
- typedef struct _PVR2DBLTINFO
- {
-@@ -326,34 +355,28 @@ typedef struct _PVR2DBLTINFO
- PVR2D_LONG MaskX, MaskY; /* mask rect top left (mask size = blt size) */
- PVR2D_ULONG MaskSurfWidth; /* size of mask surface in pixels */
- PVR2D_ULONG MaskSurfHeight; /* size of mask surface in pixels */
--
-+
- PPVR2D_ALPHABLT pAlpha; /* fully specified alpha blend (2DCore only) */
--
-+
- PVR2D_ULONG uSrcChromaPlane1; /* mem offset from start of source alloc to chroma plane 1 */
- PVR2D_ULONG uSrcChromaPlane2; /* mem offset from start of source alloc to chroma plane 2 */
- PVR2D_ULONG uDstChromaPlane1; /* mem offset from start of dest alloc to chroma plane 1 */
- PVR2D_ULONG uDstChromaPlane2; /* mem offset from start of dest alloc to chroma plane 2 */
--
-+
- PVR2D_ULONG ColourKeyMask; /* 32 bit colour key mask, only valid when PVR2D_BLIT_COLKEY_MASKED is set */
-
-+ PPVR2D_SURFACE pPat; /* full rop4 support for patterns if PVR2D_BLIT_ROP4 set (2D Core hardware only) */
-+ PVR2D_LONG PatX, PatY; /* pattern start offset if PVR2D_BLIT_ROP4 set (2D Core hardware only) */
-+
- }PVR2DBLTINFO, *PPVR2DBLTINFO;
-
-+
- typedef struct _PVR2DRECT
- {
- PVR2D_LONG left, top;
- PVR2D_LONG right, bottom;
--} PVR2DRECT;
-+} PVR2DRECT, *PPVR2DRECT;
-
--typedef struct
--{
-- PVR2DMEMINFO *pSurfMemInfo; /* surface memory */
-- PVR2D_ULONG SurfOffset; /* byte offset from start of allocation to destination surface pixel 0,0 */
-- PVR2D_LONG Stride; /* signed stride */
-- PVR2DFORMAT Format; /* format */
-- PVR2D_ULONG SurfWidth; /* surface width in pixels */
-- PVR2D_ULONG SurfHeight; /* surface height in pixels */
--
--} PVR2D_SURFACE, *PPVR2D_SURFACE;
-
- typedef struct
- {
-@@ -479,8 +502,8 @@ typedef void* PVR2DFLIPCHAINHANDLE;
-
- #define PVR2D_CREATE_FLIPCHAIN_SHARED (1UL << 0)
- #define PVR2D_CREATE_FLIPCHAIN_QUERY (1UL << 1)
--#define PVR2D_CREATE_FLIPCHAIN_OEMOVERLAY (1UL << 2)
--#define PVR2D_CREATE_FLIPCHAIN_AS_BLITCHAIN (1UL << 3)
-+#define PVR2D_CREATE_FLIPCHAIN_OEMOVERLAY (1UL << 2)
-+#define PVR2D_CREATE_FLIPCHAIN_AS_BLITCHAIN (1UL << 3)
-
- /* Colour-key colour must be translated into argb8888 format */
- #define CKEY_8888(P) (P)
-@@ -498,7 +521,8 @@ typedef void* PVR2DFLIPCHAINHANDLE;
- #define CFILL_565(P) (((P&0xF800UL)<<8) | ((P&0x7E0UL)<<5) | ((P&0x1FUL)<<3))
-
- /* PVR2DCreateDeviceContext flags */
--#define PVR2D_XSERVER_PROC 0x00000001UL /*!< Set for the Xserver connection */
-+#define PVR2D_XSERVER_PROC 0x00000001UL /* Set for the Xserver connection */
-+#define PVR2D_FLAGS_PDUMP_ACTIVE 0x00000002UL /* Set when pdumping from multiple processes */
-
- /* PVR2DMemAlloc flags */
- #define PVR2D_MEM_UNCACHED 0x00000000UL /* Default */
-@@ -508,7 +532,7 @@ typedef void* PVR2DFLIPCHAINHANDLE;
- /* Functions that the library exports */
-
- PVR2D_IMPORT
--int PVR2DEnumerateDevices(PVR2DDEVICEINFO *pDevInfo);
-+PVR2D_INT PVR2DEnumerateDevices(PVR2DDEVICEINFO *pDevInfo);
-
- PVR2D_IMPORT
- PVR2DERROR PVR2DCreateDeviceContext(PVR2D_ULONG ulDevID,
-@@ -633,7 +657,7 @@ PVR2DERROR PVR2DSetPresentFlipProperties(PVR2DCONTEXTHANDLE hContext,
- PVR2D_ULONG ulPropertyMask,
- PVR2D_LONG lDstXPos,
- PVR2D_LONG lDstYPos,
-- PVR2D_ULONG ulNumClipRects,
-+ PVR2D_ULONG ulNumClipRects,
- PVR2DRECT *pClipRects,
- PVR2D_ULONG ulSwapInterval);
-
-@@ -658,6 +682,44 @@ PVR2DERROR PVR2DBlt3D (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT pBl
- PVR2D_IMPORT
- PVR2DERROR PVR2DBlt3DExt (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT_EXT pBlt3D);
-
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DModifyPendingOps(const PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_HANDLE *phSyncModObj,
-+ PVR2DMEMINFO *psMemInfo,
-+ PVR2D_BOOL bIsWriteOp,
-+ PVR2D_ULONG *pulReadOpsPending,
-+ PVR2D_ULONG *pulWriteOpsPending);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DModifyCompleteOps(const PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_HANDLE hSyncModObj);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DFlushToSyncModObj(const PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_HANDLE hSyncModObj,
-+ PVR2D_BOOL bWait);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DTakeSyncToken(const PVR2DCONTEXTHANDLE hContext,
-+ PVR2DMEMINFO *psMemInfo,
-+ PVR2D_HANDLE *phSyncToken,
-+ PVR2D_ULONG *pulReadOpsPending,
-+ PVR2D_ULONG *pulWriteOpsPending);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DReleaseSyncToken(const PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_HANDLE hSyncToken);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DFlushToSyncToken(const PVR2DCONTEXTHANDLE hContext,
-+ PVR2DMEMINFO *psMemInfo,
-+ PVR2D_HANDLE hSyncToken,
-+ PVR2D_BOOL bWait);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DWaitForNextHardwareEvent(const PVR2DCONTEXTHANDLE hContext);
-+
- #ifdef __cplusplus
- }
- #endif
-diff --git a/src/3rdparty/powervr/wsegl2/wsegl.h b/src/3rdparty/powervr/wsegl2/wsegl.h
-index a2c3ffc..480179b 100644
---- a/src/3rdparty/powervr/wsegl2/wsegl.h
-+++ b/src/3rdparty/powervr/wsegl2/wsegl.h
-@@ -1,34 +1,43 @@
--/**********************************************************************
--*
--* Copyright(c) Imagination Technologies Ltd.
--*
--* The contents of this file are subject to the MIT license as set out below.
--*
--* Permission is hereby granted, free of charge, to any person obtaining a copy
--* of this software and associated documentation files (the "Software"),
--* to deal in the Software without restriction, including without limitation
--* the rights to use, copy, modify, merge, publish, distribute, sublicense,
--* and/or sell copies of the Software, and to permit persons to whom the
--* Software is furnished to do so, subject to the following conditions:
--*
--* The above copyright notice and this permission notice shall be included
--* in all copies or substantial portions of the Software.
--*
--* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
--* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
--* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
--* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
--* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
--* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
--* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--*
--* This License is also included in this distribution in the file called
--* "COPYING".
--*
--******************************************************************************/
--
--
--
-+/*************************************************************************/ /*!
-+@Copyright Copyright (c) Imagination Technologies Ltd. All Rights Reserved
-+@License Dual MIT/GPLv2
-+
-+The contents of this file are subject to the MIT license as set out below.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy
-+of this software and associated documentation files (the "Software"), to deal
-+in the Software without restriction, including without limitation the rights
-+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-+copies of the Software, and to permit persons to whom the Software is
-+furnished to do so, subject to the following conditions:
-+
-+The above copyright notice and this permission notice shall be included in
-+all copies or substantial portions of the Software.
-+
-+Alternatively, the contents of this file may be used under the terms of
-+the GNU General Public License Version 2 ("GPL") in which case the provisions
-+of GPL are applicable instead of those above.
-+
-+If you wish to allow use of your version of this file only under the terms of
-+GPL, and not to allow others to use your version of this file under the terms
-+of the MIT license, indicate your decision by deleting the provisions above
-+and replace them with the notice and other provisions required by GPL as set
-+out in the file called "GPL-COPYING" included in this distribution. If you do
-+not delete the provisions above, a recipient may use your version of this file
-+under the terms of either the MIT license or GPL.
-+
-+This License is also included in this distribution in the file called
-+"MIT-COPYING".
-+
-+EXCEPT AS OTHERWISE STATED IN A NEGOTIATED AGREEMENT: (A) THE SOFTWARE IS
-+PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
-+BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-+PURPOSE AND NONINFRINGEMENT; AND (B) IN NO EVENT SHALL THE AUTHORS OR
-+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+
-+*/ /**************************************************************************/
- #if !defined(__WSEGL_H__)
- #define __WSEGL_H__
-
-@@ -51,7 +60,7 @@ extern "C" {
- // WSEGL API Version Number
- */
-
--#define WSEGL_VERSION 2
-+#define WSEGL_VERSION 4
- #define WSEGL_DEFAULT_DISPLAY 0
- #define WSEGL_DEFAULT_NATIVE_ENGINE 0
-
-@@ -78,6 +87,11 @@ typedef enum WSEGLCapsType_TAG
- WSEGL_CAP_WINDOWS_USE_HW_SYNC = 3, /* System default value = 0 (FALSE) */
- WSEGL_CAP_PIXMAPS_USE_HW_SYNC = 4, /* System default value = 0 (FALSE) */
-
-+ /* When this capability is set, the EGL lock is not taken around calls
-+ to WSEGL functions. The WSEGL module is responsible for performing
-+ its own locking in this case. */
-+ WSEGL_CAP_UNLOCKED = 5, /* System default value = 0 */
-+
- } WSEGLCapsType;
-
- /*
-@@ -97,6 +111,19 @@ typedef struct WSEGLCaps_TAG
- #define WSEGL_DRAWABLE_WINDOW 0x1
- #define WSEGL_DRAWABLE_PIXMAP 0x2
-
-+/*
-+// YUV format flags and sync
-+*/
-+#define WSEGL_FLAGS_YUV_CONFORMANT_RANGE (0 << 0)
-+#define WSEGL_FLAGS_YUV_FULL_RANGE (1 << 0)
-+#define WSEGL_FLAGS_YUV_BT601 (0 << 1)
-+#define WSEGL_FLAGS_YUV_BT709 (1 << 1)
-+#define WSEGL_FLAGS_EGLIMAGE_COMPOSITION_SYNC (1 << 2)
-+
-+/*
-+// Maximum number of optional PowerVR Services 4 SYNCINFO objects
-+*/
-+#define WSEGL_MAX_SRC_SYNCS 32
-
- /*
- // Pixel format of display/drawable
-@@ -110,6 +137,16 @@ typedef enum WSEGLPixelFormat_TAG
- WSEGL_PIXELFORMAT_ARGB1555 = 3,
- WSEGL_PIXELFORMAT_ABGR8888 = 4,
- WSEGL_PIXELFORMAT_XBGR8888 = 5,
-+ WSEGL_PIXELFORMAT_NV12 = 6,
-+ WSEGL_PIXELFORMAT_YUYV = 7,
-+ WSEGL_PIXELFORMAT_YV12 = 8,
-+ WSEGL_PIXELFORMAT_XRGB8888 = 9,
-+ WSEGL_PIXELFORMAT_UYVY = 10,
-+ WSEGL_PIXELFORMAT_NV12_4KALIGN = 11,
-+ WSEGL_PIXELFORMAT_NV21_4KALIGN = 12,
-+ WSEGL_PIXELFORMAT_R8 = 13,
-+ WSEGL_PIXELFORMAT_R8G8 = 14,
-+ WSEGL_PIXELFORMAT_NV21 = 15,
-
- /* These are compatibility names only; new WSEGL
- * modules should not use them.
-@@ -138,31 +175,33 @@ typedef struct WSEGLConfig_TAG
- {
- /*
- // Type of drawables this configuration applies to -
-- // OR'd values of drawable types.
-+ // OR'd values of drawable types.
- */
-- unsigned long ui32DrawableType;
-+ unsigned long ui32DrawableType;
-
- /* Pixel format */
-- WSEGLPixelFormat ePixelFormat;
-+ WSEGLPixelFormat ePixelFormat;
-
- /* Native Renderable - set to WSEGL_TRUE if native renderable */
-- unsigned long ulNativeRenderable;
-+ unsigned long ulNativeRenderable;
-
- /* FrameBuffer Level Parameter */
-- unsigned long ulFrameBufferLevel;
-+ unsigned long ulFrameBufferLevel;
-
- /* Native Visual ID */
-- unsigned long ulNativeVisualID;
-+ unsigned long ulNativeVisualID;
-
- /* Native Visual */
-- void *hNativeVisual;
-+ unsigned long ulNativeVisualType;
-
- /* Transparent Type */
-- WSEGLTransparentType eTransparentType;
-+ WSEGLTransparentType eTransparentType;
-
- /* Transparent Color - only used if transparent type is COLOR_KEY */
-- unsigned long ulTransparentColor; /* packed as 0x00RRGGBB */
-+ unsigned long ulTransparentColor; /* packed as 0x00RRGGBB */
-
-+ /* Framebuffer Target - set to WSEGL_TRUE if config compatible with framebuffer */
-+ unsigned long ulFramebufferTarget;
-
- } WSEGLConfig;
-
-@@ -180,13 +219,14 @@ typedef enum WSEGLError_TAG
- WSEGL_BAD_DRAWABLE = 6,
- WSEGL_BAD_MATCH = 7,
- WSEGL_OUT_OF_MEMORY = 8,
-+ WSEGL_RETRY = 9,
-
- /* These are compatibility names only; new WSEGL
- * modules should not use them.
- */
- WSEGL_BAD_CONFIG = WSEGL_BAD_MATCH,
-
--} WSEGLError;
-+} WSEGLError;
-
- /*
- // Drawable orientation (in degrees anti-clockwise)
-@@ -198,7 +238,7 @@ typedef enum WSEGLRotationAngle_TAG
- WSEGL_ROTATE_180 = 2,
- WSEGL_ROTATE_270 = 3
-
--} WSEGLRotationAngle;
-+} WSEGLRotationAngle;
-
- /*
- // Drawable information required by OpenGL-ES driver
-@@ -206,26 +246,46 @@ typedef enum WSEGLRotationAngle_TAG
- typedef struct WSEGLDrawableParams_TAG
- {
- /* Width in pixels of the drawable */
-- unsigned long ui32Width;
-+ unsigned long ui32Width;
-
- /* Height in pixels of the drawable */
-- unsigned long ui32Height;
-+ unsigned long ui32Height;
-
- /* Stride in pixels of the drawable */
-- unsigned long ui32Stride;
-+ unsigned long ui32Stride;
-
- /* Pixel format of the drawable */
-- WSEGLPixelFormat ePixelFormat;
-+ WSEGLPixelFormat ePixelFormat;
-
- /* User space cpu virtual address of the drawable */
-- void *pvLinearAddress;
-+ void *pvLinearAddress;
-
- /* HW address of the drawable */
-- unsigned long ui32HWAddress;
-+ unsigned long ui32HWAddress;
-+
-+ /* Override display's HW_SYNC mode */
-+ unsigned long bWaitForRender;
-
-- /* Private data for the drawable */
-- void *hPrivateData;
-+ /* Flags */
-+ unsigned long ulFlags;
-
-+ /* Rotation angle of drawable (presently source only) */
-+ WSEGLRotationAngle eRotationAngle;
-+
-+ /*
-+ // Optional PowerVR Services 4 MEMINFO pointer. This may be used for
-+ // internal (implicit) synchronization purposes, and by PDUMP. It should
-+ // refer to the same object as the other fields in this structure.
-+ */
-+ void *hMemInfo;
-+
-+ /*
-+ // Optional PowerVR Services 4 SYNCINFO pointers to sent down as source
-+ // surface (texture) dependencies of a render. If these are provided
-+ // when not applicable, they will be ignored. If a sync is not needed,
-+ // it should be passed as NULL.
-+ */
-+ void *ahSyncInfo[WSEGL_MAX_SRC_SYNCS];
-
- } WSEGLDrawableParams;
-
-@@ -262,12 +322,18 @@ typedef struct WSEGL_FunctionTable_TAG
-
- WSEGLError (*pfnWSEGL_CopyFromPBuffer)(void *, unsigned long, unsigned long, unsigned long, WSEGLPixelFormat, NativePixmapType);
-
-- WSEGLError (*pfnWSEGL_GetDrawableParameters)(WSEGLDrawableHandle, WSEGLDrawableParams *, WSEGLDrawableParams *);
-+ WSEGLError (*pfnWSEGL_GetDrawableParameters)(WSEGLDrawableHandle, WSEGLDrawableParams *, WSEGLDrawableParams *, unsigned long);
-
- WSEGLError (*pfnWSEGL_ConnectDrawable)(WSEGLDrawableHandle);
-
- WSEGLError (*pfnWSEGL_DisconnectDrawable)(WSEGLDrawableHandle);
-
-+ WSEGLError (*pfnWSEGL_FlagStartFrame)(void);
-+
-+
-+#if defined (__QNXNTO__)
-+ WSEGLError (*pfnWSEGL_WaitForDrawableRenderBuffer)(WSEGLDrawableHandle);
-+#endif
-
- } WSEGL_FunctionTable;
-
-@@ -276,7 +342,7 @@ WSEGL_IMPORT const WSEGL_FunctionTable *WSEGL_GetFunctionTablePointer(void);
-
- #ifdef __cplusplus
- }
--#endif
-+#endif
-
- #endif /* __WSEGL_H__ */
-
-diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
-index d42e59f..24e5b0d 100644
---- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
-+++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
-@@ -336,12 +336,17 @@ static WSEGLError wseglCopyFromPBuffer
- /* Return the parameters of a drawable that are needed by the EGL layer */
- static WSEGLError wseglGetDrawableParameters
- (WSEGLDrawableHandle _drawable, WSEGLDrawableParams *sourceParams,
-- WSEGLDrawableParams *renderParams)
-+ WSEGLDrawableParams *renderParams,unsigned long ulPlaneOffset)
- {
- PvrQwsDrawable *drawable = (PvrQwsDrawable *)_drawable;
- PVR2DMEMINFO *source, *render;
- WSEGLPixelFormat pixelFormat;
-
-+ WSEGL_UNREFERENCED_PARAMETER(ulPlaneOffset);
-+
-+ memset(renderParams, 0, sizeof(*renderParams));
-+ memset(sourceParams, 0, sizeof(*sourceParams));
-+
- if (!pvrQwsGetBuffers(drawable, &source, &render))
- return WSEGL_BAD_DRAWABLE;
-
-@@ -366,7 +371,7 @@ static WSEGLError wseglGetDrawableParameters
- sourceParams->ePixelFormat = pixelFormat;
- sourceParams->pvLinearAddress = source->pBase;
- sourceParams->ui32HWAddress = source->ui32DevAddr;
-- sourceParams->hPrivateData = source->hPrivateData;
-+ sourceParams->hMemInfo = source->hPrivateData;
-
- renderParams->ui32Width = drawable->rect.width;
- renderParams->ui32Height = drawable->rect.height;
-@@ -374,7 +379,7 @@ static WSEGLError wseglGetDrawableParameters
- renderParams->ePixelFormat = pixelFormat;
- renderParams->pvLinearAddress = render->pBase;
- renderParams->ui32HWAddress = render->ui32DevAddr;
-- renderParams->hPrivateData = render->hPrivateData;
-+ renderParams->hMemInfo = render->hPrivateData;
-
- return WSEGL_SUCCESS;
- }
-@@ -393,6 +398,20 @@ static WSEGLError wseglDisconnectDrawable(WSEGLDrawableHandle hDrawable)
- return WSEGL_SUCCESS;
- }
-
-+/***********************************************************************************
-+ Function Name : WSEGL_FlagStartFrame
-+ Inputs : hDrawable
-+ Outputs : None
-+ Returns : Error code
-+ Description : Indicates that there have been rendering commands submitted
-+ by a client driver
-+************************************************************************************/
-+static WSEGLError wseglFlagStartFrame(void)
-+{
-+ return WSEGL_SUCCESS;
-+}
-+
-+
- static WSEGL_FunctionTable const wseglFunctions = {
- WSEGL_VERSION,
- wseglIsDisplayValid,
-@@ -408,7 +427,8 @@ static WSEGL_FunctionTable const wseglFunctions = {
- wseglCopyFromPBuffer,
- wseglGetDrawableParameters,
- wseglConnectDrawable,
-- wseglDisconnectDrawable
-+ wseglDisconnectDrawable,
-+ wseglFlagStartFrame,
- };
-
- /* Return the table of WSEGL functions to the EGL implementation */
---
-1.7.0.4
-
diff --git a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/0001-wsegl2-support.patch b/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/0001-wsegl2-support.patch
deleted file mode 100644
index fcfd885..0000000
--- a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/0001-wsegl2-support.patch
+++ /dev/null
@@ -1,997 +0,0 @@
-diff -Nurp qt-everywhere-opensource-src-4.6.3-orig//src/3rdparty/powervr/wsegl2/pvr2d.h qt-everywhere-opensource-src-4.6.3/src/3rdparty/powervr/wsegl2/pvr2d.h
---- qt-everywhere-opensource-src-4.6.3-orig//src/3rdparty/powervr/wsegl2/pvr2d.h 1970-01-01 00:00:00.000000000 +0000
-+++ qt-everywhere-opensource-src-4.6.3/src/3rdparty/powervr/wsegl2/pvr2d.h 2011-05-16 22:51:43.158564336 +0000
-@@ -0,0 +1,669 @@
-+/**********************************************************************
-+*
-+* Copyright(c) Imagination Technologies Ltd.
-+*
-+* The contents of this file are subject to the MIT license as set out below.
-+*
-+* Permission is hereby granted, free of charge, to any person obtaining a copy
-+* of this software and associated documentation files (the "Software"),
-+* to deal in the Software without restriction, including without limitation
-+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+* and/or sell copies of the Software, and to permit persons to whom the
-+* Software is furnished to do so, subject to the following conditions:
-+*
-+* The above copyright notice and this permission notice shall be included
-+* in all copies or substantial portions of the Software.
-+*
-+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-+* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-+* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-+* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+*
-+* This License is also included in this distribution in the file called
-+* "COPYING".
-+*
-+******************************************************************************/
-+
-+
-+
-+/******************************************************************************
-+Modifications :-
-+$Log: pvr2d.h $
-+
-+ --- Revision Logs Removed ---
-+******************************************************************************/
-+
-+#ifndef _PVR2D_H_
-+#define _PVR2D_H_
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/* PVR2D Platform-specific definitions */
-+#if defined (__linux__)
-+#define PVR2D_EXPORT __attribute__((visibility("default")))
-+#define PVR2D_IMPORT
-+#else
-+#define PVR2D_EXPORT
-+#define PVR2D_IMPORT
-+#endif
-+
-+/* PVR2D header revision */
-+#define PVR2D_REV_MAJOR 3
-+#define PVR2D_REV_MINOR 5
-+
-+/* Basic types */
-+typedef enum
-+{
-+ PVR2D_FALSE = 0,
-+ PVR2D_TRUE
-+} PVR2D_BOOL;
-+
-+typedef void* PVR2D_HANDLE;
-+
-+typedef char PVR2D_CHAR, *PVR2D_PCHAR;
-+typedef unsigned char PVR2D_UCHAR, *PVR2D_PUCHAR;
-+typedef int PVR2D_INT, *PVR2D_PINT;
-+typedef unsigned int PVR2D_UINT, *PVR2D_PUINT;
-+typedef long PVR2D_LONG, *PVR2D_PLONG;
-+typedef unsigned long PVR2D_ULONG, *PVR2D_PULONG;
-+
-+typedef void PVR2D_VOID, *PVR2D_PVOID;
-+
-+
-+/* error codes */
-+typedef enum
-+{
-+ PVR2D_OK = 0,
-+ PVR2DERROR_INVALID_PARAMETER = -1,
-+ PVR2DERROR_DEVICE_UNAVAILABLE = -2,
-+ PVR2DERROR_INVALID_CONTEXT = -3,
-+ PVR2DERROR_MEMORY_UNAVAILABLE = -4,
-+ PVR2DERROR_DEVICE_NOT_PRESENT = -5,
-+ PVR2DERROR_IOCTL_ERROR = -6,
-+ PVR2DERROR_GENERIC_ERROR = -7,
-+ PVR2DERROR_BLT_NOTCOMPLETE = -8,
-+ PVR2DERROR_HW_FEATURE_NOT_SUPPORTED = -9,
-+ PVR2DERROR_NOT_YET_IMPLEMENTED = -10,
-+ PVR2DERROR_MAPPING_FAILED = -11
-+}PVR2DERROR;
-+
-+/* 32 bit PVR2D pixel format specifier */
-+typedef unsigned long PVR2DFORMAT;
-+
-+/* Standard PVR2D pixel formats */
-+#define PVR2D_1BPP 0x00UL // 1bpp mask surface or palletized 1 bit source with 2x32 bit CLUT
-+#define PVR2D_RGB565 0x01UL // Common rgb 565 format
-+#define PVR2D_ARGB4444 0x02UL // Common argb 4444 format
-+#define PVR2D_RGB888 0x03UL // Common rgb 888 format (not supported)
-+#define PVR2D_ARGB8888 0x04UL // Common argb 8888 format
-+#define PVR2D_ARGB1555 0x05UL // Common argb 1555 format
-+#define PVR2D_ALPHA8 0x06UL // Alpha-only 8 bit per pixel (used with a constant fill colour)
-+#define PVR2D_ALPHA4 0x07UL // Alpha-only 4 bits per pixel (used with a constant fill colour)
-+#define PVR2D_PAL2 0x08UL // Palletized 2 bit format (requires 4x32 bit CLUT)
-+#define PVR2D_PAL4 0x09UL // Palletized 4 bit format (requires 16x32 bit CLUT)
-+#define PVR2D_PAL8 0x0AUL // Palletized 8 bit format (requires 256x32 bit CLUT)
-+#define PVR2D_U8 0x10UL // monochrome unsigned 8 bit
-+#define PVR2D_U88 0x11UL // monochrome unsigned 16 bit
-+#define PVR2D_S8 0x12UL // signed 8 bit
-+#define PVR2D_YUV422_YUYV 0x13UL // YUV 422 low-high byte order Y0UY1V
-+#define PVR2D_YUV422_UYVY 0x14UL // YUV 422 low-high byte order UY0VY1
-+#define PVR2D_YUV422_YVYU 0x15UL // YUV 422 low-high byte order Y0VY1U
-+#define PVR2D_YUV422_VYUY 0x16UL // YUV 422 low-high byte order VY0UY1
-+#define PVR2D_YUV420_2PLANE 0x17UL // YUV420 2 Plane
-+#define PVR2D_YUV420_3PLANE 0x18UL // YUV420 3 Plane
-+#define PVR2D_2101010ARGB 0x19UL // 32 bit 2 10 10 10
-+#define PVR2D_888RSGSBS 0x1AUL
-+#define PVR2D_16BPP_RAW 0x1BUL // 16 bit raw (no format conversion)
-+#define PVR2D_32BPP_RAW 0x1CUL // 32 bit raw
-+#define PVR2D_64BPP_RAW 0x1DUL // 64 bit raw
-+#define PVR2D_128BPP_RAW 0x1EUL // 128 bit raw
-+
-+#define PVR2D_NO_OF_FORMATS 0x1FUL
-+
-+/* Format modifier bit field (DstFormat and SrcFormat bits 16..23) */
-+#define PVR2D_FORMAT_MASK 0x0000FFFFUL // PVR2D Format bits
-+#define PVR2D_FORMAT_LAYOUT_MASK 0x000F0000UL // Format layout (strided / twiddled / tiled)
-+#define PVR2D_FORMAT_FLAGS_MASK 0x0FF00000UL // Surface Flags mask
-+
-+/* Layout */
-+#define PVR2D_FORMAT_LAYOUT_SHIFT 16
-+#define PVR2D_FORMAT_LAYOUT_STRIDED 0x00000000UL
-+#define PVR2D_FORMAT_LAYOUT_TILED 0x00010000UL
-+#define PVR2D_FORMAT_LAYOUT_TWIDDLED 0x00020000UL
-+
-+/*
-+ PVR2D_SURFACE_PDUMP
-+ This flag requests a surface pdump, to capture the pixel state after host writes.
-+ Not needed if the surface state has resulted from previous SGX 2D/3D core writes.
-+*/
-+#define PVR2D_SURFACE_PDUMP 0x00100000UL // calls PVRSRVPDumpMem to capture the surface (pdump builds only)
-+
-+/*
-+ Low level 3D format extension - for blts via the 3D core only.
-+ If the top bit of the format field is set then PVR2D reads it as a PVRSRV_PIXEL_FORMAT.
-+ The outcome is hardware dependant.
-+ There is no guarantee that any specific PVRSRV format will be supported.
-+*/
-+#define PVR2D_FORMAT_PVRSRV 0x80000000
-+
-+/* wrap surface type */
-+typedef enum
-+{
-+ PVR2D_WRAPFLAG_NONCONTIGUOUS = 0,
-+ PVR2D_WRAPFLAG_CONTIGUOUS = 1,
-+
-+}PVR2DWRAPFLAGS;
-+
-+#define PVR2D_CONTEXT_FLAGS_PRIORITY_MASK 0x00000003
-+
-+#define PVR2D_CONTEXT_FLAGS_LOW_PRIORITY_CONTEXT 1
-+#define PVR2D_CONTEXT_FLAGS_NORMAL_PRIORITY_CONTEXT 0
-+#define PVR2D_CONTEXT_FLAGS_HIGH_PRIORITY_CONTEXT 2
-+
-+/* flags for control information of additional blits */
-+typedef enum
-+{
-+ PVR2D_BLIT_DISABLE_ALL = 0x00000000, /* disable all additional controls */
-+ PVR2D_BLIT_CK_ENABLE = 0x00000001, /* enable colour key */
-+ PVR2D_BLIT_GLOBAL_ALPHA_ENABLE = 0x00000002, /* enable standard global alpha */
-+ PVR2D_BLIT_PERPIXEL_ALPHABLEND_ENABLE = 0x00000004, /* enable per-pixel alpha bleding */
-+ PVR2D_BLIT_PAT_SURFACE_ENABLE = 0x00000008, /* enable pattern surf (disable fill) */
-+ PVR2D_BLIT_FULLY_SPECIFIED_ALPHA_ENABLE = 0x00000010, /* enable fully specified alpha */
-+ PVR2D_BLIT_ROT_90 = 0x00000020, /* apply 90 degree rotation to the blt */
-+ PVR2D_BLIT_ROT_180 = 0x00000040, /* apply 180 degree rotation to the blt */
-+ PVR2D_BLIT_ROT_270 = 0x00000080, /* apply 270 degree rotation to the blt */
-+ PVR2D_BLIT_COPYORDER_TL2BR = 0x00000100, /* copy order overrides */
-+ PVR2D_BLIT_COPYORDER_BR2TL = 0x00000200,
-+ PVR2D_BLIT_COPYORDER_TR2BL = 0x00000400,
-+ PVR2D_BLIT_COPYORDER_BL2TR = 0x00000800,
-+ PVR2D_BLIT_COLKEY_SOURCE = 0x00001000, /* Key colour is on the source surface */
-+ PVR2D_BLIT_COLKEY_DEST = 0x00002000, /* Key colour is on the destination surface */
-+ PVR2D_BLIT_COLKEY_MASKED = 0x00004000, /* Mask enabled for colour key */
-+ PVR2D_BLIT_COLKEY_OP_PASS = 0x00008000, /* Colour key op = pass */
-+ PVR2D_BLIT_COLKEY_OP_REJECT = 0x00010000, /* Colour key op = reject */
-+ PVR2D_BLIT_PATH_2DCORE = 0x00100000, /* Blt via dedicated 2D Core or PTLA */
-+ PVR2D_BLIT_PATH_3DCORE = 0x00200000, /* Blt via 3D Core */
-+ PVR2D_BLIT_PATH_SWBLT = 0x00400000, /* Blt via host software */
-+ PVR2D_BLIT_NO_SRC_SYNC_INFO = 0x00800000, /* Dont send a source sync info*/
-+ PVR2D_BLIT_ISSUE_STATUS_UPDATES = 0x01000000, /* Issue status updates */
-+
-+} PVR2DBLITFLAGS;
-+
-+/* standard alpha-blending functions, AlphaBlendingFunc field of PVR2DBLTINFO */
-+typedef enum
-+{
-+ PVR2D_ALPHA_OP_SRC_DSTINV = 1, /* source alpha : Cdst = Csrc*Asrc + Cdst*(1-Asrc) */
-+ PVR2D_ALPHA_OP_SRCP_DSTINV = 2 /* premultiplied source alpha : Cdst = Csrc + Cdst*(1-Asrc) */
-+} PVR2D_ALPHABLENDFUNC;
-+
-+/* blend ops for fully specified alpha (SGX 2D Core only) */
-+typedef enum
-+{
-+ PVR2D_BLEND_OP_ZERO = 0,
-+ PVR2D_BLEND_OP_ONE = 1,
-+ PVR2D_BLEND_OP_SRC = 2,
-+ PVR2D_BLEND_OP_DST = 3,
-+ PVR2D_BLEND_OP_GLOBAL = 4,
-+ PVR2D_BLEND_OP_SRC_PLUS_GLOBAL = 5,
-+ PVR2D_BLEND_OP_DST_PLUS_GLOBAL = 6
-+}PVR2D_BLEND_OP;
-+
-+/* SGX 2D Core Fully specified alpha blend : pAlpha field of PVR2DBLTINFO structure */
-+/* a fully specified Alpha Blend operation is defined as */
-+/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (ALPHA_3 * DST (ALPHA)) */
-+/* DST (RGB) = (ALPHA_2 * SRC (RGB)) + (ALPHA_4 * DST (RGB)) */
-+/* if the pre-multiplication stage is enabled then the equations become the following: */
-+/* PRE_MUL = ((SRC(A)) * (Global Alpha Value)) */
-+/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (PRE_MUL * DST (ALPHA)) */
-+/* DST (RGB) = (ALPHA_2 * SRC (RGB)) + (PRE_MUL * DST (RGB)) */
-+/* if the transparent source alpha stage is enabled then a source alpha of zero forces the */
-+/* source to be transparent for that pixel regardless of the blend equation being used. */
-+typedef struct _PVR2D_ALPHABLT
-+{
-+ PVR2D_BLEND_OP eAlpha1;
-+ PVR2D_BOOL bAlpha1Invert;
-+ PVR2D_BLEND_OP eAlpha2;
-+ PVR2D_BOOL bAlpha2Invert;
-+ PVR2D_BLEND_OP eAlpha3;
-+ PVR2D_BOOL bAlpha3Invert;
-+ PVR2D_BLEND_OP eAlpha4;
-+ PVR2D_BOOL bAlpha4Invert;
-+ PVR2D_BOOL bPremulAlpha; /* enable pre-multiplication stage */
-+ PVR2D_BOOL bTransAlpha; /* enable transparent source alpha stage */
-+ PVR2D_BOOL bUpdateAlphaLookup; /* enable and update the 1555-Lookup alpha table */
-+ PVR2D_UCHAR uAlphaLookup0; /* 8 bit alpha when A=0 in a 1555-Lookup surface */
-+ PVR2D_UCHAR uAlphaLookup1; /* 8 bit alpha when A=1 in a 1555-Lookup surface */
-+ PVR2D_UCHAR uGlobalRGB; /* Global Alpha Value for RGB, 0=transparent 255=opaque */
-+ PVR2D_UCHAR uGlobalA; /* Global Alpha Value for Alpha */
-+
-+} PVR2D_ALPHABLT, *PPVR2D_ALPHABLT;
-+
-+
-+/* surface memory info structure */
-+typedef struct _PVR2DMEMINFO
-+{
-+ PVR2D_VOID *pBase;
-+ PVR2D_ULONG ui32MemSize;
-+ PVR2D_ULONG ui32DevAddr;
-+ PVR2D_ULONG ulFlags;
-+ PVR2D_VOID *hPrivateData;
-+ PVR2D_VOID *hPrivateMapData;
-+
-+}PVR2DMEMINFO, *PPVR2DMEMINFO;
-+
-+
-+#define PVR2D_MAX_DEVICE_NAME 20
-+
-+typedef struct _PVR2DDEVICEINFO
-+{
-+ PVR2D_ULONG ulDevID;
-+ PVR2D_CHAR szDeviceName[PVR2D_MAX_DEVICE_NAME];
-+}PVR2DDEVICEINFO;
-+
-+
-+typedef struct _PVR2DISPLAYINFO
-+{
-+ PVR2D_ULONG ulMaxFlipChains;
-+ PVR2D_ULONG ulMaxBuffersInChain;
-+ PVR2DFORMAT eFormat;
-+ PVR2D_ULONG ulWidth;
-+ PVR2D_ULONG ulHeight;
-+ PVR2D_LONG lStride;
-+ PVR2D_ULONG ulMinFlipInterval;
-+ PVR2D_ULONG ulMaxFlipInterval;
-+
-+}PVR2DDISPLAYINFO;
-+
-+
-+typedef struct _PVR2MISCDISPLAYINFO
-+{
-+ PVR2D_ULONG ulPhysicalWidthmm;
-+ PVR2D_ULONG ulPhysicalHeightmm;
-+ PVR2D_ULONG ulUnused[10];
-+
-+}PVR2DMISCDISPLAYINFO;
-+
-+
-+typedef struct _PVR2DBLTINFO
-+{
-+ PVR2D_ULONG CopyCode; /* rop code */
-+ PVR2D_ULONG Colour; /* fill colour */
-+ PVR2D_ULONG ColourKey; /* colour key argb8888 (see CKEY_ defs below) */
-+ PVR2D_UCHAR GlobalAlphaValue; /* global alpha blending */
-+ PVR2D_UCHAR AlphaBlendingFunc; /* per-pixel alpha-blending function */
-+
-+ PVR2DBLITFLAGS BlitFlags; /* additional blit control information */
-+
-+ PVR2DMEMINFO *pDstMemInfo; /* destination memory */
-+ PVR2D_ULONG DstOffset; /* byte offset from start of allocation to destination surface pixel 0,0 */
-+ PVR2D_LONG DstStride; /* signed stride, the number of bytes from pixel 0,0 to 0,1 */
-+ PVR2D_LONG DstX, DstY; /* pixel offset from start of dest surface to start of blt rectangle */
-+ PVR2D_LONG DSizeX,DSizeY; /* blt size */
-+ PVR2DFORMAT DstFormat; /* dest format */
-+ PVR2D_ULONG DstSurfWidth; /* size of dest surface in pixels */
-+ PVR2D_ULONG DstSurfHeight; /* size of dest surface in pixels */
-+
-+ PVR2DMEMINFO *pSrcMemInfo; /* source mem, (source fields are also used for patterns) */
-+ PVR2D_ULONG SrcOffset; /* byte offset from start of allocation to src/pat surface pixel 0,0 */
-+ PVR2D_LONG SrcStride; /* signed stride, the number of bytes from pixel 0,0 to 0,1 */
-+ PVR2D_LONG SrcX, SrcY; /* pixel offset from start of surface to start of source rectangle */
-+ /* for patterns this is the start offset within the pattern */
-+ PVR2D_LONG SizeX,SizeY; /* source rectangle size or pattern size in pixels */
-+ PVR2DFORMAT SrcFormat; /* source/pattern format */
-+ PVR2DMEMINFO *pPalMemInfo; /* source/pattern palette memory containing argb8888 colour table */
-+ PVR2D_ULONG PalOffset; /* byte offset from start of allocation to start of palette */
-+ PVR2D_ULONG SrcSurfWidth; /* size of source surface in pixels */
-+ PVR2D_ULONG SrcSurfHeight; /* size of source surface in pixels */
-+
-+ PVR2DMEMINFO *pMaskMemInfo; /* mask memory, 1bpp format implied */
-+ PVR2D_ULONG MaskOffset; /* byte offset from start of allocation to mask surface pixel 0,0 */
-+ PVR2D_LONG MaskStride; /* signed stride, the number of bytes from pixel 0,0 to 0,1 */
-+ PVR2D_LONG MaskX, MaskY; /* mask rect top left (mask size = blt size) */
-+ PVR2D_ULONG MaskSurfWidth; /* size of mask surface in pixels */
-+ PVR2D_ULONG MaskSurfHeight; /* size of mask surface in pixels */
-+
-+ PPVR2D_ALPHABLT pAlpha; /* fully specified alpha blend (2DCore only) */
-+
-+ PVR2D_ULONG uSrcChromaPlane1; /* mem offset from start of source alloc to chroma plane 1 */
-+ PVR2D_ULONG uSrcChromaPlane2; /* mem offset from start of source alloc to chroma plane 2 */
-+ PVR2D_ULONG uDstChromaPlane1; /* mem offset from start of dest alloc to chroma plane 1 */
-+ PVR2D_ULONG uDstChromaPlane2; /* mem offset from start of dest alloc to chroma plane 2 */
-+
-+ PVR2D_ULONG ColourKeyMask; /* 32 bit colour key mask, only valid when PVR2D_BLIT_COLKEY_MASKED is set */
-+
-+}PVR2DBLTINFO, *PPVR2DBLTINFO;
-+
-+typedef struct _PVR2DRECT
-+{
-+ PVR2D_LONG left, top;
-+ PVR2D_LONG right, bottom;
-+} PVR2DRECT;
-+
-+typedef struct
-+{
-+ PVR2DMEMINFO *pSurfMemInfo; /* surface memory */
-+ PVR2D_ULONG SurfOffset; /* byte offset from start of allocation to destination surface pixel 0,0 */
-+ PVR2D_LONG Stride; /* signed stride */
-+ PVR2DFORMAT Format; /* format */
-+ PVR2D_ULONG SurfWidth; /* surface width in pixels */
-+ PVR2D_ULONG SurfHeight; /* surface height in pixels */
-+
-+} PVR2D_SURFACE, *PPVR2D_SURFACE;
-+
-+typedef struct
-+{
-+ PVR2D_ULONG uChromaPlane1; /* YUV multiplane - byte offset from start of alloc to chroma plane 1 */
-+ PVR2D_ULONG uChromaPlane2; /* YUV multiplane - byte offset from start of alloc to chroma plane 2 */
-+ PVR2D_LONG Reserved[2]; /* Reserved, must be zero */
-+
-+} PVR2D_SURFACE_EXT, *PPVR2D_SURFACE_EXT;
-+
-+typedef struct
-+{
-+ PVR2D_ULONG *pUseCode; /* USSE code */
-+ PVR2D_ULONG UseCodeSize; /* usse code size in bytes */
-+
-+} PVR2D_USECODE, *PPVR2D_USECODE;
-+
-+typedef struct
-+{
-+ PVR2D_SURFACE sDst; /* destination surface */
-+ PVR2D_SURFACE sSrc; /* source surface */
-+ PVR2DRECT rcDest; /* destination rectangle */
-+ PVR2DRECT rcSource; /* source rectangle */
-+ PVR2D_HANDLE hUseCode; /* custom USE code (NULL implies source copy) */
-+ PVR2D_ULONG UseParams[2]; /* per-blt params for use code */
-+
-+} PVR2D_3DBLT, *PPVR2D_3DBLT;
-+
-+typedef struct
-+{
-+ PVR2D_SURFACE sDst; /* destination surface */
-+ PVR2DRECT rcDest; /* destination rectangle; scaling is supported */
-+ PVR2D_SURFACE sSrc; /* source surface */
-+ PVR2DRECT rcSource; /* source rectangle; scaling is supported */
-+ PPVR2D_SURFACE pSrc2; /* optional second source surface (NULL if not required) */
-+ PVR2DRECT* prcSource2; /* optional pSrc2 rectangle */
-+ PVR2D_HANDLE hUseCode; /* custom USSE shader code (NULL implies default source copy) */
-+ PVR2D_ULONG UseParams[2]; /* per-blt params for usse code */
-+ PVR2D_ULONG uiNumTemporaryRegisters; /* no. of temporary registers used in custom shader code */
-+ PVR2D_BOOL bDisableDestInput; /* set true if the destination is output only */
-+ PPVR2D_SURFACE_EXT pDstExt; /* Extended format params for dest */
-+ PPVR2D_SURFACE_EXT pSrcExt[2]; /* Extended format params for source 1 and 2 */
-+ PVR2D_LONG Reserved[4]; /* Reserved, must be zero */
-+
-+} PVR2D_3DBLT_EXT, *PPVR2D_3DBLT_EXT;
-+
-+
-+#define MAKE_COPY_BLIT(src,soff,dest,doff,sx,sy,dx,dy,sz)
-+
-+typedef void* PVR2DCONTEXTHANDLE;
-+typedef void* PVR2DFLIPCHAINHANDLE;
-+
-+
-+// CopyCode field of PVR2DBLTINFO structure:
-+// the CopyCode field of the PVR2DBLTINFO structure should contain a rop3 or rop4 code.
-+// a rop3 is an 8 bit code that describes a blt with three inputs : source dest and pattern
-+// rop4 is a 16 bit code that describes a blt with four inputs : source dest pattern and mask
-+// common rop3 codes are defined below
-+// a colour fill blt is processed in the pattern channel as a constant colour with a rop code of 0xF0
-+// PVR2D_BLIT_PAT_SURFACE_ENABLE defines whether the pattern channel is a surface or a fill colour.
-+// a rop4 is defined by two rop3 codes, and the 1 bit-per-pixel mask surface defines which is used.
-+// a common rop4 is 0xAAF0 which is the mask copy blt used for text glyphs.
-+// CopyCode is taken to be a rop4 when pMaskMemInfo is non zero, otherwise it is assumed to be a rop3
-+// use the PVR2DMASKROP4 macro below to construct a rop4 from two rop3's
-+// rop3a is the rop used when mask pixel = 1, and rop3b when mask = 0
-+#define PVR2DROP4(rop3b, rop3a) ((rop3b<<8)|rop3a)
-+
-+/* common rop codes */
-+#define PVR2DROPclear 0x00 /* 0 (whiteness) */
-+#define PVR2DROPset 0xFF /* 1 (blackness) */
-+#define PVR2DROPnoop 0xAA /* dst (used for masked blts) */
-+
-+/* source and dest rop codes */
-+#define PVR2DROPand 0x88 /* src AND dst */
-+#define PVR2DROPandReverse 0x44 /* src AND NOT dst */
-+#define PVR2DROPcopy 0xCC /* src (used for source copy and alpha blts) */
-+#define PVR2DROPandInverted 0x22 /* NOT src AND dst */
-+#define PVR2DROPxor 0x66 /* src XOR dst */
-+#define PVR2DROPor 0xEE /* src OR dst */
-+#define PVR2DROPnor 0x11 /* NOT src AND NOT dst */
-+#define PVR2DROPequiv 0x99 /* NOT src XOR dst */
-+#define PVR2DROPinvert 0x55 /* NOT dst */
-+#define PVR2DROPorReverse 0xDD /* src OR NOT dst */
-+#define PVR2DROPcopyInverted 0x33 /* NOT src */
-+#define PVR2DROPorInverted 0xBB /* NOT src OR dst */
-+#define PVR2DROPnand 0x77 /* NOT src OR NOT dst */
-+
-+/* pattern rop codes */
-+#define PVR2DPATROPand 0xA0 /* pat AND dst */
-+#define PVR2DPATROPandReverse 0x50 /* pat AND NOT dst */
-+#define PVR2DPATROPcopy 0xF0 /* pat (used for solid color fills and pattern blts) */
-+#define PVR2DPATROPandInverted 0x0A /* NOT pat AND dst */
-+#define PVR2DPATROPxor 0x5A /* pat XOR dst */
-+#define PVR2DPATROPor 0xFA /* pat OR dst */
-+#define PVR2DPATROPnor 0x05 /* NOT pat AND NOT dst */
-+#define PVR2DPATROPequiv 0xA5 /* NOT pat XOR dst */
-+#define PVR2DPATROPinvert 0x55 /* NOT dst */
-+#define PVR2DPATROPorReverse 0xF5 /* pat OR NOT dst */
-+#define PVR2DPATROPcopyInverted 0x0F /* NOT pat */
-+#define PVR2DPATROPorInverted 0xAF /* NOT pat OR dst */
-+#define PVR2DPATROPnand 0x5F /* NOT pat OR NOT dst */
-+
-+/* common rop4 codes */
-+#define PVR2DROP4MaskedCopy PVR2DROP4(PVR2DROPnoop,PVR2DROPcopy) /* masked source copy blt (used for rounded window corners etc) */
-+#define PVR2DROP4MaskedFill PVR2DROP4(PVR2DROPnoop,PVR2DPATROPcopy) /* masked colour fill blt (used for text) */
-+
-+/* Legacy support */
-+#define PVR2DROP3_PATMASK PVR2DPATROPcopy
-+#define PVR2DROP3_SRCMASK PVR2DROPcopy
-+
-+/* pixmap memory alignment */
-+#define PVR2D_ALIGNMENT_4 4 /* DWORD alignment */
-+#define PVR2D_ALIGNMENT_ANY 0 /* no alignment */
-+#define PVR2D_ALIGNMENT_PALETTE 16 /* 16 byte alignment is required for palettes */
-+
-+/* Heap number for PVR2DGetFrameBuffer */
-+#define PVR2D_FB_PRIMARY_SURFACE 0
-+
-+#define PVR2D_PRESENT_PROPERTY_SRCSTRIDE (1UL << 0)
-+#define PVR2D_PRESENT_PROPERTY_DSTSIZE (1UL << 1)
-+#define PVR2D_PRESENT_PROPERTY_DSTPOS (1UL << 2)
-+#define PVR2D_PRESENT_PROPERTY_CLIPRECTS (1UL << 3)
-+#define PVR2D_PRESENT_PROPERTY_INTERVAL (1UL << 4)
-+
-+#define PVR2D_CREATE_FLIPCHAIN_SHARED (1UL << 0)
-+#define PVR2D_CREATE_FLIPCHAIN_QUERY (1UL << 1)
-+#define PVR2D_CREATE_FLIPCHAIN_OEMOVERLAY (1UL << 2)
-+#define PVR2D_CREATE_FLIPCHAIN_AS_BLITCHAIN (1UL << 3)
-+
-+/* Colour-key colour must be translated into argb8888 format */
-+#define CKEY_8888(P) (P)
-+#define CKEY_4444(P) (((P&0xF000UL)<<16) | ((P&0x0F00UL)<<12) | ((P&0x00F0UL)<<8) | ((P&0x000FUL)<<4))
-+#define CKEY_1555(P) (((P&0x8000UL)<<16) | ((P&0x7C00UL)<<9) | ((P&0x3E0UL)<<6) | ((P&0x1FUL)<<3))
-+#define CKEY_565(P) (((P&0xF800UL)<<8) | ((P&0x7E0UL)<<5) | ((P&0x1FUL)<<3))
-+#define CKEY_MASK_8888 0x00FFFFFFUL
-+#define CKEY_MASK_4444 0x00F0F0F0UL
-+#define CKEY_MASK_1555 0x00F8F8F8UL /* Alpha is not normally included in the key test */
-+#define CKEY_MASK_565 0x00F8FCF8UL
-+
-+/* Fill colours must be translated into argb8888 format */
-+#define CFILL_4444(P) (((P&0xF000UL)<<16) | ((P&0x0F00UL)<<12) | ((P&0x00F0UL)<<8) | ((P&0x000FUL)<<4))
-+#define CFILL_1555(P) (((P&0x8000UL)<<16) | ((P&0x7C00UL)<<9) | ((P&0x3E0UL)<<6) | ((P&0x1FUL)<<3))
-+#define CFILL_565(P) (((P&0xF800UL)<<8) | ((P&0x7E0UL)<<5) | ((P&0x1FUL)<<3))
-+
-+/* PVR2DCreateDeviceContext flags */
-+#define PVR2D_XSERVER_PROC 0x00000001UL /*!< Set for the Xserver connection */
-+
-+/* PVR2DMemAlloc flags */
-+#define PVR2D_MEM_UNCACHED 0x00000000UL /* Default */
-+#define PVR2D_MEM_CACHED 0x00000001UL /* Caller must flush and sync when necessary */
-+#define PVR2D_MEM_WRITECOMBINE 0x00000002UL
-+
-+/* Functions that the library exports */
-+
-+PVR2D_IMPORT
-+int PVR2DEnumerateDevices(PVR2DDEVICEINFO *pDevInfo);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DCreateDeviceContext(PVR2D_ULONG ulDevID,
-+ PVR2DCONTEXTHANDLE* phContext,
-+ PVR2D_ULONG ulFlags);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DDestroyDeviceContext(PVR2DCONTEXTHANDLE hContext);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DGetDeviceInfo(PVR2DCONTEXTHANDLE hContext,
-+ PVR2DDISPLAYINFO *pDisplayInfo);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DGetMiscDisplayInfo(PVR2DCONTEXTHANDLE hContext,
-+ PVR2DMISCDISPLAYINFO *pMiscDisplayInfo);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DGetScreenMode(PVR2DCONTEXTHANDLE hContext,
-+ PVR2DFORMAT *pFormat,
-+ PVR2D_LONG *plWidth,
-+ PVR2D_LONG *plHeight,
-+ PVR2D_LONG *plStride,
-+ PVR2D_INT *piRefreshRate);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DGetFrameBuffer(PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_INT nHeap,
-+ PVR2DMEMINFO **ppsMemInfo);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DMemAlloc(PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_ULONG ulBytes,
-+ PVR2D_ULONG ulAlign,
-+ PVR2D_ULONG ulFlags,
-+ PVR2DMEMINFO **ppsMemInfo);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DMemExport(PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_ULONG ulFlags,
-+ PVR2DMEMINFO *psMemInfo,
-+ PVR2D_HANDLE *phMemHandle);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DMemWrap(PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_VOID *pMem,
-+ PVR2D_ULONG ulFlags,
-+ PVR2D_ULONG ulBytes,
-+ PVR2D_ULONG alPageAddress[],
-+ PVR2DMEMINFO **ppsMemInfo);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DMemMap(PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_ULONG ulFlags,
-+ PVR2D_HANDLE hMemHandle,
-+ PVR2DMEMINFO **ppsDstMem);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DMemFree(PVR2DCONTEXTHANDLE hContext,
-+ PVR2DMEMINFO *psMemInfo);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DBlt(PVR2DCONTEXTHANDLE hContext,
-+ PVR2DBLTINFO *pBltInfo);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DBltClipped(PVR2DCONTEXTHANDLE hContext,
-+ PVR2DBLTINFO *pBltInfo,
-+ PVR2D_ULONG ulNumClipRects,
-+ PVR2DRECT *pClipRects);
-+
-+PVR2D_EXPORT
-+PVR2DERROR PVR2DSet1555Alpha (PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_UCHAR Alpha0, PVR2D_UCHAR Alpha1);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DQueryBlitsComplete(PVR2DCONTEXTHANDLE hContext,
-+ const PVR2DMEMINFO *pMemInfo,
-+ PVR2D_UINT uiWaitForComplete);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DSetPresentBltProperties(PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_ULONG ulPropertyMask,
-+ PVR2D_LONG lSrcStride,
-+ PVR2D_ULONG ulDstWidth,
-+ PVR2D_ULONG ulDstHeight,
-+ PVR2D_LONG lDstXPos,
-+ PVR2D_LONG lDstYPos,
-+ PVR2D_ULONG ulNumClipRects,
-+ PVR2DRECT *pClipRects,
-+ PVR2D_ULONG ulSwapInterval);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DPresentBlt(PVR2DCONTEXTHANDLE hContext,
-+ PVR2DMEMINFO *pMemInfo,
-+ PVR2D_LONG lRenderID);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DCreateFlipChain(PVR2DCONTEXTHANDLE hContext,
-+ PVR2D_ULONG ulFlags,
-+ PVR2D_ULONG ulNumBuffers,
-+ PVR2D_ULONG ulWidth,
-+ PVR2D_ULONG ulHeight,
-+ PVR2DFORMAT eFormat,
-+ PVR2D_LONG *plStride,
-+ PVR2D_ULONG *pulFlipChainID,
-+ PVR2DFLIPCHAINHANDLE *phFlipChain);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DDestroyFlipChain(PVR2DCONTEXTHANDLE hContext,
-+ PVR2DFLIPCHAINHANDLE hFlipChain);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DGetFlipChainBuffers(PVR2DCONTEXTHANDLE hContext,
-+ PVR2DFLIPCHAINHANDLE hFlipChain,
-+ PVR2D_ULONG *pulNumBuffers,
-+ PVR2DMEMINFO *psMemInfo[]);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DSetPresentFlipProperties(PVR2DCONTEXTHANDLE hContext,
-+ PVR2DFLIPCHAINHANDLE hFlipChain,
-+ PVR2D_ULONG ulPropertyMask,
-+ PVR2D_LONG lDstXPos,
-+ PVR2D_LONG lDstYPos,
-+ PVR2D_ULONG ulNumClipRects,
-+ PVR2DRECT *pClipRects,
-+ PVR2D_ULONG ulSwapInterval);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DPresentFlip(PVR2DCONTEXTHANDLE hContext,
-+ PVR2DFLIPCHAINHANDLE hFlipChain,
-+ PVR2DMEMINFO *psMemInfo,
-+ PVR2D_LONG lRenderID);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DGetAPIRev(PVR2D_LONG *lRevMajor, PVR2D_LONG *lRevMinor);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DLoadUseCode (const PVR2DCONTEXTHANDLE hContext, const PVR2D_UCHAR *pUseCode,
-+ const PVR2D_ULONG UseCodeSize, PVR2D_HANDLE *pUseCodeHandle);
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DFreeUseCode (const PVR2DCONTEXTHANDLE hContext, const PVR2D_HANDLE hUseCodeHandle);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DBlt3D (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT pBlt3D);
-+
-+PVR2D_IMPORT
-+PVR2DERROR PVR2DBlt3DExt (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT_EXT pBlt3D);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* _PVR2D_H_ */
-+
-+/******************************************************************************
-+ End of file (pvr2d.h)
-+******************************************************************************/
-diff -Nurp qt-everywhere-opensource-src-4.6.3-orig//src/3rdparty/powervr/wsegl2/wsegl.h qt-everywhere-opensource-src-4.6.3/src/3rdparty/powervr/wsegl2/wsegl.h
---- qt-everywhere-opensource-src-4.6.3-orig//src/3rdparty/powervr/wsegl2/wsegl.h 1970-01-01 00:00:00.000000000 +0000
-+++ qt-everywhere-opensource-src-4.6.3/src/3rdparty/powervr/wsegl2/wsegl.h 2011-05-16 22:51:52.702601769 +0000
-@@ -0,0 +1,285 @@
-+/**********************************************************************
-+*
-+* Copyright(c) Imagination Technologies Ltd.
-+*
-+* The contents of this file are subject to the MIT license as set out below.
-+*
-+* Permission is hereby granted, free of charge, to any person obtaining a copy
-+* of this software and associated documentation files (the "Software"),
-+* to deal in the Software without restriction, including without limitation
-+* the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+* and/or sell copies of the Software, and to permit persons to whom the
-+* Software is furnished to do so, subject to the following conditions:
-+*
-+* The above copyright notice and this permission notice shall be included
-+* in all copies or substantial portions of the Software.
-+*
-+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-+* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
-+* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT
-+* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
-+* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-+*
-+* This License is also included in this distribution in the file called
-+* "COPYING".
-+*
-+******************************************************************************/
-+
-+
-+
-+#if !defined(__WSEGL_H__)
-+#define __WSEGL_H__
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+/*
-+// WSEGL Platform-specific definitions
-+*/
-+#if defined(__linux__)
-+#define WSEGL_EXPORT __attribute__((visibility("default")))
-+#define WSEGL_IMPORT
-+#else
-+#define WSEGL_EXPORT
-+#define WSEGL_IMPORT
-+#endif
-+
-+/*
-+// WSEGL API Version Number
-+*/
-+
-+#define WSEGL_VERSION 2
-+#define WSEGL_DEFAULT_DISPLAY 0
-+#define WSEGL_DEFAULT_NATIVE_ENGINE 0
-+
-+#define WSEGL_FALSE 0
-+#define WSEGL_TRUE 1
-+#define WSEGL_NULL 0
-+
-+#define WSEGL_UNREFERENCED_PARAMETER(param) (param) = (param)
-+
-+/*
-+// WSEGL handles
-+*/
-+typedef void *WSEGLDisplayHandle;
-+typedef void *WSEGLDrawableHandle;
-+
-+/*
-+// Display capability type
-+*/
-+typedef enum WSEGLCapsType_TAG
-+{
-+ WSEGL_NO_CAPS = 0,
-+ WSEGL_CAP_MIN_SWAP_INTERVAL = 1, /* System default value = 1 */
-+ WSEGL_CAP_MAX_SWAP_INTERVAL = 2, /* System default value = 1 */
-+ WSEGL_CAP_WINDOWS_USE_HW_SYNC = 3, /* System default value = 0 (FALSE) */
-+ WSEGL_CAP_PIXMAPS_USE_HW_SYNC = 4, /* System default value = 0 (FALSE) */
-+
-+} WSEGLCapsType;
-+
-+/*
-+// Display capability
-+*/
-+typedef struct WSEGLCaps_TAG
-+{
-+ WSEGLCapsType eCapsType;
-+ unsigned long ui32CapsValue;
-+
-+} WSEGLCaps;
-+
-+/*
-+// Drawable type
-+*/
-+#define WSEGL_NO_DRAWABLE 0x0
-+#define WSEGL_DRAWABLE_WINDOW 0x1
-+#define WSEGL_DRAWABLE_PIXMAP 0x2
-+
-+
-+/*
-+// Pixel format of display/drawable
-+*/
-+typedef enum WSEGLPixelFormat_TAG
-+{
-+ /* These must not be re-ordered */
-+ WSEGL_PIXELFORMAT_RGB565 = 0,
-+ WSEGL_PIXELFORMAT_ARGB4444 = 1,
-+ WSEGL_PIXELFORMAT_ARGB8888 = 2,
-+ WSEGL_PIXELFORMAT_ARGB1555 = 3,
-+ WSEGL_PIXELFORMAT_ABGR8888 = 4,
-+ WSEGL_PIXELFORMAT_XBGR8888 = 5,
-+
-+ /* These are compatibility names only; new WSEGL
-+ * modules should not use them.
-+ */
-+ WSEGL_PIXELFORMAT_565 = WSEGL_PIXELFORMAT_RGB565,
-+ WSEGL_PIXELFORMAT_4444 = WSEGL_PIXELFORMAT_ARGB4444,
-+ WSEGL_PIXELFORMAT_8888 = WSEGL_PIXELFORMAT_ARGB8888,
-+ WSEGL_PIXELFORMAT_1555 = WSEGL_PIXELFORMAT_ARGB1555,
-+
-+} WSEGLPixelFormat;
-+
-+/*
-+// Transparent of display/drawable
-+*/
-+typedef enum WSEGLTransparentType_TAG
-+{
-+ WSEGL_OPAQUE = 0,
-+ WSEGL_COLOR_KEY = 1,
-+
-+} WSEGLTransparentType;
-+
-+/*
-+// Display/drawable configuration
-+*/
-+typedef struct WSEGLConfig_TAG
-+{
-+ /*
-+ // Type of drawables this configuration applies to -
-+ // OR'd values of drawable types.
-+ */
-+ unsigned long ui32DrawableType;
-+
-+ /* Pixel format */
-+ WSEGLPixelFormat ePixelFormat;
-+
-+ /* Native Renderable - set to WSEGL_TRUE if native renderable */
-+ unsigned long ulNativeRenderable;
-+
-+ /* FrameBuffer Level Parameter */
-+ unsigned long ulFrameBufferLevel;
-+
-+ /* Native Visual ID */
-+ unsigned long ulNativeVisualID;
-+
-+ /* Native Visual */
-+ void *hNativeVisual;
-+
-+ /* Transparent Type */
-+ WSEGLTransparentType eTransparentType;
-+
-+ /* Transparent Color - only used if transparent type is COLOR_KEY */
-+ unsigned long ulTransparentColor; /* packed as 0x00RRGGBB */
-+
-+
-+} WSEGLConfig;
-+
-+/*
-+// WSEGL errors
-+*/
-+typedef enum WSEGLError_TAG
-+{
-+ WSEGL_SUCCESS = 0,
-+ WSEGL_CANNOT_INITIALISE = 1,
-+ WSEGL_BAD_NATIVE_DISPLAY = 2,
-+ WSEGL_BAD_NATIVE_WINDOW = 3,
-+ WSEGL_BAD_NATIVE_PIXMAP = 4,
-+ WSEGL_BAD_NATIVE_ENGINE = 5,
-+ WSEGL_BAD_DRAWABLE = 6,
-+ WSEGL_BAD_MATCH = 7,
-+ WSEGL_OUT_OF_MEMORY = 8,
-+
-+ /* These are compatibility names only; new WSEGL
-+ * modules should not use them.
-+ */
-+ WSEGL_BAD_CONFIG = WSEGL_BAD_MATCH,
-+
-+} WSEGLError;
-+
-+/*
-+// Drawable orientation (in degrees anti-clockwise)
-+*/
-+typedef enum WSEGLRotationAngle_TAG
-+{
-+ WSEGL_ROTATE_0 = 0,
-+ WSEGL_ROTATE_90 = 1,
-+ WSEGL_ROTATE_180 = 2,
-+ WSEGL_ROTATE_270 = 3
-+
-+} WSEGLRotationAngle;
-+
-+/*
-+// Drawable information required by OpenGL-ES driver
-+*/
-+typedef struct WSEGLDrawableParams_TAG
-+{
-+ /* Width in pixels of the drawable */
-+ unsigned long ui32Width;
-+
-+ /* Height in pixels of the drawable */
-+ unsigned long ui32Height;
-+
-+ /* Stride in pixels of the drawable */
-+ unsigned long ui32Stride;
-+
-+ /* Pixel format of the drawable */
-+ WSEGLPixelFormat ePixelFormat;
-+
-+ /* User space cpu virtual address of the drawable */
-+ void *pvLinearAddress;
-+
-+ /* HW address of the drawable */
-+ unsigned long ui32HWAddress;
-+
-+ /* Private data for the drawable */
-+ void *hPrivateData;
-+
-+
-+} WSEGLDrawableParams;
-+
-+
-+/*
-+// Table of function pointers that is returned by WSEGL_GetFunctionTablePointer()
-+//
-+// The first entry in the table is the version number of the wsegl.h header file that
-+// the module has been written against, and should therefore be set to WSEGL_VERSION
-+*/
-+typedef struct WSEGL_FunctionTable_TAG
-+{
-+ unsigned long ui32WSEGLVersion;
-+
-+ WSEGLError (*pfnWSEGL_IsDisplayValid)(NativeDisplayType);
-+
-+ WSEGLError (*pfnWSEGL_InitialiseDisplay)(NativeDisplayType, WSEGLDisplayHandle *, const WSEGLCaps **, WSEGLConfig **);
-+
-+ WSEGLError (*pfnWSEGL_CloseDisplay)(WSEGLDisplayHandle);
-+
-+ WSEGLError (*pfnWSEGL_CreateWindowDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativeWindowType, WSEGLRotationAngle *);
-+
-+ WSEGLError (*pfnWSEGL_CreatePixmapDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativePixmapType, WSEGLRotationAngle *);
-+
-+ WSEGLError (*pfnWSEGL_DeleteDrawable)(WSEGLDrawableHandle);
-+
-+ WSEGLError (*pfnWSEGL_SwapDrawable)(WSEGLDrawableHandle, unsigned long);
-+
-+ WSEGLError (*pfnWSEGL_SwapControlInterval)(WSEGLDrawableHandle, unsigned long);
-+
-+ WSEGLError (*pfnWSEGL_WaitNative)(WSEGLDrawableHandle, unsigned long);
-+
-+ WSEGLError (*pfnWSEGL_CopyFromDrawable)(WSEGLDrawableHandle, NativePixmapType);
-+
-+ WSEGLError (*pfnWSEGL_CopyFromPBuffer)(void *, unsigned long, unsigned long, unsigned long, WSEGLPixelFormat, NativePixmapType);
-+
-+ WSEGLError (*pfnWSEGL_GetDrawableParameters)(WSEGLDrawableHandle, WSEGLDrawableParams *, WSEGLDrawableParams *);
-+
-+ WSEGLError (*pfnWSEGL_ConnectDrawable)(WSEGLDrawableHandle);
-+
-+ WSEGLError (*pfnWSEGL_DisconnectDrawable)(WSEGLDrawableHandle);
-+
-+
-+} WSEGL_FunctionTable;
-+
-+
-+WSEGL_IMPORT const WSEGL_FunctionTable *WSEGL_GetFunctionTablePointer(void);
-+
-+#ifdef __cplusplus
-+}
-+#endif
-+
-+#endif /* __WSEGL_H__ */
-+
-+/******************************************************************************
-+ End of file (wsegl.h)
-+******************************************************************************/
-diff -Nurp qt-everywhere-opensource-src-4.6.3-orig//src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c qt-everywhere-opensource-src-4.6.3/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c
---- qt-everywhere-opensource-src-4.6.3-orig//src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c 2010-06-02 02:03:17.000000000 +0000
-+++ qt-everywhere-opensource-src-4.6.3/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c 2011-05-16 23:08:51.618597097 +0000
-@@ -378,6 +378,20 @@ static WSEGLError wseglGetDrawableParame
- return WSEGL_SUCCESS;
- }
-
-+/* Function stub for ConnectDrawable() */
-+static WSEGLError wseglConnectDrawable(WSEGLDrawableHandle hDrawable)
-+{
-+ WSEGL_UNREFERENCED_PARAMETER(hDrawable);
-+ return WSEGL_SUCCESS;
-+}
-+
-+/* Function stub for DisconnectDrawable() */
-+static WSEGLError wseglDisconnectDrawable(WSEGLDrawableHandle hDrawable)
-+{
-+ WSEGL_UNREFERENCED_PARAMETER(hDrawable);
-+ return WSEGL_SUCCESS;
-+}
-+
- static WSEGL_FunctionTable const wseglFunctions = {
- WSEGL_VERSION,
- wseglIsDisplayValid,
-@@ -391,7 +405,9 @@ static WSEGL_FunctionTable const wseglFu
- wseglWaitNative,
- wseglCopyFromDrawable,
- wseglCopyFromPBuffer,
-- wseglGetDrawableParameters
-+ wseglGetDrawableParameters,
-+ wseglConnectDrawable,
-+ wseglDisconnectDrawable
- };
-
- /* Return the table of WSEGL functions to the EGL implementation */
diff --git a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/002_pvrqwswsegl.c.patch b/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/002_pvrqwswsegl.c.patch
deleted file mode 100644
index 8729ea3..0000000
--- a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/002_pvrqwswsegl.c.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl_orig.c 2012-02-27 18:53:22.919285167 +0530
-+++ ./src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c 2012-02-25 11:26:47.131221091 +0530
-@@ -39,7 +39,7 @@
- **
- ****************************************************************************/
-
--#include <GLES/eglplatform.h>
-+#include <EGL/eglplatform.h>
- #include <wsegl.h>
- #include <pvr2d.h>
- #include <string.h>
diff --git a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/cursor-hack.diff b/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/cursor-hack.diff
deleted file mode 100644
index 683b3c4..0000000
--- a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/cursor-hack.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Patch originally done by Bin Liu, rediffed by Koen Kooi for Qt 4.6.2
-
-This patch is a first step to get a working cursor when using the powervr driver, it flickers when hovering over a QGLWidget, but still better than no cursor at all
-
---- /tmp/pvreglscreen.cpp 2010-04-19 09:30:32.000000000 +0200
-+++ qt-everywhere-opensource-src-4.6.2/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp 2010-04-19 09:31:30.000000000 +0200
-@@ -85,6 +85,9 @@
- bool PvrEglScreen::initDevice()
- {
- openTty();
-+#ifndef QT_NO_QWS_CURSOR
-+ QScreenCursor::initSoftwareCursor();
-+#endif
- return true;
- }
-
---- /tmp/qwindowsystem_qws.cpp 2010-04-19 09:32:47.000000000 +0200
-+++ qt-everywhere-opensource-src-4.6.2/src/gui/embedded/qwindowsystem_qws.cpp 2010-04-19 09:33:30.000000000 +0200
-@@ -3501,7 +3501,6 @@
- }
-
- #ifdef QT_QWS_CLIENTBLIT
--#ifdef QT_NO_QWS_CURSOR
- // This optimization only really works when there isn't a crazy cursor
- // wizzing around.
- QRegion directPaint = (r - transparentRegion); // in gloal coords
-@@ -3513,7 +3512,6 @@
- QWSRegionEvent::DirectPaint, id);
- }
- #endif
--#endif
- }
-
- if (doLock)
diff --git a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/linux.conf b/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/linux.conf
deleted file mode 100644
index b26b7ea..0000000
--- a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles/linux.conf
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# qmake configuration for common linux
-#
-
-QMAKE_CFLAGS_THREAD += -D_REENTRANT
-QMAKE_CXXFLAGS_THREAD += $$QMAKE_CFLAGS_THREAD
-
-QMAKE_INCDIR =
-QMAKE_LIBDIR =
-QMAKE_INCDIR_X11 =
-QMAKE_LIBDIR_X11 =
-QMAKE_INCDIR_QT = $(OE_QMAKE_INCDIR_QT)
-QMAKE_LIBDIR_QT = $(OE_QMAKE_LIBDIR_QT)
-QMAKE_INCDIR_OPENGL =
-QMAKE_LIBDIR_OPENGL =
-QMAKE_INCDIR_OPENGL_ES1 = $$QMAKE_INCDIR_OPENGL
-QMAKE_LIBDIR_OPENGL_ES1 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
-QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
-QMAKE_INCDIR_EGL =
-QMAKE_LIBDIR_EGL =
-QMAKE_INCDIR_OPENVG =
-QMAKE_LIBDIR_OPENVG =
-
-
-QMAKE_LIBS =
-QMAKE_LIBS_DYNLOAD = -ldl
-QMAKE_LIBS_X11 = $(OE_QMAKE_LIBS_X11)
-QMAKE_LIBS_X11SM = $(OE_QMAKE_LIBS_X11SM)
-QMAKE_LIBS_NIS = -lnsl
-QMAKE_LIBS_EGL = -lEGL -lIMGegl -lsrv_um
-QMAKE_LIBS_OPENGL = -lEGL -lGLES_CM -lIMGegl -lsrv_um
-QMAKE_LIBS_OPENGL_QT = -lEGL -lGLES_CM -lIMGegl -lsrv_um
-QMAKE_LIBS_OPENGL_ES1 = -lEGL -lGLES_CM -lIMGegl -lsrv_um
-QMAKE_LIBS_OPENGL_ES2 = -lEGL -lGLESv2 -lGLES_CM -lIMGegl -lsrv_um
-QMAKE_LIBS_THREAD = -lpthread
-
-QMAKE_MOC = $(OE_QMAKE_MOC)
-QMAKE_UIC = $(OE_QMAKE_UIC)
-QMAKE_UIC3 = $(OE_QMAKE_UIC3)
-QMAKE_RCC = $(OE_QMAKE_RCC)
-QMAKE_QDBUSCPP2XML = $(OE_QMAKE_QDBUSCPP2XML)
-QMAKE_QDBUSXML2CPP = $(OE_QMAKE_QDBUSXML2CPP)
-
-QMAKE_AR = $(OE_QMAKE_AR) cqs
-QMAKE_OBJCOPY = objcopy
-QMAKE_RANLIB =
-
-QMAKE_TAR = tar -cf
-QMAKE_GZIP = gzip -9f
-
-QMAKE_COPY = cp -f
-QMAKE_COPY_FILE = $(COPY)
-QMAKE_COPY_DIR = $(COPY) -r
-QMAKE_MOVE = mv -f
-QMAKE_DEL_FILE = rm -f
-QMAKE_DEL_DIR = rmdir
-QMAKE_STRIP = $(OE_QMAKE_STRIP)
-QMAKE_STRIPFLAGS_LIB += --strip-unneeded
-QMAKE_CHK_DIR_EXISTS = test -d
-QMAKE_MKDIR = mkdir -p
-QMAKE_INSTALL_FILE = install -m 644 -p
-QMAKE_INSTALL_PROGRAM = install -m 755 -p
-
-#These defines are documented in the powervr README, please read it
-DEFINES += QT_QWS_CLIENTBLIT
-
-include(unix.conf)
diff --git a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles_4.8.6.bb b/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles_4.8.6.bb
deleted file mode 100644
index c846c18..0000000
--- a/meta-arago-extras/recipes-qt/qt4/qt4-embedded-gles_4.8.6.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-require ${COREBASE}/meta/recipes-qt/qt4/qt4-${PV}.inc
-require ${COREBASE}/meta/recipes-qt/qt4/qt4-embedded.inc
-
-PR = "${INC_PR}.3"
-
-FILESEXTRAPATHS_append := ":${THISDIR}/${PN}:${COREBASE}/meta/recipes-qt/qt4/qt4-${PV}:${COREBASE}/meta/recipes-qt/qt4/files"
-
-DEFAULT_PREFERENCE = "-1"
-
-SRC_URI += " \
- file://0001-wsegl2-support.patch \
- file://002_pvrqwswsegl.c.patch \
- file://cursor-hack.diff \
-"
-SRC_URI_append_ti33x = " file://0001-Qt-4.x-v2-Changes-for-integrating-with-TI-graphics-S.patch"
-SRC_URI_append_ti43x = " file://0001-Qt-4.x-v2-Changes-for-integrating-with-TI-graphics-S.patch"
-
-QT_CONFIG_FLAGS_append_armv6 = " -no-neon "
-
-QT_CONFIG_FLAGS += " \
- -exceptions \
-"
-
-QT_GLFLAGS = "-opengl es2 -depths 16,24,32 -plugin-gfx-powervr -D QT_QWS_CLIENTBLIT"
-
-PROVIDES += "qt4-embedded"
-RPROVIDES_${PN} += "qt4-embedded"
-RPROVIDES_${PN}-dev += "qt4-embedded-dev"
-
-DEPENDS += "virtual/egl"
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 02/26] gstreamer: remove outdated 0.10.x version, no longer in oe-core
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 01/26] recipes-qt: remove all traces of qt4, no longer in oe-core Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 03/26] linux-libc-headers: remove version 4.1, default to 4.4 Denys Dmytriyenko
` (23 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../gstreamer/gst-ffmpeg_0.10.13.bbappend | 5 ---
.../gst-plugins-bad-mm-accel_0.10.23.bbappend | 9 ----
...k-Fix-depth-value-for-GST_VIDEO_CAPS_RGB_.patch | 29 ------------
...ink-fixing-calculation-of-bytes-per-pixel.patch | 52 ----------------------
.../gstreamer/gst-plugins-bad_0.10.23.bbappend | 15 -------
.../gst-plugins-good-mm-accel_0.10.31.bbappend | 6 ---
.../gstreamer/gst-plugins-good_0.10.31.bbappend | 6 ---
.../gstreamer/gst-plugins-bad-mm-accel_0.10.23.bb | 47 -------------------
.../gstreamer/gst-plugins-base-mm-accel_0.10.36.bb | 45 -------------------
.../gstreamer/gst-plugins-good-mm-accel_0.10.31.bb | 47 -------------------
.../gstreamer/gst-plugins-package-mm-accel.inc | 17 -------
.../gstreamer/gstreamer-mm-accel.inc | 9 ----
.../gstreamer/gstreamer-mm-accel_0.10.36.bb | 41 -----------------
13 files changed, 328 deletions(-)
delete mode 100644 meta-arago-distro/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bbappend
delete mode 100644 meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad-mm-accel_0.10.23.bbappend
delete mode 100644 meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad/0001-gstfbdevsink-Fix-depth-value-for-GST_VIDEO_CAPS_RGB_.patch
delete mode 100644 meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad/0001-sys-fbdevsink-fixing-calculation-of-bytes-per-pixel.patch
delete mode 100644 meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend
delete mode 100644 meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-good-mm-accel_0.10.31.bbappend
delete mode 100644 meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bbappend
delete mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-bad-mm-accel_0.10.23.bb
delete mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-base-mm-accel_0.10.36.bb
delete mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-good-mm-accel_0.10.31.bb
delete mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-package-mm-accel.inc
delete mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer-mm-accel.inc
delete mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer-mm-accel_0.10.36.bb
diff --git a/meta-arago-distro/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bbappend b/meta-arago-distro/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bbappend
deleted file mode 100644
index ca5a52a..0000000
--- a/meta-arago-distro/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-PR_append = "-arago0"
-
-# Select the non GPLv3 license option for distribution of this plugin with our
-# SDK
-LICENSE = "GPLv2+ & LGPLv2+ & (GPLv2+ & LGPLv2.1+)"
diff --git a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad-mm-accel_0.10.23.bbappend b/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad-mm-accel_0.10.23.bbappend
deleted file mode 100644
index e6d72ba..0000000
--- a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad-mm-accel_0.10.23.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-PR_append = "-arago0"
-
-PACKAGECONFIG = "bzip curl faad"
-
-# Disable features that have potential commercial licensing restrictions
-EXTRA_OECONF += "\
- --disable-mpeg2enc \
- --disable-acm \
-"
diff --git a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad/0001-gstfbdevsink-Fix-depth-value-for-GST_VIDEO_CAPS_RGB_.patch b/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad/0001-gstfbdevsink-Fix-depth-value-for-GST_VIDEO_CAPS_RGB_.patch
deleted file mode 100644
index 5905591..0000000
--- a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad/0001-gstfbdevsink-Fix-depth-value-for-GST_VIDEO_CAPS_RGB_.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From ec785d544f417aa2d88f8803e4392ff02ab424ae Mon Sep 17 00:00:00 2001
-From: Punya Prakash <pprakash@ti.com>
-Date: Fri, 4 Nov 2011 13:03:57 -0500
-Subject: [PATCH] gstfbdevsink: Fix depth value for GST_VIDEO_CAPS_RGB_15
-
-RGB color format does not have any alpha components, adding alpha length to depth could yield wrong results.
-
-Upstream-Status: Pending
-
-Signed-off-by: Punya Prakash <pprakash@ti.com>
----
- sys/fbdev/gstfbdevsink.c | 3 +--
- 1 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c
-index 8925f3d..568f091 100644
---- a/sys/fbdev/gstfbdevsink.c
-+++ b/sys/fbdev/gstfbdevsink.c
-@@ -185,8 +185,7 @@ gst_fbdevsink_getcaps (GstBaseSink * bsink)
- "bpp", G_TYPE_INT, fbdevsink->varinfo.bits_per_pixel,
- "depth", G_TYPE_INT, fbdevsink->varinfo.red.length +
- fbdevsink->varinfo.green.length +
-- fbdevsink->varinfo.blue.length +
-- fbdevsink->varinfo.transp.length,
-+ fbdevsink->varinfo.blue.length,
- "endianness", G_TYPE_INT, endianness,
- "red_mask", G_TYPE_INT, rmask,
- "green_mask", G_TYPE_INT, gmask, "blue_mask", G_TYPE_INT, bmask, NULL);
---
diff --git a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad/0001-sys-fbdevsink-fixing-calculation-of-bytes-per-pixel.patch b/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad/0001-sys-fbdevsink-fixing-calculation-of-bytes-per-pixel.patch
deleted file mode 100644
index 0b417db..0000000
--- a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad/0001-sys-fbdevsink-fixing-calculation-of-bytes-per-pixel.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 76fc77de1d38b6a41585898e16dc259bbfbb50d3 Mon Sep 17 00:00:00 2001
-From: Darren Etheridge <detheridge@ti.com>
-Date: Wed, 20 Nov 2013 15:23:51 -0600
-Subject: [PATCH] sys/fbdevsink: fixing calculation of bytes per pixel
-
-Original method will only work where there xres is identical to the
-physically allocated buffer size. On omapdss this is unlikely to be true
-because of the way buffers are allocated out of a much larger buffer in
-3 dimensions - meaning there often be a stride (or pitch) for each line.
-Changing the method of figuring out the bytes per pixel to a method that
-should work in all circumstances.
-
-Signed-off-by: Darren Etheridge <detheridge@ti.com>
----
- sys/fbdev/gstfbdevsink.c | 21 ++++++++++++++++++++-
- 1 file changed, 20 insertions(+), 1 deletion(-)
-
-diff --git a/sys/fbdev/gstfbdevsink.c b/sys/fbdev/gstfbdevsink.c
-index 7878fbf..aacef5e 100644
---- a/sys/fbdev/gstfbdevsink.c
-+++ b/sys/fbdev/gstfbdevsink.c
-@@ -213,7 +213,26 @@ gst_fbdevsink_setcaps (GstBaseSink * bsink, GstCaps * vscapslist)
- gst_structure_get_int (structure, "height", &fbdevsink->height);
-
- /* calculate centering and scanlengths for the video */
-- fbdevsink->bytespp = fbdevsink->fixinfo.line_length / fbdevsink->varinfo.xres;
-+ switch(fbdevsink->varinfo.bits_per_pixel) {
-+ case 8:
-+ fbdevsink->bytespp = 1;
-+ break;
-+ case 15:
-+ case 16:
-+ fbdevsink->bytespp = 2;
-+ break;
-+ case 24:
-+ fbdevsink->bytespp = 3;
-+ break;
-+ case 32:
-+ fbdevsink->bytespp = 4;
-+ break;
-+ default:
-+ /* other bit depths are not supported */
-+ g_warning ("unsupported bit depth: %d\n",
-+ fbdevsink->varinfo.bits_per_pixel);
-+ return FALSE;
-+ }
-
- fbdevsink->cx = ((int) fbdevsink->varinfo.xres - fbdevsink->width) / 2;
- if (fbdevsink->cx < 0)
---
-1.8.3.2
-
diff --git a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend b/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend
deleted file mode 100644
index f40fe85..0000000
--- a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
-PR_append = "-arago5"
-
-# look for files in this layer first
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += "file://0001-gstfbdevsink-Fix-depth-value-for-GST_VIDEO_CAPS_RGB_.patch \
- file://0001-sys-fbdevsink-fixing-calculation-of-bytes-per-pixel.patch"
-
-PACKAGECONFIG = "bzip curl faad"
-
-# Disable features that have potential commercial licensing restrictions
-EXTRA_OECONF += "\
- --disable-mpeg2enc \
- --disable-acm \
-"
diff --git a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-good-mm-accel_0.10.31.bbappend b/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-good-mm-accel_0.10.31.bbappend
deleted file mode 100644
index 4cb0608..0000000
--- a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-good-mm-accel_0.10.31.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-PR_append = "-arago0"
-
-DEPENDS := "${@oe_filter_out('gconf','${DEPENDS}', d)}"
-DEPENDS := "${@oe_filter_out('gconf-native','${DEPENDS}', d)}"
-
-EXTRA_OECONF += "--disable-gconftool --disable-gconf"
diff --git a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bbappend b/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bbappend
deleted file mode 100644
index c87197d..0000000
--- a/meta-arago-distro/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-PR_append = "-arago2"
-
-DEPENDS := "${@oe_filter_out('gconf','${DEPENDS}', d)}"
-DEPENDS := "${@oe_filter_out('gconf-native','${DEPENDS}', d)}"
-
-EXTRA_OECONF += "--disable-gconftool --disable-gconf"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-bad-mm-accel_0.10.23.bb b/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-bad-mm-accel_0.10.23.bb
deleted file mode 100644
index e8fa1be..0000000
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-bad-mm-accel_0.10.23.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-# Include the base gst-plugins-bad recipe since this recipe is heavily
-# derived from that one.
-require recipes-multimedia/gstreamer/gst-plugins-bad_${PV}.bb
-
-require gstreamer-mm-accel.inc
-#require gst-plugins-package-mm-accel.inc
-
-DESCRIPTION = "GStreamer bad plugins that use multimedia accelerators found on \
- TI devices"
-
-PN = "gst-plugins-bad"
-B = "${S}"
-
-# Set PROVIDES and RPROVIDES values so that the base recipe names can still
-# be used and PREFERRED_PROVIDER can be used to pick between them.
-PROVIDES += "gst-plugins-bad"
-RPROVIDES_${PN} += "gst-plugins-bad"
-RPROVIDES_${PN}-dev += "gst-plugins-bad-dev"
-RPROVIDES_${PN}-meta += "gst-plugins-bad-meta"
-RREPLACES_${PN} += "gst-plugins-bad"
-RREPLACES_${PN}-dev += "gst-plugins-bad-dev"
-RREPLACES_${PN}-meta += "gst-plugins-bad-meta"
-RCONFLICTS_${PN} += "gst-plugins-bad"
-RCONFLICTS_${PN}-dev += "gst-plugins-bad-dev"
-RCONFLICTS_${PN}-meta += "gst-plugins-bad-meta"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-DEPENDS += "virtual/libgles2 virtual/egl libdce libdrm wayland"
-
-SRCREV = "a9510bef52331fee9a23a5c955dbf76ac210056a"
-SRC_URI = "gitsm://git.ti.com/glsdk/gst-plugins-bad0-10.git;protocol=git"
-
-S = "${WORKDIR}/git"
-
-EXTRA_OECONF += " --disable-pvr"
-
-do_configure_prepend() {
- cd ${S}
- autopoint -f
-}
-
-do_install_prepend() {
- cd ${S}
-}
-
-FILESPATH .= ":${COREBASE}/meta/recipes-multimedia/gstreamer/gst-plugins-bad-${PV}"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-base-mm-accel_0.10.36.bb b/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-base-mm-accel_0.10.36.bb
deleted file mode 100644
index 0748a58..0000000
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-base-mm-accel_0.10.36.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-# Include the base gst-plugins-base recipe since this recipe is heavily
-# derived from that one.
-require recipes-multimedia/gstreamer/gst-plugins-base_${PV}.bb
-
-require gstreamer-mm-accel.inc
-#require gst-plugins-package-mm-accel.inc
-
-DESCRIPTION = "GStreamer base plugins that use multimedia accelerators found \
- on TI devices"
-
-PN = "gst-plugins-base"
-B = "${S}"
-
-# Set PROVIDES and RPROVIDES values so that the base recipe names can still
-# be used and PREFERRED_PROVIDER can be used to pick between them.
-PROVIDES += "gst-plugins-base"
-RPROVIDES_${PN} += "gst-plugins-base"
-RPROVIDES_${PN}-dev += "gst-plugins-base-dev"
-RPROVIDES_${PN}-meta += "gst-plugins-base-meta"
-RREPLACES_${PN} += "gst-plugins-base"
-RREPLACES_${PN}-dev += "gst-plugins-base-dev"
-RREPLACES_${PN}-meta += "gst-plugins-base-meta"
-RCONFLICTS_${PN} += "gst-plugins-base"
-RCONFLICTS_${PN}-dev += "gst-plugins-base-dev"
-RCONFLICTS_${PN}-meta += "gst-plugins-base-meta"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRC_URI = "gitsm://git.ti.com/glsdk/gst-plugins-base0-10.git;protocol=git"
-SRCREV = "3427e885daa749275e07339d3633b83c717aa419"
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend() {
- cd ${S}
- autopoint -f
-}
-
-do_install_prepend() {
- cd ${S}
-}
-
-EXTRA_OECONF +="--disable-ivorbis "
-
-FILESPATH .= ":${COREBASE}/meta/recipes-multimedia/gstreamer/gst-plugins-base-${PV}"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-good-mm-accel_0.10.31.bb b/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-good-mm-accel_0.10.31.bb
deleted file mode 100644
index dcce5fd..0000000
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-good-mm-accel_0.10.31.bb
+++ /dev/null
@@ -1,47 +0,0 @@
-# Include the base gst-plugins-bad recipe since this recipe is heavily
-# derived from that one.
-require recipes-multimedia/gstreamer/gst-plugins-good_${PV}.bb
-
-require gstreamer-mm-accel.inc
-#require gst-plugins-package-mm-accel.inc
-
-DESCRIPTION = "GStreamer good plugins that use multimedia accelerators found \
- on TI devices"
-
-PN = "gst-plugins-good"
-B = "${S}"
-
-# Set PROVIDES and RPROVIDES values so that the base recipe names can still
-# be used and PREFERRED_PROVIDER can be used to pick between them.
-PROVIDES += "gst-plugins-good"
-RPROVIDES_${PN} += "gst-plugins-good"
-RPROVIDES_${PN}-dev += "gst-plugins-good-dev"
-RPROVIDES_${PN}-meta += "gst-plugins-good-meta"
-RREPLACES_${PN} += "gst-plugins-good"
-RREPLACES_${PN}-dev += "gst-plugins-good-dev"
-RREPLACES_${PN}-meta += "gst-plugins-good-meta"
-RCONFLICTS_${PN} += "gst-plugins-good"
-RCONFLICTS_${PN}-dev += "gst-plugins-good-dev"
-RCONFLICTS_${PN}-meta += "gst-plugins-good-meta"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRC_URI = "gitsm://git.ti.com/glsdk/gst-plugins-good0-10.git;protocol=git"
-SRCREV = "a44097d542f2bf219ac9dc3ef2372e58d769a8f9"
-
-# Fix compile errors with recent kernels
-SRC_URI_append = " file://0001-v4l2-fix-build-with-recent-kernels-the-v4l2_buffer-i.patch \
- file://0001-v4l2_calls-define-V4L2_CID_HCENTER-and-V4L2_CID_VCEN.patch"
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend() {
- cd ${S}
- autopoint -f
-}
-
-do_install_prepend() {
- cd ${S}
-}
-
-FILESPATH .= ":${COREBASE}/meta/recipes-multimedia/gstreamer/gst-plugins-good-${PV}"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-package-mm-accel.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-package-mm-accel.inc
deleted file mode 100644
index b7b5a50..0000000
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-package-mm-accel.inc
+++ /dev/null
@@ -1,17 +0,0 @@
-python split_gstreamer10_packages () {
- def gst_lib_hook(file, pkg, pattern, format, basename):
- pkglist = " lib" + basename + " lib" + basename + "-0"
- d.setVar("DEBIAN_NOAUTONAME_" + pkg, "1")
- d.appendVar("RPROVIDES_" + pkg, pkglist)
- d.appendVar("RREPLACES_" + pkg, pkglist)
- d.appendVar("RCONFLICTS_" + pkg, pkglist)
-
- gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}')
- postinst = d.getVar('plugin_postinst', True)
- glibdir = d.getVar('libdir', True)
-
- do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True, hook=gst_lib_hook)
- do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends=d.expand('${PN}'))
- do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev'))
- do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev'))
-}
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer-mm-accel.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer-mm-accel.inc
deleted file mode 100644
index d9874b4..0000000
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer-mm-accel.inc
+++ /dev/null
@@ -1,9 +0,0 @@
-# This recipe is not valid when not using accelerated multimedia IP
-python __anonymous() {
- features = bb.data.getVar("MACHINE_FEATURES", d, 1)
- pkgn = bb.data.getVar("PN", d, 1)
- if not features:
- return
- if "mmip" not in features:
- raise bb.parse.SkipPackage('%s needs dependencies derived from "mmip" flag in MACHINE_FEATURES' % pkgn)
-}
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer-mm-accel_0.10.36.bb b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer-mm-accel_0.10.36.bb
deleted file mode 100644
index f50d0a3..0000000
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer-mm-accel_0.10.36.bb
+++ /dev/null
@@ -1,41 +0,0 @@
-require gstreamer-mm-accel.inc
-
-# Include the base gst-plugins-bad recipe since this recipe is heavily
-# derived from that one.
-require recipes-multimedia/gstreamer/gstreamer_${PV}.bb
-
-DESCRIPTION = "GStreamer that use multimedia accelerators found on TI devices"
-
-PN = "gstreamer"
-B = "${S}"
-
-# Set PROVIDES and RPROVIDES values so that the base recipe names can still
-# be used and PREFERRED_PROVIDER can be used to pick between them.
-PROVIDES += "gstreamer"
-RPROVIDES_${PN} += "gstreamer"
-RPROVIDES_${PN}-dev += "gstreamer-dev"
-RPROVIDES_${PN}-dbg += "gstreamer-dbg"
-RREPLACES_${PN} += "gstreamer"
-RREPLACES_${PN}-dev += "gstreamer-dev"
-RREPLACES_${PN}-dbg += "gstreamer-dbg"
-RCONFLICTS_${PN} += "gstreamer"
-RCONFLICTS_${PN}-dev += "gstreamer-dev"
-RCONFLICTS_${PN}-dbg += "gstreamer-dbg"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-SRC_URI = "gitsm://git.ti.com/glsdk/gstreamer0-10.git;protocol=git"
-SRCREV = "e505f4a2ceee3b0328eb2efddb9ec1281d3fd60a"
-
-S = "${WORKDIR}/git"
-
-do_configure_prepend() {
- cd ${S}
- autopoint -f
-}
-
-do_install_prepend() {
- cd ${S}
-}
-
-FILESPATH .= ":${COREBASE}/meta/recipes-multimedia/gstreamer/gstreamer-${PV}"
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 03/26] linux-libc-headers: remove version 4.1, default to 4.4
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 01/26] recipes-qt: remove all traces of qt4, no longer in oe-core Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 02/26] gstreamer: remove outdated 0.10.x version, " Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 04/26] linux: remove bbappends for old kernel versions, removed from meta-ti Denys Dmytriyenko
` (22 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
| 75 ----------------------
| 7 --
2 files changed, 82 deletions(-)
delete mode 100644 meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
delete mode 100644 meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb
diff --git a/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
deleted file mode 100644
index 566bc1e..0000000
--- a/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers.inc
+++ /dev/null
@@ -1,75 +0,0 @@
-SUMMARY = "Sanitized set of kernel headers for the C library's use"
-SECTION = "devel"
-LICENSE = "GPLv2"
-
-#########################################################################
-#### PLEASE READ
-#########################################################################
-#
-# You're probably looking here thinking you need to create some new copy
-# of linux-libc-headers since you have your own custom kernel. To put
-# this simply, you DO NOT.
-#
-# Why? These headers are used to build the libc. If you customise the
-# headers you are customising the libc and the libc becomes machine
-# specific. Most people do not add custom libc extensions to the kernel
-# and have a machine specific libc.
-#
-# But you have some kernel headers you need for some driver? That is fine
-# but get them from STAGING_KERNEL_DIR where the kernel installs itself.
-# This will make the package using them machine specific but this is much
-# better than having a machine specific C library. This does mean your
-# recipe needs a DEPENDS += "virtual/kernel" but again, that is fine and
-# makes total sense.
-#
-# There can also be a case where your kernel extremely old and you want
-# an older libc ABI for that old kernel. The headers installed by this
-# recipe should still be a standard mainline kernel, not your own custom
-# one.
-#
-# -- RP
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
-
-python __anonymous () {
- major = d.getVar("PV",True).split('.')[0]
- if major == "3":
- d.setVar("HEADER_FETCH_VER", "3.0")
- elif major == "4":
- d.setVar("HEADER_FETCH_VER", "4.x")
- else:
- d.setVar("HEADER_FETCH_VER", "2.6")
-}
-
-inherit kernel-arch
-
-KORG_ARCHIVE_COMPRESSION ?= "bz2"
-
-SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v${HEADER_FETCH_VER}/linux-${PV}.tar.${KORG_ARCHIVE_COMPRESSION}"
-
-S = "${WORKDIR}/linux-${PV}"
-
-do_configure() {
- oe_runmake allnoconfig
-}
-
-do_compile () {
-}
-
-do_install() {
- oe_runmake headers_install INSTALL_HDR_PATH=${D}${exec_prefix}
- # Kernel should not be exporting this header
- rm -f ${D}${exec_prefix}/include/scsi/scsi.h
-
- # The ..install.cmd conflicts between various configure runs
- find ${D}${includedir} -name ..install.cmd | xargs rm -f
-}
-
-BBCLASSEXTEND = "nativesdk"
-
-#DEPENDS = "cross-linkage"
-RDEPENDS_${PN}-dev = ""
-RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})"
-
-INHIBIT_DEFAULT_DEPS = "1"
-DEPENDS += "unifdef-native"
diff --git a/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb b/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb
deleted file mode 100644
index d816e5e..0000000
--- a/meta-arago-distro/recipes-kernel/linux-libc-headers/linux-libc-headers_4.1.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-KORG_ARCHIVE_COMPRESSION = "xz"
-
-require linux-libc-headers.inc
-
-SRC_URI[md5sum] = "fe9dc0f6729f36400ea81aa41d614c37"
-SRC_URI[sha256sum] = "caf51f085aac1e1cea4d00dbbf3093ead07b551fc07b31b2a989c05f8ea72d9f"
-
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 04/26] linux: remove bbappends for old kernel versions, removed from meta-ti
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (2 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 03/26] linux-libc-headers: remove version 4.1, default to 4.4 Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 05/26] wpa-gui-e: remove, as no longer supported and requiring qt4 Denys Dmytriyenko
` (21 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-kernel/linux/linux-ti-glsdk_3.8.bbappend | 17 -----------------
.../linux/sitara-linux-ti-staging_3.14.bbappend | 13 -------------
2 files changed, 30 deletions(-)
delete mode 100644 meta-arago-distro/recipes-kernel/linux/linux-ti-glsdk_3.8.bbappend
delete mode 100644 meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-glsdk_3.8.bbappend b/meta-arago-distro/recipes-kernel/linux/linux-ti-glsdk_3.8.bbappend
deleted file mode 100644
index f331309..0000000
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-glsdk_3.8.bbappend
+++ /dev/null
@@ -1,17 +0,0 @@
-MACHINE_KERNEL_PR_append = "-arago0"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
-
-require copy-defconfig.inc
-
-KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
-
-# The below lines are overlayed until the LOCALVERSION change is merged into
-# the oe-core danny branch. Update: not coming to danny, keep until dylan.
-kernel_do_configure_prepend() {
- if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
- then
- echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
- echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
- fi
-}
diff --git a/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend b/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
deleted file mode 100644
index 7e8eaf2..0000000
--- a/meta-arago-distro/recipes-kernel/linux/sitara-linux-ti-staging_3.14.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-MACHINE_KERNEL_PR_append = "-arago1"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/${P}:"
-
-KERNEL_LOCALVERSION = "-g${@d.getVar('SRCPV', True).partition('+')[2][0:7]}"
-
-kernel_do_configure_prepend() {
- if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
- then
- echo ${KERNEL_LOCALVERSION} > ${B}/.scmversion
- echo ${KERNEL_LOCALVERSION} > ${S}/.scmversion
- fi
-}
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 05/26] wpa-gui-e: remove, as no longer supported and requiring qt4
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (3 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 04/26] linux: remove bbappends for old kernel versions, removed from meta-ti Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 06/26] u-boot-fw-utils: remove old version Denys Dmytriyenko
` (20 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
...was-not-declared-in-this-scope-when-using.patch | 39 ----------------------
.../wpa-supplicant/wpa-gui-e_git.bb | 28 ----------------
2 files changed, 67 deletions(-)
delete mode 100644 meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-gui-e/0001-wpagui-Fix-was-not-declared-in-this-scope-when-using.patch
delete mode 100644 meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-gui-e_git.bb
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-gui-e/0001-wpagui-Fix-was-not-declared-in-this-scope-when-using.patch b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-gui-e/0001-wpagui-Fix-was-not-declared-in-this-scope-when-using.patch
deleted file mode 100644
index e6bc83a..0000000
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-gui-e/0001-wpagui-Fix-was-not-declared-in-this-scope-when-using.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8c707dd7af988ea29b569f42a8c462c86d65817b Mon Sep 17 00:00:00 2001
-From: Franklin S. Cooper Jr <fcooper@ti.com>
-Date: Fri, 10 May 2013 10:43:36 -0500
-Subject: [PATCH] wpagui: Fix was not declared in this scope when using gcc 4.7 based toolchain
-
-* Adding missing header to fix the following errors:
- error: 'getopt' was not declared in this scope
- error: 'optarg' was not declared in this scope
-
-Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
----
- wpagui.cpp | 5 +----
- 1 files changed, 1 insertions(+), 4 deletions(-)
-
-diff --git a/wpagui.cpp b/wpagui.cpp
-index 97bf5ac..4b5ec23 100644
---- a/wpagui.cpp
-+++ b/wpagui.cpp
-@@ -12,16 +12,13 @@
- * See README and COPYING for more details.
- */
-
--#ifdef __MINGW32__
--/* Need to get getopt() */
--#include <unistd.h>
--#endif
-
- #ifdef CONFIG_NATIVE_WINDOWS
- #include <windows.h>
- #endif /* CONFIG_NATIVE_WINDOWS */
-
- #include <cstdio>
-+#include <unistd.h>
- #include <QMessageBox>
- #include <QCloseEvent>
- #include <QImageReader>
---
-1.7.0.4
-
diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-gui-e_git.bb b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-gui-e_git.bb
deleted file mode 100644
index 07da836..0000000
--- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-gui-e_git.bb
+++ /dev/null
@@ -1,28 +0,0 @@
-HOMEPAGE = "http://hostap.epitest.fi/wpa_supplicant/"
-SECTION = "network"
-DESCRIPTION = "Qt embedded interface for choosing which configured network \
-to connect to. It also provides a method for browsing 802.11 SSID scan \
-results, an event history log of messages generated by wpa_supplicant, and \
-a method to add or edit wpa_supplicant networks."
-LICENSE = "GPLv2 | BSD"
-LIC_FILES_CHKSUM = "file://../../COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
- file://../../README;md5=ac69bb94677a5725da586adce7406526 \
-"
-
-PV = "0.7.3+0.8.0-rc+git${SRCPV}"
-PR = "r1"
-
-SRCREV = "653c4893be17d12ef7bc6e941b765c92c1e4a161"
-
-SRC_URI = "git://w1.fi/srv/git/hostap.git;protocol=git \
- file://0001-wpagui-Fix-was-not-declared-in-this-scope-when-using.patch"
-
-S = "${WORKDIR}/git/wpa_supplicant/wpa_gui-qt4"
-
-inherit qt4e
-ARM_INSTRUCTION_SET = "arm"
-
-do_install () {
- install -d ${D}${bindir}
- install -m 755 wpa_gui ${D}/${bindir}/wpa_gui-e
-}
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 06/26] u-boot-fw-utils: remove old version
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (4 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 05/26] wpa-gui-e: remove, as no longer supported and requiring qt4 Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 07/26] cryptodev-tests: remove, the change got upstreamed Denys Dmytriyenko
` (19 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb | 33 ----------------------
.../u-boot/u-boot-fw-utils_2014.07.bbappend | 7 -----
2 files changed, 40 deletions(-)
delete mode 100644 meta-arago-distro/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
delete mode 100644 meta-arago-distro/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bbappend
diff --git a/meta-arago-distro/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb b/meta-arago-distro/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
deleted file mode 100644
index 10a3cd4..0000000
--- a/meta-arago-distro/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
-SECTION = "bootloader"
-DEPENDS = "mtd-utils"
-
-# This revision corresponds to the tag "v2014.07"
-# We use the revision in order to avoid having to fetch it from the
-# repo during parse
-SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
-
-PV = "v2014.07+git${SRCPV}"
-
-SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
-
-S = "${WORKDIR}/git"
-
-INSANE_SKIP_${PN} = "already-stripped"
-
-do_compile () {
- oe_runmake ${UBOOT_MACHINE}
- oe_runmake env
-}
-
-do_install () {
- install -d ${D}${base_sbindir}
- install -d ${D}${sysconfdir}
- install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
- install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
- install -m 0644 ${S}/tools/env/fw_env.config ${D}${sysconfdir}/fw_env.config
-}
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-arago-distro/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bbappend b/meta-arago-distro/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bbappend
deleted file mode 100644
index 67bf9cf..0000000
--- a/meta-arago-distro/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bbappend
+++ /dev/null
@@ -1,7 +0,0 @@
-PR_append = "-arago1"
-
-# The proper config doesn't currently exist anywhere in mainline U-boot.
-# For now just use a similar config which is good enough for U-boot utilities.
-UBOOT_MACHINE_am57xx-evm = "dra7xx_evm_config"
-UBOOT_MACHINE_dra7xx-hs-evm = "dra7xx_evm_config"
-UBOOT_MACHINE_am437x-hs-evm = "am43xx_evm_config"
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 07/26] cryptodev-tests: remove, the change got upstreamed
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (5 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 06/26] u-boot-fw-utils: remove old version Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 08/26] udev: rename bbappends to eudev, add symlink for libudev.so.0 Denys Dmytriyenko
` (18 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-kernel/cryptodev/cryptodev-tests_1.6.bbappend | 3 ---
1 file changed, 3 deletions(-)
delete mode 100644 meta-arago-distro/recipes-kernel/cryptodev/cryptodev-tests_1.6.bbappend
diff --git a/meta-arago-distro/recipes-kernel/cryptodev/cryptodev-tests_1.6.bbappend b/meta-arago-distro/recipes-kernel/cryptodev/cryptodev-tests_1.6.bbappend
deleted file mode 100644
index 19a031f..0000000
--- a/meta-arago-distro/recipes-kernel/cryptodev/cryptodev-tests_1.6.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-PR_append = "-arago0"
-
-EXTRA_OEMAKE='KERNEL_DIR="${STAGING_EXECPREFIXDIR}" PREFIX="${D}"'
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 08/26] udev: rename bbappends to eudev, add symlink for libudev.so.0
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (6 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 07/26] cryptodev-tests: remove, the change got upstreamed Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 09/26] gstreamer: overlay .inc files from fido and update 1.2.3 recipes Denys Dmytriyenko
` (17 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Old library name/version is hardcoded in SGX binaries
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../udev/{udev/keystone => eudev/dra7xx}/udev-cache.default | 0
.../udev/{udev/dra7xx => eudev/keystone}/udev-cache.default | 0
meta-arago-distro/recipes-core/udev/{udev => eudev}/local.rules | 0
meta-arago-distro/recipes-core/udev/{udev => eudev}/usb1-rules.sh | 0
meta-arago-distro/recipes-core/udev/{udev => eudev}/usb2-rules.sh | 0
.../recipes-core/udev/{udev_%.bbappend => eudev_%.bbappend} | 3 ++-
6 files changed, 2 insertions(+), 1 deletion(-)
rename meta-arago-distro/recipes-core/udev/{udev/keystone => eudev/dra7xx}/udev-cache.default (100%)
rename meta-arago-distro/recipes-core/udev/{udev/dra7xx => eudev/keystone}/udev-cache.default (100%)
rename meta-arago-distro/recipes-core/udev/{udev => eudev}/local.rules (100%)
rename meta-arago-distro/recipes-core/udev/{udev => eudev}/usb1-rules.sh (100%)
rename meta-arago-distro/recipes-core/udev/{udev => eudev}/usb2-rules.sh (100%)
rename meta-arago-distro/recipes-core/udev/{udev_%.bbappend => eudev_%.bbappend} (88%)
diff --git a/meta-arago-distro/recipes-core/udev/udev/keystone/udev-cache.default b/meta-arago-distro/recipes-core/udev/eudev/dra7xx/udev-cache.default
similarity index 100%
rename from meta-arago-distro/recipes-core/udev/udev/keystone/udev-cache.default
rename to meta-arago-distro/recipes-core/udev/eudev/dra7xx/udev-cache.default
diff --git a/meta-arago-distro/recipes-core/udev/udev/dra7xx/udev-cache.default b/meta-arago-distro/recipes-core/udev/eudev/keystone/udev-cache.default
similarity index 100%
rename from meta-arago-distro/recipes-core/udev/udev/dra7xx/udev-cache.default
rename to meta-arago-distro/recipes-core/udev/eudev/keystone/udev-cache.default
diff --git a/meta-arago-distro/recipes-core/udev/udev/local.rules b/meta-arago-distro/recipes-core/udev/eudev/local.rules
similarity index 100%
rename from meta-arago-distro/recipes-core/udev/udev/local.rules
rename to meta-arago-distro/recipes-core/udev/eudev/local.rules
diff --git a/meta-arago-distro/recipes-core/udev/udev/usb1-rules.sh b/meta-arago-distro/recipes-core/udev/eudev/usb1-rules.sh
similarity index 100%
rename from meta-arago-distro/recipes-core/udev/udev/usb1-rules.sh
rename to meta-arago-distro/recipes-core/udev/eudev/usb1-rules.sh
diff --git a/meta-arago-distro/recipes-core/udev/udev/usb2-rules.sh b/meta-arago-distro/recipes-core/udev/eudev/usb2-rules.sh
similarity index 100%
rename from meta-arago-distro/recipes-core/udev/udev/usb2-rules.sh
rename to meta-arago-distro/recipes-core/udev/eudev/usb2-rules.sh
diff --git a/meta-arago-distro/recipes-core/udev/udev_%.bbappend b/meta-arago-distro/recipes-core/udev/eudev_%.bbappend
similarity index 88%
rename from meta-arago-distro/recipes-core/udev/udev_%.bbappend
rename to meta-arago-distro/recipes-core/udev/eudev_%.bbappend
index a84bbd8..4080723 100644
--- a/meta-arago-distro/recipes-core/udev/udev_%.bbappend
+++ b/meta-arago-distro/recipes-core/udev/eudev_%.bbappend
@@ -5,7 +5,7 @@
# look for files in this layer first
FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-PR_append = "-arago4"
+PR_append = "-arago5"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -18,4 +18,5 @@ do_install_append() {
install -m 0755 ${WORKDIR}/usb1-rules.sh ${D}${bindir}/usb1-rules.sh
install -m 0755 ${WORKDIR}/usb2-rules.sh ${D}${bindir}/usb2-rules.sh
+ ln -sf libudev.so.1 ${D}${base_libdir}/libudev.so.0
}
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 09/26] gstreamer: overlay .inc files from fido and update 1.2.3 recipes
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (7 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 08/26] udev: rename bbappends to eudev, add symlink for libudev.so.0 Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 10/26] liboil: overlay locally for gstreamer-1.2.3 dependency Denys Dmytriyenko
` (16 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Version 1.2.3 is required for now for HW acceleration, until it's ported to 1.6.3
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../gstreamer/gst-plugins-package.inc | 57 +++++++++
.../gstreamer/gstreamer1.0-libav.inc | 31 +++++
.../gstreamer/gstreamer1.0-libav_1.2.3.bb | 1 -
.../gstreamer/gstreamer1.0-plugins-bad.inc | 135 +++++++++++++++++++++
.../gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb | 1 -
.../gstreamer/gstreamer1.0-plugins-base.inc | 40 ++++++
.../gstreamer/gstreamer1.0-plugins-good.inc | 58 +++++++++
.../gstreamer/gstreamer1.0-plugins-good_1.2.3.bb | 1 -
.../gstreamer/gstreamer1.0-plugins-ugly.inc | 30 +++++
.../gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb | 1 -
.../gstreamer/gstreamer1.0-plugins.inc | 56 +++++++++
.../recipes-multimedia/gstreamer/gstreamer1.0.inc | 27 +++++
.../gstreamer/gstreamer1.0_1.2.3.bb | 1 -
13 files changed, 434 insertions(+), 5 deletions(-)
create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-package.inc
create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
create mode 100644 meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0.inc
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-package.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-package.inc
new file mode 100644
index 0000000..617a735
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gst-plugins-package.inc
@@ -0,0 +1,57 @@
+PACKAGESPLITFUNCS_prepend = " split_gstreamer10_packages "
+PACKAGESPLITFUNCS_append = " set_metapkg_rdepends "
+
+python split_gstreamer10_packages () {
+ gst_libdir = d.expand('${libdir}/gstreamer-${LIBV}')
+ postinst = d.getVar('plugin_postinst', True)
+ glibdir = d.getVar('libdir', True)
+
+ do_split_packages(d, glibdir, '^lib(.*)\.so\.*', 'lib%s', 'gstreamer %s library', extra_depends='', allow_links=True)
+ do_split_packages(d, gst_libdir, 'libgst(.*)\.so$', d.expand('${PN}-%s'), 'GStreamer plugin for %s', postinst=postinst, extra_depends='')
+ do_split_packages(d, gst_libdir, 'libgst(.*)\.la$', d.expand('${PN}-%s-dev'), 'GStreamer plugin for %s (development files)', extra_depends=d.expand('${PN}-dev'))
+ do_split_packages(d, gst_libdir, 'libgst(.*)\.a$', d.expand('${PN}-%s-staticdev'), 'GStreamer plugin for %s (static development files)', extra_depends=d.expand('${PN}-staticdev'))
+}
+
+python set_metapkg_rdepends () {
+ import os
+
+ pn = d.getVar('PN', True)
+ metapkg = pn + '-meta'
+ d.setVar('ALLOW_EMPTY_' + metapkg, "1")
+ d.setVar('FILES_' + metapkg, "")
+ blacklist = [ pn, pn + '-locale', pn + '-dev', pn + '-dbg', pn + '-doc', pn + '-meta' ]
+ metapkg_rdepends = []
+ packages = d.getVar('PACKAGES', True).split()
+ pkgdest = d.getVar('PKGDEST', True)
+ for pkg in packages[1:]:
+ if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.count('locale') and not pkg.count('-staticdev'):
+ # See if the package is empty by looking at the contents of its PKGDEST subdirectory.
+ # If this subdirectory is empty, then the package is.
+ # Empty packages do not get added to the meta package's RDEPENDS
+ pkgdir = os.path.join(pkgdest, pkg)
+ if os.path.exists(pkgdir):
+ dir_contents = os.listdir(pkgdir) or []
+ else:
+ dir_contents = []
+ is_empty = len(dir_contents) == 0
+ if not is_empty:
+ metapkg_rdepends.append(pkg)
+ d.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends))
+ d.setVar('DESCRIPTION_' + metapkg, pn + ' meta package')
+}
+
+# each plugin-dev depends on PN-dev, plugin-staticdev on PN-staticdev
+# so we need them even when empty (like in gst-plugins-good case)
+ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY_${PN}-dev = "1"
+ALLOW_EMPTY_${PN}-staticdev = "1"
+
+PACKAGES += "${PN}-apps ${PN}-meta ${PN}-glib"
+FILES_${PN}-apps = "${bindir}"
+
+RDEPENDS_${PN}-apps += "perl"
+RRECOMMENDS_${PN} += "${PN}-meta"
+
+FILES_${PN} = ""
+FILES_${PN}-dbg += "${libdir}/gstreamer-${LIBV}/.debug"
+FILES_${PN}-glib = "${datadir}/glib-2.0"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
new file mode 100644
index 0000000..6c8bc95
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav.inc
@@ -0,0 +1,31 @@
+SUMMARY = "Libav-based GStreamer 1.x plugin"
+SECTION = "multimedia"
+LICENSE = "GPLv2+ & LGPLv2+ & ( (GPLv2+ & LGPLv2.1+) | (GPLv3+ & LGPLv3+) )"
+LICENSE_FLAGS = "commercial"
+HOMEPAGE = "http://www.gstreamer.net/"
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base zlib bzip2"
+
+inherit autotools pkgconfig
+
+# CAUTION: Using the system libav is not recommended. Since the libav API is changing all the time,
+# compilation errors (and other, more subtle bugs) can happen. It is usually better to rely on the
+# libav copy included in the gst-libav package.
+PACKAGECONFIG ??= " orc yasm "
+PACKAGECONFIG[libav] = "--with-system-libav,,libav"
+PACKAGECONFIG[lgpl] = "--enable-lgpl,,"
+PACKAGECONFIG[yasm] = "--enable-yasm,--disable-yasm,yasm-native"
+PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
+
+
+GSTREAMER_1_0_DEBUG ?= "--disable-debug"
+
+LIBAV_EXTRA_CONFIGURE = "--with-libav-extra-configure"
+LIBAV_EXTRA_CONFIGURE_COMMON = \
+'${LIBAV_EXTRA_CONFIGURE}="${LIBAV_EXTRA_CONFIGURE_COMMON_ARG}"'
+
+EXTRA_OECONF = "${LIBAV_EXTRA_CONFIGURE_COMMON}"
+
+FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
+FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug"
+FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
+FILES_${PN}-staticdev += "${libdir}/gstreamer-1.0/*.a"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.2.3.bb b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.2.3.bb
index a05fe2e..3e99273 100644
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.2.3.bb
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-libav_1.2.3.bb
@@ -23,4 +23,3 @@ LIBAV_EXTRA_CONFIGURE_COMMON_ARG = "--target-os=linux \
${GSTREAMER_1_0_DEBUG}"
S = "${WORKDIR}/gst-libav-${PV}"
-
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
new file mode 100644
index 0000000..85ef6ce
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad.inc
@@ -0,0 +1,135 @@
+require gstreamer1.0-plugins.inc
+
+LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+ "
+
+DEPENDS += "gstreamer1.0-plugins-base bzip2 libpng jpeg"
+
+S = "${WORKDIR}/gst-plugins-bad-${PV}"
+
+SRC_URI += "file://configure-allow-to-disable-libssh2.patch \
+ "
+
+inherit gettext bluetooth
+
+# opengl packageconfig factored out to make it easy for distros
+# and BSP layers to pick either (desktop) opengl, gles2, or no GL
+PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2', '', d)}"
+
+PACKAGECONFIG ??= " \
+ ${PACKAGECONFIG_GL} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \
+ orc curl uvch264 neon sndfile \
+ hls sbc dash bz2 smoothstreaming \
+ "
+
+# dash = Dynamic Adaptive Streaming over HTTP
+PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass"
+PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl"
+PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
+PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"
+PACKAGECONFIG[faac] = "--enable-faac,--disable-faac,faac"
+PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2"
+PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms"
+PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug"
+PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
+PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus"
+PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa"
+PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
+PACKAGECONFIG[wayland] = "--enable-wayland --enable-egl,--disable-wayland --disable-egl,wayland virtual/egl"
+PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 udev"
+PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb"
+PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon"
+PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft"
+PACKAGECONFIG[hls] = "--enable-hls,--disable-hls,gnutls"
+PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc"
+PACKAGECONFIG[dash] = "--enable-dash,--disable-dash,libxml2"
+PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2"
+PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth"
+PACKAGECONFIG[schroedinger] = "--enable-schro,--disable-schro,schroedinger"
+PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2"
+PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}"
+PACKAGECONFIG[rsvg] = "--enable-rsvg,--disable-rsvg,librsvg"
+PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1"
+PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
+PACKAGECONFIG[rtmp] = "--enable-rtmp,--disable-rtmp,rtmpdump"
+PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2"
+
+# these plugins have not been ported to 1.0 (yet):
+# directdraw vcd apexsink dc1394 lv2 linsys musepack mythtv
+# nas timidity teletextdec sdl xvid wininet acm gsettings
+# sndio qtwrapper cdxaparse dccp faceoverlay hdvparse tta
+# mve nuvdemux osx_video patchdetect quicktime real sdi
+# videomeasure gsettings
+
+# these plugins have no corresponding library in OE-core or meta-openembedded:
+# openni2 winks direct3d directdraw directsound winscreencap osx_video
+# apple_media android_media avc chromaprint daala dts gme gsm kate ladspa mimic
+# mpeg2enc mplex ofa openjpeg opensles pvr resindvd rtmp soundtouch spandsp spc
+# srtp vdpau voaacenc voamrwbenc wasapi zbar
+
+EXTRA_OECONF += " \
+ --enable-dvb \
+ --enable-shm \
+ --enable-fbdev \
+ --enable-decklink \
+ --disable-acm \
+ --disable-android_media \
+ --disable-apexsink \
+ --disable-apple_media \
+ --disable-avc \
+ --disable-chromaprint \
+ --disable-cocoa \
+ --disable-daala \
+ --disable-dc1394 \
+ --disable-direct3d \
+ --disable-directdraw \
+ --disable-directsound \
+ --disable-dts \
+ --disable-gme \
+ --disable-gsettings \
+ --disable-gsm \
+ --disable-kate \
+ --disable-ladspa \
+ --disable-linsys \
+ --disable-lv2 \
+ --disable-mimic \
+ --disable-mpeg2enc \
+ --disable-mplex \
+ --disable-musepack \
+ --disable-mythtv \
+ --disable-nas \
+ --disable-ofa \
+ --disable-openjpeg \
+ --disable-opensles \
+ --disable-osx_video \
+ --disable-pvr \
+ --disable-quicktime \
+ --disable-resindvd \
+ --disable-sdl \
+ --disable-sdltest \
+ --disable-sndio \
+ --disable-soundtouch \
+ --disable-spandsp \
+ --disable-spc \
+ --disable-srtp \
+ --disable-teletextdec \
+ --disable-timidity \
+ --disable-vcd \
+ --disable-vdpau \
+ --disable-voaacenc \
+ --disable-voamrwbenc \
+ --disable-wasapi \
+ --disable-wildmidi \
+ --disable-wininet \
+ --disable-winscreencap \
+ --disable-xvid \
+ --disable-zbar \
+ ${GSTREAMER_1_0_ORC} \
+ ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--disable-yadif", "", d)} \
+ "
+
+ARM_INSTRUCTION_SET = "arm"
+
+FILES_gstreamer1.0-plugins-bad-opencv += "${datadir}/gst-plugins-bad/1.0/opencv*"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb
index c9272bc..6dc8a3c 100644
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bb
@@ -11,4 +11,3 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73a5855a8119deb017f5f13cf327095d \
SRC_URI[md5sum] = "cfd6f303c8df2740b27cc63b945decef"
SRC_URI[sha256sum] = "595d7911a9e6207dea37200587724bdbf841b81a5eb0730118be36976684278c"
S = "${WORKDIR}/gst-plugins-bad-${PV}"
-
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
new file mode 100644
index 0000000..06eac67
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
@@ -0,0 +1,40 @@
+require gstreamer1.0-plugins.inc
+
+LICENSE = "GPLv2+ & LGPLv2+"
+
+DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}"
+DEPENDS += "freetype liboil util-linux"
+
+inherit gettext
+
+PACKAGES_DYNAMIC =+ "^libgst.*"
+
+PACKAGECONFIG ??= " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \
+ orc ivorbis ogg theora vorbis \
+ "
+
+X11DEPENDS = "virtual/libx11 libsm libxrender"
+X11ENABLEOPTS = "--enable-x --enable-xvideo --enable-xshm"
+X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm"
+PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
+PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
+PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor"
+PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg"
+PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora"
+PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis"
+PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
+
+
+# cdparanoia and libvisual do not seem to exist anywhere in OE
+EXTRA_OECONF += " \
+ --disable-freetypetest \
+ --disable-cdparanoia \
+ --disable-libvisual \
+ ${GSTREAMER_1_0_ORC} \
+"
+
+FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
+
+CACHED_CONFIGUREVARS_append_i586 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
new file mode 100644
index 0000000..37217f0
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good.inc
@@ -0,0 +1,58 @@
+require gstreamer1.0-plugins.inc
+
+LICENSE = "GPLv2+ & LGPLv2.1+"
+
+# libid3tag
+DEPENDS += "gstreamer1.0-plugins-base zlib bzip2 libcap"
+
+inherit gettext
+
+
+PACKAGECONFIG ??= " \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \
+ orc cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib \
+ "
+
+X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
+X11ENABLEOPTS = "--enable-x --enable-xshm"
+X11DISABLEOPTS = "--disable-x --disable-xshm"
+PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
+PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
+PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo"
+PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac"
+PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
+PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,udev"
+PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
+PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
+PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng"
+PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4"
+PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
+PACKAGECONFIG[taglib] = "--enable-taglib,--disable-taglib,taglib"
+PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx"
+PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack"
+
+# the 1394 plugins require both libraw1394 and libiec61883
+# the former is included in meta-oe, the latter isn't
+# -> disabled
+
+EXTRA_OECONF += " \
+ --enable-oss \
+ --enable-gst_v4l2 \
+ --without-libv4l2 \
+ --disable-directsound \
+ --disable-waveform \
+ --disable-oss4 \
+ --disable-sunaudio \
+ --disable-osx_audio \
+ --disable-osx_video \
+ --disable-aalib \
+ --disable-libcaca \
+ --disable-libdv \
+ --disable-shout2 \
+ --disable-examples \
+ --disable-dv1394 \
+ ${GSTREAMER_1_0_ORC} \
+"
+
+FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb
index c2a7293..52e4542 100644
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bb
@@ -6,4 +6,3 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
SRC_URI[md5sum] = "1a1f96bc27ad446e559474299160a9a8"
SRC_URI[sha256sum] = "bfb33536a515bdcc34482f64b8d9cc3e47c753878b254923b419bc2f7485e470"
S = "${WORKDIR}/gst-plugins-good-${PV}"
-
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
new file mode 100644
index 0000000..2dd8ea5
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly.inc
@@ -0,0 +1,30 @@
+require gstreamer1.0-plugins.inc
+
+LICENSE = "GPLv2+ & LGPLv2.1+ & LGPLv2+"
+LICENSE_FLAGS = "commercial"
+
+DEPENDS += "gstreamer1.0-plugins-base libid3tag"
+
+inherit gettext
+
+
+PACKAGECONFIG ??= " \
+ orc a52dec lame mad mpeg2dec \
+ "
+
+PACKAGECONFIG[a52dec] = "--enable-a52dec,--disable-a52dec,liba52"
+PACKAGECONFIG[cdio] = "--enable-cdio,--disable-cdio,libcdio"
+PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread,libdvdread"
+PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame"
+PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
+PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
+PACKAGECONFIG[x264] = "--enable-x264,--disable-x264,x264"
+
+
+EXTRA_OECONF += " \
+ --disable-amrnb \
+ --disable-amrwb \
+ --disable-sidplay \
+ --disable-twolame \
+ ${GSTREAMER_1_0_ORC} \
+ "
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb
index c1fc233..ed48039 100644
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bb
@@ -5,4 +5,3 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \
SRC_URI[md5sum] = "7ae60e2f759f58f32af5fcdc3c9193c4"
SRC_URI[sha256sum] = "537b0a7607eee499026388bb705b5b68985a3fd59fe22ee09accaf8cdf57eb3b"
S = "${WORKDIR}/gst-plugins-ugly-${PV}"
-
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
new file mode 100644
index 0000000..c3a2db1
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
@@ -0,0 +1,56 @@
+SUMMARY = "Plugins for the GStreamer multimedia framework 1.x"
+HOMEPAGE = "http://gstreamer.freedesktop.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
+SECTION = "multimedia"
+DEPENDS = "gstreamer1.0"
+
+inherit autotools pkgconfig
+
+GSTREAMER_1_0_DEBUG ?= "--disable-debug"
+GSTREAMER_1_0_GIT_BRANCH ?= "master"
+EXTRA_OECONF = "--disable-valgrind ${GSTREAMER_1_0_DEBUG} --disable-examples --disable-introspection"
+
+acpaths = "-I ${S}/common/m4 -I ${S}/m4"
+
+LIBV = "1.0"
+require gst-plugins-package.inc
+
+PACKAGECONFIG[orc] = "--enable-orc,--disable-orc,orc"
+
+PACKAGES_DYNAMIC = "^${PN}-.*"
+
+# apply gstreamer hack after Makefile.in.in in source is replaced by our version from
+# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed
+# http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html
+oe_runconf_prepend() {
+ if [ -e ${S}/po/Makefile.in.in ]; then
+ sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in
+ fi
+}
+
+SRC_URI = "${@get_gst_srcuri(d)}"
+
+def get_gst_srcuri(d):
+ # check if expected prefix is present
+ prefix = "gstreamer1.0-"
+ bpn = d.getVar("BPN", True)
+ if not bpn.startswith(prefix):
+ bb.fatal('Invalid GStreamer 1.0 plugin package name "%s" : must start with "%s"' % (bpn, prefix))
+
+ # replaced prefix with "gst-", which is what is used for the tarball and repository filenames
+ gstpkg_basename = "gst-" + bpn[len(prefix):]
+ pv = d.getVar("PV", True)
+ branch = d.getVar("GSTREAMER_1_0_GIT_BRANCH", True)
+
+ if pv == "git":
+ s = "git://anongit.freedesktop.org/gstreamer/%s;branch=%s" % (gstpkg_basename, branch)
+ else:
+ s = "http://gstreamer.freedesktop.org/src/%s/%s-%s.tar.xz" % (gstpkg_basename, gstpkg_basename, pv)
+ return s
+
+delete_liblink_m4_file() {
+ # This m4 file contains nastiness which conflicts with libtool 2.2.2
+ rm "${S}/m4/lib-link.m4" || true
+}
+
+do_configure[prefuncs] += " delete_liblink_m4_file "
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0.inc b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0.inc
new file mode 100644
index 0000000..7eff2aa
--- /dev/null
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0.inc
@@ -0,0 +1,27 @@
+SUMMARY = "GStreamer 1.0 multimedia framework"
+DESCRIPTION = "GStreamer is a multimedia framework for encoding and decoding video and sound. \
+It supports a wide range of formats including mp3, ogg, avi, mpeg and quicktime."
+HOMEPAGE = "http://gstreamer.freedesktop.org/"
+BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
+SECTION = "multimedia"
+LICENSE = "LGPLv2+"
+DEPENDS = "glib-2.0 libxml2 bison-native flex-native"
+
+inherit autotools pkgconfig gettext
+
+GSTREAMER_1_DEBUG ?= "--disable-debug"
+EXTRA_OECONF = "--disable-docbook --disable-gtk-doc \
+ --disable-dependency-tracking --disable-check \
+ --disable-examples --disable-tests \
+ --disable-valgrind ${GSTREAMER_1_DEBUG} \
+ --disable-introspection \
+ "
+
+RRECOMMENDS_${PN}_qemux86 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
+RRECOMMENDS_${PN}_qemux86-64 += "kernel-module-snd-ens1370 kernel-module-snd-rawmidi"
+
+CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no"
+
+FILES_${PN} += " ${libdir}/gstreamer-1.0/*.so"
+FILES_${PN}-dev += " ${libdir}/gstreamer-1.0/*.la ${libdir}/gstreamer-1.0/*.a"
+FILES_${PN}-dbg += " ${libdir}/gstreamer-1.0/.debug/ ${libexecdir}/gstreamer-1.0/.debug/"
diff --git a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb
index 045534d..75a42eb 100644
--- a/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb
+++ b/meta-arago-extras/recipes-multimedia/gstreamer/gstreamer1.0_1.2.3.bb
@@ -12,4 +12,3 @@ SRC_URI = " \
SRC_URI[md5sum] = "8155b9c7574ccaa361cc504e8e0e72dc"
SRC_URI[sha256sum] = "0f9a9817a384b3448c368c23345e5122435caef9c00f1c40d7b1953827b0d8eb"
S = "${WORKDIR}/gstreamer-${PV}"
-
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 10/26] liboil: overlay locally for gstreamer-1.2.3 dependency
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (8 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 09/26] gstreamer: overlay .inc files from fido and update 1.2.3 recipes Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 11/26] obexd: fix typo in license URL Denys Dmytriyenko
` (15 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../liboil-0.3.17/0001-Fix-enable-vfp-flag.patch | 41 ++++
.../liboil-0.3.17/fix-unaligned-whitelist.patch | 19 ++
.../liboil/liboil-0.3.17/liboil_fix_for_x32.patch | 222 +++++++++++++++++++++
.../liboil/liboil-0.3.17/no-tests.patch | 24 +++
.../recipes-support/liboil/liboil_0.3.17.bb | 27 +++
5 files changed, 333 insertions(+)
create mode 100644 meta-arago-extras/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch
create mode 100644 meta-arago-extras/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
create mode 100644 meta-arago-extras/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch
create mode 100644 meta-arago-extras/recipes-support/liboil/liboil-0.3.17/no-tests.patch
create mode 100644 meta-arago-extras/recipes-support/liboil/liboil_0.3.17.bb
diff --git a/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch b/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch
new file mode 100644
index 0000000..aff1cb1
--- /dev/null
+++ b/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/0001-Fix-enable-vfp-flag.patch
@@ -0,0 +1,41 @@
+Upstream-Status: Inappropriate [configuration]
+
+From 1921498bcc06408e8b051a3a9e9ce4182998f748 Mon Sep 17 00:00:00 2001
+From: David Schleef <ds@schleef.org>
+Date: Fri, 8 Apr 2011 10:05:49 -0700
+Subject: [PATCH 10/10] Fix --enable-vfp flag
+
+Patch from Christophe Lyon, fixes #36084.
+---
+ configure.ac | 4 ++--
+ liboil/arm/Makefile.am | 1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 98c81fb..407d88c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -188,8 +188,8 @@ fi
+ AC_ARG_ENABLE(vfp,
+ AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]),
+ enable_vfp=$enableval,enable_vfp=yes)
+-if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then
+- AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"],
++if test "x$enable_vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then
++ AS_COMPILER_FLAG(["-mfpu=vfp"],
+ [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"],
+ true)
+ #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"],
+diff --git a/liboil/arm/Makefile.am b/liboil/arm/Makefile.am
+index ead08ed..cd8d9fa 100644
+--- a/liboil/arm/Makefile.am
++++ b/liboil/arm/Makefile.am
+@@ -6,4 +6,5 @@ libarm_la_SOURCES = \
+ math_vfp_asm.S
+
+ libarm_la_CFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS)
++libarm_la_CCASFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS)
+
+--
+1.7.6
+
diff --git a/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch b/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
new file mode 100644
index 0000000..c8e3c1f
--- /dev/null
+++ b/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/fix-unaligned-whitelist.patch
@@ -0,0 +1,19 @@
+Upstream: https://bugs.freedesktop.org/show_bug.cgi?id=31358
+
+configure: fix whitelisting of x86_64 unaligned memory access
+
+Fix typo in whitelist so cross-compile works for x86_64.
+
+Upstream-Status: Inappropriate [configuration]
+
+--- liboil-0.3.17/m4/as-unaligned-access.m4.orig 2009-02-26 14:40:08.000000000 -0500
++++ liboil-0.3.17/m4/as-unaligned-access.m4 2010-11-03 12:19:55.000000000 -0400
+@@ -9,7 +9,7 @@
+ _AS_ECHO_N([(blacklisted) ])
+ as_cv_unaligned_access=no
+ ;;
+- i?86*|x86_64|amd64|powerpc*|m68k*|cris*)
++ i?86*|x86_64*|amd64*|powerpc*|m68k*|cris*)
+ _AS_ECHO_N([(whitelisted) ])
+ as_cv_unaligned_access=yes
+ ;;
diff --git a/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch b/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch
new file mode 100644
index 0000000..473380e
--- /dev/null
+++ b/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/liboil_fix_for_x32.patch
@@ -0,0 +1,222 @@
+Upstream-Status: Pending
+
+Make the assembly syntax compatible with x32 gcc. Othewise x32 gcc throws errors.
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2011/12/01
+
+
+Index: liboil-0.3.17/liboil/amd64/wavelet.c
+===================================================================
+--- liboil-0.3.17.orig/liboil/amd64/wavelet.c
++++ liboil-0.3.17/liboil/amd64/wavelet.c
+@@ -21,14 +21,14 @@ deinterleave2_asm (int16_t *d1, int16_t
+ asm volatile ("\n"
+ " sub $2, %%rcx\n"
+ "1:\n"
+- " movw (%1,%%rcx,4), %%ax\n"
+- " movw %%ax, (%0,%%rcx,2)\n"
+- " movw 2(%1,%%rcx,4), %%ax\n"
+- " movw %%ax, (%2,%%rcx,2)\n"
+- " movw 4(%1,%%rcx,4), %%ax\n"
+- " movw %%ax, 2(%0,%%rcx,2)\n"
+- " movw 6(%1,%%rcx,4), %%ax\n"
+- " movw %%ax, 2(%2,%%rcx,2)\n"
++ " movw (%q1,%%rcx,4), %%ax\n"
++ " movw %%ax, (%q0,%%rcx,2)\n"
++ " movw 2(%q1,%%rcx,4), %%ax\n"
++ " movw %%ax, (%q2,%%rcx,2)\n"
++ " movw 4(%q1,%%rcx,4), %%ax\n"
++ " movw %%ax, 2(%q0,%%rcx,2)\n"
++ " movw 6(%q1,%%rcx,4), %%ax\n"
++ " movw %%ax, 2(%q2,%%rcx,2)\n"
+ " sub $2, %%rcx\n"
+ " jge 1b\n"
+ : "+r" (d1), "+r" (s_2xn), "+r" (d2), "+c" (n)
+@@ -53,20 +53,20 @@ deinterleave2_mmx (int16_t *d1, int16_t
+ asm volatile ("\n"
+ " xor %%rcx, %%rcx\n"
+ "1:\n"
+- " movq (%1,%%rcx,4), %%mm0\n"
+- " movq 8(%1,%%rcx,4), %%mm1\n"
++ " movq (%q1,%%rcx,4), %%mm0\n"
++ " movq 8(%q1,%%rcx,4), %%mm1\n"
+ " pslld $16, %%mm0\n"
+ " pslld $16, %%mm1\n"
+ " psrad $16, %%mm0\n"
+ " psrad $16, %%mm1\n"
+ " packssdw %%mm1, %%mm0\n"
+- " movq %%mm0, (%0,%%rcx,2)\n"
+- " movq (%1,%%rcx,4), %%mm0\n"
+- " movq 8(%1,%%rcx,4), %%mm1\n"
++ " movq %%mm0, (%q0,%%rcx,2)\n"
++ " movq (%q1,%%rcx,4), %%mm0\n"
++ " movq 8(%q1,%%rcx,4), %%mm1\n"
+ " psrad $16, %%mm0\n"
+ " psrad $16, %%mm1\n"
+ " packssdw %%mm1, %%mm0\n"
+- " movq %%mm0, (%2,%%rcx,2)\n"
++ " movq %%mm0, (%q2,%%rcx,2)\n"
+ " add $4, %%rcx\n"
+ " cmp %3, %%ecx\n"
+ " jl 1b\n"
+@@ -93,10 +93,10 @@ deinterleave2_mmx_2 (int16_t *d1, int16_
+ asm volatile ("\n"
+ " xor %%rcx, %%rcx\n"
+ "1:\n"
+- " pshufw $0xd8, (%1,%%rcx,4), %%mm0\n"
+- " movd %%mm0, (%0,%%rcx,2)\n"
+- " pshufw $0x8d, (%1,%%rcx,4), %%mm0\n"
+- " movd %%mm0, (%2,%%rcx,2)\n"
++ " pshufw $0xd8, (%q1,%%rcx,4), %%mm0\n"
++ " movd %%mm0, (%q0,%%rcx,2)\n"
++ " pshufw $0x8d, (%q1,%%rcx,4), %%mm0\n"
++ " movd %%mm0, (%q2,%%rcx,2)\n"
+ " add $2, %%rcx\n"
+ " cmp %3, %%ecx\n"
+ " jl 1b\n"
+@@ -123,16 +123,16 @@ deinterleave2_mmx_3 (int16_t *d1, int16_
+ asm volatile ("\n"
+ " xor %%rcx, %%rcx\n"
+ "1:\n"
+- " movq (%1,%%rcx,4), %%mm1\n"
+- " movq (%1,%%rcx,4), %%mm2\n"
+- " movq 8(%1,%%rcx,4), %%mm0\n"
++ " movq (%q1,%%rcx,4), %%mm1\n"
++ " movq (%q1,%%rcx,4), %%mm2\n"
++ " movq 8(%q1,%%rcx,4), %%mm0\n"
+ " punpcklwd %%mm0, %%mm1\n"
+ " punpckhwd %%mm0, %%mm2\n"
+ " movq %%mm1, %%mm0\n"
+ " punpcklwd %%mm2, %%mm0\n"
+ " punpckhwd %%mm2, %%mm1\n"
+- " movq %%mm0, (%0,%%rcx,2)\n"
+- " movq %%mm1, (%2,%%rcx,2)\n"
++ " movq %%mm0, (%q0,%%rcx,2)\n"
++ " movq %%mm1, (%q2,%%rcx,2)\n"
+ " add $4, %%rcx\n"
+ " cmp %3, %%ecx\n"
+ " jl 1b\n"
+@@ -159,26 +159,26 @@ deinterleave2_mmx_4 (int16_t *d1, int16_
+ asm volatile ("\n"
+ " xor %%rcx, %%rcx\n"
+ "1:\n"
+- " movq (%1,%%rcx,4), %%mm1\n"
++ " movq (%q1,%%rcx,4), %%mm1\n"
+ " movq %%mm1, %%mm2\n"
+- " movq 8(%1,%%rcx,4), %%mm0\n"
+- " movq 16(%1,%%rcx,4), %%mm5\n"
++ " movq 8(%q1,%%rcx,4), %%mm0\n"
++ " movq 16(%q1,%%rcx,4), %%mm5\n"
+ " punpcklwd %%mm0, %%mm1\n"
+ " movq %%mm5, %%mm6\n"
+ " punpckhwd %%mm0, %%mm2\n"
+- " movq 24(%1,%%rcx,4), %%mm4\n"
++ " movq 24(%q1,%%rcx,4), %%mm4\n"
+ " movq %%mm1, %%mm0\n"
+ " punpcklwd %%mm4, %%mm5\n"
+ " punpcklwd %%mm2, %%mm0\n"
+ " punpckhwd %%mm4, %%mm6\n"
+ " punpckhwd %%mm2, %%mm1\n"
+ " movq %%mm5, %%mm4\n"
+- " movq %%mm0, (%0,%%rcx,2)\n"
++ " movq %%mm0, (%q0,%%rcx,2)\n"
+ " punpcklwd %%mm6, %%mm4\n"
+- " movq %%mm1, (%2,%%rcx,2)\n"
++ " movq %%mm1, (%q2,%%rcx,2)\n"
+ " punpckhwd %%mm6, %%mm5\n"
+- " movq %%mm4, 8(%0,%%rcx,2)\n"
+- " movq %%mm5, 8(%2,%%rcx,2)\n"
++ " movq %%mm4, 8(%q0,%%rcx,2)\n"
++ " movq %%mm5, 8(%q2,%%rcx,2)\n"
+ " add $8, %%rcx\n"
+ " cmp %3, %%ecx\n"
+ " jl 1b\n"
+@@ -252,13 +252,13 @@ interleave2_mmx (int16_t *d_2xn, int16_t
+ asm volatile ("\n"
+ " xor %%rcx, %%rcx\n"
+ "1:\n"
+- " movq (%1,%%rcx,2), %%mm0\n"
+- " movq (%2,%%rcx,2), %%mm1\n"
++ " movq (%q1,%%rcx,2), %%mm0\n"
++ " movq (%q2,%%rcx,2), %%mm1\n"
+ " movq %%mm0, %%mm2\n"
+ " punpckhwd %%mm1, %%mm0\n"
+ " punpcklwd %%mm1, %%mm2\n"
+- " movq %%mm2, (%0,%%rcx,4)\n"
+- " movq %%mm0, 8(%0,%%rcx,4)\n"
++ " movq %%mm2, (%q0,%%rcx,4)\n"
++ " movq %%mm0, 8(%q0,%%rcx,4)\n"
+ " add $4, %%rcx\n"
+ " cmp %3, %%ecx\n"
+ " jl 1b\n"
+@@ -285,12 +285,12 @@ lift_add_shift1_mmx (int16_t *d, int16_t
+ asm volatile ("\n"
+ " xor %%rcx, %%rcx\n"
+ "1:\n"
+- " movq (%2,%%rcx,2), %%mm1\n"
+- " movq (%3,%%rcx,2), %%mm2\n"
++ " movq (%q2,%%rcx,2), %%mm1\n"
++ " movq (%q3,%%rcx,2), %%mm2\n"
+ " paddw %%mm2, %%mm1\n"
+ " psraw $1, %%mm1\n"
+- " paddw (%1,%%rcx,2), %%mm1\n"
+- " movq %%mm1, (%0,%%rcx,2)\n"
++ " paddw (%q1,%%rcx,2), %%mm1\n"
++ " movq %%mm1, (%q0,%%rcx,2)\n"
+ " add $4, %%rcx\n"
+ " cmp %4, %%ecx\n"
+ " jl 1b\n"
+@@ -317,13 +317,13 @@ lift_sub_shift1_mmx (int16_t *d, int16_t
+ asm volatile ("\n"
+ " xor %%rcx, %%rcx\n"
+ "1:\n"
+- " movq (%2,%%rcx,2), %%mm1\n"
+- " movq (%3,%%rcx,2), %%mm2\n"
+- " movq (%1,%%rcx,2), %%mm0\n"
++ " movq (%q2,%%rcx,2), %%mm1\n"
++ " movq (%q3,%%rcx,2), %%mm2\n"
++ " movq (%q1,%%rcx,2), %%mm0\n"
+ " paddw %%mm2, %%mm1\n"
+ " psraw $1, %%mm1\n"
+ " psubw %%mm1, %%mm0\n"
+- " movq %%mm0, (%0,%%rcx,2)\n"
++ " movq %%mm0, (%q0,%%rcx,2)\n"
+ " add $4, %%rcx\n"
+ " cmp %4, %%ecx\n"
+ " jl 1b\n"
+@@ -350,12 +350,12 @@ lift_add_shift2_mmx (int16_t *d, int16_t
+ asm volatile ("\n"
+ " xor %%rcx, %%rcx\n"
+ "1:\n"
+- " movq (%2,%%rcx,2), %%mm1\n"
+- " movq (%3,%%rcx,2), %%mm2\n"
++ " movq (%q2,%%rcx,2), %%mm1\n"
++ " movq (%q3,%%rcx,2), %%mm2\n"
+ " paddw %%mm2, %%mm1\n"
+ " psraw $2, %%mm1\n"
+- " paddw (%1,%%rcx,2), %%mm1\n"
+- " movq %%mm1, (%0,%%rcx,2)\n"
++ " paddw (%q1,%%rcx,2), %%mm1\n"
++ " movq %%mm1, (%q0,%%rcx,2)\n"
+ " add $4, %%rcx\n"
+ " cmp %4, %%ecx\n"
+ " jl 1b\n"
+@@ -382,13 +382,13 @@ lift_sub_shift2_mmx (int16_t *d, int16_t
+ asm volatile ("\n"
+ " xor %%rcx, %%rcx\n"
+ "1:\n"
+- " movq (%2,%%rcx,2), %%mm1\n"
+- " movq (%3,%%rcx,2), %%mm2\n"
+- " movq (%1,%%rcx,2), %%mm0\n"
++ " movq (%q2,%%rcx,2), %%mm1\n"
++ " movq (%q3,%%rcx,2), %%mm2\n"
++ " movq (%q1,%%rcx,2), %%mm0\n"
+ " paddw %%mm2, %%mm1\n"
+ " psraw $2, %%mm1\n"
+ " psubw %%mm1, %%mm0\n"
+- " movq %%mm0, (%0,%%rcx,2)\n"
++ " movq %%mm0, (%q0,%%rcx,2)\n"
+ " add $4, %%rcx\n"
+ " cmp %4, %%ecx\n"
+ " jl 1b\n"
diff --git a/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/no-tests.patch b/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/no-tests.patch
new file mode 100644
index 0000000..892d441
--- /dev/null
+++ b/meta-arago-extras/recipes-support/liboil/liboil-0.3.17/no-tests.patch
@@ -0,0 +1,24 @@
+Upstream-Status: Inappropriate [disable feature]
+
+--- liboil-0.3.9/liboil/liboilfunction.c.old 2006-09-18 13:03:20.000000000 +0100
++++ liboil-0.3.9/liboil/liboilfunction.c 2006-09-18 13:04:10.000000000 +0100
+@@ -345,7 +345,9 @@
+ return;
+ }
+
+- test = oil_test_new (klass);
++ klass->chosen_impl = klass->reference_impl;
++ klass->func = klass->reference_impl->func;
++/* test = oil_test_new (klass);
+ if (test == NULL) {
+ OIL_ERROR ("failed to test function class %s", klass->name);
+ return;
+@@ -385,7 +387,7 @@
+ klass->chosen_impl = min_impl;
+ klass->func = min_impl->func;
+
+- oil_test_free (test);
++ oil_test_free (test);*/
+ }
+
+ static void
diff --git a/meta-arago-extras/recipes-support/liboil/liboil_0.3.17.bb b/meta-arago-extras/recipes-support/liboil/liboil_0.3.17.bb
new file mode 100644
index 0000000..03b7785
--- /dev/null
+++ b/meta-arago-extras/recipes-support/liboil/liboil_0.3.17.bb
@@ -0,0 +1,27 @@
+SUMMARY = "Library of simple functions optimized for various CPUs"
+HOMEPAGE = "http://liboil.freedesktop.org/"
+BUGTRACKER = "https://bugs.freedesktop.org/"
+
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=ad80780d9c5205d63481a0184e199a15 \
+ file://liboil/liboil.h;endline=28;md5=95c794a66b88800d949fed17e437d9fb \
+ file://liboil/liboilcpu.c;endline=28;md5=89da69a61d88eedcba066f42353fb75a \
+ file://examples/example1.c;endline=29;md5=9d4dad9fcbbdf0441ee063f8af5170c9 \
+ file://testsuite/trans.c;endline=29;md5=380ecd43121fe3dcc0d8d7e5984f283d"
+
+DEPENDS = "glib-2.0"
+PR = "r5"
+
+SRC_URI = "http://liboil.freedesktop.org/download/${BPN}-${PV}.tar.gz \
+ file://no-tests.patch \
+ file://fix-unaligned-whitelist.patch \
+ file://0001-Fix-enable-vfp-flag.patch \
+ file://liboil_fix_for_x32.patch \
+ "
+
+SRC_URI[md5sum] = "47dc734f82faeb2964d97771cfd2e701"
+SRC_URI[sha256sum] = "105f02079b0b50034c759db34b473ecb5704ffa20a5486b60a8b7698128bfc69"
+
+inherit autotools pkgconfig
+
+ARM_INSTRUCTION_SET = "arm"
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 11/26] obexd: fix typo in license URL
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (9 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 10/26] liboil: overlay locally for gstreamer-1.2.3 dependency Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 12/26] cpuloadgen: fix cross-compilation by passing correct parameters Denys Dmytriyenko
` (14 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--git a/meta-arago-extras/recipes-connectivity/obexd/obexd_0.34.bb b/meta-arago-extras/recipes-connectivity/obexd/obexd_0.34.bb
index 388a6dd..60199fa 100644
--- a/meta-arago-extras/recipes-connectivity/obexd/obexd_0.34.bb
+++ b/meta-arago-extras/recipes-connectivity/obexd/obexd_0.34.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OBEX Server and Client"
DEPENDS = "openobex glib-2.0 dbus bluez4 libical"
LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "files://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
PR = "r1"
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 12/26] cpuloadgen: fix cross-compilation by passing correct parameters
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (10 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 11/26] obexd: fix typo in license URL Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 13/26] eventdump: " Denys Dmytriyenko
` (13 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
| 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--git a/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb b/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb
index a44083a..99bc6a4 100644
--- a/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb
+++ b/meta-arago-extras/recipes-devtools/cpuloadgen/cpuloadgen_git.bb
@@ -14,7 +14,9 @@ SRC_URI = "git://github.com/ptitiano/cpuloadgen.git;protocol=git;branch=${BRANCH
S = "${WORKDIR}/git"
+EXTRA_OEMAKE = "DESTDIR=${D}${bindir} CROSS_COMPILE=${TARGET_PREFIX}"
+
do_install () {
install -d ${D}${bindir}
- oe_runmake DESTDIR=${D}${bindir} install
+ oe_runmake install
}
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 13/26] eventdump: fix cross-compilation by passing correct parameters
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (11 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 12/26] cpuloadgen: fix cross-compilation by passing correct parameters Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 14/26] serialcheck: " Denys Dmytriyenko
` (12 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
| 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
--git a/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb b/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb
index c4bb15e..7eabf25 100644
--- a/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb
+++ b/meta-arago-extras/recipes-devtools/eventdump/eventdump_git.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Utility for parsing system events"
LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://eventdump.c;beginline=1;endline=34;md5=23b59be24a88ddc407b553035f3fd3e9"
-PR = "r1"
+PR = "r2"
PV = "1.0+git${SRCPV}"
SRCREV = "5db45a36a05a78ea44a4cb25312ed5ee3c2bd76d"
@@ -11,6 +11,8 @@ SRC_URI = "git://github.com/TI-ECS/eventdump.git;protocol=git"
S = "${WORKDIR}/git"
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} DEST_DIR=${D} BIN_DIR=${bindir}"
+
do_install() {
- oe_runmake 'DEST_DIR=${D}' 'BIN_DIR=${bindir}' install
+ oe_runmake install
}
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 14/26] serialcheck: fix cross-compilation by passing correct parameters
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (12 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 13/26] eventdump: " Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 15/26] omapconf: bump SRCREV to pick up gcc-5 fixes Denys Dmytriyenko
` (11 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--git a/meta-arago-extras/recipes-devtools/serialcheck/serialcheck_1.0.0.bb b/meta-arago-extras/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
index 9cfb6da..16d3ddd 100644
--- a/meta-arago-extras/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
+++ b/meta-arago-extras/recipes-devtools/serialcheck/serialcheck_1.0.0.bb
@@ -14,7 +14,7 @@ CLEANBROKEN = "1"
S = "${WORKDIR}/git"
-CFLAGS_prepend = "-Wall -Wextra -Wno-sign-compare -Wno-pointer-sign "
+EXTRA_OEMAKE = "CC="${CC}""
do_install() {
install -d ${D}${bindir}
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 15/26] omapconf: bump SRCREV to pick up gcc-5 fixes
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (13 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 14/26] serialcheck: " Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 16/26] ltp-ddt: fix make scripts failure due to new kernel task dependencies Denys Dmytriyenko
` (10 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
| 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--git a/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb b/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb
index 81f85f9..fa08cfa 100644
--- a/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb
+++ b/meta-arago-extras/recipes-devtools/omapconf/omapconf_git.bb
@@ -5,12 +5,12 @@ LICENSE = "GPLv2 | BSD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=205c83c4e2242a765acb923fc766e914"
PV = "1.72"
-PR = "r1"
+PR = "r2"
COMPATIBLE_MACHINE = "ti33x|ti43x|omap-a15|omap4"
BRANCH ?= "master"
-SRCREV = "e821a16e707cbde41ed07c1a05de4a497b39c000"
+SRCREV = "340f7dddb23664d8323c8d2002443606b95d969b"
SRC_URI = "git://github.com/omapconf/omapconf.git;protocol=git;branch=${BRANCH}"
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 16/26] ltp-ddt: fix make scripts failure due to new kernel task dependencies
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (14 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 15/26] omapconf: bump SRCREV to pick up gcc-5 fixes Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 17/26] python3: fix configure failure to find cross-version of readelf Denys Dmytriyenko
` (9 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
| 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
--git a/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb b/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb
index 1d01ca1..26dde30 100644
--- a/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb
+++ b/meta-arago-extras/recipes-devtools/ltp-ddt/ltp-ddt_1.0.0.bb
@@ -8,7 +8,7 @@ PR = "r11"
PV_append = "+git${SRCPV}"
PROVIDES += "ltp"
-DEPENDS += "zip-native virtual/kernel alsa-lib"
+DEPENDS += "zip-native alsa-lib"
RDEPENDS_${PN} += "pm-qa serialcheck"
@@ -41,6 +41,7 @@ EXTRA_OEMAKE_append = " \
DESTDIR=${D} \
CC='${CC}' \
KERNEL_CC='${KERNEL_CC}' \
+ KERNEL_SRC=${STAGING_KERNEL_DIR} \
"
TARGET_CC_ARCH += "${LDFLAGS}"
@@ -92,6 +93,6 @@ do_install() {
}
# do_make_scripts should be a separate task for the lock to work
-addtask make_scripts before do_compile
+addtask make_scripts after do_patch before do_compile
do_make_scripts[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
-do_make_scripts[deptask] = "do_populate_sysroot"
+do_make_scripts[depends] += "virtual/kernel:do_shared_workdir"
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 17/26] python3: fix configure failure to find cross-version of readelf
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (15 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 16/26] ltp-ddt: fix make scripts failure due to new kernel task dependencies Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 18/26] packagegroup-arago-console: alsa-utils-alsaconf got renamed to alsa-utils-scripts Denys Dmytriyenko
` (8 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/recipes-devtools/python/python3_%.bbappend | 2 ++
1 file changed, 2 insertions(+)
create mode 100644 meta-arago-distro/recipes-devtools/python/python3_%.bbappend
diff --git a/meta-arago-distro/recipes-devtools/python/python3_%.bbappend b/meta-arago-distro/recipes-devtools/python/python3_%.bbappend
new file mode 100644
index 0000000..97f5a19
--- /dev/null
+++ b/meta-arago-distro/recipes-devtools/python/python3_%.bbappend
@@ -0,0 +1,2 @@
+READELF_class-target = "arm-linux-gnueabihf-readelf"
+export READELF
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 18/26] packagegroup-arago-console: alsa-utils-alsaconf got renamed to alsa-utils-scripts
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (16 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 17/26] python3: fix configure failure to find cross-version of readelf Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 19/26] HACK: weston-init: overlay locally due to REQUIRED_DISTRO_FEATURES = "opengl" Denys Dmytriyenko
` (7 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-core/packagegroups/packagegroup-arago-console.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb
index 64b21a5..4073488 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-console.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Extended task to get more basic and console apps"
LICENSE = "MIT"
-PR = "r12"
+PR = "r13"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -13,7 +13,7 @@ ARAGO_ALSA_EXTRA = "\
alsa-server \
alsa-utils \
alsa-utils-aconnect \
- alsa-utils-alsaconf \
+ alsa-utils-scripts \
alsa-utils-alsactl \
alsa-utils-alsamixer \
alsa-utils-amixer \
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 19/26] HACK: weston-init: overlay locally due to REQUIRED_DISTRO_FEATURES = "opengl"
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (17 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 18/26] packagegroup-arago-console: alsa-utils-alsaconf got renamed to alsa-utils-scripts Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 20/26] HACK: dt: disable for now as breaking with gcc-5 Denys Dmytriyenko
` (6 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Need to sort it out with upstream
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-graphics/wayland/weston-init.bb | 28 ++++++++++
.../recipes-graphics/wayland/weston-init/init | 60 ++++++++++++++++++++++
.../wayland/weston-init/weston.service | 15 ++++++
3 files changed, 103 insertions(+)
create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston-init.bb
create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston-init/init
create mode 100644 meta-arago-extras/recipes-graphics/wayland/weston-init/weston.service
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston-init.bb b/meta-arago-extras/recipes-graphics/wayland/weston-init.bb
new file mode 100644
index 0000000..a40f4b2
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston-init.bb
@@ -0,0 +1,28 @@
+SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690"
+
+SRC_URI = "file://init \
+ file://weston.service"
+
+S = "${WORKDIR}"
+
+do_install() {
+ install -d ${D}/${sysconfdir}/init.d
+ install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston
+
+ install -d ${D}${systemd_system_unitdir}
+ install -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}
+}
+
+inherit allarch update-rc.d distro_features_check systemd
+
+# rdepends on weston which depends on virtual/egl
+#REQUIRED_DISTRO_FEATURES = "opengl"
+
+RDEPENDS_${PN} = "weston kbd"
+
+INITSCRIPT_NAME = "weston"
+INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ."
+
+SYSTEMD_SERVICE_${PN} = "weston.service"
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston-init/init b/meta-arago-extras/recipes-graphics/wayland/weston-init/init
new file mode 100644
index 0000000..2e938f4
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston-init/init
@@ -0,0 +1,60 @@
+#!/bin/sh
+#
+### BEGIN INIT INFO
+# Provides: weston
+# Required-Start: $local_fs $remote_fs
+# Required-Stop: $local_fs $remote_fs
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+### END INIT INFO
+
+if test -e /etc/default/weston ; then
+ . /etc/default/weston
+fi
+
+killproc() {
+ pid=`/bin/pidof $1`
+ [ "$pid" != "" ] && kill $pid
+}
+
+read CMDLINE < /proc/cmdline
+for x in $CMDLINE; do
+ case $x in
+ weston=false)
+ echo "Weston disabled"
+ exit 0;
+ ;;
+ esac
+done
+
+case "$1" in
+ start)
+ . /etc/profile
+
+ # This is all a nasty hack
+ if test -z "$XDG_RUNTIME_DIR"; then
+ export XDG_RUNTIME_DIR=/run/user/root
+ mkdir --parents $XDG_RUNTIME_DIR
+ chmod 0700 $XDG_RUNTIME_DIR
+ fi
+
+ openvt -s weston -- $OPTARGS
+ ;;
+
+ stop)
+ echo "Stopping Weston"
+ killproc weston
+ ;;
+
+ restart)
+ $0 stop
+ sleep 1
+ $0 start
+ ;;
+
+ *)
+ echo "usage: $0 { start | stop | restart }"
+ ;;
+esac
+
+exit 0
diff --git a/meta-arago-extras/recipes-graphics/wayland/weston-init/weston.service b/meta-arago-extras/recipes-graphics/wayland/weston-init/weston.service
new file mode 100644
index 0000000..4f1f7ff
--- /dev/null
+++ b/meta-arago-extras/recipes-graphics/wayland/weston-init/weston.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Weston Wayland compositor startup
+RequiresMountsFor=/run
+
+[Service]
+User=root
+EnvironmentFile=-/etc/default/weston
+Environment="XDG_RUNTIME_DIR=/run/user/root"
+ExecStartPre=/bin/mkdir -p /run/user/root
+ExecStartPre=/bin/chmod 0700 /run/user/root
+ExecStart=/usr/bin/openvt -v -e /usr/bin/weston -- $OPTARGS
+
+[Install]
+WantedBy=multi-user.target
+
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 20/26] HACK: dt: disable for now as breaking with gcc-5
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (18 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 19/26] HACK: weston-init: overlay locally due to REQUIRED_DISTRO_FEATURES = "opengl" Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 21/26] FIXME: external-linaro-toolchain-cross: target Linaro gcc version doesn't match cross version Denys Dmytriyenko
` (5 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
index dc0a927..2894f74 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-addons.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install additional utilities/demos for SDKs"
LICENSE = "MIT"
-PR = "r43"
+PR = "r44"
PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -8,9 +8,10 @@ inherit packagegroup
PACKAGES =+ "${PN}-extra"
+# dt
+
UTILS = " \
am-sysinfo \
- dt \
gdbserver \
oprofile \
nbench-byte \
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 21/26] FIXME: external-linaro-toolchain-cross: target Linaro gcc version doesn't match cross version
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (19 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 20/26] HACK: dt: disable for now as breaking with gcc-5 Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 22/26] branding-core: disable SGX for now, until drivers updated for 4.4 Denys Dmytriyenko
` (4 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
meta-linaro only provides recipe to build gcc-5.2 for now
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-core/meta/external-linaro-toolchain-cross.bb | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain-cross.bb b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain-cross.bb
index d448f47..92fbfca 100644
--- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain-cross.bb
+++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain-cross.bb
@@ -13,7 +13,10 @@ BPN = "external-linaro-toolchain"
INHIBIT_DEFAULT_DEPS = "1"
INHIBIT_AUTOTOOLS_DEPS = "1"
+#TGT_VER_GCC = "${ELT_VER_GCC}"
+TGT_VER_GCC = "5.2.1"
+
do_install() {
- install -d ${D}${libdir}/gcc/${TARGET_SYS}/${ELT_VER_GCC}/include/
- cp -a ${TOOLCHAIN_PATH}/lib/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/include/unwind.h ${D}/${libdir}/gcc/${TARGET_SYS}/${ELT_VER_GCC}/include/
+ install -d ${D}${libdir}/gcc/${TARGET_SYS}/${TGT_VER_GCC}/include/
+ cp -a ${TOOLCHAIN_PATH}/lib/gcc/${ELT_TARGET_SYS}/${ELT_VER_GCC}/include/unwind.h ${D}/${libdir}/gcc/${TARGET_SYS}/${TGT_VER_GCC}/include/
}
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 22/26] branding-core: disable SGX for now, until drivers updated for 4.4
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (20 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 21/26] FIXME: external-linaro-toolchain-cross: target Linaro gcc version doesn't match cross version Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 23/26] external-linaro-toolchain.bbappend: drop unneeded fixes for broken 2015.05 Denys Dmytriyenko
` (3 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/include/branding-core.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/meta-arago-distro/conf/distro/include/branding-core.inc b/meta-arago-distro/conf/distro/include/branding-core.inc
index 99bedcf..8947bd3 100644
--- a/meta-arago-distro/conf/distro/include/branding-core.inc
+++ b/meta-arago-distro/conf/distro/include/branding-core.inc
@@ -17,3 +17,7 @@ ALTERNATIVE_PRIORITY_pn-opencl-monitor = "1"
# Raise priority for sample IPC FW images
ALTERNATIVE_PRIORITY_pn-ti-ipc-rtos = "15"
+
+# Temporarily disable "sgx" machine feature for all SOCs while building
+# latest 4.4 integration kernel, until DDK 1.14 issues are resolved
+MACHINE_FEATURES := "${@d.getVar('MACHINE_FEATURES', True).replace('sgx', '')}"
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 23/26] external-linaro-toolchain.bbappend: drop unneeded fixes for broken 2015.05
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (21 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 22/26] branding-core: disable SGX for now, until drivers updated for 4.4 Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 24/26] arago-prefs: update toolchain preferences, drop gstreamer 0.10 Denys Dmytriyenko
` (2 subsequent siblings)
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Inhibit stripping for now - one of the libraries fails to strip
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../recipes-core/meta/external-linaro-toolchain.bbappend | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
index 19e7617..c5c460b 100644
--- a/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
+++ b/meta-arago-extras/recipes-core/meta/external-linaro-toolchain.bbappend
@@ -1,4 +1,4 @@
-INHIBIT_PACKAGE_STRIP = "0"
+#INHIBIT_PACKAGE_STRIP = "0"
ALLOW_EMPTY_${PN}-utils = "1"
ALLOW_EMPTY_ldd = "1"
@@ -6,7 +6,7 @@ ALLOW_EMPTY_ldd = "1"
ALLOW_EMPTY_libstdc++ = "1"
ALLOW_EMPTY_libgomp = "1"
-PR_append = "-arago29"
+PR_append = "-arago30"
PROVIDES := "${@oe_filter_out('virtual/linux-libc-headers', '${PROVIDES}', d)}"
PROVIDES := "${@oe_filter_out('linux-libc-headers', '${PROVIDES}', d)}"
@@ -104,12 +104,6 @@ FILES_libgomp-dev += "\
"
do_install_append() {
- mv ${D}${base_libdir}/libc.so ${D}${libdir}/libc.so || true
- mv ${D}${base_libdir}/libpthread.so ${D}${libdir}/libpthread.so || true
-
- ln -sf ../../lib/libc.so.6 ${D}${libdir}/libc.so.6
- ln -sf ../../lib/libpthread.so.0 ${D}${libdir}/libpthread.so.0
-
sed -i -e "s# /lib/${ELT_TARGET_SYS}# ../../lib#g" -e "s# /usr/lib/${ELT_TARGET_SYS}# .#g" -e "s# /lib/ld-linux# ../../lib/ld-linux#g" ${D}${libdir}/libc.so
sed -i -e "s# /lib/# ../../lib/#g" -e "s# /usr/lib/# ./#g" ${D}${libdir}/libc.so
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 24/26] arago-prefs: update toolchain preferences, drop gstreamer 0.10
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (22 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 23/26] external-linaro-toolchain.bbappend: drop unneeded fixes for broken 2015.05 Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 25/26] toolchain*.inc: update toolchain preferences Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 26/26] arago.conf: disable bluez5, disable -fstack-protector, restore git-native ASSUME_PROVIDED Denys Dmytriyenko
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
.../conf/distro/include/arago-prefs.inc | 27 ++++++----------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index 8acd156..4a02e79 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -1,10 +1,10 @@
# Set *target* toolchain preferences at global distro level.
# Cross and SDK toolchain preferences are set in toolchain-*.inc files
-GCCVERSION ?= "linaro-4.9%"
+GCCVERSION ?= "linaro-5.2%"
BINUVERSION ?= "linaro-2.25%"
-GLIBCVERSION ?= "2.21%"
-GLIBCINITVERSION ?= "2.21%"
-LINUXLIBCVERSION ?= "4.1"
+GLIBCVERSION ?= "2.23%"
+GLIBCINITVERSION ?= "2.23%"
+LINUXLIBCVERSION ?= "4.4"
PREFERRED_VERSION_gcc ?= "${GCCVERSION}"
PREFERRED_VERSION_binutils ?= "${BINUVERSION}"
@@ -78,8 +78,8 @@ PREFERRED_PROVIDER_u-boot_omap-a15 = "u-boot-ti-staging"
PREFERRED_VERSION_u-boot-ti-staging = "2015.07%"
# Pin down udev version from oe-core, as meta-oe pulls in newer systemd-enhanced version
-PREFERRED_VERSION_udev = "182"
-PREFERRED_PROVIDER_udev = "udev"
+PREFERRED_VERSION_eudev = "3.1.5"
+PREFERRED_PROVIDER_eudev = "eudev"
# Set the PREFERRED_PROVIDER for jpeg functionality based on the MACHINE
# architecture. For armv7a devices libjpeg-turbo should be used to take
@@ -95,7 +95,7 @@ PREFERRED_VERSION_readline-native = "5.2"
PREFERRED_VERSION_readline-nativesdk = "5.2"
PREFERRED_VERSION_libnl = "3.2.25"
-PREFERRED_VERSION_crda = "3.13"
+PREFERRED_VERSION_crda = "3.18"
PREFERRED_VERSION_obex = "0.34"
PREFERRED_VERSION_bash = "3.2.48"
PREFERRED_VERSION_gettext = "0.16.1"
@@ -107,19 +107,6 @@ PREFERRED_PROVIDER_wpa-supplicant_ti33x = "wpa-supplicant-wl18xx"
PREFERRED_PROVIDER_wpa-supplicant_ti43x = "wpa-supplicant-wl18xx"
PREFERRED_PROVIDER_wpa-supplicant_omap-a15 = "wpa-supplicant-wl18xx"
-PREFERRED_PROVIDER_gstreamer = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gstreamer-mm-accel', 'gstreamer', d)}"
-PREFERRED_PROVIDER_gstreamer-dev = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gstreamer-mm-accel-dev', 'gstreamer-dev', d)}"
-PREFERRED_PROVIDER_gstreamer-dbg = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gstreamer-mm-accel-dbg', 'gstreamer-dbg', d)}"
-PREFERRED_PROVIDER_gst-plugins-bad = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gst-plugins-bad-mm-accel', 'gst-plugins-bad', d)}"
-PREFERRED_PROVIDER_gst-plugins-bad-dev = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gst-plugins-bad-mm-accel-dev', 'gst-plugins-bad-dev', d)}"
-PREFERRED_PROVIDER_gst-plugins-bad-meta = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gst-plugins-bad-mm-accel-meta', 'gst-plugins-bad-meta', d)}"
-PREFERRED_PROVIDER_gst-plugins-base = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gst-plugins-base-mm-accel', 'gst-plugins-base', d)}"
-PREFERRED_PROVIDER_gst-plugins-base-dev = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gst-plugins-base-mm-accel-dev', 'gst-plugins-base-dev', d)}"
-PREFERRED_PROVIDER_gst-plugins-base-meta = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gst-plugins-base-mm-accel-meta', 'gst-plugins-base-meta', d)}"
-PREFERRED_PROVIDER_gst-plugins-good = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gst-plugins-good-mm-accel', 'gst-plugins-good', d)}"
-PREFERRED_PROVIDER_gst-plugins-good-dev = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gst-plugins-good-mm-accel-dev', 'gst-plugins-good-dev', d)}"
-PREFERRED_PROVIDER_gst-plugins-good-meta = "${@base_contains('MACHINE_FEATURES', 'mmip', 'gst-plugins-good-mm-accel-meta', 'gst-plugins-good-meta', d)}"
-
def filter_out(f, str, d):
from re import match
return " ".join(filter(lambda x: not match(f, x, 0), str.split()))
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 25/26] toolchain*.inc: update toolchain preferences
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (23 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 24/26] arago-prefs: update toolchain preferences, drop gstreamer 0.10 Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
2016-04-01 3:41 ` [PATCH 26/26] arago.conf: disable bluez5, disable -fstack-protector, restore git-native ASSUME_PROVIDED Denys Dmytriyenko
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/include/toolchain-gcc.inc | 8 ++++----
meta-arago-distro/conf/distro/include/toolchain-linaro.inc | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta-arago-distro/conf/distro/include/toolchain-gcc.inc b/meta-arago-distro/conf/distro/include/toolchain-gcc.inc
index f86a79c..e378f2d 100644
--- a/meta-arago-distro/conf/distro/include/toolchain-gcc.inc
+++ b/meta-arago-distro/conf/distro/include/toolchain-gcc.inc
@@ -14,10 +14,10 @@ PREFERRED_PROVIDER_gcc-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "gcc-cross-ca
PREFERRED_PROVIDER_binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} ?= "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}"
PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}"
-SDKGCCVERSION ?= "4.9%"
-SDKBINUVERSION ?= "2.24%"
-SDKGLIBCVERSION ?= "2.21%"
-SDKLINUXLIBCVERSION ?= "4.1%"
+SDKGCCVERSION ?= "5.3%"
+SDKBINUVERSION ?= "2.26%"
+SDKGLIBCVERSION ?= "2.23%"
+SDKLINUXLIBCVERSION ?= "4.4%"
PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}"
diff --git a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc b/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
index 233f293..25c2ddc 100644
--- a/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
+++ b/meta-arago-distro/conf/distro/include/toolchain-linaro.inc
@@ -28,10 +28,10 @@ PREFERRED_PROVIDER_gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} = "gdb-cross-can
PREFERRED_PROVIDER_libgcc = "external-linaro-toolchain"
PREFERRED_PROVIDER_gcc-runtime = "external-linaro-toolchain"
-SDKGCCVERSION ?= "linaro-4.9%"
+SDKGCCVERSION ?= "linaro-5.2%"
SDKBINUVERSION ?= "linaro-2.25%"
-SDKGLIBCVERSION ?= "2.21%"
-SDKLINUXLIBCVERSION ?= "4.1%"
+SDKGLIBCVERSION ?= "2.23%"
+SDKLINUXLIBCVERSION ?= "4.4%"
PREFERRED_VERSION_gcc-crosssdk ?= "${SDKGCCVERSION}"
PREFERRED_VERSION_gcc-crosssdk-initial ?= "${SDKGCCVERSION}"
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread* [PATCH 26/26] arago.conf: disable bluez5, disable -fstack-protector, restore git-native ASSUME_PROVIDED
2016-04-01 3:41 [PATCH 00/26] Initial batch of fixes for master/krogoth Denys Dmytriyenko
` (24 preceding siblings ...)
2016-04-01 3:41 ` [PATCH 25/26] toolchain*.inc: update toolchain preferences Denys Dmytriyenko
@ 2016-04-01 3:41 ` Denys Dmytriyenko
25 siblings, 0 replies; 27+ messages in thread
From: Denys Dmytriyenko @ 2016-04-01 3:41 UTC (permalink / raw)
To: meta-arago
From: Denys Dmytriyenko <denys@ti.com>
Need to use security_flags.inc for things like -fstack-protector and -D_FORTIFY_SOURCE
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
meta-arago-distro/conf/distro/arago.conf | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 526e1a9..df90133 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -30,6 +30,7 @@ NO32LIBS = "0"
# Set our distro features, don't forget all the standard libc ones
DISTRO_FEATURES = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g ipv4 ipv6 pulseaudio ${DISTRO_FEATURES_LIBC}"
+DISTRO_FEATURES_BACKFILL_CONSIDERED = "bluez5"
# Set additional distro features
DISTRO_FEATURES += "pam wayland"
@@ -90,16 +91,11 @@ require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
# Enable basic stack and buffer overflow protections
#TARGET_CPPFLAGS += "-fstack-protector -D_FORTIFY_SOURCE=1"
-TARGET_CPPFLAGS += "-fstack-protector"
+#TARGET_CPPFLAGS += "-fstack-protector"
# Load default preferences
require conf/distro/include/arago-prefs.inc
-# Remove the ASSUME_PROVIDED setting for git-native so that we can
-# use the latest version for the sourceipk which leads to a smaller
-# git history.
-ASSUME_PROVIDED := "${@filter_out('git-native','${ASSUME_PROVIDED}',d)}"
-
# Enable generation of source packages for SDKs
require arago-source-ipk.conf
--
2.2.0
^ permalink raw reply related [flat|nested] 27+ messages in thread