From 55947a0e551b3d6f3263b6a6cb0cc3abc547a8bd Mon Sep 17 00:00:00 2001 From: "Daisuke Fujimura (fd0)" Date: Wed, 27 Dec 2017 11:32:36 +0900 Subject: [PATCH] libdrm-2.4.89 (WIP) --- libdrm/README | 95 ++++++++++--------- ...bl1.cygport => libdrm-2.4.89-1bl1.cygport} | 0 ...src.patch => libdrm-2.4.89-1bl1.src.patch} | 52 +++++----- 3 files changed, 75 insertions(+), 72 deletions(-) rename libdrm/{libdrm-2.4.88-1bl1.cygport => libdrm-2.4.89-1bl1.cygport} (100%) rename libdrm/{libdrm-2.4.88-1bl1.src.patch => libdrm-2.4.89-1bl1.src.patch} (54%) diff --git a/libdrm/README b/libdrm/README index cac9eb5a3..3915cc9db 100644 --- a/libdrm/README +++ b/libdrm/README @@ -6,26 +6,26 @@ Runtime requirements: CUnit-2.1.3-1 cygwin-2.9.0-3 libcairo2-1.14.10-1 - libdrm-devel-2.4.88-1bl1 - libdrm2-2.4.88-1bl1 - libdrm_amdgpu-devel-2.4.88-1bl1 - libdrm_amdgpu1-2.4.88-1bl1 - libdrm_etnaviv-devel-2.4.88-1bl1 - libdrm_etnaviv1-2.4.88-1bl1 - libdrm_exynos-devel-2.4.88-1bl1 - libdrm_exynos1-2.4.88-1bl1 - libdrm_freedreno-devel-2.4.88-1bl1 - libdrm_freedreno1-2.4.88-1bl1 - libdrm_intel-devel-2.4.88-1bl1 - libdrm_intel1-2.4.88-1bl1 - libdrm_nouveau-devel-2.4.88-1bl1 - libdrm_nouveau2-2.4.88-1bl1 - libdrm_omap-devel-2.4.88-1bl1 - libdrm_omap1-2.4.88-1bl1 - libdrm_radeon-devel-2.4.88-1bl1 - libdrm_radeon1-2.4.88-1bl1 - libdrm_tegra-devel-2.4.88-1bl1 - libdrm_tegra0-2.4.88-1bl1 + libdrm-devel-2.4.89-1bl1 + libdrm2-2.4.89-1bl1 + libdrm_amdgpu-devel-2.4.89-1bl1 + libdrm_amdgpu1-2.4.89-1bl1 + libdrm_etnaviv-devel-2.4.89-1bl1 + libdrm_etnaviv1-2.4.89-1bl1 + libdrm_exynos-devel-2.4.89-1bl1 + libdrm_exynos1-2.4.89-1bl1 + libdrm_freedreno-devel-2.4.89-1bl1 + libdrm_freedreno1-2.4.89-1bl1 + libdrm_intel-devel-2.4.89-1bl1 + libdrm_intel1-2.4.89-1bl1 + libdrm_nouveau-devel-2.4.89-1bl1 + libdrm_nouveau2-2.4.89-1bl1 + libdrm_omap-devel-2.4.89-1bl1 + libdrm_omap1-2.4.89-1bl1 + libdrm_radeon-devel-2.4.89-1bl1 + libdrm_radeon1-2.4.89-1bl1 + libdrm_tegra-devel-2.4.89-1bl1 + libdrm_tegra0-2.4.89-1bl1 libpciaccess0-0.14-1bl1 pkg-config-0.29.1-1 @@ -43,41 +43,41 @@ Canonical website: http://dri.freedesktop.org/ Canonical download: - http://dri.freedesktop.org/libdrm/libdrm-2.4.88.tar.bz2 + http://dri.freedesktop.org/libdrm/libdrm-2.4.89.tar.bz2 ------------------------------------------- Build instructions: - 1. unpack libdrm-2.4.88-X-src.tar.xz + 1. unpack libdrm-2.4.89-X-src.tar.xz 2. if you use setup to install this src package, it will be unpacked under /usr/src automatically % cd /usr/src - % cygport ./libdrm-2.4.88-X.cygport all + % cygport ./libdrm-2.4.89-X.cygport all This will create: - /usr/src/libdrm-2.4.88-X-src.tar.xz - /usr/src/libdrm-2.4.88-X.tar.xz - /usr/src/libdrm2-2.4.88-X.tar.xz - /usr/src/libdrm-devel-2.4.88-X.tar.xz - /usr/src/libdrm_amdgpu1-2.4.88-X.tar.xz - /usr/src/libdrm_amdgpu-devel-2.4.88-X.tar.xz - /usr/src/libdrm_etnaviv1-2.4.88-X.tar.xz - /usr/src/libdrm_etnaviv-devel-2.4.88-X.tar.xz - /usr/src/libdrm_exynos1-2.4.88-X.tar.xz - /usr/src/libdrm_exynos-devel-2.4.88-X.tar.xz - /usr/src/libdrm_freedreno1-2.4.88-X.tar.xz - /usr/src/libdrm_freedreno-devel-2.4.88-X.tar.xz - /usr/src/libdrm_intel1-2.4.88-X.tar.xz - /usr/src/libdrm_intel-devel-2.4.88-X.tar.xz - /usr/src/libdrm_nouveau2-2.4.88-X.tar.xz - /usr/src/libdrm_nouveau-devel-2.4.88-X.tar.xz - /usr/src/libdrm_omap1-2.4.88-X.tar.xz - /usr/src/libdrm_omap-devel-2.4.88-X.tar.xz - /usr/src/libdrm_radeon1-2.4.88-X.tar.xz - /usr/src/libdrm_radeon-devel-2.4.88-X.tar.xz - /usr/src/libdrm_tegra0-2.4.88-X.tar.xz - /usr/src/libdrm_tegra-devel-2.4.88-X.tar.xz - /usr/src/libdrm_vc4-devel-2.4.88-X.tar.xz + /usr/src/libdrm-2.4.89-X-src.tar.xz + /usr/src/libdrm-2.4.89-X.tar.xz + /usr/src/libdrm2-2.4.89-X.tar.xz + /usr/src/libdrm-devel-2.4.89-X.tar.xz + /usr/src/libdrm_amdgpu1-2.4.89-X.tar.xz + /usr/src/libdrm_amdgpu-devel-2.4.89-X.tar.xz + /usr/src/libdrm_etnaviv1-2.4.89-X.tar.xz + /usr/src/libdrm_etnaviv-devel-2.4.89-X.tar.xz + /usr/src/libdrm_exynos1-2.4.89-X.tar.xz + /usr/src/libdrm_exynos-devel-2.4.89-X.tar.xz + /usr/src/libdrm_freedreno1-2.4.89-X.tar.xz + /usr/src/libdrm_freedreno-devel-2.4.89-X.tar.xz + /usr/src/libdrm_intel1-2.4.89-X.tar.xz + /usr/src/libdrm_intel-devel-2.4.89-X.tar.xz + /usr/src/libdrm_nouveau2-2.4.89-X.tar.xz + /usr/src/libdrm_nouveau-devel-2.4.89-X.tar.xz + /usr/src/libdrm_omap1-2.4.89-X.tar.xz + /usr/src/libdrm_omap-devel-2.4.89-X.tar.xz + /usr/src/libdrm_radeon1-2.4.89-X.tar.xz + /usr/src/libdrm_radeon-devel-2.4.89-X.tar.xz + /usr/src/libdrm_tegra0-2.4.89-X.tar.xz + /usr/src/libdrm_tegra-devel-2.4.89-X.tar.xz + /usr/src/libdrm_vc4-devel-2.4.89-X.tar.xz ------------------------------------------- @@ -239,6 +239,9 @@ Files included in the binary package: Port Notes: +----- version 2.4.89-1bl1 ----- +Version bump. + ----- version 2.4.88-1bl1 ----- Version bump. diff --git a/libdrm/libdrm-2.4.88-1bl1.cygport b/libdrm/libdrm-2.4.89-1bl1.cygport similarity index 100% rename from libdrm/libdrm-2.4.88-1bl1.cygport rename to libdrm/libdrm-2.4.89-1bl1.cygport diff --git a/libdrm/libdrm-2.4.88-1bl1.src.patch b/libdrm/libdrm-2.4.89-1bl1.src.patch similarity index 54% rename from libdrm/libdrm-2.4.88-1bl1.src.patch rename to libdrm/libdrm-2.4.89-1bl1.src.patch index ad52dc4dd..57fc4a230 100644 --- a/libdrm/libdrm-2.4.88-1bl1.src.patch +++ b/libdrm/libdrm-2.4.89-1bl1.src.patch @@ -1,5 +1,5 @@ ---- origsrc/libdrm-2.4.88/etnaviv/etnaviv_device.c 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/etnaviv/etnaviv_device.c 2017-12-17 00:17:25.715944500 +0900 +--- origsrc/libdrm-2.4.89/etnaviv/etnaviv_device.c 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/etnaviv/etnaviv_device.c 2017-12-27 10:48:55.838096900 +0900 @@ -29,8 +29,10 @@ #endif @@ -11,8 +11,8 @@ #include #include #include ---- origsrc/libdrm-2.4.88/exynos/exynos_drm.c 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/exynos/exynos_drm.c 2017-12-17 00:17:25.731558700 +0900 +--- origsrc/libdrm-2.4.89/exynos/exynos_drm.c 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/exynos/exynos_drm.c 2017-12-27 10:48:55.854493700 +0900 @@ -35,7 +35,9 @@ #include @@ -23,9 +23,9 @@ #include ---- origsrc/libdrm-2.4.88/exynos/exynos_fimg2d.c 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/exynos/exynos_fimg2d.c 2017-12-17 00:17:25.731558700 +0900 -@@ -21,7 +21,9 @@ +--- origsrc/libdrm-2.4.89/exynos/exynos_fimg2d.c 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/exynos/exynos_fimg2d.c 2017-12-27 10:48:55.869362800 +0900 +@@ -34,7 +34,9 @@ #include #include @@ -35,8 +35,8 @@ #include ---- origsrc/libdrm-2.4.88/freedreno/kgsl/kgsl_bo.c 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/freedreno/kgsl/kgsl_bo.c 2017-12-17 00:17:25.747190200 +0900 +--- origsrc/libdrm-2.4.89/freedreno/kgsl/kgsl_bo.c 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/freedreno/kgsl/kgsl_bo.c 2017-12-27 10:48:55.869362800 +0900 @@ -32,7 +32,9 @@ #include "kgsl_priv.h" @@ -47,8 +47,8 @@ static int set_memtype(struct fd_device *dev, uint32_t handle, uint32_t flags) { ---- origsrc/libdrm-2.4.88/include/drm/drm.h 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/include/drm/drm.h 2017-12-17 00:17:25.762850500 +0900 +--- origsrc/libdrm-2.4.89/include/drm/drm.h 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/include/drm/drm.h 2017-12-27 10:48:55.884979200 +0900 @@ -44,7 +44,11 @@ typedef unsigned int drm_handle_t; #else /* One of the BSDs */ @@ -61,8 +61,8 @@ #include typedef int8_t __s8; typedef uint8_t __u8; ---- origsrc/libdrm-2.4.88/omap/omap_drm.c 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/omap/omap_drm.c 2017-12-17 00:17:25.778439000 +0900 +--- origsrc/libdrm-2.4.89/omap/omap_drm.c 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/omap/omap_drm.c 2017-12-27 10:48:55.900635500 +0900 @@ -31,8 +31,10 @@ #endif @@ -74,9 +74,9 @@ #include #include #include ---- origsrc/libdrm-2.4.88/tests/exynos/exynos_fimg2d_test.c 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/tests/exynos/exynos_fimg2d_test.c 2017-12-17 00:17:25.825312200 +0900 -@@ -22,7 +22,9 @@ +--- origsrc/libdrm-2.4.89/tests/exynos/exynos_fimg2d_test.c 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/tests/exynos/exynos_fimg2d_test.c 2017-12-27 10:48:55.916274300 +0900 +@@ -35,7 +35,9 @@ #include #include @@ -86,8 +86,8 @@ #include #include ---- origsrc/libdrm-2.4.88/tests/modetest/Makefile.am 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/tests/modetest/Makefile.am 2017-12-17 00:17:25.840971700 +0900 +--- origsrc/libdrm-2.4.89/tests/modetest/Makefile.am 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/tests/modetest/Makefile.am 2017-12-27 10:48:55.931844500 +0900 @@ -19,6 +19,6 @@ endif modetest_SOURCES = $(MODETEST_FILES) @@ -96,8 +96,8 @@ $(top_builddir)/tests/util/libutil.la \ + $(top_builddir)/libdrm.la \ $(CAIRO_LIBS) ---- origsrc/libdrm-2.4.88/tests/proptest/Makefile.am 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/tests/proptest/Makefile.am 2017-12-17 00:17:25.857821800 +0900 +--- origsrc/libdrm-2.4.89/tests/proptest/Makefile.am 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/tests/proptest/Makefile.am 2017-12-27 10:48:55.947501500 +0900 @@ -17,5 +17,5 @@ endif proptest_SOURCES = $(PROPTEST_FILES) @@ -106,8 +106,8 @@ - $(top_builddir)/tests/util/libutil.la + $(top_builddir)/tests/util/libutil.la \ + $(top_builddir)/libdrm.la ---- origsrc/libdrm-2.4.88/tests/util/Makefile.am 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/tests/util/Makefile.am 2017-12-17 00:17:25.857821800 +0900 +--- origsrc/libdrm-2.4.89/tests/util/Makefile.am 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/tests/util/Makefile.am 2017-12-27 10:48:55.947501500 +0900 @@ -10,4 +10,6 @@ libutil_la_CPPFLAGS = \ libutil_la_CFLAGS = \ $(CAIRO_CFLAGS) @@ -115,8 +115,8 @@ +libutil_la_LDFLAGS = $(top_builddir)/libdrm.la + libutil_la_SOURCES = $(UTIL_FILES) ---- origsrc/libdrm-2.4.88/tests/vbltest/Makefile.am 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/tests/vbltest/Makefile.am 2017-12-17 00:17:25.857821800 +0900 +--- origsrc/libdrm-2.4.89/tests/vbltest/Makefile.am 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/tests/vbltest/Makefile.am 2017-12-27 10:48:55.963097000 +0900 @@ -15,5 +15,5 @@ endif vbltest_SOURCES = \ vbltest.c @@ -125,8 +125,8 @@ - $(top_builddir)/tests/util/libutil.la + $(top_builddir)/tests/util/libutil.la \ + $(top_builddir)/libdrm.la ---- origsrc/libdrm-2.4.88/xf86drm.h 2017-11-04 01:44:27.000000000 +0900 -+++ src/libdrm-2.4.88/xf86drm.h 2017-12-17 00:17:25.887897800 +0900 +--- origsrc/libdrm-2.4.89/xf86drm.h 2017-12-18 10:33:10.000000000 +0900 ++++ src/libdrm-2.4.89/xf86drm.h 2017-12-27 10:48:55.978758000 +0900 @@ -47,7 +47,7 @@ extern "C" { #define DRM_MAX_MINOR 16 #endif