diff options
Diffstat (limited to 'extra/libdrm')
| -rw-r--r-- | extra/libdrm/.md5sum.i686 | 2 | ||||
| -rw-r--r-- | extra/libdrm/.md5sum.x86_64 | 2 | ||||
| -rwxr-xr-x | extra/libdrm/Pkgfile | 11 | ||||
| -rw-r--r-- | extra/libdrm/add_missing_files.patch | 19 | ||||
| -rw-r--r-- | extra/libdrm/list.h | 137 | ||||
| -rw-r--r-- | extra/libdrm/rbo.h | 50 |
6 files changed, 4 insertions, 217 deletions
diff --git a/extra/libdrm/.md5sum.i686 b/extra/libdrm/.md5sum.i686 index 4201dfc0b..084f1a67c 100644 --- a/extra/libdrm/.md5sum.i686 +++ b/extra/libdrm/.md5sum.i686 @@ -1,4 +1,4 @@ 671b87f9670e709e54a19cd292c6330d add_missing_files.patch -6488f64119c6439fa4038e9cd7b30b67 libdrm-2.4.28.tar.bz2 +96d5e3e9edd55f4b016fe3b5dd0a1953 libdrm-2.4.29.tar.bz2 ce867d3331862c2b87d1a37461b42dbe list.h 073846ea43fb4d6130062c1897d92e40 rbo.h diff --git a/extra/libdrm/.md5sum.x86_64 b/extra/libdrm/.md5sum.x86_64 index 4201dfc0b..084f1a67c 100644 --- a/extra/libdrm/.md5sum.x86_64 +++ b/extra/libdrm/.md5sum.x86_64 @@ -1,4 +1,4 @@ 671b87f9670e709e54a19cd292c6330d add_missing_files.patch -6488f64119c6439fa4038e9cd7b30b67 libdrm-2.4.28.tar.bz2 +96d5e3e9edd55f4b016fe3b5dd0a1953 libdrm-2.4.29.tar.bz2 ce867d3331862c2b87d1a37461b42dbe list.h 073846ea43fb4d6130062c1897d92e40 rbo.h diff --git a/extra/libdrm/Pkgfile b/extra/libdrm/Pkgfile index 5d42d314b..7113308cd 100755 --- a/extra/libdrm/Pkgfile +++ b/extra/libdrm/Pkgfile @@ -6,18 +6,12 @@ # Run on: libpthread-stubs,xorg-libpciaccess name=libdrm -version=2.4.28 +version=2.4.29 release=1 -source=(http://dri.freedesktop.org/libdrm/libdrm-$version.tar.bz2 - add_missing_files.patch - rbo.h - list.h) +source=(http://dri.freedesktop.org/libdrm/libdrm-$version.tar.bz2) build() { cd $name-$version - patch -p1 < ../add_missing_files.patch - cp ../{rbo,list}.h tests/radeon/ - autoreconf -if ./configure --prefix=/usr \ --enable-static \ --enable-intel \ @@ -29,4 +23,3 @@ build() { make make DESTDIR=$PKG install } - diff --git a/extra/libdrm/add_missing_files.patch b/extra/libdrm/add_missing_files.patch deleted file mode 100644 index 5ebcb606a..000000000 --- a/extra/libdrm/add_missing_files.patch +++ /dev/null @@ -1,19 +0,0 @@ -From 902ee661f1864aaf8325621085f6a1b5a6a3673a Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Mon, 05 Dec 2011 21:24:48 +0000 -Subject: test/radeon: add missing files for dist - ---- -diff --git a/tests/radeon/Makefile.am b/tests/radeon/Makefile.am -index 021ca72..1775669 100644 ---- a/tests/radeon/Makefile.am -+++ b/tests/radeon/Makefile.am -@@ -9,4 +9,6 @@ noinst_PROGRAMS = \ - - radeon_ttm_SOURCES = \ - rbo.c \ -+ rbo.h \ -+ list.h \ - radeon_ttm.c --- -cgit v0.9.0.2-2-gbebe diff --git a/extra/libdrm/list.h b/extra/libdrm/list.h deleted file mode 100644 index 305c903e1..000000000 --- a/extra/libdrm/list.h +++ /dev/null @@ -1,137 +0,0 @@ -/* - * - * Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA. - * All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sub license, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM, - * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR - * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE - * USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * The above copyright notice and this permission notice (including the - * next paragraph) shall be included in all copies or substantial portions - * of the Software. - * - */ - -/** - * \file - * List macros heavily inspired by the Linux kernel - * list handling. No list looping yet. - * - * Is not threadsafe, so common operations need to - * be protected using an external mutex. - */ -#ifndef _U_DOUBLE_LIST_H_ -#define _U_DOUBLE_LIST_H_ - -#include <stddef.h> - -struct list_head -{ - struct list_head *prev; - struct list_head *next; -}; - -static void list_inithead(struct list_head *item) -{ - item->prev = item; - item->next = item; -} - -static void list_add(struct list_head *item, struct list_head *list) -{ - item->prev = list; - item->next = list->next; - list->next->prev = item; - list->next = item; -} - -static void list_addtail(struct list_head *item, struct list_head *list) -{ - item->next = list; - item->prev = list->prev; - list->prev->next = item; - list->prev = item; -} - -static void list_replace(struct list_head *from, struct list_head *to) -{ - to->prev = from->prev; - to->next = from->next; - from->next->prev = to; - from->prev->next = to; -} - -static void list_del(struct list_head *item) -{ - item->prev->next = item->next; - item->next->prev = item->prev; -} - -static void list_delinit(struct list_head *item) -{ - item->prev->next = item->next; - item->next->prev = item->prev; - item->next = item; - item->prev = item; -} - -#define LIST_INITHEAD(__item) list_inithead(__item) -#define LIST_ADD(__item, __list) list_add(__item, __list) -#define LIST_ADDTAIL(__item, __list) list_addtail(__item, __list) -#define LIST_REPLACE(__from, __to) list_replace(__from, __to) -#define LIST_DEL(__item) list_del(__item) -#define LIST_DELINIT(__item) list_delinit(__item) - -#define LIST_ENTRY(__type, __item, __field) \ - ((__type *)(((char *)(__item)) - offsetof(__type, __field))) - -#define LIST_IS_EMPTY(__list) \ - ((__list)->next == (__list)) - -#ifndef container_of -#define container_of(ptr, sample, member) \ - (void *)((char *)(ptr) \ - - ((char *)&(sample)->member - (char *)(sample))) -#endif - -#define LIST_FOR_EACH_ENTRY(pos, head, member) \ - for (pos = container_of((head)->next, pos, member); \ - &pos->member != (head); \ - pos = container_of(pos->member.next, pos, member)) - -#define LIST_FOR_EACH_ENTRY_SAFE(pos, storage, head, member) \ - for (pos = container_of((head)->next, pos, member), \ - storage = container_of(pos->member.next, pos, member); \ - &pos->member != (head); \ - pos = storage, storage = container_of(storage->member.next, storage, member)) - -#define LIST_FOR_EACH_ENTRY_SAFE_REV(pos, storage, head, member) \ - for (pos = container_of((head)->prev, pos, member), \ - storage = container_of(pos->member.prev, pos, member); \ - &pos->member != (head); \ - pos = storage, storage = container_of(storage->member.prev, storage, member)) - -#define LIST_FOR_EACH_ENTRY_FROM(pos, start, head, member) \ - for (pos = container_of((start), pos, member); \ - &pos->member != (head); \ - pos = container_of(pos->member.next, pos, member)) - -#define LIST_FOR_EACH_ENTRY_FROM_REV(pos, start, head, member) \ - for (pos = container_of((start), pos, member); \ - &pos->member != (head); \ - pos = container_of(pos->member.prev, pos, member)) - -#endif /*_U_DOUBLE_LIST_H_*/ diff --git a/extra/libdrm/rbo.h b/extra/libdrm/rbo.h deleted file mode 100644 index c25c73a4c..000000000 --- a/extra/libdrm/rbo.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright © 2011 Red Hat - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - * - * Authors: - * Jerome Glisse <j.glisse@gmail.com> - */ -#ifndef RBO_H -#define RBO_H - -#include "list.h" - -struct rbo { - struct list_head list; - int fd; - unsigned refcount; - unsigned mapcount; - unsigned handle; - unsigned size; - unsigned alignment; - void *data; -}; - -struct rbo *rbo(int fd, unsigned handle, unsigned size, - unsigned alignment, void *ptr); -int rbo_map(struct rbo *bo); -void rbo_unmap(struct rbo *bo); -struct rbo *rbo_incref(struct rbo *bo); -struct rbo *rbo_decref(struct rbo *bo); -int rbo_wait(struct rbo *bo); - -#endif |