From 48556c8603155f5d35b111b28734b88e89508adb Mon Sep 17 00:00:00 2001 From: Kristof Robot Date: Sat, 8 Mar 2014 19:07:44 +0100 Subject: [PATCH 1/2] sunxi-mali: removing unused patch (resolves #23) --- ...oving-dri2-link-for-libump-and-addin.patch | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 recipes-graphics/libgles/sunxi-mali/0001-fix-build-by-removing-dri2-link-for-libump-and-addin.patch diff --git a/recipes-graphics/libgles/sunxi-mali/0001-fix-build-by-removing-dri2-link-for-libump-and-addin.patch b/recipes-graphics/libgles/sunxi-mali/0001-fix-build-by-removing-dri2-link-for-libump-and-addin.patch deleted file mode 100644 index 8900576..0000000 --- a/recipes-graphics/libgles/sunxi-mali/0001-fix-build-by-removing-dri2-link-for-libump-and-addin.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9f72dadae695f64631d4de361c2862683d5c9ccc Mon Sep 17 00:00:00 2001 -From: Nicolas Aguirre -Date: Fri, 13 Sep 2013 00:23:28 +0200 -Subject: [PATCH] fix build by removing dri2 link for libump and adding lX11 - for tests - ---- - lib/ump/Makefile | 2 +- - test/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/ump/Makefile b/lib/ump/Makefile -index c3da96b..d5fcb01 100644 ---- a/lib/ump/Makefile -+++ b/lib/ump/Makefile -@@ -7,7 +7,7 @@ CFLAGS += -Wall -O3 -fPIC - - LDFLAGS += -Wl,--no-as-needed - ifeq ($(MALI_EGL_TYPE),x11) -- LDFLAGS += -ldri2 -ldrm -lXfixes -+ LDFLAGS += -ldrm -lXfixes - endif - - BARE_TARGET = libUMP.so -diff --git a/test/Makefile b/test/Makefile -index 700416e..fa652f9 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -5,7 +5,7 @@ CFLAGS ?= -Wall - all: test - - test: ../config.mk test.c -- $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2 -+ $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2 -lX11 - - clean: - rm -f test --- -1.8.4 - From 1d4e496b9dfbe2697241fbafaf7a8fa53070b119 Mon Sep 17 00:00:00 2001 From: Kristof Robot Date: Sat, 8 Mar 2014 19:08:25 +0100 Subject: [PATCH 2/2] libdri2: adding missing dri2proto dependency (resolves #23) --- recipes-graphics/xorg-xserver/libdri2_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-graphics/xorg-xserver/libdri2_git.bb b/recipes-graphics/xorg-xserver/libdri2_git.bb index 596801f..9f89692 100644 --- a/recipes-graphics/xorg-xserver/libdri2_git.bb +++ b/recipes-graphics/xorg-xserver/libdri2_git.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Library for the DRI2 extension to the X Window System" LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=827da9afab1f727f2a66574629e0f39c" -DEPENDS = "libdrm libxext xextproto libxfixes" +DEPENDS = "libdrm libxext xextproto libxfixes dri2proto" PE = "1" PV = "1.0.0+git${SRCPV}"