diff options
| author |   Graeme Gregory <dp@xora.org.uk> | 2008-11-12 16:20:40 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2008-11-12 16:20:40 +0000 |
| commit | c2d4ecfceeeca4174ddd8d2d495e20df323fd112 (patch) | |
| tree | 016219928ef9556472f6720d315938fbaaf0debb /packages | |
| parent | 8476a8f3212064b5ebb979d9f6b96043af5db2e5 (diff) | |
| parent | a1ca202a5c8f8a7502639297b55ccffe30493022 (diff) | |
| download | openembedded-c2d4ecfceeeca4174ddd8d2d495e20df323fd112.tar.gz | |
Merge branch 'shared/xorg-7.4-update' into org.openembedded.dev
Diffstat (limited to 'packages')
57 files changed, 395 insertions, 159 deletions
diff --git a/packages/xorg-app/xcursorgen-native_1.0.2.bb b/packages/xorg-app/xcursorgen-native_1.0.2.bb new file mode 100644 index 0000000000..0cbf9fc716 --- /dev/null +++ b/packages/xorg-app/xcursorgen-native_1.0.2.bb @@ -0,0 +1,7 @@ +inherit native +require xcursorgen_${PV}.bb + +DEPENDS = "libx11-native libpng-native" + +S="${WORKDIR}/xcursorgen-${PV}" +XORG_PN="xcursorgen" diff --git a/packages/xorg-app/xwd_1.0.2.bb b/packages/xorg-app/xwd_1.0.2.bb new file mode 100644 index 0000000000..7b712390c6 --- /dev/null +++ b/packages/xorg-app/xwd_1.0.2.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxmu virtual/libx11" + diff --git a/packages/xorg-app/xwininfo_1.0.4.bb b/packages/xorg-app/xwininfo_1.0.4.bb new file mode 100644 index 0000000000..069dd30aa8 --- /dev/null +++ b/packages/xorg-app/xwininfo_1.0.4.bb @@ -0,0 +1,5 @@ +require xorg-app-common.inc +PE = "1" + +DEPENDS += " libxmu libxext virtual/libx11" + diff --git a/packages/xorg-data/xcursor-themes_1.0.1.bb b/packages/xorg-data/xcursor-themes_1.0.1.bb index 8cf822e56f..1107d08da9 100644 --- a/packages/xorg-data/xcursor-themes_1.0.1.bb +++ b/packages/xorg-data/xcursor-themes_1.0.1.bb @@ -1,5 +1,7 @@ require xorg-data-common.inc PE = "1" -DEPENDS += " libxcursor" +DEPENDS += " libxcursor xcursorgen-native" + +FILES_${PN} += "${datadir}/icons" diff --git a/packages/xorg-driver/xf86-input-evdev_2.0.4.bb b/packages/xorg-driver/xf86-input-evdev_2.0.4.bb new file mode 100644 index 0000000000..792909621a --- /dev/null +++ b/packages/xorg-driver/xf86-input-evdev_2.0.4.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- evdev input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-joystick_1.3.2.bb b/packages/xorg-driver/xf86-input-joystick_1.3.2.bb new file mode 100644 index 0000000000..a53297fd8a --- /dev/null +++ b/packages/xorg-driver/xf86-input-joystick_1.3.2.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- joystick input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb b/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb new file mode 100644 index 0000000000..e6325675f8 --- /dev/null +++ b/packages/xorg-driver/xf86-input-synaptics_0.15.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-input.inc + +DESCRIPTION = "X.Org X server -- mouse input driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-input-tslib_0.0.5.bb b/packages/xorg-driver/xf86-input-tslib_0.0.5.bb index bed0160138..f5c0186565 100644 --- a/packages/xorg-driver/xf86-input-tslib_0.0.5.bb +++ b/packages/xorg-driver/xf86-input-tslib_0.0.5.bb @@ -8,8 +8,8 @@ PR = "r6" SRC_URI = "http://www.pengutronix.de/software/xf86-input-tslib/download/xf86-input-tslib-${PV}.tar.bz2 \ file://use-hal-for-device.diff;patch=1 \ - file://01_fix-wrong-value-range-for-the-axises.diff;patch=1 \ - file://dynamic-xy.patch;patch=1 \ + file://01_fix-wrong-value-range-for-the-axises.diff;patch=1 \ + file://dynamic-xy.patch;patch=1 \ file://10-x11-input-tslib.fdi" do_configure_prepend() { diff --git a/packages/xorg-driver/xf86-video-geode_2.10.1.bb b/packages/xorg-driver/xf86-video-geode_2.10.1.bb new file mode 100644 index 0000000000..380ce2ea0b --- /dev/null +++ b/packages/xorg-driver/xf86-video-geode_2.10.1.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc +PE = "1" + +COMPATIBLE_HOST = 'i.86.*-linux' +DESCRIPTION = "X.org server -- Geode GX2/LX display driver" diff --git a/packages/xorg-driver/xf86-video-glint_1.2.1.bb b/packages/xorg-driver/xf86-video-glint_1.2.1.bb new file mode 100644 index 0000000000..eac23c74d9 --- /dev/null +++ b/packages/xorg-driver/xf86-video-glint_1.2.1.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- Glint display driver" + +DEPENDS += " xf86dgaproto drm xf86driproto" + diff --git a/packages/xorg-driver/xf86-video-i128_1.3.1.bb b/packages/xorg-driver/xf86-video-i128_1.3.1.bb new file mode 100644 index 0000000000..78d5eda810 --- /dev/null +++ b/packages/xorg-driver/xf86-video-i128_1.3.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- i128 display driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-impact_0.2.0.bb b/packages/xorg-driver/xf86-video-impact_0.2.0.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/packages/xorg-driver/xf86-video-impact_0.2.0.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/packages/xorg-driver/xf86-video-intel_2.4.2.bb b/packages/xorg-driver/xf86-video-intel_2.4.2.bb new file mode 100644 index 0000000000..eed1fcb600 --- /dev/null +++ b/packages/xorg-driver/xf86-video-intel_2.4.2.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-mach64_6.8.0.bb b/packages/xorg-driver/xf86-video-mach64_6.8.0.bb new file mode 100644 index 0000000000..eed1fcb600 --- /dev/null +++ b/packages/xorg-driver/xf86-video-mach64_6.8.0.bb @@ -0,0 +1,5 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- Intel i8xx, i9xx display driver" +DEPENDS += " virtual/libx11 libxvmc drm xf86driproto" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-mga_1.4.9.bb b/packages/xorg-driver/xf86-video-mga_1.4.9.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/packages/xorg-driver/xf86-video-mga_1.4.9.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/packages/xorg-driver/xf86-video-nv_2.1.12.bb b/packages/xorg-driver/xf86-video-nv_2.1.12.bb new file mode 100644 index 0000000000..0d4ee2ed19 --- /dev/null +++ b/packages/xorg-driver/xf86-video-nv_2.1.12.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- NV display driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-openchrome_0.2.903.bb b/packages/xorg-driver/xf86-video-openchrome_0.2.903.bb new file mode 100644 index 0000000000..facae8950a --- /dev/null +++ b/packages/xorg-driver/xf86-video-openchrome_0.2.903.bb @@ -0,0 +1,9 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- openchrome display driver" +PE = "1" + +do_configure_prepend() { + rm ${S}/acinclude.m4 || true +} + diff --git a/packages/xorg-driver/xf86-video-r128_6.8.0.bb b/packages/xorg-driver/xf86-video-r128_6.8.0.bb new file mode 100644 index 0000000000..994ea24d8f --- /dev/null +++ b/packages/xorg-driver/xf86-video-r128_6.8.0.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- r128 display driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-sunffb_1.2.0.bb b/packages/xorg-driver/xf86-video-sunffb_1.2.0.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/packages/xorg-driver/xf86-video-sunffb_1.2.0.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/packages/xorg-driver/xf86-video-sunleo_1.2.0.bb b/packages/xorg-driver/xf86-video-sunleo_1.2.0.bb new file mode 100644 index 0000000000..c2b6b7608a --- /dev/null +++ b/packages/xorg-driver/xf86-video-sunleo_1.2.0.bb @@ -0,0 +1,2 @@ +require xorg-driver-video.inc +PE = "1" diff --git a/packages/xorg-driver/xf86-video-tga_1.2.0.bb b/packages/xorg-driver/xf86-video-tga_1.2.0.bb new file mode 100644 index 0000000000..d3cf65f034 --- /dev/null +++ b/packages/xorg-driver/xf86-video-tga_1.2.0.bb @@ -0,0 +1,8 @@ +require xorg-driver-video.inc + +PE = "1" + +DESCRIPTION = "DEC 21030 X11 driver" + +DEPENDS += " xf86dgaproto" + diff --git a/packages/xorg-driver/xf86-video-vermilion_1.0.1.bb b/packages/xorg-driver/xf86-video-vermilion_1.0.1.bb new file mode 100644 index 0000000000..c3054b9051 --- /dev/null +++ b/packages/xorg-driver/xf86-video-vermilion_1.0.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +PE = "1" + diff --git a/packages/xorg-driver/xf86-video-vesa/fix-configure-includes.patch b/packages/xorg-driver/xf86-video-vesa/fix-configure-includes.patch new file mode 100644 index 0000000000..a886e6c150 --- /dev/null +++ b/packages/xorg-driver/xf86-video-vesa/fix-configure-includes.patch @@ -0,0 +1,13 @@ +Index: xf86-video-vesa-2.0.0/configure.ac +=================================================================== +--- xf86-video-vesa-2.0.0.orig/configure.ac 2008-11-06 15:13:02.000000000 +0000 ++++ xf86-video-vesa-2.0.0/configure.ac 2008-11-06 15:13:16.000000000 +0000 +@@ -69,7 +69,7 @@ + AM_CONDITIONAL(XSERVER_LIBPCIACCESS, test "x$XSERVER_LIBPCIACCESS" = xyes) + + CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' +-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src' ++INCLUDES="$XORG_INCS "'-I$(top_srcdir)/src' + AC_SUBST([CFLAGS]) + AC_SUBST([INCLUDES]) + diff --git a/packages/xorg-driver/xf86-video-vesa_2.0.0.bb b/packages/xorg-driver/xf86-video-vesa_2.0.0.bb new file mode 100644 index 0000000000..bd2f7cf7c1 --- /dev/null +++ b/packages/xorg-driver/xf86-video-vesa_2.0.0.bb @@ -0,0 +1,9 @@ +require xorg-driver-video.inc +PE = "1" + +SRC_URI += "file://fix-includepath.patch;patch=1 \ + file://fix-configure-includes.patch;patch=1" + +#DESCRIPTION = "" + +#DEPENDS += " " diff --git a/packages/xorg-driver/xf86-video-vmware_10.16.5.bb b/packages/xorg-driver/xf86-video-vmware_10.16.5.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/packages/xorg-driver/xf86-video-vmware_10.16.5.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/packages/xorg-driver/xf86-video-wsfb_0.2.1.bb b/packages/xorg-driver/xf86-video-wsfb_0.2.1.bb new file mode 100644 index 0000000000..ea1c005e8c --- /dev/null +++ b/packages/xorg-driver/xf86-video-wsfb_0.2.1.bb @@ -0,0 +1,4 @@ +require xorg-driver-video.inc + +DESCRIPTION = "X.Org X server -- wsfb display driver" +PE = "1" diff --git a/packages/xorg-driver/xf86-video-xgixp_1.7.99.3.bb b/packages/xorg-driver/xf86-video-xgixp_1.7.99.3.bb new file mode 100644 index 0000000000..994b8b6a3c --- /dev/null +++ b/packages/xorg-driver/xf86-video-xgixp_1.7.99.3.bb @@ -0,0 +1,6 @@ +require xorg-driver-video.inc +PE = "1" + +#DESCRIPTION = "" + +DEPENDS += " xineramaproto xf86miscproto drm xf86driproto" diff --git a/packages/xorg-driver/xorg-driver-common.inc b/packages/xorg-driver/xorg-driver-common.inc index a75e409c8c..0f24dd5e30 100644 --- a/packages/xorg-driver/xorg-driver-common.inc +++ b/packages/xorg-driver/xorg-driver-common.inc @@ -25,10 +25,10 @@ do_stage() { # Of course this will blow up when cross compiling. do_configure_prepend() { - incdir=${STAGING_INCDIR}/xorg - for f in dri.h sarea.h dristruct.h exa.h damage.h; do + incdir=${layout_includedir}/xorg + for f in dri.h sarea.h dristruct.h exa.h damage.h xf86Module.h; do path="$incdir/$f" - if [ -f "$path" ]; then + if [ -f "${STAGING_DIR_HOST}/$path" ]; then p=`echo "$path" | sed 'y%*+%pp%;s%[^_[:alnum:]]%_%g'` eval "export ac_cv_file_$p=yes" fi diff --git a/packages/xorg-lib/diet-x11_1.1.5.bb b/packages/xorg-lib/diet-x11_1.1.5.bb new file mode 100644 index 0000000000..19a9efecbf --- /dev/null +++ b/packages/xorg-lib/diet-x11_1.1.5.bb @@ -0,0 +1,10 @@ +require libx11_${PV}.bb + +SRC_URI += "file://X18NCMSstubs.diff;patch=1 \ + file://fix-disable-xlocale.diff;patch=1 \ + file://fix-utf8-wrong-define.patch;patch=1" + +FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libx11" + +EXTRA_OECONF += "--disable-udc --disable-xcms --disable-xlocale --disable-xkb" +CFLAGS += "-D_GNU_SOURCE" diff --git a/packages/xorg-lib/libsm_1.1.0.bb b/packages/xorg-lib/libsm_1.1.0.bb new file mode 100644 index 0000000000..7a3089894d --- /dev/null +++ b/packages/xorg-lib/libsm_1.1.0.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Session management library" +DEPENDS += "libice xproto xtrans e2fsprogs-libs" +PR = "r0" +PE = "1" + +XORG_PN = "libSM" diff --git a/packages/xorg-lib/libx11/keysymdef_include.patch b/packages/xorg-lib/libx11/keysymdef_include.patch new file mode 100644 index 0000000000..07487b6b2e --- /dev/null +++ b/packages/xorg-lib/libx11/keysymdef_include.patch @@ -0,0 +1,29 @@ +Index: libX11-1.1.5/configure.ac +=================================================================== +--- libX11-1.1.5.orig/configure.ac 2008-10-28 11:36:49.000000000 +0000 ++++ libX11-1.1.5/configure.ac 2008-10-28 11:40:05.000000000 +0000 +@@ -221,13 +221,21 @@ + # Find keysymdef.h + # + AC_MSG_CHECKING([keysymdef.h]) +-dir=`pkg-config --variable=includedir xproto` +-KEYSYMDEF="$dir/X11/keysymdef.h" ++AC_ARG_WITH(keysymdef, ++ AC_HELP_STRING([--with-keysymdef=DIR/keysymdef.h], [The location of keysymdef.h]), ++ KEYSYMDEF=$withval, KEYSYMDEF="") ++ ++if test x$KEYSYMDEF = x; then ++ dir=`pkg-config --variable=includedir xproto` ++ KEYSYMDEF="$dir/X11/keysymdef.h" ++fi ++ + if test -f "$KEYSYMDEF"; then +- AC_MSG_RESULT([$KEYSYMDEF]) ++ AC_MSG_RESULT([$KEYSYMDEF]) + else + AC_MSG_ERROR([Cannot find keysymdef.h]) + fi ++ + AC_SUBST(KEYSYMDEF) + + AM_CONDITIONAL(UDC, test xfalse = xtrue) diff --git a/packages/xorg-lib/libx11_1.1.5.bb b/packages/xorg-lib/libx11_1.1.5.bb new file mode 100644 index 0000000000..a22b7a0158 --- /dev/null +++ b/packages/xorg-lib/libx11_1.1.5.bb @@ -0,0 +1,31 @@ +require xorg-lib-common.inc + +DESCRIPTION = "Base X libs." +DEPENDS += "bigreqsproto xproto xextproto xtrans libxau xcmiscproto \ + libxdmcp xf86bigfontproto kbproto inputproto xproto-native" +PROVIDES = "virtual/libx11" +PE = "1" +PR = "r3" + +XORG_PN = "libX11" + +SRC_URI += "file://x11_disable_makekeys.patch;patch=1 \ + file://keysymdef_include.patch;patch=1" + +EXTRA_OECONF += "--without-xcb --with-keysymdef=${STAGING_INCDIR}/X11/keysymdef.h" + +do_compile() { + ( + unset CC LD CXX CCLD CFLAGS CPPFLAGS LDFLAGS CXXFLAGS + cd src/util; + mv makekeys.c.orig makekeys.c || true + touch makekeys-makekeys.o ; ${BUILD_CC} ${BUILD_CFLAGS} -I${STAGING_INCDIR_NATIVE} makekeys.c -o makekeys + # mv to stop it getting rebuilt + mv makekeys.c makekeys.c.orig + cd ../../ + ) || exit 1 + oe_runmake +} + +FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${libdir}/X11/Xcms.txt" +FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" diff --git a/packages/xorg-lib/libxcursor-native_1.1.9.bb b/packages/xorg-lib/libxcursor-native_1.1.9.bb new file mode 100644 index 0000000000..403030e93d --- /dev/null +++ b/packages/xorg-lib/libxcursor-native_1.1.9.bb @@ -0,0 +1,6 @@ +require libxcursor_${PV}.bb + +DEPENDS = "libx11-native fixesproto-native libxfixes-native" +PE = "1" + +inherit native diff --git a/packages/xorg-lib/libxfixes-native_4.0.3.bb b/packages/xorg-lib/libxfixes-native_4.0.3.bb new file mode 100644 index 0000000000..5ef6ded80a --- /dev/null +++ b/packages/xorg-lib/libxfixes-native_4.0.3.bb @@ -0,0 +1,6 @@ +require libxfixes_${PV}.bb + +DEPENDS = "libx11-native" +PE = "1" + +inherit native diff --git a/packages/xorg-lib/libxft_2.1.13.bb b/packages/xorg-lib/libxft_2.1.13.bb new file mode 100644 index 0000000000..84d0cc2cbe --- /dev/null +++ b/packages/xorg-lib/libxft_2.1.13.bb @@ -0,0 +1,20 @@ +require xorg-lib-common.inc + +DESCRIPTION = "FreeType-based font drawing library for X" +DEPENDS += "libxrender freetype fontconfig" +PROVIDES = "xft" +PR = "r0" +PE = "1" + +XORG_PN = "libXft" + +python do_package() { + if bb.data.getVar('DEBIAN_NAMES', d, 1): + bb.data.setVar('PKG_${PN}', 'libxft2', d) + bb.build.exec_func('package_do_package', d) +} + +FILES_${PN} = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir}" diff --git a/packages/xorg-lib/libxrandr_1.2.3.bb b/packages/xorg-lib/libxrandr_1.2.3.bb new file mode 100644 index 0000000000..f6d7623bca --- /dev/null +++ b/packages/xorg-lib/libxrandr_1.2.3.bb @@ -0,0 +1,9 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 Resize and Rotate extension library" +LICENSE = "BSD-X" +DEPENDS += "randrproto libxrender libxext" +PR = "r0" +PE = "1" + +XORG_PN = "libXrandr" diff --git a/packages/xorg-lib/libxrender-native_0.9.4.bb b/packages/xorg-lib/libxrender-native_0.9.4.bb new file mode 100644 index 0000000000..a4f4ba9e36 --- /dev/null +++ b/packages/xorg-lib/libxrender-native_0.9.4.bb @@ -0,0 +1,6 @@ +require libxrender_${PV}.bb + +DEPENDS = "libx11-native renderproto-native" +PE = "1" + +inherit native diff --git a/packages/xorg-lib/libxxf86vm_1.0.2.bb b/packages/xorg-lib/libxxf86vm_1.0.2.bb new file mode 100644 index 0000000000..2d1af9c9aa --- /dev/null +++ b/packages/xorg-lib/libxxf86vm_1.0.2.bb @@ -0,0 +1,8 @@ +require xorg-lib-common.inc + +DESCRIPTION = "X11 XFree86 video mode extension library" +DEPENDS += "libxext xf86vidmodeproto" +PR = "r0" +PE = "1" + +XORG_PN = "libXxf86vm" diff --git a/packages/xorg-proto/fixesproto-native_4.0.bb b/packages/xorg-proto/fixesproto-native_4.0.bb new file mode 100644 index 0000000000..927e004437 --- /dev/null +++ b/packages/xorg-proto/fixesproto-native_4.0.bb @@ -0,0 +1,7 @@ +require fixesproto_${PV}.bb + +PR = "r1" + +XORG_PN = "fixesproto" + +inherit native diff --git a/packages/xorg-proto/renderproto-native_0.9.3.bb b/packages/xorg-proto/renderproto-native_0.9.3.bb new file mode 100644 index 0000000000..8d83c99774 --- /dev/null +++ b/packages/xorg-proto/renderproto-native_0.9.3.bb @@ -0,0 +1,7 @@ +require renderproto_${PV}.bb + +PR = "r1" + +XORG_PN = "renderproto" + +inherit native diff --git a/packages/xorg-proto/xproto-native_7.0.13.bb b/packages/xorg-proto/xproto-native_7.0.13.bb new file mode 100644 index 0000000000..5dde8a7d4a --- /dev/null +++ b/packages/xorg-proto/xproto-native_7.0.13.bb @@ -0,0 +1,3 @@ +require xproto_${PV}.bb + +inherit native diff --git a/packages/xorg-proto/xproto_7.0.13.bb b/packages/xorg-proto/xproto_7.0.13.bb new file mode 100644 index 0000000000..b403ff5615 --- /dev/null +++ b/packages/xorg-proto/xproto_7.0.13.bb @@ -0,0 +1,6 @@ +require xorg-proto-common.inc + +PR = "r0" +PE = "1" + +XORG_PN = "xproto" diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 190de2c49a..d391ffe60b 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -16,8 +16,7 @@ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa libxcalibrate" RECOMMENDS_${PN} = "hal" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2 \ - file://xorg.conf" +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" S = "${WORKDIR}/${XORG_PN}-${PV}" @@ -26,9 +25,11 @@ inherit autotools pkgconfig EXTRA_OECONF += " --enable-xcalibrate \ ac_cv_file__usr_share_sgml_X11_defs_ent=no" +EXTRA_OECONF_append_arm = " ac_cv_header_linux_apm_bios_h=no " + PACKAGES =+ "xserver-security-policy" FILES_xserver-security-policy += "${libdir}/xserver/SecurityPolicy" -RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb" +RRECOMMENDS_${PN} += "xserver-security-policy xkeyboard-config xorg-minimal-fonts rgb xserver-xorg-conf" PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils" @@ -43,14 +44,10 @@ FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ ${libdir}/xorg/modules/*/*/.debug \ " -CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" - do_stage() { autotools_stage_all } do_install_append () { - install -d ${D}/${sysconfdir}/X11 - install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ ln -sf ${datadir}/fonts/X11 ${D}/${libdir}/X11/fonts } diff --git a/packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch b/packages/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch new file mode 100644 index 0000000000..e0f633bc24 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-1.5.1/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/beagleboard/xorg.conf b/packages/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf index 1778960638..1778960638 100644 --- a/packages/xorg-xserver/xserver-xorg/beagleboard/xorg.conf +++ b/packages/xorg-xserver/xserver-xorg-conf/beagleboard/xorg.conf diff --git a/packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf b/packages/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf index 983bb0823a..983bb0823a 100644 --- a/packages/xorg-xserver/xserver-xorg/omap3evm/xorg.conf +++ b/packages/xorg-xserver/xserver-xorg-conf/omap3evm/xorg.conf diff --git a/packages/xorg-xserver/xserver-xorg-conf/xorg.conf b/packages/xorg-xserver/xserver-xorg-conf/xorg.conf new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-conf/xorg.conf diff --git a/packages/xorg-xserver/xserver-xorg-conf_0.1.bb b/packages/xorg-xserver/xserver-xorg-conf_0.1.bb new file mode 100644 index 0000000000..1ff83ea27b --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Machine specific xorg.conf files" + +SRC_URI = "file://xorg.conf" + +do_install() { + install -d ${D}/${sysconfdir}/X11 + install -m 0644 ${WORKDIR}/xorg.conf ${D}/${sysconfdir}/X11/ +} + +CONFFILES_${PN} += "${sysconfdir}/X11/xorg.conf" + diff --git a/packages/xorg-xserver/xserver-xorg/xorg.conf b/packages/xorg-xserver/xserver-xorg/xorg.conf deleted file mode 100644 index 4b327022f6..0000000000 --- a/packages/xorg-xserver/xserver-xorg/xorg.conf +++ /dev/null @@ -1,135 +0,0 @@ - -# xorg configuration - -Section "ServerLayout" - Identifier "Default Layout" - Screen 0 "Screen0" 0 0 - InputDevice "Mouse0" "CorePointer" - InputDevice "Keyboard0" "CoreKeyboard" -EndSection - -Section "Files" - -# RgbPath is the location of the RGB database. Note, this is the name of the -# file minus the extension (like ".txt" or ".db"). There is normally -# no need to change the default. -# Multiple FontPath entries are allowed (they are concatenated together) -# By default, Red Hat 6.0 and later now use a font server independent of -# the X server to render fonts. -# FontPath "unix/:7100" - FontPath "/usr/lib/X11/fonts/misc" -EndSection - -Section "Module" - Load "dbe" - Load "extmod" - Load "fbdevhw" -# Load "glx" - Load "record" - Load "freetype" - Load "type1" -# to enable Xv, link /dev/videox to video device, eg. ln -s video0 /dev/videox -# Load "z4l" -EndSection - -Section "InputDevice" - -# Specify which keyboard LEDs can be user-controlled (eg, with xset(1)) -# Option "Xleds" "1 2 3" -# To disable the XKEYBOARD extension, uncomment XkbDisable. -# Option "XkbDisable" -# To customise the XKB settings to suit your keyboard, modify the -# lines below (which are the defaults). For example, for a non-U.S. -# keyboard, you will probably want to use: -# Option "XkbModel" "pc102" -# If you have a US Microsoft Natural keyboard, you can use: -# Option "XkbModel" "microsoft" -# -# Then to change the language, change the Layout setting. -# For example, a german layout can be obtained with: -# Option "XkbLayout" "de" -# or: -# Option "XkbLayout" "de" -# Option "XkbVariant" "nodeadkeys" -# -# If you'd like to switch the positions of your capslock and -# control keys, use: -# Option "XkbOptions" "ctrl:swapcaps" -# Or if you just want both to be control, use: -# Option "XkbOptions" "ctrl:nocaps" -# - Identifier "Keyboard0" - Driver "keyboard" - Option "XkbModel" "pc105" - Option "XkbLayout" "us" -EndSection - -Section "InputDevice" - Identifier "Mouse0" - Driver "mouse" - Option "Protocol" "IMPS/2" - Option "Device" "/dev/input/mice" - Option "ZAxisMapping" "4 5" - Option "Emulate3Buttons" "yes" -EndSection - -Section "Monitor" - Identifier "Monitor0" - VendorName "Monitor Vendor" - ModelName "NEC FP2141SB" -# DisplaySize 400 300 -# Note: setting HorizSync/VertRefresh will override DDC probe -# HorizSync 30.0 - 140.0 -# VertRefresh 25.0 - 160.0 - Option "dpms" -EndSection - -Section "Monitor" - Identifier "Monitor1" - VendorName "Generic Vendor" - ModelName "Generic Monitor" - HorizSync 28-50 - VertRefresh 43-73 - Modeline "800x600-60" 40.0000 800 840 976 1056 600 601 605 628 - Modeline "800x600-72" 50.0000 800 856 976 1040 600 637 643 666 - Modeline "640x480-60" 25.1749 640 656 744 800 480 490 492 525 -HSync -VSync - Modeline "640x480-72" 31.5000 640 664 704 832 480 489 492 520 -HSync -VSync - Option "dpms" -EndSection - - -Section "Device" - Identifier "FBDev" - Driver "fbdev" - #Option "shadowfb" "off" -EndSection - -Section "Screen" - Identifier "Screen0" - Device "FBDev" - Monitor "Monitor0" - DefaultDepth 16 - - SubSection "Display" - Depth 8 - Modes "1024x768" "800x600" "640x480" - EndSubsection - - SubSection "Display" - Depth 16 - Modes "1024x768" "800x600" "640x480" - EndSubsection - - SubSection "Display" - Depth 24 - FbBpp 32 - Modes "1024x768" "800x600" "640x480" - EndSubsection - -EndSection - -Section "DRI" - Group 0 - Mode 0666 -EndSection - diff --git a/packages/xorg-xserver/xserver-xorg_1.2.0.bb b/packages/xorg-xserver/xserver-xorg_1.2.0.bb index 218e6dc026..61f73b3454 100644 --- a/packages/xorg-xserver/xserver-xorg_1.2.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.2.0.bb @@ -2,9 +2,7 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r3" - -EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no " +PR = "r4" export LDFLAGS += " -ldl " diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb index d28fec16e1..9d6dca4489 100644 --- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -2,13 +2,11 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" -PR = "r7" +PR = "r8" SRC_URI += "file://drmfix.patch;patch=1 \ file://glyphstr.patch;patch=1" -EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no " - export LDFLAGS += " -ldl " #DESCRIPTION = "" diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb index 562266ff39..852e847265 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r9" +PR = "r10" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb index 3f53002a34..ba64d72d35 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.bb @@ -3,7 +3,7 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" PE = "1" -PR = "r7" +PR = "r8" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ @@ -11,6 +11,4 @@ SRC_URI += "file://drmfix.patch;patch=1 \ MESA_VER = "7.0.2" -EXTRA_OECONF += " ac_cv_file__usr_share_sgml_X11_defs_ent=no " - export LDFLAGS += " -ldl " diff --git a/packages/xorg-xserver/xserver-xorg_1.5.1.bb b/packages/xorg-xserver/xserver-xorg_1.5.1.bb new file mode 100644 index 0000000000..92ef22fd63 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg_1.5.1.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 " diff --git a/packages/xserver-common/files/gta-xorg-fixes.patch b/packages/xserver-common/files/gta-xorg-fixes.patch new file mode 100644 index 0000000000..adf6798a99 --- /dev/null +++ b/packages/xserver-common/files/gta-xorg-fixes.patch @@ -0,0 +1,29 @@ +Index: xserver-common-1.22/X11/Xserver +=================================================================== +--- xserver-common-1.22.orig/X11/Xserver 2008-11-12 09:16:50.000000000 +0000 ++++ xserver-common-1.22/X11/Xserver 2008-11-12 09:18:53.000000000 +0000 +@@ -109,7 +109,11 @@ + "Nokia RX-44") + ARGS="$ARGS -dpi 225 -screen ${SCREEN_SIZE} -mouse tslib" ;; + "GTA01" ) +- ARGS="$ARGS -dpi 285 -screen 480x640" ;; ++ ARGS="$ARGS -dpi 285" ++ if [ "$XSERVER" != "Xorg" ] ; then ++ ARGS="$ARGS -screen 480x640" ++ fi ++ ;; + "Motorola Ezx Platform") + ARGS="$ARGS -dpi 170 -screen 240x320" ;; + "ARM-IntegratorCP" | "ARM-Versatile PB") +@@ -118,7 +122,10 @@ + modprobe mbxfb + ARGS="$ARGS -fb /dev/fb1" ;; + "GTA02") +- ARGS="$ARGS -dpi 285 -screen ${SCREEN_SIZE}" ++ ARGS="$ARGS -dpi 285" ++ if [ "$XSERVER" != "Xorg" ] ; then ++ ARGS="$ARGS -screen ${SCREEN_SIZE}" ++ fi + ;; + "Boundary Devices Neon board") + ARGS="$ARGS -dpi 100 -screen ${SCREEN_SIZE} -mouse tslib" diff --git a/packages/xserver-common/files/xorg-fixes.patch b/packages/xserver-common/files/xorg-fixes.patch new file mode 100644 index 0000000000..b2fd544fb5 --- /dev/null +++ b/packages/xserver-common/files/xorg-fixes.patch @@ -0,0 +1,25 @@ +Index: xserver-common-1.22/X11/Xserver +=================================================================== +--- xserver-common-1.22.orig/X11/Xserver 2008-11-12 09:14:55.000000000 +0000 ++++ xserver-common-1.22/X11/Xserver 2008-11-12 09:16:22.000000000 +0000 +@@ -48,6 +48,7 @@ + + ARGS="-br -pn $INPUT_EXTRA_ARGS" + ++if [ "$XSERVER" != "Xorg" ] ; then + # use ucb 1x00 touchscreen if present + if [ -z "$TSLIB_TSDEVICE" ] && [ -e /dev/touchscreen/ucb1x00 ]; then + ARGS="$ARGS -mouse /dev/touchscreen/ucb1x00" +@@ -58,10 +59,11 @@ + if [ -e "$TSLIB_TSDEVICE" ] ; then + ARGS="$ARGS -mouse tslib" + else +- if [ -e /dev/input/mice ] && [ "$XSERVER" != "Xorg" ] ; then ++ if [ -e /dev/input/mice ] ; then + ARGS="$ARGS -mouse mouse" + fi + fi ++fi + + # start off server in conventional location. + case `module_id` in diff --git a/packages/xserver-common/xserver-common_1.22.bb b/packages/xserver-common/xserver-common_1.22.bb index 6dcbc6862d..05b15ae564 100644 --- a/packages/xserver-common/xserver-common_1.22.bb +++ b/packages/xserver-common/xserver-common_1.22.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Common X11 scripts and support files" LICENSE = "GPL" SECTION = "x11" RDEPENDS_${PN} = "xmodmap xrandr xdpyinfo" -PR = "r7" +PR = "r8" PACKAGE_ARCH = "all" @@ -11,6 +11,8 @@ inherit gpe SRC_URI_append = " file://setDPI.sh " SRC_URI_append_angstrom = " file://kdrive-1.4-fixes.patch;patch=1 \ + file://xorg-fixes.patch;patch=1 \ + file://gta-xorg-fixes.patch;patch=1 \ file://default.xmodmap " do_install_append() { |