From 28a627e78d957096eb4c16889ec71a51100993f0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 5 Nov 2008 09:09:00 -0200 Subject: xorg-xserver-common.inc: add default font path to misc fonts --- packages/xorg-xserver/xorg-xserver-common.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'packages/xorg-xserver') diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index d391ffe60b..0dee7db032 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -23,6 +23,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig EXTRA_OECONF += " --enable-xcalibrate \ + --with-default-font-path="/usr/share/fonts/X11/misc" \ ac_cv_file__usr_share_sgml_X11_defs_ent=no" EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no " -- cgit v1.2.3 From 44a201e095eb1f32c5e2e3f7510ee7a5400f6757 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 12 Nov 2008 22:16:05 -0200 Subject: xorg-xserver-common.inc: build xephyr package It makes sense to build xephyr package from xserver-xorg recipe as well to be sure that the version of both matches. --- packages/xorg-xserver/xorg-xserver-common.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'packages/xorg-xserver') diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 0dee7db032..df594133ba 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -23,6 +23,8 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig EXTRA_OECONF += " --enable-xcalibrate \ + --enable-kdrive \ + --enable-xephyr \ --with-default-font-path="/usr/share/fonts/X11/misc" \ ac_cv_file__usr_share_sgml_X11_defs_ent=no" @@ -32,13 +34,14 @@ PACKAGES =+ "xserver-security-policy" FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy" RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb xserver-xorg-conf" -PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils" +PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xephyr" FILES_${PN}-xprint = "${libdir}/X11/xserver/*/print" FILES_${PN}-xvfb = "${bindir}/Xvfb" FILES_${PN}-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} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules ${libdir}/xorg/modules /etc/X11 " FILES_${PN}-doc += "${libdir}/X11/doc /usr/share/X11/xkb/compiled/README.compiled" +FILES_${PN}-xephyr = "${bindir}/Xephyr" FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ ${libdir}/xorg/modules/*/.debug \ -- cgit v1.2.3 From c9ba39c5b65be9731f760160a176bef6acf8d67d Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 14 Nov 2008 16:49:34 +0000 Subject: xserver-xorg_1.5.3.bb : xserver update to 1.5.3 --- packages/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch | 13 +++++++++++++ packages/xorg-xserver/xserver-xorg_1.5.3.bb | 13 +++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 packages/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch create mode 100644 packages/xorg-xserver/xserver-xorg_1.5.3.bb (limited to 'packages/xorg-xserver') diff --git a/packages/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch b/packages/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch new file mode 100644 index 0000000000..e0f633bc24 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch @@ -0,0 +1,13 @@ +Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am +=================================================================== +--- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100 ++++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000 +@@ -40,7 +40,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) + +-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack ++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) + + # FIXME: These need to be added to the build + LNX_EXTRA_SRCS = \ diff --git a/packages/xorg-xserver/xserver-xorg_1.5.3.bb b/packages/xorg-xserver/xserver-xorg_1.5.3.bb new file mode 100644 index 0000000000..92ef22fd63 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg_1.5.3.bb @@ -0,0 +1,13 @@ +require xorg-xserver-common.inc + +DESCRIPTION = "the X.Org X server" +DEPENDS += "pixman libpciaccess openssl" +PE = "1" +PR = "r1" + +SRC_URI += "file://drmfix.patch;patch=1 \ + file://sysroot_fix.patch;patch=1" + +MESA_VER = "7.2" + +export LDFLAGS += " -ldl " -- cgit v1.2.3