From c1f19455eb436ee60f13d756128227bc5d0a65d2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 13 Jun 2010 19:16:28 +0200 Subject: [PATCH] libdrm: - update to libdrm-2.4.21 --- packages/graphics/libdrm/install | 3 -- .../libdrm/patches/libdrm-2.4.0-no-bc.diff | 54 ------------------- .../patches/libdrm-make-dri-perms-okay.diff | 12 ----- packages/graphics/libdrm/url | 2 +- 4 files changed, 1 insertion(+), 70 deletions(-) delete mode 100644 packages/graphics/libdrm/patches/libdrm-2.4.0-no-bc.diff delete mode 100644 packages/graphics/libdrm/patches/libdrm-make-dri-perms-okay.diff diff --git a/packages/graphics/libdrm/install b/packages/graphics/libdrm/install index 3f19522394..489bb77f71 100755 --- a/packages/graphics/libdrm/install +++ b/packages/graphics/libdrm/install @@ -10,9 +10,6 @@ mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/.libs/libdrm.so* $INSTALL/usr/lib cp -PR $PKG_BUILD/libkms/.libs/libkms.so* $INSTALL/usr/lib || true -mkdir -p $INSTALL/lib/udev/rules.d - cp -PR $PKG_DIR/config/*.rules $INSTALL/lib/udev/rules.d - for drv in $DRM_DRIVERS; do cp -PR $PKG_BUILD/$drv/.libs/libdrm_$drv*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libdrm_$drv*.so*T diff --git a/packages/graphics/libdrm/patches/libdrm-2.4.0-no-bc.diff b/packages/graphics/libdrm/patches/libdrm-2.4.0-no-bc.diff deleted file mode 100644 index ad14e2108f..0000000000 --- a/packages/graphics/libdrm/patches/libdrm-2.4.0-no-bc.diff +++ /dev/null @@ -1,54 +0,0 @@ -diff -up libdrm-20080814/xf86drm.c.no-bc libdrm-20080814/xf86drm.c ---- libdrm-20080814/xf86drm.c.no-bc 2008-08-14 15:43:09.000000000 +1000 -+++ libdrm-20080814/xf86drm.c 2008-08-14 15:45:09.000000000 +1000 -@@ -396,11 +396,6 @@ int drmAvailable(void) - int fd; - - if ((fd = drmOpenMinor(0, 1, DRM_NODE_RENDER)) < 0) { --#ifdef __linux__ -- /* Try proc for backward Linux compatibility */ -- if (!access("/proc/dri/0", R_OK)) -- return 1; --#endif - return 0; - } - -@@ -519,38 +514,6 @@ static int drmOpenByName(const char *nam - } - } - --#ifdef __linux__ -- /* Backward-compatibility /proc support */ -- for (i = 0; i < 8; i++) { -- char proc_name[64], buf[512]; -- char *driver, *pt, *devstring; -- int retcode; -- -- sprintf(proc_name, "/proc/dri/%d/name", i); -- if ((fd = open(proc_name, 0, 0)) >= 0) { -- retcode = read(fd, buf, sizeof(buf)-1); -- close(fd); -- if (retcode) { -- buf[retcode-1] = '\0'; -- for (driver = pt = buf; *pt && *pt != ' '; ++pt) -- ; -- if (*pt) { /* Device is next */ -- *pt = '\0'; -- if (!strcmp(driver, name)) { /* Match */ -- for (devstring = ++pt; *pt && *pt != ' '; ++pt) -- ; -- if (*pt) { /* Found busid */ -- return drmOpenByBusid(++pt); -- } else { /* No busid */ -- return drmOpenDevice(strtol(devstring, NULL, 0),i, DRM_NODE_RENDER); -- } -- } -- } -- } -- } -- } --#endif -- - return -1; - } - diff --git a/packages/graphics/libdrm/patches/libdrm-make-dri-perms-okay.diff b/packages/graphics/libdrm/patches/libdrm-make-dri-perms-okay.diff deleted file mode 100644 index 0d82319f24..0000000000 --- a/packages/graphics/libdrm/patches/libdrm-make-dri-perms-okay.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libdrm-20080303/xf86drm.h.da libdrm-20080303/xf86drm.h ---- libdrm-20080303/xf86drm.h.da 2008-03-19 15:26:31.000000000 +1000 -+++ libdrm-20080303/xf86drm.h 2008-03-19 15:26:46.000000000 +1000 -@@ -45,7 +45,7 @@ - /* Default /dev/dri directory permissions 0755 */ - #define DRM_DEV_DIRMODE \ - (S_IRUSR|S_IWUSR|S_IXUSR|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH) --#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP) -+#define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) - - #define DRM_DIR_NAME "/dev/dri" - #define DRM_DEV_NAME "%s/card%d" diff --git a/packages/graphics/libdrm/url b/packages/graphics/libdrm/url index 5e01baf439..46e9bf5b1c 100644 --- a/packages/graphics/libdrm/url +++ b/packages/graphics/libdrm/url @@ -1 +1 @@ -http://dri.freedesktop.org/libdrm/libdrm-2.4.20.tar.bz2 \ No newline at end of file +http://dri.freedesktop.org/libdrm/libdrm-2.4.21.tar.bz2 \ No newline at end of file