diff options
| author | Philipp Zabel <philipp.zabel@gmail.com> | 2008-03-13 21:36:48 +0000 |
|---|---|---|
| committer | Philipp Zabel <philipp.zabel@gmail.com> | 2008-03-13 21:36:48 +0000 |
| commit | eaba7389f65a007c3cee55e0ba1f260e7aa6a0f7 (patch) | |
| tree | 817196023205ecf830d468c49d2882d4e5f607c1 /packages | |
| parent | 4fc1def46d15bbb899ab003df07a4b0f472d01bb (diff) | |
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
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/xorg-xserver/files/pkgconfig_fix.patch (renamed from packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch) | 2 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg-1.4/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg-1.4/drmfix.patch | 13 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_1.4.bb | 14 |
4 files changed, 28 insertions, 1 deletions
diff --git a/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch b/packages/xorg-xserver/files/pkgconfig_fix.patch index 0790d4c32b..e75e209cbe 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.4/pkgconfig_fix.patch +++ b/packages/xorg-xserver/files/pkgconfig_fix.patch @@ -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} 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 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-1.4/.mtn2git_empty 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 " |