rpms/xorg-x11-drv-i810/devel intel-stub.c, NONE, 1.1 .cvsignore, 1.25, 1.26 sources, 1.26, 1.27 xorg-x11-drv-i810.spec, 1.73, 1.74

[Kristian Høgsberg (krh)]

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-i810/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19912

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Added Files:
	intel-stub.c 
Log Message:
* Wed Feb 27 2008 Kristian Høgsberg <krh at redhat.com> - 2.2.1-1
- Bump to 2.2.1, include build of the intel-batchbuffer branch.



--- NEW FILE intel-stub.c ---
/*
 * Copyright © 2008 Red Hat, Inc.
 *
 * Permission is hereby granted, free of charge, to any person obtaining a
 * copy of this software and associated documentation files (the "Soft-
 * ware"), to deal in the Software without restriction, including without
 * limitation the rights to use, copy, modify, merge, publish, distribute,
 * and/or sell copies of the Software, and to permit persons to whom the
 * Software is furnished to do so, provided that the above copyright
 * notice(s) and this permission notice appear in all copies of the Soft-
 * ware and that both the above copyright notice(s) and this permission
 * notice appear in supporting documentation.
 *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
 * ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY
 * RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN
 * THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSE-
 * QUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
 * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
 * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFOR-
 * MANCE OF THIS SOFTWARE.
 *
 * Except as contained in this notice, the name of a copyright holder shall
 * not be used in advertising or otherwise to promote the sale, use or
 * other dealings in this Software without prior written authorization of
 * the copyright holder.
 *
 * Authors:
 *   Kristian Høgsberg (krh at redhat.com)
 */

#include "xorg-server.h"
#include "xf86.h"
#include "xf86Priv.h"

#define INTEL_VERSION_MAJOR 2
#define INTEL_VERSION_MINOR 2
#define INTEL_VERSION_PATCH 1

enum {
	FLAG_BATCHBUFFER,
};

static OptionInfoRec stubOptions[] = {
	{ FLAG_BATCHBUFFER, "intel-batchbuffer", OPTV_BOOLEAN, { 0 }, FALSE },
	{ -1, NULL, OPTV_NONE, { 0 }, FALSE },
};

static pointer
intelStubSetup(pointer module, pointer options, int *errmaj, int *errmin)
{
	pointer driver;
	Bool value;
	const char *name;

	xf86ProcessOptions(-1, xf86ConfigLayout.options, stubOptions);
	if (xf86GetOptValBool(stubOptions, FLAG_BATCHBUFFER, &value) && value)
		name = "intel_batchbuffer";
	else
		name = "intel_master";

	driver = LoadSubModule(module, name, NULL, NULL, NULL, NULL, 
			       errmaj, errmin);

	return driver;
}

static XF86ModuleVersionInfo intelStubVersRec = {
	"intel",
	MODULEVENDORSTRING,
	MODINFOSTRING1,
	MODINFOSTRING2,
	XORG_VERSION_CURRENT,
	INTEL_VERSION_MAJOR, INTEL_VERSION_MINOR, INTEL_VERSION_PATCH,
	ABI_CLASS_VIDEODRV,
	ABI_VIDEODRV_VERSION,
	MOD_CLASS_VIDEODRV,
	{0, 0, 0, 0}
};

/* We can't call this struct intelStubModuleData, since the loader
 * will look for "module name" + ModuleData. */

_X_EXPORT XF86ModuleData intelModuleData = {
	&intelStubVersRec,
	intelStubSetup,
	NULL
};


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- .cvsignore	27 Nov 2007 20:58:10 -0000	1.25
+++ .cvsignore	27 Feb 2008 22:32:21 -0000	1.26
@@ -1 +1,2 @@
-xf86-video-intel-2.2.0.tar.bz2
+xf86-video-intel-2.2.1.tar.bz2
+xf86-video-intel-2.2.0-185-g11adf8c.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	27 Nov 2007 20:58:10 -0000	1.26
+++ sources	27 Feb 2008 22:32:21 -0000	1.27
@@ -1 +1,2 @@
-e90d44adc819e8c5c76a1abde525a963  xf86-video-intel-2.2.0.tar.bz2
+3334dc5142871b78fc609fd1b3dac3f2  xf86-video-intel-2.2.1.tar.bz2
+596cd1e9415bfa7c4dbfa2dddf996a15  xf86-video-intel-2.2.0-185-g11adf8c.tar.bz2


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- xorg-x11-drv-i810.spec	20 Feb 2008 07:26:59 -0000	1.73
+++ xorg-x11-drv-i810.spec	27 Feb 2008 22:32:21 -0000	1.74
@@ -1,27 +1,35 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
+%define batchbuffer_version 2.2.0-185-g11adf8c
 
 Summary:   Xorg X11 Intel video driver(s)
 Name:      xorg-x11-drv-i810
-Version:   2.2.0
-Release:   4%{?dist}
+Version:   2.2.1
+Release:   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 
+
+# Update git snapshot by saying make dist distdir=$(git-describe) from
+# the intel-batchbuffer branch.
+Source1:   xf86-video-intel-%{batchbuffer_version}.tar.bz2 
 Source2:   i810.xinf
+Source3:   intel-stub.c
 
-Patch1: intel-2.2.0-alloca.patch
 Patch2: intel-2.1.1-fix-vt-switch.patch
 Patch3: intel-2.1.1-fix-xv-reset.patch
 Patch4: intel-2.1.1-fix-xv-compiz.patch
 
+Patch100: intel-master.patch
+Patch101: intel-batchbuffer.patch
+
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: autoconf automake libtool
-BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
+BuildRequires: xorg-x11-server-devel >= 1.4.99.1
 BuildRequires: libXvMC-devel
 BuildRequires: mesa-libGL-devel >= 6.5-9
 BuildRequires: libdrm-devel >= 2.0-1
@@ -44,25 +52,52 @@
 X.Org X11 Intel video driver XvMC development package.
 
 %prep
-%setup -q -n xf86-video-intel-%{version}
-%patch1 -p1 -b .alloca
+%setup -q -c %{name}-%{version} -a1
+
+cd xf86-video-intel-%{version}
 # XXX rebase me plz
 #patch2 -p1 -b .vtswitch
 %patch3 -p1 -b .xvfix
 #patch4 -p1 -b .xv-compiz
+%patch100 -p1 -b .intel-master
+
+cd ../xf86-video-intel-%{batchbuffer_version}
+%patch101 -p1 -b .intel-batchbuffer
 
 %build
+
+cd xf86-video-intel-%{version}
+%configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri
+make
+
+cd ../xf86-video-intel-%{batchbuffer_version}
 %configure --disable-static --libdir=%{_libdir} --mandir=%{_mandir} --enable-dri
 make
 
+# Build the wrapper driver that lets us load either intel_master or
+# intel_batchbuffer driver as just 'intel'
+
+cd ..
+gcc -o intel_drv.so -shared %{SOURCE3} \
+	$RPM_OPT_FLAGS $(pkg-config --cflags --libs xorg-server)
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make -C xf86-video-intel-%{version} install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/intel_drv.so  $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/intel_master_drv.so
+
+make -C xf86-video-intel-%{batchbuffer_version} install DESTDIR=$RPM_BUILD_ROOT
+mv $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/intel_drv.so  $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/intel_batchbuffer_drv.so
+
+mkdir -p $RPM_BUILD_ROOT%{driverdir}
+install -m 0755 %{_builddir}/%{name}-%{version}/intel_drv.so \
+	$RPM_BUILD_ROOT%{driverdir}
 
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/hwdata/videoaliases/
 
+
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
 %clean
@@ -72,6 +107,8 @@
 %defattr(-,root,root,-)
 %{driverdir}/i810_drv.so
 %{driverdir}/intel_drv.so
+%{driverdir}/intel_master_drv.so
+%{driverdir}/intel_batchbuffer_drv.so
 %{driverdir}/ch7xxx.so
 %{driverdir}/sil164.so
 %{driverdir}/ch7017.so
@@ -87,6 +124,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Wed Feb 27 2008 Kristian Høgsberg <krh at redhat.com> - 2.2.1-1
+- Bump to 2.2.1, include build of the intel-batchbuffer branch.
+
 * Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.0-4
 - Autorebuild for GCC 4.3