[oe-commits] org.oe.dev xorg-xserver: add xserver-xorg 1.4, fix pkgconfig_fix.patch and move it

[pH5 commit]

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

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 18293653fb0ec41c60cab9ca36df1dd7c1834880
ViewMTN: http://monotone.openembedded.org/revision/info/18293653fb0ec41c60cab9ca36df1dd7c1834880
Files:
1
packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch
packages/xorg-xserver/files/pkgconfig_fix.patch
packages/xorg-xserver/xserver-xorg-1.4
packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch
packages/xorg-xserver/xserver-xorg_1.4.bb
Diffs:

#
# mt diff -rc5ad3ae8a925c021ec7f72e2d48163eb2373b177 -r18293653fb0ec41c60cab9ca36df1dd7c1834880
#
#
#
# rename "packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch"
#     to "packages/xorg-xserver/files/pkgconfig_fix.patch"
# 
# add_dir "packages/xorg-xserver/xserver-xorg-1.4"
# 
# add_file "packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch"
#  content [1f677919202395a75968515302a556e50edaa142]
# 
# add_file "packages/xorg-xserver/xserver-xorg_1.4.bb"
#  content [390cc0513bf74cbc87ed0298fcaf45b4df70d20b]
# 
# patch "packages/xorg-xserver/files/pkgconfig_fix.patch"
#  from [c63f18a7b52ed2a806647ca314ea5f8e3bcf08f2]
#    to [901ea1fce771604e7c73a41df2ee265efa81dc53]
#
============================================================
--- packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch	1f677919202395a75968515302a556e50edaa142
+++ packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch	1f677919202395a75968515302a556e50edaa142
@@ -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 = \
============================================================
--- packages/xorg-xserver/xserver-xorg_1.4.bb	390cc0513bf74cbc87ed0298fcaf45b4df70d20b
+++ packages/xorg-xserver/xserver-xorg_1.4.bb	390cc0513bf74cbc87ed0298fcaf45b4df70d20b
@@ -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 "
============================================================
--- packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch	c63f18a7b52ed2a806647ca314ea5f8e3bcf08f2
+++ packages/xorg-xserver/files/pkgconfig_fix.patch	901ea1fce771604e7c73a41df2ee265efa81dc53
@@ -6,7 +6,7 @@ Index: xorg-server-1.4/xorg-server.pc.in
  
  Name: xorg-server
  Description: Modular X.Org X Server
-+Requires: pixman
++Requires: pixman-1
  Version: @PACKAGE_VERSION@
 -Cflags: -I${sdkdir} @PIXMAN_CFLAGS@
 +Cflags: -I${sdkdir}