Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/02 16:53:33+02:00 hrw.one.pl!hrw
added sylpheed 1.9.12

2005/06/02 16:52:37+02:00 hrw.one.pl!hrw
added RPROVIDES='virtual/xserver' to xserver-* to get gpe-base-depends working

BKrev: 429f285aaDfmHaZfMW5G5epcdFjW9w

5 files changed, 71 insertions, 4 deletions

diff --git a/packages/xserver/xserver-kdrive_20050207.bb b/packages/xserver/xserver-kdrive_20050207.bb
index bbe3871a42..f7691a6038 100644
--- a/packages/xserver/xserver-kdrive_20050207.bb
+++ b/packages/xserver/xserver-kdrive_20050207.bb
@@ -1,6 +1,7 @@
 LICENSE = "MIT"
 DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
 PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
 PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
 SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
@@ -15,7 +16,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR = "r1"
+PR = "r2"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-ati = "${bindir}/Xati"
diff --git a/packages/xserver/xserver-kdrive_cvs.bb b/packages/xserver/xserver-kdrive_cvs.bb
index fa9125ed74..3cadddd29e 100644
--- a/packages/xserver/xserver-kdrive_cvs.bb
+++ b/packages/xserver/xserver-kdrive_cvs.bb
@@ -2,6 +2,7 @@ PV = "0.0cvs${CVSDATE}"
 LICENSE = "MIT"
 DEPENDS = "tslib xproto xdmcp xextensions xtrans xau x11 xext libxrandr fixesext damageext xfont resourceext compositeext xcalibrateext recordext"
 PROVIDES = "virtual/xserver"
+RPROVIDES = "virtual/xserver"
 PACKAGES = "xserver-kdrive-mach64 xserver-kdrive-fbdev xserver-kdrive-vesa xserver-kdrive-mga xserver-kdrive-via xserver-kdrive-ati xserver-kdrive-fake xserver-kdrive-i810 xserver-kdrive-xephyr xserver-kdrive-epson ${PN}-doc ${PN}-dev ${PN}-locale"
 SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
@@ -16,7 +17,7 @@ DESCRIPTION_xserver-kdrive-epson = "X server from freedesktop.org, supporting Ep
 DESCRIPTION_xserver-kdrive-fake = "Fake X server"
 DESCRIPTION_xserver-kdrive-xephyr = "X server in an X window"
 
-PR = "r9"
+PR = "r10"
 
 FILES_xserver-kdrive-fbdev = "${bindir}/Xfbdev"
 FILES_xserver-kdrive-ati = "${bindir}/Xati"
diff --git a/packages/xserver/xserver-xorg_6.8.99.5.bb b/packages/xserver/xserver-xorg_6.8.99.5.bb
index e69de29bb2..63bf99184d 100644
--- a/packages/xserver/xserver-xorg_6.8.99.5.bb
+++ b/packages/xserver/xserver-xorg_6.8.99.5.bb
@@ -0,0 +1,61 @@
+SECTION = "x11/base"
+RPROVIDES = "virtual/xserver"
+PROVIDES = "virtual/xserver"
+LICENSE = "Xorg"
+PR = "r1"
+
+DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native"
+
+SRC_URI = "cvs://anoncvs@cvs.freedesktop.org/cvs/xorg;module=xc;method=pserver;tag=XORG-6_8_99_5 \
+	file://imake-staging.patch;patch=1 \
+	file://imake-installed.patch;patch=1 \
+	file://dri.patch;patch=1"
+
+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
+	  pushd ${S}/programs/Xserver/hw/xfree86/drivers/$i; install -m 0644 *.h ${STAGING_INCDIR}/xserver-xorg/; popd
+	done
+	install -m 0644 programs/Xserver/hw/xfree86/common/fourcc.h ${STAGING_INCDIR}/xserver-xorg/
+}
diff --git a/packages/xserver/xserver-xorg_6.8.bb b/packages/xserver/xserver-xorg_6.8.bb
index 165af48ea0..308189fc24 100644
--- a/packages/xserver/xserver-xorg_6.8.bb
+++ b/packages/xserver/xserver-xorg_6.8.bb
@@ -1,6 +1,8 @@
 SECTION = "x11/base"
-PR = "r5"
+RPROVIDES = "virtual/xserver"
+PROVIDES = "virtual/xserver"
 LICENSE = "Xorg"
+PR = "r6"
 
 DEPENDS = "freetype libxi xmu flex-2.5.4-native"
 
diff --git a/packages/xserver/xserver-xorg_cvs.bb b/packages/xserver/xserver-xorg_cvs.bb
index 89c0d20e73..3f7f8afe0e 100644
--- a/packages/xserver/xserver-xorg_cvs.bb
+++ b/packages/xserver/xserver-xorg_cvs.bb
@@ -1,6 +1,8 @@
 SECTION = "x11/base"
 LICENSE = "Xorg"
-PR = "r2"
+RPROVIDES = "virtual/xserver"
+PROVIDES = "virtual/xserver"
+PR = "r3"
 PV = "6.8.1+cvs${CVSDATE}"
 
 DEPENDS = "fontconfig freetype libxi xmu flex-2.5.4-native"