diff options
| author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-08-19 11:44:29 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2007-08-19 11:44:29 +0000 |
| commit | 3d20eb666d9b30cb286156bdd30ebaaf396f2116 (patch) | |
| tree | 92c8031bc4c0f526c5a236e6994a005332611c57 | |
| parent | 3749fb97fb897e5ce64df385a0940a71c7fd3e92 (diff) | |
| parent | 8f66510f0c7a19fe3d427a7d5d346b595fa35197 (diff) | |
merge of '470abd3e031218485cbc8e340327fcfa663ed504'
and 'e3172af4d60e901a6bd89e3e56ad6e04471826d1'
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg-1.3.0.0/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch | 11 | ||||
| -rw-r--r-- | packages/xorg-xserver/xserver-xorg_1.3.0.0.bb | 3 |
3 files changed, 14 insertions, 0 deletions
diff --git a/packages/xorg-xserver/xserver-xorg-1.3.0.0/.mtn2git_empty b/packages/xorg-xserver/xserver-xorg-1.3.0.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-1.3.0.0/.mtn2git_empty diff --git a/packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch b/packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch new file mode 100644 index 0000000000..96924484af --- /dev/null +++ b/packages/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch @@ -0,0 +1,11 @@ +--- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am ++++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am +@@ -38,7 +38,7 @@ + + AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(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_SOURCES = \ diff --git a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb index 78fdc01b46..b04ef19038 100644 --- a/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb +++ b/packages/xorg-xserver/xserver-xorg_1.3.0.0.bb @@ -2,6 +2,9 @@ MESA_VER = "6.5.2" require xorg-xserver-common.inc PE = "1" +PR = "r1" + +SRC_URI += "file://drmfix.patch;patch=1" EXTRA_OECONF += " ac_cv_file__usr_share_X11_sgml_defs_ent=no " |