Merge libdrm-glamo_git directly to libdrm_git.
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 Merge libdrm-glamo_git directly to libdrm_git.
--- conf/distro/include/sane-srcrevs.inc | 1 + recipes/dri/libdrm-glamo_git.bb | 17 ----------------- recipes/dri/libdrm_git.bb | 19 +++++++++++++++++++ 4 files changed, 30 insertions(+), 19 deletions(-) delete mode 100644 recipes/dri/libdrm-glamo_git.bb create mode 100644 recipes/dri/libdrm_git.bb
conf/distro/include/sane-srcrevs.inc +1 -0
@@ -80,6 +80,7 @@ SRCREV_pn-intuition ?= "194" SRCREV_pn-kismet ?= "2285" SRCREV_pn-kismet-newcore ?= "2285" SRCREV_pn-libcalenabler2 ?= "1410" +SRCREV_pn-libdrm ?= " a107e5b12960f64722bff424502a4fc0ad33dc8f" SRCREV_pn-libefso ?= "194" SRCREV_pn-libexalt ?= "78" SRCREV_pn-libexalt-dbus ?= "76"
recipes/dri/libdrm-glamo_git.bb deleted +0 -17
@@ -1,17 +0,0 @@ -SECTION = "x11/base" -LICENSE = "MIT" -SRC_URI = "git://git.bitwiz.org.uk/libdrm.git;protocol=git;branch=glamo" -PROVIDES = "drm" -DEPENDS = "libpthread-stubs virtual/kernel" - -PV=2.4.4+gitr${SRCPV} - -DEFAULT_PREFERENCE = "-1" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -do_stage() { - autotools_stage_all -}
recipes/dri/libdrm_git.bb new file +19 -0
@@ -0,0 +1,19 @@ +SECTION = "x11/base" +LICENSE = "MIT" +SRC_URI = "git://anongit.freedesktop.org/mesa/drm;protocol=git;branch=master" +SRC_URI_om-gta02 = "git://git.bitwiz.org.uk/libdrm.git;protocol=git;branch=glamo" +PROVIDES = "drm" +DEPENDS = "libpthread-stubs virtual/kernel" + +PV=2.4.15+gitr${SRCREV} + +DEFAULT_PREFERENCE = "-1" +DEFAULT_PREFERENCE_om-gta02 = "1" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +}
Signature · 1 line
1.6.5.rc2
PATCH 2/2 Add missing patch for xorg-xserver
--- .../xorg-xserver/xserver-xorg-1.7.0/dolt-fix.patch | 21 ++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) create mode 100644 recipes/xorg-xserver/xserver-xorg-1.7.0/dolt-fix.patch
recipes/xorg-xserver/xserver-xorg-1.7.0/dolt-fix.patch new file +21 -0
@@ -0,0 +1,21 @@ +Index: xorg-server/m4/dolt.m4 +=================================================================== +--- xorg-server/m4/dolt.m4 2009-04-14 21:14:56.000000000 +0400 ++++ xorg-server-2/m4/dolt.m4 2009-07-15 12:38:33.796848843 +0400 +@@ -147,7 +147,7 @@ + cat <<__DOLTLIBTOOL__EOF__ > doltlibtool + #!$DOLT_BASH + __DOLTLIBTOOL__EOF__ +- cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool ++ cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool + top_builddir_slash="${0%%doltlibtool}" + : ${top_builddir_slash:=./} + args=() +@@ -163,7 +163,7 @@ + if $modeok && $tagok ; then + . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}" + else +- exec ${top_builddir_slash}libtool "$[]@" ++ exec ${top_builddir_slash}@host_alias@-libtool "$[]@" + fi + __DOLTLIBTOOL__EOF__
Signature · 1 line
1.6.5.rc2