diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-07-01 16:19:36 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-07-01 17:41:03 +0200 |
commit | 962da8c4e8c5796f2e4ed81be38c1d09615cb5f2 (patch) | |
tree | 5d22efd48ac457aa9256294bd97665736694894a /recipes/xorg-xserver/xserver-xorg | |
parent | 77211ccab1822696b1482b5c56492232a1439d78 (diff) |
xserver-xorg: remove CVS recipe and patches used only there, xserver is in GIT for long
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-xserver/xserver-xorg')
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg/dri.patch | 14 | ||||
-rw-r--r-- | recipes/xorg-xserver/xserver-xorg/imake-staging.patch | 38 |
2 files changed, 0 insertions, 52 deletions
diff --git a/recipes/xorg-xserver/xserver-xorg/dri.patch b/recipes/xorg-xserver/xserver-xorg/dri.patch deleted file mode 100644 index dd94bdf6b2..0000000000 --- a/recipes/xorg-xserver/xserver-xorg/dri.patch +++ /dev/null @@ -1,14 +0,0 @@ -upstream: not applicable upstream. The relevant code seems to have been dropped - within the last three years. the outdated cvs recipe is the only bb that uses - this patch. - ---- xc/extras/drm/shared/drm.h.old 2004-09-14 21:42:45.000000000 +0100 -+++ xc/extras/drm/shared/drm.h 2004-09-14 21:42:47.000000000 +0100 -@@ -38,7 +38,6 @@ - #define _DRM_H_ - - #if defined(__linux__) --#include <linux/config.h> - #include <asm/ioctl.h> /* For _IO* macros */ - #define DRM_IOCTL_NR(n) _IOC_NR(n) - #define DRM_IOC_VOID _IOC_NONE diff --git a/recipes/xorg-xserver/xserver-xorg/imake-staging.patch b/recipes/xorg-xserver/xserver-xorg/imake-staging.patch deleted file mode 100644 index bf2e350830..0000000000 --- a/recipes/xorg-xserver/xserver-xorg/imake-staging.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100 -+++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100 -@@ -2038,11 +2038,11 @@ - */ - ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) - ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) -- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING) - LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) - LDPRELIB = LdPreLib $(INSTALLED_LIBS) - LDPOSTLIB = LdPostLib -- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) -+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING) - CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) - - LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) ---- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100 -+++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100 -@@ -114,7 +114,7 @@ - STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) - CDEBUGFLAGS = LibraryCDebugFlags - CLIBDEBUGFLAGS = LibraryDebugOpt -- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) -+ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING) - # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) - PICFLAGS = LargePositionIndependentCFlags - # endif ---- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100 -+++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100 -@@ -3359,7 +3359,7 @@ - FREETYPE2LIBDIR = Freetype2LibDir - FREETYPE2INCDIR = Freetype2IncDir - #if Freetype2LibDirStandard --FREETYPE2LIB = -lfreetype -+FREETYPE2LIB = $(LD_STAGING) -lfreetype - #else - FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype - #endif |