From eaba7389f65a007c3cee55e0ba1f260e7aa6a0f7 Mon Sep 17 00:00:00 2001
From: Philipp Zabel <philipp.zabel@gmail.com>
Date: Thu, 13 Mar 2008 21:36:48 +0000
Subject: xorg-xserver: add xserver-xorg 1.4, fix pkgconfig_fix.patch and move
 it to have it used by both xserver-kdrive and xserver-xorg 1.4

---
 packages/xorg-xserver/files/pkgconfig_fix.patch            | 13 +++++++++++++
 .../xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch    | 13 -------------
 packages/xorg-xserver/xserver-xorg-1.4/.mtn2git_empty      |  0
 packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch        | 13 +++++++++++++
 packages/xorg-xserver/xserver-xorg_1.4.bb                  | 14 ++++++++++++++
 5 files changed, 40 insertions(+), 13 deletions(-)
 create mode 100644 packages/xorg-xserver/files/pkgconfig_fix.patch
 delete mode 100644 packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
 create mode 100644 packages/xorg-xserver/xserver-xorg-1.4/.mtn2git_empty
 create mode 100644 packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch
 create mode 100644 packages/xorg-xserver/xserver-xorg_1.4.bb

diff --git a/packages/xorg-xserver/files/pkgconfig_fix.patch b/packages/xorg-xserver/files/pkgconfig_fix.patch
new file mode 100644
index 0000000000..e75e209cbe
--- /dev/null
+++ b/packages/xorg-xserver/files/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-1
+ Version: @PACKAGE_VERSION@
+-Cflags: -I${sdkdir} @PIXMAN_CFLAGS@
++Cflags: -I${sdkdir}
+ Libs: -L${libdir}
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch b/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
deleted file mode 100644
index 0790d4c32b..0000000000
--- a/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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-xorg-1.4/.mtn2git_empty b/packages/xorg-xserver/xserver-xorg-1.4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch b/packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch
new file mode 100644
index 0000000000..a62a767f23
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch
@@ -0,0 +1,13 @@
+Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am
+===================================================================
+--- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am	2007-08-23 21:04:53.000000000 +0200
++++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am	2008-03-13 18:27:23.000000000 +0100
+@@ -41,7 +41,7 @@
+ 
+ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+ 
+-INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack
++INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
+ 
+ # FIXME: These need to be added to the build
+ LNX_EXTRA_SRCS = \
diff --git a/packages/xorg-xserver/xserver-xorg_1.4.bb b/packages/xorg-xserver/xserver-xorg_1.4.bb
new file mode 100644
index 0000000000..b89be011fa
--- /dev/null
+++ b/packages/xorg-xserver/xserver-xorg_1.4.bb
@@ -0,0 +1,14 @@
+require xorg-xserver-common.inc
+
+DESCRIPTION = "the X.Org X server"
+DEPENDS += "pixman"
+PE = "1"
+
+SRC_URI += "file://drmfix.patch;patch=1 \
+            file://pkgconfig_fix.patch;patch=1"
+
+MESA_VER = "7.0.2"
+
+EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no "
+
+export LDFLAGS += " -ldl "
-- 
cgit v1.2.3