summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sysutils/libdrm/Makefile10
-rw-r--r--sysutils/libdrm/distinfo4
-rw-r--r--sysutils/libdrm/patches/patch-xf86drm_c20
-rw-r--r--sysutils/libdrm/patches/patch-xf86drm_h6
4 files changed, 20 insertions, 20 deletions
diff --git a/sysutils/libdrm/Makefile b/sysutils/libdrm/Makefile
index c96b661..9c861e3 100644
--- a/sysutils/libdrm/Makefile
+++ b/sysutils/libdrm/Makefile
@@ -2,7 +2,7 @@ ONLY_FOR_ARCHS = amd64 i386 sparc64
COMMENT = Direct Rendering Manager library and headers
-DISTNAME = libdrm-2.4.114
+DISTNAME = libdrm-2.4.117
EXTRACT_SUFX = .tar.xz
SHARED_LIBS = drm 7.12 drm_radeon 4.0 drm_intel 5.4 \
@@ -21,17 +21,17 @@ MODULES = devel/meson xenocara
WANTLIB = pciaccess
-MASTER_SITES = https://dri.freedesktop.org/libdrm/
+SITES = https://dri.freedesktop.org/libdrm/
-BUILD_DEPENDS = graphics/cairo \
- textproc/py-docutils
+BUILD_DEPENDS = textproc/py-docutils
LIB_DEPENDS = sysutils/libpciaccess
CONFIGURE_ARGS = -Detnaviv=disabled \
-Dfreedreno=disabled \
-Dnouveau=disabled \
- -Dvalgrind=disabled
+ -Dvalgrind=disabled \
+ -Dcairo-tests=disabled
SEPARATE_BUILD = Yes
diff --git a/sysutils/libdrm/distinfo b/sysutils/libdrm/distinfo
index 0f6d8df..834640e 100644
--- a/sysutils/libdrm/distinfo
+++ b/sysutils/libdrm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdrm-2.4.114.tar.xz) = MEnPhDpH0S5e7vvDvjSW14L6CfQjRr8Lfe/j0eWY0CY=
-SIZE (libdrm-2.4.114.tar.xz) = 471664
+SHA256 (libdrm-2.4.117.tar.xz) = ooiNaePrHIp3rcCKdaYPuuAfDSCNJvA00aEuNiNhJCs=
+SIZE (libdrm-2.4.117.tar.xz) = 475504
diff --git a/sysutils/libdrm/patches/patch-xf86drm_c b/sysutils/libdrm/patches/patch-xf86drm_c
index db61b47..ea8d83e 100644
--- a/sysutils/libdrm/patches/patch-xf86drm_c
+++ b/sysutils/libdrm/patches/patch-xf86drm_c
@@ -12,7 +12,7 @@ Index: xf86drm.c
#if defined(__OpenBSD__) || defined(__DragonFly__)
struct drm_pciinfo {
uint16_t domain;
-@@ -732,7 +736,7 @@ static int drmMatchBusID(const char *id1, const char *
+@@ -806,7 +810,7 @@ static int drmMatchBusID(const char *id1, const char *
* If any other failure happened then it will output error message using
* drmMsg() call.
*/
@@ -21,7 +21,7 @@ Index: xf86drm.c
static int chown_check_return(const char *path, uid_t owner, gid_t group)
{
int rv;
-@@ -763,6 +767,18 @@ static const char *drmGetDeviceName(int type)
+@@ -835,6 +839,18 @@ static const char *drmGetDeviceName(int type)
return NULL;
}
@@ -40,7 +40,7 @@ Index: xf86drm.c
/**
* Open the DRM device, creating it if necessary.
*
-@@ -784,7 +800,7 @@ static int drmOpenDevice(dev_t dev, int minor, int typ
+@@ -856,7 +872,7 @@ static int drmOpenDevice(dev_t dev, int minor, int typ
int fd;
mode_t devmode = DRM_DEV_MODE, serv_mode;
gid_t serv_group;
@@ -49,7 +49,7 @@ Index: xf86drm.c
int isroot = !geteuid();
uid_t user = DRM_DEV_UID;
gid_t group = DRM_DEV_GID;
-@@ -802,6 +818,7 @@ static int drmOpenDevice(dev_t dev, int minor, int typ
+@@ -874,6 +890,7 @@ static int drmOpenDevice(dev_t dev, int minor, int typ
devmode &= ~(S_IXUSR|S_IXGRP|S_IXOTH);
}
@@ -57,7 +57,7 @@ Index: xf86drm.c
#if !UDEV
if (stat(DRM_DIR_NAME, &st)) {
if (!isroot)
-@@ -848,14 +865,19 @@ wait_for_udev:
+@@ -920,14 +937,19 @@ wait_for_udev:
}
}
#endif
@@ -78,7 +78,7 @@ Index: xf86drm.c
/* Check if the device node is not what we expect it to be, and recreate it
* and try again if so.
*/
-@@ -907,8 +929,13 @@ static int drmOpenMinor(int minor, int create, int typ
+@@ -979,8 +1001,13 @@ static int drmOpenMinor(int minor, int create, int typ
return -EINVAL;
sprintf(buf, dev_name, DRM_DIR_NAME, minor);
@@ -94,7 +94,7 @@ Index: xf86drm.c
return -errno;
}
-@@ -3438,7 +3465,11 @@ static char *drmGetMinorNameForFD(int fd, int type)
+@@ -3505,7 +3532,11 @@ static char *drmGetMinorNameForFD(int fd, int type)
const char *dev_name = drmGetDeviceName(type);
unsigned int maj, min;
int n;
@@ -106,7 +106,7 @@ Index: xf86drm.c
if (fstat(fd, &sbuf))
return NULL;
-@@ -3451,7 +3482,7 @@ static char *drmGetMinorNameForFD(int fd, int type)
+@@ -3518,7 +3549,7 @@ static char *drmGetMinorNameForFD(int fd, int type)
if (!dev_name)
return NULL;
@@ -115,7 +115,7 @@ Index: xf86drm.c
if (n == -1 || n >= sizeof(buf))
return NULL;
-@@ -4514,53 +4545,6 @@ drm_device_has_rdev(drmDevicePtr device, dev_t find_rd
+@@ -4574,53 +4605,6 @@ drm_device_has_rdev(drmDevicePtr device, dev_t find_rd
*/
drm_public int drmGetDeviceFromDevId(dev_t find_rdev, uint32_t flags, drmDevicePtr *device)
{
@@ -169,7 +169,7 @@ Index: xf86drm.c
drmDevicePtr local_devices[MAX_DRM_NODES];
drmDevicePtr d;
DIR *sysdir;
-@@ -4624,7 +4608,6 @@ drm_public int drmGetDeviceFromDevId(dev_t find_rdev,
+@@ -4684,7 +4668,6 @@ drm_public int drmGetDeviceFromDevId(dev_t find_rdev,
if (*device == NULL)
return -ENODEV;
return 0;
diff --git a/sysutils/libdrm/patches/patch-xf86drm_h b/sysutils/libdrm/patches/patch-xf86drm_h
index cd845fd..26961e3 100644
--- a/sysutils/libdrm/patches/patch-xf86drm_h
+++ b/sysutils/libdrm/patches/patch-xf86drm_h
@@ -8,15 +8,15 @@ Index: xf86drm.h
-#ifdef __OpenBSD__
-#define DRM_DIR_NAME "/dev"
-#define DRM_PRIMARY_MINOR_NAME "drm"
--#define DRM_CONTROL_MINOR_NAME "drmC"
+-#define DRM_CONTROL_MINOR_NAME "drmC" /* deprecated */
-#define DRM_RENDER_MINOR_NAME "drmR"
-#else
#define DRM_DIR_NAME "/dev/dri"
#define DRM_PRIMARY_MINOR_NAME "card"
- #define DRM_CONTROL_MINOR_NAME "controlD"
+ #define DRM_CONTROL_MINOR_NAME "controlD" /* deprecated */
#define DRM_RENDER_MINOR_NAME "renderD"
#define DRM_PROC_NAME "/proc/dri/" /* For backward Linux compatibility */
-#endif
#define DRM_DEV_NAME "%s/" DRM_PRIMARY_MINOR_NAME "%d"
- #define DRM_CONTROL_DEV_NAME "%s/" DRM_CONTROL_MINOR_NAME "%d"
+ #define DRM_CONTROL_DEV_NAME "%s/" DRM_CONTROL_MINOR_NAME "%d" /* deprecated */
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 20:06:57 +0000