diff options
| author | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-09-11 16:26:32 +0000 |
|---|---|---|
| committer | Daniel Silverstone <daniel.silverstone@codethink.co.uk> | 2014-09-11 16:26:32 +0000 |
| commit | cf770f5d4f6473fe127eb53d98daa3aca51d530b (patch) | |
| tree | 086b4f97f4c9e3403b6877410c1afcfe0a43b77d /strata | |
| parent | 6523c60a6e918d982ac378beef48e0d3dfa0603e (diff) | |
| download | definitions-cf770f5d4f6473fe127eb53d98daa3aca51d530b.tar.gz | |
Update GENIVI and related content a little, add Jetson GENIVI baseline
Diffstat (limited to 'strata')
| -rw-r--r-- | strata/weston-genivi.morph | 4 | ||||
| -rw-r--r-- | strata/x-common.morph | 21 | ||||
| -rw-r--r-- | strata/x-common/drm.morph | 20 |
3 files changed, 36 insertions, 9 deletions
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index 5d1c9ab1..9299d3ee 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -14,8 +14,8 @@ chunks: - name: weston morph: strata/weston-genivi/weston.morph repo: upstream:weston - ref: 8658e06e69cc3944e89684a2de619e479751633f - unpetrify-ref: baserock/genivi/baseline-h-1.1 + ref: ct-mcr-1/danielsilverstone/jetson-genivi + unpetrify-ref: 8658e06e69cc3944e89684a2de619e479751633f build-depends: - linux-pam - name: wayland-ivi-extension diff --git a/strata/x-common.morph b/strata/x-common.morph index a6791d48..a03bce85 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -21,7 +21,7 @@ chunks: build-depends: [] - name: xorg-util-macros repo: upstream:xorg-util-macros - ref: c98b41de5596c675c603ef43ae9570133f1a9921 + ref: 9a54b858601bd305de2737b06e609084a2a114c2 unpetrify-ref: baserock/morph build-depends: [] - name: xorg-proto-bigreqsproto @@ -30,6 +30,12 @@ chunks: unpetrify-ref: baserock/morph build-depends: - xorg-util-macros +- name: xorg-proto-presentproto + repo: upstream:xorg-proto-presentproto + ref: ef84007fc4a23d3897b4776906139de9d0698c2a + unpetrify-ref: master + build-depends: + - xorg-util-macros - name: xorg-proto-compositeproto repo: upstream:xorg-proto-compositeproto ref: 39738dbe9438dc80fc6b9e221d9ed26a6d42da6b @@ -176,8 +182,8 @@ chunks: - xorg-util-macros - name: xcb-proto repo: upstream:xcb-proto - ref: ca30e6d5d7a0c7618d988f9051026d250f5e124e - unpetrify-ref: baserock/morph + ref: 4b384d2a015c50d0e93dcacda4b8260a3fd37640 + unpetrify-ref: "1.11" build-depends: - xorg-util-macros - name: xorg-lib-libXau @@ -189,8 +195,8 @@ chunks: - xorg-util-macros - name: xcb-libxcb repo: upstream:xcb-libxcb - ref: 0dd8f8d26a758bc385e79d9239bf6ef2e3d7bf13 - unpetrify-ref: baserock/morph + ref: d1e8ec96fca4862f37ec9f0e9407bb989c4c161a + unpetrify-ref: "1.11" build-depends: - xcb-proto - xcb-pthread-stubs @@ -225,9 +231,10 @@ chunks: build-depends: - xorg-util-macros - name: drm + morph: strata/x-common/drm.morph repo: upstream:drm - ref: 7ddc98f92f92560e2b52287ae8cf816ca4a057de - unpetrify-ref: baserock/libdrm-2.4.49 + ref: ct-mcr-1/danielsilverstone/jetson-genivi + unpetrify-ref: 7ddc98f92f92560e2b52287ae8cf816ca4a057de build-depends: - xcb-pthread-stubs - xorg-lib-libpciaccess diff --git a/strata/x-common/drm.morph b/strata/x-common/drm.morph new file mode 100644 index 00000000..99cea8c0 --- /dev/null +++ b/strata/x-common/drm.morph @@ -0,0 +1,20 @@ +name: drm +kind: chunk +build-system: autotools +configure-commands: + - NOCONFIGURE=1 ./autogen.sh + - | + set -x + if test "$MORPH_ARCH" = "armv7lhf"; then + TEGRA=--enable-tegra-experimental-api + else + TEGRA= + fi + ./configure --prefix="$PREFIX" $TEGRA +install-commands: + - make install DESTDIR="$DESTDIR" + - | + if test -e tegra/libdrm_tegra.la; then + mkdir -p "$DESTDIR"/usr/lib/pkgconfig + /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig + fi |