diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-25 11:08:48 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-25 11:08:48 +0100 |
commit | e28023a472ba1c3ee2be2d615c90e7d5dc4b5929 (patch) | |
tree | 8f94b8b9f9dd6e14d217eee369a7cae1d6911396 /strata | |
parent | 3cf8034029b258b76fdd588977fa9931ac6e7d0d (diff) | |
parent | 16d7c5526e09a764208df26398af61efd49ba02d (diff) | |
download | definitions-e28023a472ba1c3ee2be2d615c90e7d5dc4b5929.tar.gz |
Merge remote-tracking branch 'gitorious/jjardon/mesa'
Reviewed-By: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk>
Diffstat (limited to 'strata')
-rw-r--r-- | strata/mesa-common.morph | 4 | ||||
-rw-r--r-- | strata/mesa-common/mesa.morph | 4 | ||||
-rw-r--r-- | strata/x-common.morph | 20 |
3 files changed, 23 insertions, 5 deletions
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index b5a3ec6c..6a84aa8e 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -5,6 +5,8 @@ build-depends: - morph: strata/wayland-generic.morph chunks: - name: mesa + morph: strata/mesa-common/mesa.morph repo: upstream:mesa - ref: baserock/unified + ref: 1b12af300dfa77c24088780e88200703653293d3 + unpetrify-ref: mesa-10.3 build-depends: [] diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index 733e1b1f..44a9af85 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -6,10 +6,10 @@ configure-commands: cpu=$(echo $TARGET | cut -d '-' -f 1) case "$cpu" in x86_32|x64_64) - DRIDRIVERS=intel,i915,i965,swrast + DRIDRIVERS=i915,i965,swrast,nouveau ;; *) - DRIDRIVERS=swrast + DRIDRIVERS=swrast,nouveau ;; esac ./autogen.sh --prefix="$PREFIX" \ diff --git a/strata/x-common.morph b/strata/x-common.morph index 537569a2..20eb7c06 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -158,6 +158,16 @@ chunks: unpetrify-ref: baserock/morph build-depends: - xorg-util-macros +- name: xorg-proto-dri3proto + repo: upstream:xorg-proto-dri3proto + ref: 91df0f88b70c268f3580385a7b37543ab8c544c8 + build-depends: + - xorg-util-macros +- name: xorg-proto-presentproto + repo: upstream:xorg-proto-presentproto + ref: ef84007fc4a23d3897b4776906139de9d0698c2a + build-depends: + - xorg-util-macros - name: xcb-pthread-stubs repo: upstream:xcb-pthread-stubs ref: 431d2c0be218d878b9dd3862e4232243c599df4b @@ -170,6 +180,12 @@ chunks: unpetrify-ref: "1.11" build-depends: - xorg-util-macros +- name: xorg-lib-libxshmfence + repo: upstream:xorg-lib-libxshmfence + ref: 9c4f070e1304a3503cfab08f68573443025fc4c9 + build-depends: + - xorg-proto-x11proto + - xorg-util-macros - name: xorg-lib-libXau repo: upstream:xorg-lib-libXau ref: 1a8a1b2c68967b48c07b56142799b1020f017027 @@ -216,8 +232,8 @@ chunks: - xorg-util-macros - name: drm repo: upstream:drm - ref: 7ddc98f92f92560e2b52287ae8cf816ca4a057de - unpetrify-ref: baserock/libdrm-2.4.49 + ref: d6861609b2b887612d652bb2be7c39f199802937 + unpetrify-ref: libdrm-2.4.56 build-depends: - xcb-pthread-stubs - xorg-lib-libpciaccess |