summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOyvind Repvik <nail@nslu2-linux.org>2007-03-30 16:53:07 +0000
committerOyvind Repvik <nail@nslu2-linux.org>2007-03-30 16:53:07 +0000
commit88ebf69d40fad41b9a6bab4073cdb34960918dfa (patch)
tree31978e5b3fd8d95e4a3117071fe591841c85e2ae
parent5dcc8301f347b05837c88eb7a0d73acbd0900992 (diff)
parent0d34dd4e5c2135f24cdf7533b96f05c87d93a843 (diff)
merge of '08572570b3312090fa0da584f4b7b2272ac58cae'
and '1054ca4965286d532ebc6789997a44625d410958'
-rw-r--r--packages/dri/drm_cvs.bb18
-rw-r--r--packages/opie-init/opie-init_1.2.2.bb (renamed from packages/opie-init/opie-init_cvs.bb)1
-rw-r--r--packages/xorg-xserver/xorg-xserver-common.inc2
3 files changed, 1 insertions, 20 deletions
diff --git a/packages/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb
deleted file mode 100644
index 8e219880d0..0000000000
--- a/packages/dri/drm_cvs.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SECTION = "x11/base"
-LICENSE = "MIT"
-SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver"
-
-PV = "0.0+cvs${SRCDATE}"
-PR = "r3"
-
-S = "${WORKDIR}/drm"
-
-inherit autotools pkgconfig
-
-do_compile() {
- oe_runmake -C libdrm
-}
-
-do_stage() {
- autotools_stage_all
-}
diff --git a/packages/opie-init/opie-init_cvs.bb b/packages/opie-init/opie-init_1.2.2.bb
index b45baeb5ae..271ff62e51 100644
--- a/packages/opie-init/opie-init_cvs.bb
+++ b/packages/opie-init/opie-init_1.2.2.bb
@@ -1,5 +1,4 @@
require ${PN}.inc
-PV = "${OPIE_CVS_PV}"
PR = "r0"
SRC_URI = "file://opie-reorgfiles \
diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc
index fcfec6d4f7..634d6eb835 100644
--- a/packages/xorg-xserver/xorg-xserver-common.inc
+++ b/packages/xorg-xserver/xorg-xserver-common.inc
@@ -8,7 +8,7 @@ PROVIDES = "virtual/xserver"
MESA_VER ?= "6.5"
DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \
-xf86driproto drm glproto randrproto renderproto fixesproto damageproto \
+xf86driproto libdrm glproto randrproto renderproto fixesproto damageproto \
xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \
scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \
xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \