diff options
24 files changed, 220 insertions, 36 deletions
diff --git a/conf/machine/include/zaurus-2.6.conf b/conf/machine/include/zaurus-2.6.conf index 45d8891b44..4e9e6a2ad9 100644 --- a/conf/machine/include/zaurus-2.6.conf +++ b/conf/machine/include/zaurus-2.6.conf @@ -6,7 +6,10 @@ PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" MACHINE_KERNEL_VERSION = "2.6" -EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" +ERASEBLOCKSIZE = "0x4000" +ERASEBLOCKSIZE_akita = "0x20000" + +EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf index 83d17aeb78..5e51566484 100644 --- a/conf/machine/include/zaurus-clamshell.conf +++ b/conf/machine/include/zaurus-clamshell.conf @@ -1,14 +1,13 @@ EXTRA_IMAGEDEPENDS += "sharp-flash-header-c700" IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \ - --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \ + --output=${T}/${IMAGE_NAME}.rootfs.jffs2; \ + sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ + -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ + --eraseblock=${ERASEBLOCKSIZE} -l -p; \ cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img" - -# add a summary to the jffs2 file to make it mount a lot faster -EXTRA_IMAGECMD_jffs2 += "&& sumtool -i ${T}/${IMAGE_NAME}.rootfs.jffs2 \ - -o ${T}/${IMAGE_NAME}.rootfs.jffs2.summary \ - --eraseblock=0x4000 -l -p" - -IMAGE_CMD_jffs2 += "; cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ - ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.img" + ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2; \ + rm ${T}/${IMAGE_NAME}.rootfs.jffs2; \ + cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \ + ${T}/${IMAGE_NAME}.rootfs.jffs2.summary > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.summary.jffs2 \ + rm ${T}/${IMAGE_NAME}.rootfs.jffs2.summary;" diff --git a/conf/machine/palmz72.conf b/conf/machine/palmz72.conf index 0178adf459..85bce509b1 100644 --- a/conf/machine/palmz72.conf +++ b/conf/machine/palmz72.conf @@ -6,7 +6,6 @@ TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te" PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6" -PREFERRED_PROVIDER_virtual/kernel-image = "linux-hackndev-2.6" PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive" @@ -20,5 +19,6 @@ GUI_MACHINE_CLASS = "bigscreen" # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm. require conf/machine/include/tune-xscale.conf +require conf/machine/include/tune-thumb.conf module_autoload_sa1100-rtc = "sa1100-rtc" diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf index 84c340f66e..6b08ec1aa9 100644 --- a/conf/machine/spitz.conf +++ b/conf/machine/spitz.conf @@ -8,6 +8,6 @@ require conf/machine/include/zaurus-clamshell.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" PACKAGE_EXTRA_ARCHS += "iwmmxt" -IMAGE_FSTYPES ?= "tar.gz" +IMAGE_FSTYPES += "tar.gz" ROOT_FLASH_SIZE = "100" diff --git a/packages/dri/drm-kernel/.mtn2git_empty b/packages/dri/drm-kernel/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/dri/drm-kernel/.mtn2git_empty diff --git a/packages/dri/make.patch b/packages/dri/drm-kernel/make.patch index f0dabecd5e..f0dabecd5e 100644 --- a/packages/dri/make.patch +++ b/packages/dri/drm-kernel/make.patch diff --git a/packages/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb index 0c235a3adb..8e219880d0 100644 --- a/packages/dri/drm_cvs.bb +++ b/packages/dri/drm_cvs.bb @@ -16,5 +16,3 @@ do_compile() { do_stage() { autotools_stage_all } - - diff --git a/packages/dri/libdrm_2.3.0.bb b/packages/dri/libdrm_2.3.0.bb new file mode 100644 index 0000000000..9caf9b4bea --- /dev/null +++ b/packages/dri/libdrm_2.3.0.bb @@ -0,0 +1,10 @@ +SECTION = "x11/base" +LICENSE = "MIT" +SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" +PROVIDES = "drm" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} diff --git a/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch new file mode 100644 index 0000000000..3d8f3f614b --- /dev/null +++ b/packages/gtk+/gtk+-2.6.10/compile-against-newer-glib.patch @@ -0,0 +1,49 @@ +--- gtk+-2.6.10/gtk/gtkstatusbar.h 2005/03/20 07:01:22 1.17 ++++ gtk+-2.6.10/gtk/gtkstatusbar.h 2005/12/06 14:25:30 1.17.2.1 +@@ -65,7 +65,7 @@ + { + GtkHBoxClass parent_class; + +- GMemChunk *messages_mem_chunk; ++ gpointer messages_mem_chunk; + + void (*text_pushed) (GtkStatusbar *statusbar, + guint context_id, +--- gtk+-2.6.10/gtk/gtkstatusbar.c 2005/07/21 19:10:48 1.56 ++++ gtk+-2.6.10/gtk/gtkstatusbar.c 2005/12/06 14:25:30 1.56.2.1 +@@ -302,7 +302,7 @@ + g_return_val_if_fail (text != NULL, 0); + + class = GTK_STATUSBAR_GET_CLASS (statusbar); +- msg = g_chunk_new (GtkStatusbarMsg, class->messages_mem_chunk); ++ msg = g_chunk_new (GtkStatusbarMsg, (GMemChunk *)class->messages_mem_chunk); + msg->text = g_strdup (text); + msg->context_id = context_id; + msg->message_id = statusbar->seq_message_id++; +@@ -343,7 +343,7 @@ + statusbar->messages = g_slist_remove_link (statusbar->messages, + list); + g_free (msg->text); +- g_mem_chunk_free (class->messages_mem_chunk, msg); ++ g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg); + g_slist_free_1 (list); + break; + } +@@ -394,7 +394,7 @@ + class = GTK_STATUSBAR_GET_CLASS (statusbar); + statusbar->messages = g_slist_remove_link (statusbar->messages, list); + g_free (msg->text); +- g_mem_chunk_free (class->messages_mem_chunk, msg); ++ g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg); + g_slist_free_1 (list); + + break; +@@ -459,7 +459,7 @@ + + msg = list->data; + g_free (msg->text); +- g_mem_chunk_free (class->messages_mem_chunk, msg); ++ g_mem_chunk_free ((GMemChunk *)class->messages_mem_chunk, msg); + } + g_slist_free (statusbar->messages); + statusbar->messages = NULL; diff --git a/packages/gtk+/gtk+_2.6.10.bb b/packages/gtk+/gtk+_2.6.10.bb index 171c712fc0..9af2dba568 100644 --- a/packages/gtk+/gtk+_2.6.10.bb +++ b/packages/gtk+/gtk+_2.6.10.bb @@ -5,7 +5,7 @@ SECTION = "libs" LICENSE = "LGPL" PRIORITY = "optional" DEPENDS = "glib-2.0 pango atk jpeg libpng libxext libxcursor gtk-doc libgcrypt" -PR = "r4" +PR = "r6" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://help.patch;patch=1 \ @@ -23,7 +23,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/gtk+-${PV}.tar.bz2 \ file://small-gtkfilesel.patch;patch=1 \ file://migration.patch;patch=1;pnum=0 \ file://single-click.patch;patch=1 \ - file://menu-styling.patch;patch=1" + file://menu-styling.patch;patch=1 \ + file://compile-against-newer-glib.patch;patch=1" inherit autotools pkgconfig @@ -53,6 +54,13 @@ EXTRA_OECONF = "--without-libtiff --disable-xkb --disable-glibtest --enable-disp LIBV = "2.4.0" +do_configure_prepend() { + for i in `find . -name "Makefile.am"` + do + sed -e -i s,-DG_DISABLE_DEPRECATED,-DSED_ROCKS_DUDES, $i + done +} + do_stage () { oe_libinstall -so -C gtk libgtk-x11-2.0 ${STAGING_LIBDIR} oe_libinstall -so -C gdk libgdk-x11-2.0 ${STAGING_LIBDIR} diff --git a/packages/linux/linux-epia-2.6.19.2/epia_defconfig b/packages/linux/linux-epia-2.6.19.2/epia_defconfig index 3cb0893080..db84c236cb 100644 --- a/packages/linux/linux-epia-2.6.19.2/epia_defconfig +++ b/packages/linux/linux-epia-2.6.19.2/epia_defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.19.2 -# Fri Jan 19 21:02:53 2007 +# Fri Jan 26 11:55:32 2007 # CONFIG_X86_32=y CONFIG_GENERIC_TIME=y @@ -343,7 +343,7 @@ CONFIG_SYN_COOKIES=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set -CONFIG_INET_XFRM_TUNNEL=y +# CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set CONFIG_INET_XFRM_MODE_TRANSPORT=y CONFIG_INET_XFRM_MODE_TUNNEL=y @@ -996,7 +996,14 @@ CONFIG_AGP=y # CONFIG_AGP_SWORKS is not set CONFIG_AGP_VIA=y # CONFIG_AGP_EFFICEON is not set -# CONFIG_DRM is not set +CONFIG_DRM=y +# CONFIG_DRM_TDFX is not set +# CONFIG_DRM_R128 is not set +# CONFIG_DRM_RADEON is not set +# CONFIG_DRM_MGA is not set +# CONFIG_DRM_SIS is not set +CONFIG_DRM_VIA=y +# CONFIG_DRM_SAVAGE is not set # CONFIG_MWAVE is not set # CONFIG_PC8736x_GPIO is not set # CONFIG_NSC_GPIO is not set @@ -1058,7 +1065,6 @@ CONFIG_I2C_VIAPRO=m # CONFIG_SENSORS_DS1337 is not set # CONFIG_SENSORS_DS1374 is not set # CONFIG_SENSORS_EEPROM is not set -CONFIG_SENSORS_VT1211=m # CONFIG_SENSORS_PCF8574 is not set # CONFIG_SENSORS_PCA9539 is not set # CONFIG_SENSORS_PCF8591 is not set @@ -1117,6 +1123,7 @@ CONFIG_HWMON_VID=m # CONFIG_SENSORS_SMSC47M192 is not set # CONFIG_SENSORS_SMSC47B397 is not set # CONFIG_SENSORS_VIA686A is not set +CONFIG_SENSORS_VT1211=m # CONFIG_SENSORS_VT8231 is not set # CONFIG_SENSORS_W83781D is not set # CONFIG_SENSORS_W83791D is not set diff --git a/packages/linux/linux-epia_2.6.19.2.bb b/packages/linux/linux-epia_2.6.19.2.bb index a52f512c12..87d61b0226 100644 --- a/packages/linux/linux-epia_2.6.19.2.bb +++ b/packages/linux/linux-epia_2.6.19.2.bb @@ -1,7 +1,7 @@ SECTION = "kernel" DESCRIPTION = "Linux kernel for VIA EPiA" LICENSE = "GPL" -PR = "r0" +PR = "r1" KERNEL_CCSUFFIX = "-3.3.4" diff --git a/packages/linux/linux-hackndev-2.6/palmz72/defconfig b/packages/linux/linux-hackndev-2.6/palmz72/defconfig index fa582f0deb..db628a2424 100644 --- a/packages/linux/linux-hackndev-2.6/palmz72/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmz72/defconfig @@ -212,7 +212,6 @@ CONFIG_XSCALE_PMU=y CONFIG_PREEMPT=y # CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 -# CONFIG_AEABI is not set # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -541,13 +540,6 @@ CONFIG_PPP=y # CONFIG_INPUT=y -# -# Userland interfaces -# -CONFIG_INPUT_MOUSEDEV=y -CONFIG_INPUT_MOUSEDEV_PSAUX=y -CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=320 # CONFIG_INPUT_JOYDEV is not set CONFIG_INPUT_TSDEV=y CONFIG_INPUT_TSDEV_SCREEN_X=320 diff --git a/packages/lirc/lirc-modules_0.8.1.bb b/packages/lirc/lirc-modules_0.8.1.bb new file mode 100644 index 0000000000..0ef3713276 --- /dev/null +++ b/packages/lirc/lirc-modules_0.8.1.bb @@ -0,0 +1,42 @@ +DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls. This package contains the lirc kernel modules." +SECTION = "base" +PRIORITY = "optional" +HOMEPAGE = "http://www.lirc.org" +LICENSE = "GPL" +DEPENDS = "virtual/kernel fakeroot-native setserial" +RDEPENDS_nslu2 = "setserial" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz" +S = "${WORKDIR}/lirc-${PV}" + +inherit autotools module + +require lirc-config.inc + +MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e' -C drivers" + +fakeroot do_install() { + oe_runmake -C drivers DESTDIR="${D}" moduledir="/lib/modules/${KERNEL_VERSION}/lirc" install + rm -rf ${D}/dev +} + +# nslu2 uses udev, so /dev/lirc0 will be created automatically +# and /dev/lirc will be created by /etc/udev/rules.d/lirc.rules +# (that's the kernel-2.6+udev solution) +do_install_append_nslu2() { + install -d ${D}${sysconfdir}/modutils/ + echo 'lirc_serial' > ${D}${sysconfdir}/modutils/lirc_serial + install -d ${D}${sysconfdir}/modprobe.d/ + echo 'install lirc_serial /bin/setserial /dev/ttyS1 uart none; /sbin/leds ready on; /sbin/modprobe --ignore-install lirc_serial' >${D}${sysconfdir}/modprobe.d/lirc_serial + install -d ${D}${sysconfdir}/udev/rules.d/ + echo 'KERNEL="lirc0", SYMLINK="lirc"' > ${D}${sysconfdir}/udev/rules.d/lirc.rules +} + +# this is for distributions that don't use udev +pkg_postinst_append() { +if [ ! -c $D/dev/lirc -a ! -f /sbin/udevd ]; then mknod $D/dev/lirc c 61 0; fi +} + +FILES_${PN} = "/lib/modules" +FILES_${PN}_append_nslu2 = " ${sysconfdir}/modutils ${sysconfdir}/modprobe.d ${sysconfdir}/udev/rules.d" diff --git a/packages/mesa/mesa-6.0.1/.mtn2git_empty b/packages/mesa/mesa-6.0.1/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mesa/mesa-6.0.1/.mtn2git_empty diff --git a/packages/mesa/Make-config.patch b/packages/mesa/mesa-6.0.1/Make-config.patch index cfe8890e3b..cfe8890e3b 100644 --- a/packages/mesa/Make-config.patch +++ b/packages/mesa/mesa-6.0.1/Make-config.patch diff --git a/packages/mesa/mklib.patch b/packages/mesa/mesa-6.0.1/mklib.patch index 7dc1ec76a7..7dc1ec76a7 100644 --- a/packages/mesa/mklib.patch +++ b/packages/mesa/mesa-6.0.1/mklib.patch diff --git a/packages/mesa/mesa-6.5.2/.mtn2git_empty b/packages/mesa/mesa-6.5.2/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/mesa/mesa-6.5.2/.mtn2git_empty diff --git a/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch b/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch new file mode 100644 index 0000000000..e59513abfe --- /dev/null +++ b/packages/mesa/mesa-6.5.2/mklib-rpath-link.patch @@ -0,0 +1,23 @@ +--- Mesa/bin/mklib.orig 2006-06-04 20:56:22.000000000 -0600 ++++ Mesa/bin/mklib 2006-06-04 20:57:04.000000000 -0600 +@@ -98,6 +98,9 @@ + -L*) + DEPS="$DEPS $1" + ;; ++ -Wl*) ++ DEPS="$DEPS $1" ++ ;; + '-cplusplus') + CPLUSPLUS=1 + ;; +--- Mesa-6.5.2/configs/default.old 2007-01-26 11:49:32.000000000 +0000 ++++ Mesa-6.5.2/configs/default 2007-01-26 11:49:49.000000000 +0000 +@@ -73,7 +73,7 @@ + GLU_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -lm + GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lX11 -lXmu -lXt -lXi -lm + GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) $(EXTRA_LIB_PATH) -lXt -lX11 +-APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm ++APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) $(EXTRA_LIB_PATH) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm + + + diff --git a/packages/mesa/mesa_6.5.2.bb b/packages/mesa/mesa_6.5.2.bb new file mode 100644 index 0000000000..5cbc2bbc56 --- /dev/null +++ b/packages/mesa/mesa_6.5.2.bb @@ -0,0 +1,50 @@ +SECTION = "x11" + +SRC_URI = "${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${PV}.tar.bz2 \ + file://mklib-rpath-link.patch;patch=1" +S = "${WORKDIR}/Mesa-${PV}" + +LICENSE = "LGPL" + +RDEPENDS = "expat" +DEPENDS = "makedepend-native xf86vidmodeproto glproto virtual/libx11 libxext libxxf86vm libxi libxmu libice" + +PACKAGES =+ "libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev" + +FILES_libgl = "${libdir}/libGL.so.*" +FILES_libglu = "${libdir}/libGLU.so.*" +FILES_libosmesa = "${libdir}/libOSMesa.so.*" + +FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL" +FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h" +FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h" + +do_configure() { + cd configs + + ln -sf linux current + sed -e "s%CC *= *.*%CC = ${CC}%" -i current + sed -e "s%CXX *= *.*%CXX = ${CXX}%" -i current + sed -e "s%LD *= *.*%LD = ${LD}%" -i current + sed -e "s%OPT_FLAGS *= *.*%OPT_FLAGS = ${TARGET_CFLAGS}%" -i current + sed -e "s%X11_INCLUDES *= *.*%X11_INCLUDES = -I${STAGING_INCDIR}/X11%" -i current + sed -e "s%EXTRA_LIB_PATH *= *.*%EXTRA_LIB_PATH = ${LDFLAGS}%" -i current + sed -i s:\$\(CC\):gcc:g ../src/mesa/x86/Makefile + echo "SRC_DIRS = mesa glu glut/glx" >> current +} + +do_compile() { + oe_runmake default +} + +do_install() { + install -d ${D}${libdir} + cp -pP lib/* ${D}${libdir}/ + install -d ${D}${includedir} + cp -R include/GL ${D}${includedir}/ +} + +do_stage() { + cp -pP lib/* ${STAGING_LIBDIR}/ + cp -R include/GL ${STAGING_INCDIR}/ +} diff --git a/packages/tasks/task-mythfront.bb b/packages/tasks/task-mythfront.bb index c1a92c708c..a2a38ae338 100644 --- a/packages/tasks/task-mythfront.bb +++ b/packages/tasks/task-mythfront.bb @@ -1,11 +1,11 @@ PACKAGES = "${PN}" DESCRIPTION = "Meta-package for MythTV diskless frontend" ALLOW_EMPTY = "1" -PR = "r10" +PR = "r11" -RDEPENDS = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t. mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd drm-module-drm font-cursor-misc font-misc-misc xf86-input-keyboard xf86-input-mouse" +RDEPENDS = "xserver-xorg mythtv-frontend mythtv-filters mythtv-theme-g.a.n.t. mythtv-theme-default lirc lirc-modules ttf-bitstream-vera fontconfig-utils setserial snes9x ntp mythfront-config gpe-dm mythfront-session bootlogd font-cursor-misc font-misc-misc xf86-input-keyboard xf86-input-mouse" -RDEPENDS_append_epia = " xf86-video-via drm-module-via" +RDEPENDS_append_epia = " xf86-video-via" LICENSE = "MIT" diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index b1cbd5c472..3aa3aaf3c6 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -5,6 +5,8 @@ LICENSE = "MIT-X" RPROVIDES_${PN} = "virtual/xserver" PROVIDES = "virtual/xserver" +MESA_VER ?= "6.5" + DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \ xf86driproto drm glproto randrproto renderproto fixesproto damageproto \ xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ @@ -18,13 +20,14 @@ RDEPENDS_${PN} = "rgb" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/${@bb.data.getVar('PV', d, 1)[0:7]}/src/xserver/${XORG_PN}-${PV}.tar.bz2 \ + ${SOURCEFORGE_MIRROR}/mesa3d/MesaLib-${MESA_VER}.tar.bz2 \ file://xorg.conf" S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -EXTRA_OECONF = "--disable-builddocs" +EXTRA_OECONF = "--disable-builddocs --with-mesa-source=${WORKDIR}/Mesa-${MESA_VER}" PACKAGES =+ "${PN}-xprint ${PN}-xvfb ${PN}-utils ${PN}-xnest ${PN}-dmx" diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb index 57d57fda84..e91a50a603 100644 --- a/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb +++ b/packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb @@ -1,6 +1,6 @@ require xorg-xserver-common.inc -PR = "r2" +PR = "r3" #DESCRIPTION = "" diff --git a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb index 6ee935a21e..3c29684394 100644 --- a/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb +++ b/packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb @@ -2,7 +2,7 @@ require xorg-xserver-common.inc SRC_URI += "file://drmfix.patch;patch=1" -PR = "r2" +PR = "r3" EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " |