summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-20 12:33:51 +0000
committerJavier Jardón <jjardon@gnome.org>2015-02-20 12:36:15 +0000
commit35d4a972537728c56d6d3763cede5560c3a09405 (patch)
treeead831d0be7f134fd9d6ce95d1daa5ca54bbb1aa
parent801facb2865b67b96032d36a9409a997e16945c2 (diff)
parente72db1c5cfadff68a28c273a6b417dae33b4a2df (diff)
downloaddefinitions-35d4a972537728c56d6d3763cede5560c3a09405.tar.gz
Merge branch 'baserock/jjardon/libdrm2_4_59'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk> Reviewed-By: Richard Maw <richard.maw@gmail.com> Reviewed-by: James Thomas <james.thomas@codethink.co.uk>
-rw-r--r--strata/libdrm-common.morph8
-rw-r--r--strata/libdrm-common/drm.morph4
2 files changed, 4 insertions, 8 deletions
diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph
index e364bab2..316bf483 100644
--- a/strata/libdrm-common.morph
+++ b/strata/libdrm-common.morph
@@ -5,13 +5,13 @@ build-depends:
chunks:
- name: xorg-lib-libpciaccess
repo: upstream:xorg-lib-libpciaccess
- ref: 3e17f069682a226c14bb29c802e776c6e39f7e8f
- unpetrify-ref: baserock/morph
+ ref: f99c2e4199ce37f6f94428df504427f67c3ec543
+ unpetrify-ref: libpciaccess-0.13.3
build-depends: []
- name: drm
repo: upstream:drm
morph: strata/libdrm-common/drm.morph
- ref: 83b2c40922ce451f5844aae0707ae9783a78d74f
- unpetrify-ref: baserock/drm_2.4.58/jetson
+ ref: d2e0f552467ca11162fe04dfed55de4590280f23
+ unpetrify-ref: libdrm-2.4.59
build-depends:
- xorg-lib-libpciaccess
diff --git a/strata/libdrm-common/drm.morph b/strata/libdrm-common/drm.morph
index d3d06fd8..d1a5381b 100644
--- a/strata/libdrm-common/drm.morph
+++ b/strata/libdrm-common/drm.morph
@@ -4,7 +4,3 @@ build-system: autotools
configure-commands:
- NOCONFIGURE=1 ./autogen.sh
- ./configure --prefix="$PREFIX" --enable-tegra-experimental-api --enable-freedreno-experimental-api
-install-commands:
- - make install DESTDIR="$DESTDIR"
- - mkdir -p "$DESTDIR"/usr/lib/pkgconfig
- - /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig