diff options
| author | Phil Blundell <philb@gnu.org> | 2007-01-25 17:57:09 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2007-01-25 17:57:09 +0000 |
| commit | 1da45933698256b4dd8024aaa9c5f9ef76d82cf8 (patch) | |
| tree | e24f28915f89bb8658b9d07b415b39e038e039d7 | |
| parent | 34ba4b814e7922e6d32adaa76ec00001a977ddd7 (diff) | |
| parent | 10347e09692baa998b8be76ce139f214292e2eb1 (diff) | |
merge of 'a168d537f470c511ba24d39191d37b97fb4bf2c2'
and 'ee5fc7606ee238c94493b08405d3802b6f550a5b'
| -rw-r--r-- | packages/tasks/task-mythfront.bb | 4 | ||||
| -rw-r--r-- | packages/xorg-xserver/xorg-xserver-common.inc | 5 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_X11R7.0-1.0.1.bb | 2 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_X11R7.1-1.1.0.bb | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/packages/tasks/task-mythfront.bb b/packages/tasks/task-mythfront.bb index 459b67fd79..c1a92c708c 100644 --- a/packages/tasks/task-mythfront.bb +++ b/packages/tasks/task-mythfront.bb @@ -1,9 +1,9 @@ PACKAGES = "${PN}" DESCRIPTION = "Meta-package for MythTV diskless frontend" ALLOW_EMPTY = "1" -PR = "r8" +PR = "r10" -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 xf86-input-evdev" +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_append_epia = " xf86-video-via drm-module-via" diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index 68e39826c0..b1cbd5c472 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -2,7 +2,7 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/base" LICENSE = "MIT-X" -RPROVIDES = "virtual/xserver" +RPROVIDES_${PN} = "virtual/xserver" PROVIDES = "virtual/xserver" DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \ @@ -14,7 +14,7 @@ resourceproto xineramaproto xtrans evieext libxkbfile libxfont libxau \ libfontenc libxdmcp libxxf86vm libxaw libxmu libxt libxpm libxext libx11 \ libxkbui libxxf86misc libxi libdmx libxtst libxres mesa mkfontscale-native" -RDEPENDS="rgb" +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 \ @@ -24,7 +24,6 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig - EXTRA_OECONF = "--disable-builddocs" 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 06270e4316..57d57fda84 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 = "r1" +PR = "r2" #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 acf1f2abb0..6ee935a21e 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 = "r1" +PR = "r2" EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " |