summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-02-29 15:57:59 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-02-29 15:57:59 +0000
commite69abd79c3b8104a1b44cf40be7a60a9d1ed9c12 (patch)
tree5860a185b6292e7ed8017d30a05fe69837a236fd
parentf0db03f5fa5e65e1d7f097c98063f644503b4940 (diff)
xorg-xserver-1.4: Fix pkgconfig file
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch13
-rw-r--r--packages/xorg-xserver/xserver-kdrive_1.4.bb3
2 files changed, 15 insertions, 1 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch b/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
new file mode 100644
index 0000000000..0790d4c32b
--- /dev/null
+++ b/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/xorg-server.pc.in
+===================================================================
+--- xorg-server-1.4.orig/xorg-server.pc.in 2008-02-29 12:29:02.000000000 +0000
++++ xorg-server-1.4/xorg-server.pc.in 2008-02-29 12:27:36.000000000 +0000
+@@ -7,6 +7,7 @@
+
+ Name: xorg-server
+ Description: Modular X.Org X Server
++Requires: pixman
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${sdkdir} @PIXMAN_CFLAGS@
++Cflags: -I${sdkdir}
+ Libs: -L${libdir}
diff --git a/packages/xorg-xserver/xserver-kdrive_1.4.bb b/packages/xorg-xserver/xserver-kdrive_1.4.bb
index c87090197c..30ae4a2e3d 100644
--- a/packages/xorg-xserver/xserver-kdrive_1.4.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.4.bb
@@ -3,7 +3,7 @@ require xserver-kdrive-common.inc
DEPENDS += "hal libxkbfile libxcalibrate pixman"
PE = "1"
-PR = "r3"
+PR = "r4"
SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
${KDRIVE_COMMON_PATCHES} \
@@ -22,6 +22,7 @@ SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
file://fbdev-evdev.patch;patch=1 \
file://keyboard-resume-workaround.patch;patch=1 \
file://xorg-avr32-support.diff;patch=1 \
+ file://pkgconfig_fix.patch;patch=1 \
"
S = "${WORKDIR}/xorg-server-${PV}"