From 308465ddfae3b08046a2772f20f5c66d257af301 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 12 Jan 2013 18:16:34 +0200 Subject: [PATCH] xf86-dri-vivante: Upgrade to 1.1.0 Change-Id: I8935341e3513bcf845478a5a54a723b96c8cdcbf Signed-off-by: Otavio Salvador --- .../xf86-dri-vivante/fix-libdrm-link.patch | 33 +++++++++++++++ .../xf86-dri-vivante/remove-mibstore.patch | 36 ---------------- .../xorg-driver/xf86-dri-vivante_1.1.0.bb | 42 +++++++++++++++++++ .../xorg-driver/xf86-dri-vivante_12.09.01.bb | 38 ----------------- 4 files changed, 75 insertions(+), 74 deletions(-) create mode 100644 meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante/fix-libdrm-link.patch delete mode 100644 meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch create mode 100644 meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb delete mode 100644 meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante/fix-libdrm-link.patch b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante/fix-libdrm-link.patch new file mode 100644 index 00000000..fe3e610b --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante/fix-libdrm-link.patch @@ -0,0 +1,33 @@ +This adds a missing link dependency on libdrm + +Upstream-Status: Pending +Signed-off-by: Otavio Salvador + +Index: DRI_1.10.4/configure.ac +=================================================================== +--- DRI_1.10.4.orig/configure.ac ++++ DRI_1.10.4/configure.ac +@@ -55,6 +55,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto) + + # Checks for pkg-config packages + PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901 xproto fontsproto $REQUIRED_MODULES]) ++PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.3.0]) + sdkdir=$(pkg-config --variable=sdkdir xorg-server) + + # Checks for libraries. +Index: DRI_1.10.4/src/Makefile.am +=================================================================== +--- DRI_1.10.4.orig/src/Makefile.am ++++ DRI_1.10.4/src/Makefile.am +@@ -11,9 +11,9 @@ + ############################################################################## + + +-AM_CFLAGS = @XORG_CFLAGS@ ++AM_CFLAGS = @XORG_CFLAGS@ @LIBDRM_CFLAGS@ + libdri_la_LTLIBRARIES = libdri.la +-libdri_la_LDFLAGS = -module -avoid-version ++libdri_la_LDFLAGS = -module -avoid-version @LIBDRM_LIBS@ + libdri_ladir = @moduledir@/extensions + libdri_la_SOURCES = \ + dri.c \ diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch deleted file mode 100644 index 1bdfaf9d..00000000 --- a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch +++ /dev/null @@ -1,36 +0,0 @@ -mibstore functions are no longer supported in the X server. -This patch removes them from this driver, following the pattern in - http://patches.openembedded.org/patch/46133/ - -This checkin shows when/where the changes to the X server were made -that deleted the header mibstore.h and mentions the reasons. - http://lists.x.org/archives/xorg-devel/2012-September/033575.html - -Upstream-Status: Pending -Signed-off-by: Gary Thomas --- - -Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/vivante_common.h -=================================================================== ---- xserver-xorg-video-imx-viv-12.09.01.orig/src/vivante_util/vivante_common.h -+++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/vivante_common.h -@@ -48,7 +48,6 @@ extern "C" { - - - #include "mipointer.h" --#include "mibstore.h" - #include "micmap.h" - #include "mipointrst.h" - #include "inputstr.h" -Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_driver.c -=================================================================== ---- xserver-xorg-video-imx-viv-12.09.01.orig/src/vivante_fbdev/vivante_fbdev_driver.c -+++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_driver.c -@@ -746,7 +746,6 @@ VivScreenInit(SCREEN_INIT_ARGS_DECL) { - - - xf86SetBlackWhitePixels(pScreen); -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - pScrn->vtSema = TRUE; diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb new file mode 100644 index 00000000..aa2361a5 --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante_1.1.0.bb @@ -0,0 +1,42 @@ +# Copyright (C) 2012-2013 Freescale Semiconductor +# Copyright (C) 2012-2013 O.S. Systems Software LTDA. +# Released under the MIT license (see COPYING.MIT for the terms) + +LICENSE = "MIT" +SECTION = "x11/base" +DEPENDS = "virtual/xserver xf86-video-imxfb-vivante" +LIC_FILES_CHKSUM = "file://src/dri.h;enline=27;md5=1d0d59e1dc96f5197ea3a8b101bf1fcc" + +SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \ + file://fix-libdrm-link.patch" +SRC_URI[md5sum] = "d872365c046738628a7016343ffdb79a" +SRC_URI[sha256sum] = "d53216d5f9e3f7803983ac1577d83985dfda33145e4711300f4ad5cbbe28e32d" + +PE = "1" +PR = "r0" + +S = "${WORKDIR}/xserver-xorg-video-imx-viv-${PV}/DRI_1.10.4" + +inherit fsl-eula-unpack autotools pkgconfig + +EXTRA_OECONF_armv7a = " --enable-neon " +CFLAGS += " -I${STAGING_INCDIR}/xorg -DXSERVER_LIBPCIACCESS" + +do_install_append () { + # Install header files + install -d ${D}${includedir}/xorg + cp -axr ${S}/src/*.h ${D}${includedir}/xorg + find ${D}${includedir} -type f -exec chmod 660 {} \; + + # don't install libtool (*.la) archive not usefull, fix Makefile.am + find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- +} + +FILES_${PN}-dev += "${includedir}/xorg/*.h" +FILES_${PN} += " ${libdir}/xorg/modules/extensions/*.so" +FILES_${PN}-dbg += " ${libdir}/xorg/modules/extensions/.debug" + +RDEPENDS_${PN} += "xserver-xorg-extension-glx" + +PACKAGE_ARCH = "${MACHINE_ARCH}" +COMPATIBLE_MACHINE = "(mx6)" diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb deleted file mode 100644 index 9f63fb8a..00000000 --- a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (C) 2012 Freescale Semiconductor -# Released under the MIT license (see COPYING.MIT for the terms) - -LICENSE = "MIT" -SECTION = "x11/base" -DEPENDS = "virtual/libx11 util-macros xf86-video-imxfb-vivante" -LIC_FILES_CHKSUM = "file://src/dri.h;enline=27;md5=79a9064e49ae41adca4827cd2281a014" - -SRC_URI = "${FSL_MIRROR}/dri-xorg-graphic-imx-viv-${PV}.bin;fsl-eula=true \ - file://remove-mibstore.patch \ -" -SRC_URI[md5sum] = "8c90045cd5f4dba81095856634ba5136" -SRC_URI[sha256sum] = "c844dc180e43901359bbdb4f797ab178b3821fbf63bdee9577e5a0afe5d7f6ad" - -S = "${WORKDIR}/dri-xorg-graphic-imx-viv-${PV}" - -PR = "r2" - -inherit fsl-eula-unpack autotools pkgconfig - -EXTRA_OECONF_armv7a = " --enable-neon " -CFLAGS += " -I${STAGING_INCDIR}/xorg" - -do_install_append () { -# Install header files - install -d ${D}${includedir}/xorg - cp -axr ${S}/src/*.h ${D}${includedir}/xorg - find ${D}${includedir} -type f -exec chmod 660 {} \; -# don't install libtool (*.la) archive not usefull, fix Makefile.am - find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f -- -} - -FILES_${PN}-dev += "${includedir}/xorg/*.h" -FILES_${PN} += " ${libdir}/xorg/modules/extensions/*.so" -FILES_${PN}-dbg += " ${libdir}/xorg/modules/extensions/.debug" - -PACKAGE_ARCH = "${MACHINE_ARCH}" -COMPATIBLE_MACHINE = "(mx6)" -- 2.40.1