From b3d9a9881acd16ae14de23ab7f72939265980909 Mon Sep 17 00:00:00 2001 From: Gordon Ross Date: Sat, 31 Dec 2016 19:00:24 -0500 Subject: 7732 Update to libdrm-2.4.74 --- usr/src/common/libdrm/Check-patches | 4 ++-- usr/src/common/libdrm/Makefile | 4 ++-- usr/src/common/libdrm/Makefile.drm | 5 ++--- usr/src/common/libdrm/patches/intel-drm.patch | 16 ++++++++-------- usr/src/common/libdrm/patches/libdrm-lists-h.patch | 1 - usr/src/common/libdrm/patches/xf86drm-c.patch | 15 ++++++++++++--- usr/src/common/libdrm/patches/xf86drm-h.patch | 9 ++++----- usr/src/lib/libdrm/common/sun_devinfo.c | 1 - usr/src/pkg/Makefile | 3 +++ usr/src/pkg/manifests/x11-library-libdrm.mf | 4 ++-- 10 files changed, 35 insertions(+), 27 deletions(-) diff --git a/usr/src/common/libdrm/Check-patches b/usr/src/common/libdrm/Check-patches index 13afccc..89f2ba2 100644 --- a/usr/src/common/libdrm/Check-patches +++ b/usr/src/common/libdrm/Check-patches @@ -52,8 +52,8 @@ # One big patch might be easier than all this... # but for now the patches are split up as shown below. -ref=libdrm-2.4.73-ref -dir=libdrm-2.4.73 +ref=libdrm-2.4.74-ref +dir=libdrm-2.4.74 # You make this directory by hand. Not doing this automatically # because I want to make srue you to know it's being written into. diff --git a/usr/src/common/libdrm/Makefile b/usr/src/common/libdrm/Makefile index c648b8f..79af234 100644 --- a/usr/src/common/libdrm/Makefile +++ b/usr/src/common/libdrm/Makefile @@ -22,12 +22,12 @@ include $(SRC)/Makefile.master FETCH= $(SRC)/tools/userland-fetch # See also: ./Makefile.drm LIBDRM_VERS -LIBDRM_VERS=2.4.73 +LIBDRM_VERS=2.4.74 LIBDRM_DIR=libdrm-$(LIBDRM_VERS) LIBDRM_ARCHIVE=$(LIBDRM_DIR).tar.bz2 LIBDRM_URL=http://dri.freedesktop.org/libdrm/$(LIBDRM_ARCHIVE) -LIBDRM_HASH=sha256:96bfd39242fe168017d95f22e141645a35591f5902a7d98c2fa4ca8c31df5e4d +LIBDRM_HASH=sha256:d80dd5a76c401f4c8756dcccd999c63d7e0a3bad258d96a829055cfd86ef840b def all install install_h: .patched check diff --git a/usr/src/common/libdrm/Makefile.drm b/usr/src/common/libdrm/Makefile.drm index a26cd51..43f85b7 100644 --- a/usr/src/common/libdrm/Makefile.drm +++ b/usr/src/common/libdrm/Makefile.drm @@ -15,9 +15,8 @@ # This make include is used in $SRC/lib/libdrm/* # -# See also: ./Makefile LIBDRM_VERS, ./Check-patches, and -# $SRC/pkg/manifests/x11-library-libdrm.mf -LIBDRM_VERS=2.4.73 +# See also: ./Makefile LIBDRM_VERS, ./Check-patches +LIBDRM_VERS=2.4.74 LIBDRM_CMN_DIR=$(SRC)/common/libdrm/libdrm-$(LIBDRM_VERS) diff --git a/usr/src/common/libdrm/patches/intel-drm.patch b/usr/src/common/libdrm/patches/intel-drm.patch index a621086..47fa4d3 100644 --- a/usr/src/common/libdrm/patches/intel-drm.patch +++ b/usr/src/common/libdrm/patches/intel-drm.patch @@ -1,7 +1,7 @@ -diff ... libdrm-2.4.73/intel/intel_bufmgr_gem.c ---- libdrm-2.4.73-ref/intel/intel_bufmgr_gem.c Mon Nov 14 14:48:04 2016 -+++ libdrm-2.4.73/intel/intel_bufmgr_gem.c Sat Dec 31 12:27:53 2016 -@@ -3352,6 +3352,16 @@ +diff ... libdrm-2.4.74/intel/intel_bufmgr_gem.c +--- libdrm-2.4.74-ref/intel/intel_bufmgr_gem.c Tue Nov 29 06:15:10 2016 ++++ libdrm-2.4.74/intel/intel_bufmgr_gem.c Sat Dec 31 18:30:23 2016 +@@ -3363,6 +3363,16 @@ static pthread_mutex_t bufmgr_list_mutex = PTHREAD_MUTEX_INITIALIZER; static drmMMListHead bufmgr_list = { &bufmgr_list, &bufmgr_list }; @@ -18,7 +18,7 @@ diff ... libdrm-2.4.73/intel/intel_bufmgr_gem.c static drm_intel_bufmgr_gem * drm_intel_bufmgr_gem_find(int fd) { -@@ -3358,7 +3368,8 @@ +@@ -3369,7 +3379,8 @@ drm_intel_bufmgr_gem *bufmgr_gem; DRMLISTFOREACHENTRY(bufmgr_gem, &bufmgr_list, managers) { @@ -28,9 +28,9 @@ diff ... libdrm-2.4.73/intel/intel_bufmgr_gem.c atomic_inc(&bufmgr_gem->refcount); return bufmgr_gem; } -diff ... libdrm-2.4.73/intel/intel_decode.c ---- libdrm-2.4.73-ref/intel/intel_decode.c Wed Aug 24 12:57:39 2016 -+++ libdrm-2.4.73/intel/intel_decode.c Sat Dec 31 17:49:32 2016 +diff ... libdrm-2.4.74/intel/intel_decode.c +--- libdrm-2.4.74-ref/intel/intel_decode.c Tue Nov 29 06:15:10 2016 ++++ libdrm-2.4.74/intel/intel_decode.c Sat Dec 31 18:30:23 2016 @@ -402,6 +402,7 @@ format = "1555"; break; diff --git a/usr/src/common/libdrm/patches/libdrm-lists-h.patch b/usr/src/common/libdrm/patches/libdrm-lists-h.patch index a1d2691..bd94d4c 100644 --- a/usr/src/common/libdrm/patches/libdrm-lists-h.patch +++ b/usr/src/common/libdrm/patches/libdrm-lists-h.patch @@ -25,4 +25,3 @@ diff ... libdrm-2.4.67/libdrm_lists.h (__temp)->__head.next, __head)) #define DRMLISTJOIN(__list, __join) if (!DRMLISTEMPTY(__list)) { \ - diff --git a/usr/src/common/libdrm/patches/xf86drm-c.patch b/usr/src/common/libdrm/patches/xf86drm-c.patch index 19a6b25..93dcd86 100644 --- a/usr/src/common/libdrm/patches/xf86drm-c.patch +++ b/usr/src/common/libdrm/patches/xf86drm-c.patch @@ -1,6 +1,6 @@ -diff ... libdrm-2.4.71/xf86drm.c ---- libdrm-2.4.71-ref/xf86drm.c Wed Jul 20 19:42:21 2016 -+++ libdrm-2.4.71/xf86drm.c Sun Nov 20 11:16:08 2016 +diff ... libdrm-2.4.74/xf86drm.c +--- libdrm-2.4.74-ref/xf86drm.c Tue Nov 29 06:15:10 2016 ++++ libdrm-2.4.74/xf86drm.c Sat Dec 31 19:13:57 2016 @@ -98,6 +98,11 @@ #endif #endif /* __OpenBSD__ */ @@ -172,3 +172,12 @@ diff ... libdrm-2.4.71/xf86drm.c void drmFreeDevice(drmDevicePtr *device) { +@@ -3349,6 +3400,8 @@ + + fclose(f); + return device_name; ++#elif defined(__sun) ++ return(_sun_drmGetMinorNameForFD(fd, -1)); + #else + #warning "Missing implementation of drmGetDeviceNameFromFd2" + return NULL; diff --git a/usr/src/common/libdrm/patches/xf86drm-h.patch b/usr/src/common/libdrm/patches/xf86drm-h.patch index 1dd0f7e..3bba940 100644 --- a/usr/src/common/libdrm/patches/xf86drm-h.patch +++ b/usr/src/common/libdrm/patches/xf86drm-h.patch @@ -25,10 +25,9 @@ # or other dealings in this Software without prior written authorization # of the copyright holder. -diff --git a/xf86drm.h b/xf86drm.h -index 76eb94e..6a14120 100644 ---- a/xf86drm.h -+++ b/xf86drm.h +diff ... libdrm-2.4.74/xf86drm.h +--- libdrm-2.4.74-ref/xf86drm.h Tue Nov 29 06:15:10 2016 ++++ libdrm-2.4.74/xf86drm.h Sat Dec 31 19:13:17 2016 @@ -472,6 +472,17 @@ #endif /* architecture */ #endif /* __GNUC__ >= 2 */ @@ -47,7 +46,7 @@ index 76eb94e..6a14120 100644 #ifndef DRM_CAS #define DRM_CAS(lock,old,new,ret) do { ret=1; } while (0) /* FAST LOCK FAILS */ #endif -@@ -796,6 +807,17 @@ +@@ -801,6 +812,17 @@ extern int drmGetDevices(drmDevicePtr devices[], int max_devices); extern void drmFreeDevices(drmDevicePtr devices[], int count); diff --git a/usr/src/lib/libdrm/common/sun_devinfo.c b/usr/src/lib/libdrm/common/sun_devinfo.c index d7d5669..9509b73 100644 --- a/usr/src/lib/libdrm/common/sun_devinfo.c +++ b/usr/src/lib/libdrm/common/sun_devinfo.c @@ -235,7 +235,6 @@ _sun_drm_get_pci_info(char *path, drmPciDeviceInfo *pcii) char pathbuf[MAXPATHLEN]; di_node_t node; char *s; - char *propstr = NULL; int *propval = NULL; int ret = -EINVAL; diff --git a/usr/src/pkg/Makefile b/usr/src/pkg/Makefile index f93829e..e5a0609 100644 --- a/usr/src/pkg/Makefile +++ b/usr/src/pkg/Makefile @@ -29,6 +29,8 @@ include $(SRC)/Makefile.master # include $(SRC)/Makefile.buildnum ONNV_BUILDNUM= 151 +# Get LIBDRM_VERS +include $(SRC)/common/libdrm/Makefile.drm # # Make sure we're getting a consistent execution environment for the @@ -171,6 +173,7 @@ PKGMOG_DEFINES= \ ARCH=$(PKGMACH) \ ARCH32=$($(PKGMACH)_ARCH32) \ ARCH64=$($(PKGMACH)_ARCH64) \ + LIBDRM_VERS=$(LIBDRM_VERS) \ PKGVERS_COMPONENT=$(PKGVERS_COMPONENT) \ PKGVERS_BUILTON=$(PKGVERS_BUILTON) \ PKGVERS_BRANCH=$(PKGVERS_BRANCH) \ diff --git a/usr/src/pkg/manifests/x11-library-libdrm.mf b/usr/src/pkg/manifests/x11-library-libdrm.mf index 865429d..3216a46 100644 --- a/usr/src/pkg/manifests/x11-library-libdrm.mf +++ b/usr/src/pkg/manifests/x11-library-libdrm.mf @@ -14,12 +14,12 @@ # set name=pkg.fmri \ - value=pkg:/x11/library/libdrm@2.4.73,$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) + value=pkg:/x11/library/libdrm@$(LIBDRM_VERS),$(PKGVERS_BUILTON)-$(PKGVERS_BRANCH) set name=pkg.description value="Direct Rendering Manager (DRM) Libraries" set name=pkg.summary value="DRM Libraries" set name=info.classification value=System/X11 set name=info.source-url \ - value=http://dri.freedesktop.org/libdrm-2.4.73.tar.bz2 + value=http://dri.freedesktop.org/libdrm-$(LIBDRM_VERS).tar.bz2 set name=info.upstream-url value=http://dri.freedesktop.org # dir path=usr group=sys -- cgit v1.2.3