Patchwork [meta-fsl-arm,3/3] xf86-video-imxfb-vivante: Remove unused patches

login
register
mail settings
Submitter Otavio Salvador
Date Sept. 1, 2013, 12:35 p.m.
Message ID <1378038938-13700-3-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/57189/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - Sept. 1, 2013, 12:35 p.m.
Following patches were not being used:

 - Makefile-fix-cross-compile.patch
 - Makefile.am-remove-prefixed-include-path.patch
 - build-Don-t-force-things-decided-by-build-system.patch

Those were included when working on 3.5.7-1.0.0-alpha release but not
removed, by mistake, when updating for 3.5.7-1.0.0-alpha.2 release.

Change-Id: Ib99562eaaa2d50845782f53a5b3ad3334cb9f48a
Reported-by: Evan Kotara <evan.kotara@freescale.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 .../Makefile-fix-cross-compile.patch               | 23 ------
 .../Makefile.am-remove-prefixed-include-path.patch | 31 --------
 ...on-t-force-things-decided-by-build-system.patch | 82 ----------------------
 3 files changed, 136 deletions(-)
 delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile-fix-cross-compile.patch
 delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch
 delete mode 100644 recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/build-Don-t-force-things-decided-by-build-system.patch

Patch

diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile-fix-cross-compile.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile-fix-cross-compile.patch
deleted file mode 100644
index ce3a9ae..0000000
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile-fix-cross-compile.patch
+++ /dev/null
@@ -1,23 +0,0 @@ 
-diff --git a/EXA/src/makefile.linux b/EXA/src/makefile.linux
-index 12cb8f3..005b002 100644
---- a/EXA/src/makefile.linux
-+++ b/EXA/src/makefile.linux
-@@ -1,9 +1,6 @@
- 
- .PHONY: all clean install
- 
--CC  := $(CROSS_COMPILE)gcc
--LD  := $(CROSS_COMPILE)gcc
--
- target := vivante_drv.so
- 
- OBJS := vivante_gal/vivante_gal_blit.o \
-@@ -63,7 +60,7 @@ LFLAGS += -L$(sysroot)/usr/lib -lm -ldl -lGAL -Wl,-soname -Wl,vivante_drv.so
- all: $(target)
- 
- $(target): $(OBJS)
--	$(LD) -shared -fPIC -o $(target) $(OBJS) $(LFLAGS)
-+	$(CC) -shared -fPIC -o $(target) $(OBJS) $(LFLAGS)
- 
- clean:
- 	-@rm $(target) $(OBJS)
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch
deleted file mode 100644
index c44f01a..0000000
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Makefile.am-remove-prefixed-include-path.patch
+++ /dev/null
@@ -1,31 +0,0 @@ 
-From 230acf40ab9ed8ab5f291ff6644160b3f3859d69 Mon Sep 17 00:00:00 2001
-From: Adrian Alonso <aalonso00@gmail.com>
-Date: Fri, 15 Jun 2012 00:46:28 -0500
-Subject: [PATCH] Makefile.am remove prefixed include path
-
-* Remove prefixed include path, use ${STAGING_INCDIR}
-  to locate drm headers.
-
-Upstream-Status: Pending
-
-Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
----
- src/Makefile.am |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 820278b..4acdf6a 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -50,7 +50,7 @@ VIVSRC_CFLAGS = \
-        -I./vivante_util \
-        -I./vivante_exa
- 
--AM_CFLAGS = @XORG_CFLAGS@ $(VIVSRC_CFLAGS) -I/usr/include/drm
-+AM_CFLAGS = @XORG_CFLAGS@ $(VIVSRC_CFLAGS) ${CFLAGS}
- vivante_drv_la_LTLIBRARIES = vivante_drv.la
- vivante_drv_la_LDFLAGS = -module -avoid-version
- vivante_drv_ladir = @moduledir@/drivers
--- 
-1.7.7.6
-
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/build-Don-t-force-things-decided-by-build-system.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/build-Don-t-force-things-decided-by-build-system.patch
deleted file mode 100644
index 5fda33c..0000000
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/build-Don-t-force-things-decided-by-build-system.patch
+++ /dev/null
@@ -1,82 +0,0 @@ 
-From bc46bc886c79246065cf779a7b4e197b80acd9b1 Mon Sep 17 00:00:00 2001
-From: Otavio Salvador <otavio@ossystems.com.br>
-Date: Thu, 18 Jul 2013 19:52:11 -0300
-Subject: [PATCH] build: Don't force things decided by build system
-
-The build system should't enforce build flags and linking flags which
-are not really necessary so it build system can do the "Right Thing"
-automatically.
-
-Upstream-Status: Pending
-
-Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
----
- DRI_1.10.4/src/makefile.linux | 20 +-------------------
- EXA/src/makefile.linux        |  9 +--------
- 2 files changed, 2 insertions(+), 27 deletions(-)
-
-diff --git a/DRI_1.10.4/src/makefile.linux b/DRI_1.10.4/src/makefile.linux
-index 86aa903..9188432 100644
---- a/DRI_1.10.4/src/makefile.linux
-+++ b/DRI_1.10.4/src/makefile.linux
-@@ -37,29 +37,11 @@ ifeq ($(SWAP_SINGLE_PARAMETER),1)
- CFLAGS  += -DSWAP_SINGLE_PARAMETER
- endif
- 
--ifeq ($(BUILD_HARD_VFP),1)
--CFLAGS += -mfpu=neon -mfloat-abi=hard
--else
--CFLAGS += -mfpu=vfp -mfloat-abi=softfp
--endif
--
- CFLAGS += -fvisibility=hidden -fPIC -DPIC
- CFLAGS += -I. -I.. -I$(sysroot)/usr/include -I$(sysroot)/usr/include/xorg -I$(sysroot)/usr/include/$(PIXMAN)
- CFLAGS += -I../../EXA/src/vivante_gal
--ifeq ($(YOCTO),1)
--# Yocto: compile will fail (does not support ldrex/strexeq/...)
--# specify armv6 to walkaround it
--# armv7: not supported by the toolchain
--CFLAGS += -march=armv6
--else
--CFLAGS += -marm
--# -Wa,-mimplicit-it=thumb
--endif
--
- 
--#LFLAGS += -lGAL -lm -ldl -ldrm -lX11 -module -Wl,-soname -Wl,$(target) -Wl,-rpath,/usr/lib/xorg/modules/extensions
--#LFLAGS += -lGAL -lm -ldl -ldrm -lX11 -module -Wl,-soname -Wl,$(target)
--LFLAGS += -L$(sysroot)/usr/lib -lGAL -lm -ldl -ldrm -lX11 -Wl,-soname -Wl,$(target)
-+LFLAGS += -lGAL -lm -ldl -ldrm -lX11 -Wl,-soname -Wl,$(target)
- 
- all: $(target)
- 
-diff --git a/EXA/src/makefile.linux b/EXA/src/makefile.linux
-index eb56de5..bfaf314 100644
---- a/EXA/src/makefile.linux
-+++ b/EXA/src/makefile.linux
-@@ -57,12 +57,6 @@ ifeq ($(BUSID_HAS_NUMBER),1)
- CFLAGS  += -DBUSID_HAS_NUMBER
- endif
- 
--ifeq ($(BUILD_HARD_VFP),1)
--CFLAGS += -mfpu=neon -mfloat-abi=hard
--else
--CFLAGS += -mfpu=vfp -mfloat-abi=softfp
--endif
--
- # macro FREESCALE_EXTENSION is reserved for future use
- CFLAGS += -fvisibility=hidden -fPIC -DPIC -O2 -DFREESCALE_EXTENSION
- CFLAGS += -I. -I.. -I$(sysroot)/usr/include -I$(sysroot)/usr/include/xorg -I$(sysroot)/usr/include/$(PIXMAN)
-@@ -73,8 +67,7 @@ CFLAGS += -marm
- #CFLAGS += -mimplicit-it=thumb
- 
- LFLAGS += -fPIC
--#LFLAGS +=  -Wl,--no-allow-shlib-undefined -lX11
--LFLAGS += -L$(sysroot)/usr/lib -lm -ldl -lGAL -Wl,-soname -Wl,vivante_drv.so
-+LFLAGS += -lm -ldl -lGAL -Wl,-soname -Wl,vivante_drv.so
- 
- 
- all: $(target)
--- 
-1.8.3.2
-