rpms/xorg-x11-drv-intel/devel make-git-snapshot.sh, NONE, 1.1 .cvsignore, 1.3, 1.4 copy-fb.patch, 1.3, 1.4 sources, 1.4, 1.5 xorg-x11-drv-intel.spec, 1.13, 1.14 abi.patch, 1.1, NONE intel-2.6.99.902-to-git.patch, 1.1, NONE intel-2.7-dont-gtt-map-big-objects.patch, 1.1, NONE intel-2.7-fixes.patch, 1.1, NONE intel-2.7-glyph-copyarea-upload.patch, 1.1, NONE rc1-to-2.7.patch, 1.1, NONE
Adam Jackson
ajax at fedoraproject.org
Wed Jun 24 18:31:36 UTC 2009
- Previous message (by thread): rpms/mkinitrd/devel .cvsignore, 1.226, 1.227 mkinitrd.spec, 1.323, 1.324 sources, 1.268, 1.269
- Next message (by thread): rpms/kernel/devel patch-2.6.30-git22.bz2.sign, NONE, 1.1 .cvsignore, 1.1084, 1.1085 Makefile, 1.104, 1.105 config-debug, 1.24, 1.25 config-generic, 1.292, 1.293 config-nodebug, 1.33, 1.34 config-s390x, 1.15, 1.16 kernel.spec, 1.1587, 1.1588 linux-2.6-defaults-pci_no_msi.patch, 1.5, 1.6 sources, 1.1042, 1.1043 upstream, 1.956, 1.957 linux-2.6-net-velocity-pktlen.patch, 1.1, NONE patch-2.6.30-git18.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19206
Modified Files:
.cvsignore copy-fb.patch sources xorg-x11-drv-intel.spec
Added Files:
make-git-snapshot.sh
Removed Files:
abi.patch intel-2.6.99.902-to-git.patch
intel-2.7-dont-gtt-map-big-objects.patch intel-2.7-fixes.patch
intel-2.7-glyph-copyarea-upload.patch rc1-to-2.7.patch
Log Message:
* Wed Jun 24 2009 Adam Jackson <ajax at redhat.com> 2.8.0-0.1
- Today's git snapshots (driver and gpu tools)
--- NEW FILE make-git-snapshot.sh ---
#!/bin/sh
# Usage: ./make-git-snapshot.sh [COMMIT]
#
# to make a snapshot of the given tag/branch. Defaults to HEAD.
# Point env var REF to a local mesa repo to reduce clone time.
DIRNAME=xf86-video-intel-$( date +%Y%m%d )
echo REF ${REF:+--reference $REF}
echo DIRNAME $DIRNAME
echo HEAD ${1:-HEAD}
rm -rf $DIRNAME
git clone ${REF:+--reference $REF} \
git://git.freedesktop.org/git/xorg/driver/xf86-video-intel $DIRNAME
GIT_DIR=$DIRNAME/.git git archive --format=tar --prefix=$DIRNAME/ ${1:-HEAD} \
| bzip2 > $DIRNAME.tar.bz2
# rm -rf $DIRNAME
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore 11 Mar 2009 15:44:40 -0000 1.3
+++ .cvsignore 24 Jun 2009 18:31:04 -0000 1.4
@@ -1 +1,3 @@
xf86-video-intel-2.6.99.902.tar.bz2
+intel-gpu-tools-20090624.tar.bz2
+xf86-video-intel-20090624.tar.bz2
copy-fb.patch:
Index: copy-fb.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/copy-fb.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- copy-fb.patch 5 Mar 2009 22:58:57 -0000 1.3
+++ copy-fb.patch 24 Jun 2009 18:31:04 -0000 1.4
@@ -1,13 +1,6 @@
-commit b209cbc72f8d524b2c4c6d0e6e6acf8385e96062
-Author: Kristian Høgsberg <krh at redhat.com>
-Date: Tue Feb 24 10:49:45 2009 -0500
-
- Copy initial framebuffer contents when starting with -br.
-
-diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index df0f1a2..35dc24c 100644
---- a/src/drmmode_display.c
-+++ b/src/drmmode_display.c
+diff -up xf86-video-intel-20090624/src/drmmode_display.c.jx xf86-video-intel-20090624/src/drmmode_display.c
+--- xf86-video-intel-20090624/src/drmmode_display.c.jx 2009-06-24 13:57:46.000000000 -0400
++++ xf86-video-intel-20090624/src/drmmode_display.c 2009-06-24 13:59:20.000000000 -0400
@@ -29,6 +29,8 @@
#include "config.h"
#endif
@@ -16,8 +9,8 @@ index df0f1a2..35dc24c 100644
+
#include "xorgVersion.h"
- #ifdef XF86DRM_MODE
-@@ -145,7 +147,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+ #include "i830.h"
+@@ -163,7 +165,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc,
unsigned int pitch = pScrn->displayWidth * pI830->cpp;
if (drmmode->fb_id == 0) {
@@ -26,7 +19,7 @@ index df0f1a2..35dc24c 100644
pScrn->virtualX, pScrn->virtualY,
pScrn->depth, pScrn->bitsPerPixel,
pitch, pI830->front_buffer->bo->handle,
-@@ -523,6 +525,13 @@ drmmode_output_dpms(xf86OutputPtr output, int mode)
+@@ -728,6 +730,13 @@ drmmode_output_dpms(xf86OutputPtr output
drmmode_ptr drmmode = drmmode_output->drmmode;
int i;
drmModePropertyPtr props;
@@ -40,19 +33,20 @@ index df0f1a2..35dc24c 100644
for (i = 0; i < koutput->count_props; i++) {
props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
-@@ -753,6 +762,8 @@ Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp)
+@@ -1073,6 +1082,8 @@ drmmode_xf86crtc_resize (ScrnInfoPtr scr
+ if (old_front)
+ i830_free_memory(scrn, old_front);
- xf86InitialConfiguration(pScrn, pI830->can_resize);
-
-+ pScrn->canDoBGNoneRoot = TRUE;
++ scrn->canDoBGNoneRoot = TRUE;
+
return TRUE;
- }
-@@ -780,4 +791,97 @@ Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData, dri_bo **bo)
- #endif
- }
+ fail:
+@@ -1129,3 +1140,98 @@ drmmode_get_pipe_from_crtc_id(drm_intel_
+ return drm_intel_get_pipe_from_crtc_id (bufmgr, drmmode_crtc->mode_crtc->crtc_id);
+ }
++
+static PixmapPtr
+drmmode_create_pixmap_for_fbcon(ScrnInfoPtr pScrn)
+{
@@ -110,6 +104,7 @@ index df0f1a2..35dc24c 100644
+
+ return pixmap;
+}
++
+void drmmode_copy_fb(ScrnInfoPtr pScrn)
+{
+ ScreenPtr pScreen = screenInfo.screens[pScrn->scrnIndex];
@@ -146,24 +141,10 @@ index df0f1a2..35dc24c 100644
+ (*pScreen->DestroyPixmap)(dst);
+}
+
- #endif
-diff --git a/src/i830.h b/src/i830.h
-index cd9c38a..8651169 100644
---- a/src/i830.h
-+++ b/src/i830.h
-@@ -835,6 +835,7 @@ void I830DRI2CloseScreen(ScreenPtr pScreen);
- extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
- extern Bool drmmode_is_rotate_pixmap(ScrnInfoPtr pScrn, pointer pPixData,
- dri_bo **bo);
-+extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
- #endif
-
- extern Bool I830AccelInit(ScreenPtr pScreen);
-diff --git a/src/i830_driver.c b/src/i830_driver.c
-index f80ca69..0591db9 100644
---- a/src/i830_driver.c
-+++ b/src/i830_driver.c
-@@ -3725,6 +3725,8 @@ I830EnterVT(int scrnIndex, int flags)
+diff -up xf86-video-intel-20090624/src/i830_driver.c.jx xf86-video-intel-20090624/src/i830_driver.c
+--- xf86-video-intel-20090624/src/i830_driver.c.jx 2009-06-23 18:35:41.000000000 -0400
++++ xf86-video-intel-20090624/src/i830_driver.c 2009-06-24 13:57:58.000000000 -0400
+@@ -3097,6 +3097,8 @@ I830EnterVT(int scrnIndex, int flags)
/* Clear the framebuffer */
memset(pI830->FbBase + pScrn->fbOffset, 0,
pScrn->virtualY * pScrn->displayWidth * pI830->cpp);
@@ -172,3 +153,14 @@ index f80ca69..0591db9 100644
}
if (!xf86SetDesiredModes (pScrn))
+diff -up xf86-video-intel-20090624/src/i830.h.jx xf86-video-intel-20090624/src/i830.h
+--- xf86-video-intel-20090624/src/i830.h.jx 2009-06-23 18:35:41.000000000 -0400
++++ xf86-video-intel-20090624/src/i830.h 2009-06-24 13:59:49.000000000 -0400
+@@ -691,6 +691,7 @@ void I830DRI2CloseScreen(ScreenPtr pScre
+
+ extern Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
+ extern int drmmode_get_pipe_from_crtc_id(drm_intel_bufmgr *bufmgr, xf86CrtcPtr crtc);
++extern void drmmode_copy_fb(ScrnInfoPtr pScrn);
+
+ extern Bool I830AccelInit(ScreenPtr pScreen);
+ extern void I830SetupForScreenToScreenCopy(ScrnInfoPtr pScrn, int xdir,
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 22 Jun 2009 21:31:45 -0000 1.4
+++ sources 24 Jun 2009 18:31:04 -0000 1.5
@@ -1,2 +1,2 @@
-5832172ac69b9a066a202e1578a5d3c8 xf86-video-intel-2.7.0.tar.bz2
-6f03b21b598ef1b3af5280c8f9e01fa1 intel-gpu-tools-20090507.tar.bz2
+df3d898b00c84228c37ecb454a6e63e7 intel-gpu-tools-20090624.tar.bz2
+2892648278871dad4d2d151534d4c596 xf86-video-intel-20090624.tar.bz2
Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/devel/xorg-x11-drv-intel.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xorg-x11-drv-intel.spec 22 Jun 2009 21:31:45 -0000 1.13
+++ xorg-x11-drv-intel.spec 24 Jun 2009 18:31:04 -0000 1.14
@@ -2,29 +2,28 @@
%define legacyver 2.6.0-8
%define moduledir %(pkg-config xorg-server --variable=moduledir )
%define driverdir %{moduledir}/drivers
-%define gputoolsdate 20090507
+%define gputoolsdate 20090624
+%define gitdate 20090624
Summary: Xorg X11 Intel video driver
Name: xorg-x11-drv-intel
-Version: 2.7.0
-Release: 8%{?dist}
+Version: 2.8.0
+Release: 0.1%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2
+#Source0: http://xorg.freedesktop.org/archive/individual/driver/xf86-video-intel-%{version}.tar.bz2
+Source0: xf86-video-intel-%{gitdate}.tar.bz2
Source1: make-intel-gpu-tools-snapshot.sh
Source2: intel.xinf
Source3: intel-gpu-tools-%{gputoolsdate}.tar.bz2
+Source4: make-git-snapshot.sh
Patch1: kill-svideo.patch
Patch2: copy-fb.patch
-# patches from 2.7 branch
-Patch10: intel-2.7-fixes.patch
-Patch11: intel-2.7-dont-gtt-map-big-objects.patch
-
# needs to be upstreamed
Patch20: intel-2.6.99.902-kms-get-crtc.patch
Patch21: intel-2.7.0-lvds-default-modes.patch
@@ -32,8 +31,6 @@ Patch21: intel-2.7.0-lvds-default-modes.
# Disable xv vsync, it locks up the GPU
Patch22: intel-2.7-dont-vsync-xv.patch
-Patch23: abi.patch
-
ExclusiveArch: %{ix86} x86_64 ia64
BuildRequires: autoconf automake libtool
@@ -72,14 +69,11 @@ Group: Development/Tools
Debugging tools for Intel graphics chips
%prep
-%setup -q -n xf86-video-intel-%{version} -b3
+%setup -q -n xf86-video-intel-%{gitdate} -b3
%patch1 -p1 -b .svideo
%patch2 -p1 -b .copy-fb
-%patch10 -p1 -b .2.7-fixes
%patch20 -p1 -b .get-crtc
-%patch11 -p1 -b .big-objects
-
# notyet. we don't handle switching in and out of tiled front buffer
# correctly yet, so let's not have people stumble into it more than
# they have to.
@@ -87,11 +81,11 @@ Debugging tools for Intel graphics chips
%patch22 -p1 -b .xv-vsync
-%patch23 -p1 -b .abi
-
%build
-
-# autoreconf -vi
+
+%if 0%{?gitdate}
+autoreconf -vi
+%endif
%configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri --enable-kms
make
@@ -138,8 +132,12 @@ rm -rf $RPM_BUILD_ROOT
%files -n intel-gpu-tools
%defattr(-,root,root,-)
%{_bindir}/intel_*
+%{_mandir}/man1/intel_*.1*
%changelog
+* Wed Jun 24 2009 Adam Jackson <ajax at redhat.com> 2.8.0-0.1
+- Today's git snapshots (driver and gpu tools)
+
* Mon Jun 22 2009 Adam Jackson <ajax at redhat.com> 2.7.0-8
- Fix ABI for new server version
--- abi.patch DELETED ---
--- intel-2.6.99.902-to-git.patch DELETED ---
--- intel-2.7-dont-gtt-map-big-objects.patch DELETED ---
--- intel-2.7-fixes.patch DELETED ---
--- intel-2.7-glyph-copyarea-upload.patch DELETED ---
--- rc1-to-2.7.patch DELETED ---
- Previous message (by thread): rpms/mkinitrd/devel .cvsignore, 1.226, 1.227 mkinitrd.spec, 1.323, 1.324 sources, 1.268, 1.269
- Next message (by thread): rpms/kernel/devel patch-2.6.30-git22.bz2.sign, NONE, 1.1 .cvsignore, 1.1084, 1.1085 Makefile, 1.104, 1.105 config-debug, 1.24, 1.25 config-generic, 1.292, 1.293 config-nodebug, 1.33, 1.34 config-s390x, 1.15, 1.16 kernel.spec, 1.1587, 1.1588 linux-2.6-defaults-pci_no_msi.patch, 1.5, 1.6 sources, 1.1042, 1.1043 upstream, 1.956, 1.957 linux-2.6-net-velocity-pktlen.patch, 1.1, NONE patch-2.6.30-git18.bz2.sign, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list