[oe-commits] Martin Jansa : xserver-xorg: remove CVS recipe and patches used only there, xserver is in GIT for long
git version control
git at git.openembedded.org
Thu Jul 1 15:42:41 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 962da8c4e8c5796f2e4ed81be38c1d09615cb5f2
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=962da8c4e8c5796f2e4ed81be38c1d09615cb5f2
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Thu Jul 1 16:19:36 2010 +0200
xserver-xorg: remove CVS recipe and patches used only there, xserver is in GIT for long
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
recipes/xorg-xserver/xserver-xorg/dri.patch | 14 -----
.../xorg-xserver/xserver-xorg/imake-staging.patch | 38 ------------
recipes/xorg-xserver/xserver-xorg_cvs.bb | 62 --------------------
3 files changed, 0 insertions(+), 114 deletions(-)
diff --git a/recipes/xorg-xserver/xserver-xorg/dri.patch b/recipes/xorg-xserver/xserver-xorg/dri.patch
deleted file mode 100644
index dd94bdf..0000000
--- 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 bf2e350..0000000
--- 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
diff --git a/recipes/xorg-xserver/xserver-xorg_cvs.bb b/recipes/xorg-xserver/xserver-xorg_cvs.bb
deleted file mode 100644
index ef081d9..0000000
--- a/recipes/xorg-xserver/xserver-xorg_cvs.bb
+++ /dev/null
@@ -1,62 +0,0 @@
-SECTION = "x11/base"
-LICENSE = "Xorg"
-PROVIDES = "virtual/xserver"
-PR = "r7"
-PV = "6.8.1+cvs${SRCDATE}"
-
-DEPENDS = "fontconfig freetype libxi libxmu flex-2.5.4-native"
-
-SRC_URI = "${FREEDESKTOP_CVS}/xorg;module=xc;method=pserver \
- file://imake-staging.patch \
- file://dri.patch"
-
-PACKAGES =+ "xserver-xorg-xprint xserver-xorg-xvfb xserver-xorg-utils"
-
-S = "${WORKDIR}/xc"
-
-FILES_xserver-xorg-xprint = "${bindir}/Xprt /etc/init.d/xprint /etc/rc.d/rc*.d/*xprint /etc/X11/Xsession.d/92xprint-xpserverlist.sh /etc/X11/xinit/xinitrc.d/92xprint-xpserverlist.sh /etc/X11/xserver/*/print"
-FILES_xserver-xorg-xvfb = "${bindir}/Xvfb"
-FILES_xserver-xorg-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl"
-FILES_${PN} += "${libdir}/modules/*.o "${libdir}/modules/*/*.o ${libdir}/X11/Options ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules"
-FILES_${PN}-doc += "${libdir}/X11/doc"
-
-do_configure() {
- echo "#define BuildServersOnly YES" > config/cf/host.def
- echo "#define ProjectRoot /usr" >> config/cf/host.def
- echo "#define XnestServer NO" >> config/cf/host.def
- echo "#define XdmxServer NO" >> config/cf/host.def
- echo "#define CcCmd ${CC}" >> config/cf/host.def
- echo "#define LdCmd ${LD}" >> config/cf/host.def
- echo "#define HasFreetype2 YES" >> config/cf/host.def
- echo "#define HasFontconfig YES" >> config/cf/host.def
- echo "#define BuildDevelDRIDrivers YES" >>config/cf/host.def
- echo "" > config/cf/date.def
- rm -f include/extensions/panoramiX.h
-}
-
-do_compile() {
- make -C config/imake -f Makefile.ini CC="${BUILD_CC}" BOOTSTRAPCFLAGS="${BUILD_CFLAGS}" clean imake
- make CC="${BUILD_CC}" xmakefile
- make Makefiles
- make clean
- #make depend
- make includes
- make -C config/util CC="${BUILD_CC}"
- for l in font xtrans Xdmcp lbxutil; do make -C lib/$l CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}"; done
- make -C programs/Xserver CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS=""
-}
-
-do_install() {
- make -C programs/Xserver DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
- make -C lib/font DESTDIR="${D}" CC="${CC}" LD="${LD}" CC_STAGING="-I${STAGING_INCDIR}" LD_STAGING="-L${STAGING_LIBDIR}" INSTALLED_LIBS="" install
-}
-
-do_stage() {
- install -d ${STAGING_INCDIR}/xserver-xorg
- for i in i810 via; do
- cd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/
- done
-
- cd ${S}
- install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
-}
More information about the Openembedded-commits
mailing list