From 31f62932422dc94c2d254eca6ed91470a4521a74 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Mon, 28 Feb 2011 18:13:26 +0000
Subject: [PATCH] - rel 2; kernel-small_fixes is back after evil broke it;
 virtio conditional dropped (always build it as module)

Changed files:
    kernel-patches.config -> 1.9
    kernel.spec -> 1.886
---
 kernel-patches.config |  3 +++
 kernel.spec           | 24 +++++++++---------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/kernel-patches.config b/kernel-patches.config
index 4bfe2fd9..6faedcc5 100644
--- a/kernel-patches.config
+++ b/kernel-patches.config
@@ -53,3 +53,6 @@ RING all=m
 
 NET_SCH_ESFQ all=m
 NET_SCH_ESFQ_NFCT all=y
+
+# virtio-gl
+VIRTIOGL=m
diff --git a/kernel.spec b/kernel.spec
index 5c7b3bdd..91279e53 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -31,7 +31,6 @@
 %bcond_with	fbcondecor	# build fbcondecor (disable FB_TILEBLITTING and affected fb modules)
 %bcond_with	pae		# build PAE (HIGHMEM64G) support on uniprocessor
 %bcond_with	nfsroot		# build with root on NFS support
-%bcond_with	virtio_gl	# build with virtio_gl thats avaible under guest OS with patched qemu (qemu-gl.spec)
 
 %bcond_without	imq		# imq support
 %bcond_without	wrr		# wrr support
@@ -56,10 +55,6 @@
 %define		with_pax		1
 %endif
 
-%if %{with virtio_gl}
-%define		with_virtiogl		1
-%endif
-
 %define		have_drm	1
 %define		have_oss	1
 %define		have_sound	1
@@ -93,7 +88,7 @@
 
 %define		basever		2.6.37
 %define		postver		.2
-%define		rel		1
+%define		rel		2
 
 %define		_enable_debug_packages			0
 
@@ -106,7 +101,7 @@
 %endif
 %else
 %if %{without rescuecd}
-%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{?with_pae:pae}%{?with_virtiogl:virtiogl}
+%define		__alt_kernel	%{?with_pax:pax}%{!?with_grsecurity:nogrsecurity}%{?with_pae:pae}
 %if "%{__alt_kernel}" != ""
 %define		alt_kernel	%{__alt_kernel}
 %endif
@@ -281,6 +276,9 @@ Patch250:	kernel-fix_256colors_menuconfig.patch
 # http://www.ssi.bg/~ja/routes-2.6.37-16.diff
 Patch300:	kernel-routes.patch
 
+# https://patchwork.kernel.org/patch/236261/
+Patch400:	kernel-virtio-gl-accel.patch
+
 Patch2000:	kernel-small_fixes.patch
 Patch2001:	kernel-pwc-uncompress.patch
 Patch2003:	kernel-regressions.patch
@@ -309,7 +307,6 @@ Patch10002:	kernel-grsec_fixes.patch
 # Do not remove this line, please. It is easier for me to uncomment two lines, then patch
 # kernel.spec every time.
 #Patch50000:	kernel-usb_reset.patch
-Patch60000:	kernel-virtio-gl-accel.patch
 
 URL:		http://www.kernel.org/
 BuildRequires:	binutils >= 3:2.18
@@ -445,7 +442,6 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %{?with_pax:PaX support - enabled}\
 %{?with_fbcondecor:Fbsplash/fbcondecor - enabled }\
 %{?with_nfsroot:Root on NFS - enabled}\
-%{?with_virtiogl:virtio_gl for qemu-gl guest OpenGL accel - enabled}\
 
 %define Features %(echo "%{__features}" | sed '/^$/d')
 
@@ -808,14 +804,16 @@ sed -i 's/-Werror//' arch/alpha/kernel/Makefile
 # routes
 %patch300 -p1
 
+# virtio-gl
+%patch400 -p1
+
 # Small fixes:
-#%patch2000 -p1
+%patch2000 -p1
 %patch2001 -p1
 #%patch2003 -p1
 
 # Do not remove this, please!
 #%patch50000 -p1
-%{?with_virtiogl:%patch60000 -p1}
 
 # Fix EXTRAVERSION in main Makefile
 sed -i 's#EXTRAVERSION =.*#EXTRAVERSION = %{postver}%{?alt_kernel:_%{alt_kernel}}#g' Makefile
@@ -972,10 +970,6 @@ BuildConfig() {
 		CONFIG_ROOT_NFS=y
 %endif
 
-%if %{with virtio_gl}
-		CONFIG_VIRTIOGL=m
-%endif
-
 # Temporary disabled RELOCATABLE. Needed only on x86??
 %if %{with pax} || %{with grsecurity}
 		CONFIG_RELOCATABLE=n
-- 
2.44.0