rpms/libdrm/devel .cvsignore, 1.21, 1.22 libdrm.spec, 1.76, 1.77 make-git-snapshot.sh, 1.3, 1.4 sources, 1.21, 1.22 libdrm-2.4.7-revert-bong.patch, 1.1, NONE libdrm-intel-gtt.patch, 1.1, NONE libdrm-radeon.patch, 1.9, NONE radeon-bo-name.patch, 1.1, NONE

[Dave Airlie]

Author: airlied

Update of /cvs/pkgs/rpms/libdrm/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10936

Modified Files:
	.cvsignore libdrm.spec make-git-snapshot.sh sources 
Removed Files:
	libdrm-2.4.7-revert-bong.patch libdrm-intel-gtt.patch 
	libdrm-radeon.patch radeon-bo-name.patch 
Log Message:
* Mon Jun 22 2009 Dave Airlie <airlied at redhat.com> 2.4.12-0.1
- rebase onto git snapshot - remove radeon patch in master now



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	9 Jun 2009 01:15:29 -0000	1.21
+++ .cvsignore	21 Jun 2009 23:33:10 -0000	1.22
@@ -1 +1 @@
-libdrm-2.4.11.tar.bz2
+libdrm-20090622.tar.bz2


Index: libdrm.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/libdrm.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- libdrm.spec	9 Jun 2009 01:15:30 -0000	1.76
+++ libdrm.spec	21 Jun 2009 23:33:11 -0000	1.77
@@ -1,14 +1,14 @@
-%define gitdate 20080930
+%define gitdate 20090622
 
 Summary: Direct Rendering Manager runtime library
 Name: libdrm
-Version: 2.4.11
-Release: 0%{?dist}
+Version: 2.4.12
+Release: 0.1%{?dist}
 License: MIT
 Group: System Environment/Libraries
 URL: http://dri.sourceforge.net
-Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
-#Source0: %{name}-%{gitdate}.tar.bz2
+#Source0: http://dri.freedesktop.org/libdrm/%{name}-%{version}.tar.bz2
+Source0: %{name}-%{gitdate}.tar.bz2
 Source1: make-git-snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,8 +26,6 @@ Source2: 91-drm-modeset.rules
 Patch3: libdrm-make-dri-perms-okay.patch
 # remove backwards compat not needed on Fedora
 Patch4: libdrm-2.4.0-no-bc.patch
-# radeon libdrm patches from modesetting-gem branch of upstream
-Patch8: libdrm-radeon.patch
 
 %description
 Direct Rendering Manager runtime library
@@ -43,14 +41,13 @@ Requires: pkgconfig
 Direct Rendering Manager development package
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{gitdate}
 %patch3 -p1 -b .forceperms
 %patch4 -p1 -b .no-bc
-%patch8 -p1 -b .radeon
 
 %build
 autoreconf -v --install || exit 1
-%configure --enable-udev --enable-nouveau-experimental-api
+%configure --enable-udev --enable-nouveau-experimental-api --enable-radeon-experimental-api
 make %{?_smp_mflags}
 
 %install
@@ -106,6 +103,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libdrm_nouveau.pc
 
 %changelog
+* Mon Jun 22 2009 Dave Airlie <airlied at redhat.com> 2.4.12-0.1
+- rebase onto git snapshot - remove radeon patch in master now
+
 * Mon Jun  8 2009 Kristian Høgsberg <krh at redhat.com> - 2.4.11-0
 - Bump to 2.4.11.
 


Index: make-git-snapshot.sh
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/make-git-snapshot.sh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- make-git-snapshot.sh	14 Aug 2008 05:51:06 -0000	1.3
+++ make-git-snapshot.sh	21 Jun 2009 23:33:11 -0000	1.4
@@ -16,10 +16,6 @@ rm -rf $DIRNAME
 git clone ${REF:+--reference $REF} \
 	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} \
 	| bzip2 > $DIRNAME.tar.bz2
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libdrm/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	9 Jun 2009 01:15:30 -0000	1.21
+++ sources	21 Jun 2009 23:33:11 -0000	1.22
@@ -1 +1 @@
-e0e66fae165d0b665b61e9516bf33ade  libdrm-2.4.11.tar.bz2
+e027cc71e9cbc7a66fa0a8a1c0203bac  libdrm-20090622.tar.bz2


--- libdrm-2.4.7-revert-bong.patch DELETED ---


--- libdrm-intel-gtt.patch DELETED ---


--- libdrm-radeon.patch DELETED ---


--- radeon-bo-name.patch DELETED ---