diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-09-12 16:18:38 +0100 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2015-09-21 14:40:06 +0000 |
| commit | a6c2568197f2ac2d8ba3c4e08cd3558fa9a344c1 (patch) | |
| tree | 3539db1ade825a0536b6b5be02dafc4fa2a7394d | |
| parent | aed14945e1e168e60c2e80cb06ce404f6a5e6d3b (diff) | |
| download | definitions-a6c2568197f2ac2d8ba3c4e08cd3558fa9a344c1.tar.gz | |
strata/libdrm-common: Upgrade to 2.4.64
No hacks for tegra are needed anymore as everything has been merged
upstream in 2.4.62
Also remove --enable-freedreno-experimental-api, as freedreno is
stable now
Change-Id: Ic2d5e94e8601229422f470be4ed4215f894417b4
| -rw-r--r-- | strata/libdrm-common.morph | 4 | ||||
| -rw-r--r-- | strata/libdrm-common/drm.morph | 16 |
2 files changed, 5 insertions, 15 deletions
diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index affa2dae..d4da4408 100644 --- a/strata/libdrm-common.morph +++ b/strata/libdrm-common.morph @@ -11,7 +11,7 @@ chunks: - name: drm repo: upstream:drm morph: strata/libdrm-common/drm.morph - ref: 5f7b6723e1bed755c230817eea0563bab5b2a8a7 - unpetrify-ref: libdrm-2.4.60 + ref: ab2fadabde3829b1ec56bd4756165dd9bd281488 + unpetrify-ref: libdrm-2.4.64 build-depends: - xorg-lib-libpciaccess diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph index 4b0bdcc1..acb0f061 100644 --- a/strata/libdrm-common/drm.morph +++ b/strata/libdrm-common/drm.morph @@ -1,17 +1,7 @@ name: drm kind: chunk build-system: autotools -pre-configure-commands: - # Tegra requires a new coherent BO attribute, not currently upstream, so - # patch it here - - sed -i '/NOUVEAU_GEM_DOMAIN_MAPPABLE (1 << 3)/a#define NOUVEAU_GEM_DOMAIN_COHERENT (1 - << 4)' include/drm/nouveau_drm.h - - | - sed -i '/info->domain |= NOUVEAU_GEM_DOMAIN_MAPPABLE;/a\ - if (bo->flags & NOUVEAU_BO_COHERENT)\ - info->domain |= NOUVEAU_GEM_DOMAIN_COHERENT;' nouveau/abi16.c - - sed -i '/NOUVEAU_BO_NOSNOOP 0x20000000/a#define NOUVEAU_BO_COHERENT 0x10000000' - nouveau/nouveau.h configure-commands: -- NOCONFIGURE=1 ./autogen.sh -- ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api +- | + ./autogen.sh --prefix="$PREFIX" \ + --enable-tegra-experimental-api |