From 00fa1c64ca8be8f14d3420d97654419625602f53 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Tue, 13 Jan 2009 18:26:08 +0100 Subject: xserver-(kdrive,xorg): versions newer then 1.3.0.0 require HAL also on device Moved hal dependency from angstrom-x11-base-depends into xservers. --- packages/angstrom/angstrom-x11-base-depends.bb | 5 ++--- packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb | 3 ++- packages/xorg-xserver/xserver-kdrive_1.4.2.bb | 3 ++- packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb | 3 ++- packages/xorg-xserver/xserver-kdrive_1.4.bb | 3 ++- packages/xorg-xserver/xserver-kdrive_1.5.3.bb | 2 ++ packages/xorg-xserver/xserver-xorg_1.4.2.bb | 3 ++- packages/xorg-xserver/xserver-xorg_1.4.bb | 3 ++- packages/xorg-xserver/xserver-xorg_1.5.1.bb | 3 ++- packages/xorg-xserver/xserver-xorg_1.5.3.bb | 3 ++- 10 files changed, 20 insertions(+), 11 deletions(-) (limited to 'packages') diff --git a/packages/angstrom/angstrom-x11-base-depends.bb b/packages/angstrom/angstrom-x11-base-depends.bb index 6c4c19d807..cbad108680 100644 --- a/packages/angstrom/angstrom-x11-base-depends.bb +++ b/packages/angstrom/angstrom-x11-base-depends.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for the Angstrom distribution" -PR = "r41" +PR = "r42" inherit task @@ -11,8 +11,7 @@ DEPENDS = "virtual/xserver" RDEPENDS = "\ ${XSERVER} \ - hal \ - dbus-x11 \ + dbus-x11 \ ttf-dejavu-sans \ ttf-dejavu-sans-mono \ " diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb index 5caec02a7b..70503d749c 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.4.0.90.bb @@ -1,9 +1,10 @@ require xserver-kdrive-common.inc DEPENDS += "hal libxkbfile libxcalibrate pixman" +RDEPENDS += "hal" PE = "1" -PR = "r4" +PR = "r5" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.2.bb b/packages/xorg-xserver/xserver-kdrive_1.4.2.bb index 922d8f58f3..e6e791ad4f 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.4.2.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.4.2.bb @@ -1,9 +1,10 @@ require xserver-kdrive-common.inc DEPENDS += "hal libxkbfile libxcalibrate pixman" +RDEPENDS += "hal" PE = "1" -PR = "r2" +PR = "r3" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb b/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb index 04470d3d9a..161390179d 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.4.99.901.bb @@ -1,11 +1,12 @@ require xserver-kdrive-common.inc DEPENDS += "hal libxkbfile libxcalibrate pixman" +RDEPENDS += "hal" DEFAULT_PREFERENCE = "-99" PE = "1" -PR = "r3" +PR = "r4" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.bb b/packages/xorg-xserver/xserver-kdrive_1.4.bb index 5a46d7dd17..e792c84ce0 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.4.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.4.bb @@ -1,9 +1,10 @@ require xserver-kdrive-common.inc DEPENDS += "hal libxkbfile libxcalibrate pixman" +RDEPENDS += "hal" PE = "1" -PR = "r5" +PR = "r6" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/packages/xorg-xserver/xserver-kdrive_1.5.3.bb b/packages/xorg-xserver/xserver-kdrive_1.5.3.bb index ce0d9e1638..686826eca3 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.5.3.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.5.3.bb @@ -1,10 +1,12 @@ require xserver-kdrive-common.inc DEPENDS += "hal libxkbfile libxcalibrate pixman" +RDEPENDS += "hal" DEFAULT_PREFERENCE = "-99" PE = "1" +PR = "r1" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ diff --git a/packages/xorg-xserver/xserver-xorg_1.4.2.bb b/packages/xorg-xserver/xserver-xorg_1.4.2.bb index 852e847265..2c4f3d8716 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.2.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.2.bb @@ -2,8 +2,9 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" +RDEPENDS += "hal" PE = "1" -PR = "r10" +PR = "r11" 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 ba64d72d35..cb9ddcd9d3 100644 --- a/packages/xorg-xserver/xserver-xorg_1.4.bb +++ b/packages/xorg-xserver/xserver-xorg_1.4.bb @@ -2,8 +2,9 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman" +RDEPENDS += "hal" PE = "1" -PR = "r8" +PR = "r9" SRC_URI += "file://drmfix.patch;patch=1 \ file://pkgconfig_fix.patch;patch=1 \ diff --git a/packages/xorg-xserver/xserver-xorg_1.5.1.bb b/packages/xorg-xserver/xserver-xorg_1.5.1.bb index 2e21fbdd1c..d4b8caffa0 100644 --- a/packages/xorg-xserver/xserver-xorg_1.5.1.bb +++ b/packages/xorg-xserver/xserver-xorg_1.5.1.bb @@ -2,8 +2,9 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl" +RDEPENDS += "hal" PE = "1" -PR = "r2" +PR = "r3" SRC_URI += "file://drmfix.patch;patch=1 \ file://sysroot_fix.patch;patch=1" diff --git a/packages/xorg-xserver/xserver-xorg_1.5.3.bb b/packages/xorg-xserver/xserver-xorg_1.5.3.bb index 1402c8e653..79df5b3bf2 100644 --- a/packages/xorg-xserver/xserver-xorg_1.5.3.bb +++ b/packages/xorg-xserver/xserver-xorg_1.5.3.bb @@ -2,8 +2,9 @@ require xorg-xserver-common.inc DESCRIPTION = "the X.Org X server" DEPENDS += "pixman libpciaccess openssl" +RDEPENDS += "hal" PE = "2" -PR = "r3" +PR = "r4" SRC_URI += "file://drmfix.patch;patch=1 \ file://sysroot_fix.patch;patch=1" -- cgit v1.2.3