rpms/libdrm
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- add back modesetting support - this is a snapshot from modesetting-gem

Browse Source 
- any bugs are in the other packages that fail to build
This commit is contained in:
Dave Airlie 2008-08-14 05:51:06 +00:00
parent 0f7039d7f0
commit cea73d9741
5 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
libdrm-20080811.tar.bz2 libdrm-20080814.tar.bz2

14
libdrm-2.4.0-no-bc.patch
View File

@ -1,10 +1,10 @@
diff -up libdrm-20080811/libdrm/xf86drm.c.jx libdrm-20080811/libdrm/xf86drm.c diff -up libdrm-20080814/libdrm/xf86drm.c.no-bc libdrm-20080814/libdrm/xf86drm.c
--- libdrm-20080811/libdrm/xf86drm.c.jx 2008-08-11 13:48:47.000000000 -0400 --- libdrm-20080814/libdrm/xf86drm.c.no-bc 2008-08-14 15:43:09.000000000 +1000
+++ libdrm-20080811/libdrm/xf86drm.c 2008-08-11 15:12:02.000000000 -0400 +++ libdrm-20080814/libdrm/xf86drm.c 2008-08-14 15:45:09.000000000 +1000
@@ -393,11 +393,6 @@ int drmAvailable(void) @@ -396,11 +396,6 @@ int drmAvailable(void)
int fd; int fd;
if ((fd = drmOpenMinor(0, 1)) < 0) { if ((fd = drmOpenMinor(0, 1, DRM_NODE_RENDER)) < 0) {
-#ifdef __linux__ -#ifdef __linux__
- /* Try proc for backward Linux compatibility */ - /* Try proc for backward Linux compatibility */
- if (!access("/proc/dri/0", R_OK)) - if (!access("/proc/dri/0", R_OK))
@ -13,7 +13,7 @@ diff -up libdrm-20080811/libdrm/xf86drm.c.jx libdrm-20080811/libdrm/xf86drm.c
return 0; return 0;
} }
@@ -516,38 +511,6 @@ static int drmOpenByName(const char *nam @@ -519,38 +514,6 @@ static int drmOpenByName(const char *nam
} }
} }
@ -40,7 +40,7 @@ diff -up libdrm-20080811/libdrm/xf86drm.c.jx libdrm-20080811/libdrm/xf86drm.c
- if (*pt) { /* Found busid */ - if (*pt) { /* Found busid */
- return drmOpenByBusid(++pt); - return drmOpenByBusid(++pt);
- } else { /* No busid */ - } else { /* No busid */
- return drmOpenDevice(strtol(devstring, NULL, 0),i); - return drmOpenDevice(strtol(devstring, NULL, 0),i, DRM_NODE_RENDER);
- } - }
- } - }
- } - }

9
libdrm.spec
View File

@ -1,9 +1,9 @@
%define gitdate 20080811 %define gitdate 20080814
Summary: Direct Rendering Manager runtime library Summary: Direct Rendering Manager runtime library
Name: libdrm Name: libdrm
Version: 2.4.0 Version: 2.4.0
Release: 0.18%{?dist} Release: 0.19%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://dri.sourceforge.net URL: http://dri.sourceforge.net
@ -84,12 +84,17 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-) %defattr(-,root,root,-)
# FIXME should be in drm/ too # FIXME should be in drm/ too
%{_includedir}/xf86drm.h %{_includedir}/xf86drm.h
%{_includedir}/xf86drmMode.h
%{_includedir}/dri_bufmgr.h %{_includedir}/dri_bufmgr.h
%{_includedir}/intel_bufmgr.h %{_includedir}/intel_bufmgr.h
%{_libdir}/libdrm.so %{_libdir}/libdrm.so
%{_libdir}/pkgconfig/libdrm.pc %{_libdir}/pkgconfig/libdrm.pc
%changelog %changelog
* Thu Aug 14 2008 Dave Airlie <airlied@redhat.com> 2.4.0-0.19
- add back modesetting support - this is a snapshot from modesetting-gem
- any bugs are in the other packages that fail to build
* Mon Aug 11 2008 Adam Jackson <ajax@redhat.com> 2.4.0-0.18 * Mon Aug 11 2008 Adam Jackson <ajax@redhat.com> 2.4.0-0.18
- Today's git snap. - Today's git snap.

4
make-git-snapshot.sh
View File

@ -16,6 +16,10 @@ rm -rf $DIRNAME
git clone ${REF:+--reference $REF} \ git clone ${REF:+--reference $REF} \
git://git.freedesktop.org/git/mesa/drm $DIRNAME git://git.freedesktop.org/git/mesa/drm $DIRNAME
cd $DIRNAME
git checkout -f origin/modesetting-gem
cd -
GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \ GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
| bzip2 > $DIRNAME.tar.bz2 | bzip2 > $DIRNAME.tar.bz2

2
sources
View File

@ -1 +1 @@
43ebfba0a885e8d8ae1286ba0149d3fa libdrm-20080811.tar.bz2 2af5325c8ae923a7cbaea3671bc7b969 libdrm-20080814.tar.bz2