Hello community,
here is the log from the commit of package xorg-x11-driver-video for
openSUSE:Factory
checked in at Mon Jul 4 09:43:50 CEST 2011.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2011-06-22
10:27:29.000000000 +0200
+++
/mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes
2011-07-02 21:11:24.000000000 +0200
@@ -1,0 +2,16 @@
+Sat Jul 2 18:42:53 UTC 2011 - sndir...@novell.com
+
+- xf86-video-geode-Stop-including-linux-videodev.h-in-z4l.c.patch
+ * Stop including "linux/videodev.h" in z4l.c V4L1 support was
+ dropped as of Linux kernel 2.6.38
+
+-------------------------------------------------------------------
+Fri Jul 1 10:51:57 UTC 2011 - sndir...@novell.com
+
+- commented out xorg.conf.d snippets by default, since
+ "use-last-screen.patch" of xorg-x11-server package hasn't been
+ accepted upstream and we want to get rid of it; documented the
+ issues in the conf.d files themselves, when make use of these
+ sections (fdo #32430)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
xf86-video-geode-Stop-including-linux-videodev.h-in-z4l.c.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.PEkc4p/_old 2011-07-04 09:43:16.000000000 +0200
+++ /var/tmp/diff_new_pack.PEkc4p/_new 2011-07-04 09:43:16.000000000 +0200
@@ -23,7 +23,7 @@
BuildRequires: Mesa-devel libdrm-devel pkgconfig xorg-x11-proto-devel
xorg-x11-server-sdk
Url: http://xorg.freedesktop.org/
Version: 7.6
-Release: 71
+Release: 73
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -97,6 +97,7 @@
Patch145: xf86-video-xgixp-symbols.diff
Patch150: xf86-video-intel-dell_backlight.diff
Patch155: xf86-video-intel-copyfb.diff
+Patch156: xf86-video-geode-Stop-including-linux-videodev.h-in-z4l.c.patch
%description
This package contains X.Org video drivers.
@@ -152,6 +153,11 @@
pushd xf86-video-xgixp-*
%patch145 -p1
popd
+%ifarch %ix86
+pushd xf86-video-geode-*
+%patch156 -p1
+popd
+%endif
%build
for dir in $(ls -d xf86-video-*) intel-gpu-tools-*; do
++++++ xf86-video-geode-Stop-including-linux-videodev.h-in-z4l.c.patch ++++++
>From 30d46e6c28479e07ac8328b6f4dfc2692eb1ac6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin-=C3=89ric=20Racine?= <martin-eric.rac...@iki.fi>
Date: Mon, 7 Feb 2011 00:04:06 +0000
Subject: [PATCH] Stop including "linux/videodev.h" in z4l.c
V4L1 support was dropped as of Linux kernel 2.6.38
---
src/z4l.c | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/z4l.c b/src/z4l.c
index 11b3fa5..d44ff73 100644
--- a/src/z4l.c
+++ b/src/z4l.c
@@ -55,7 +55,6 @@ typedef long long __s64;
#define __u64 __u_64
typedef unsigned long long __u64;
-#include "linux/videodev.h"
#define __user
#include "linux/videodev2.h"
--
1.7.4.1
++++++ xorg-confd-snippets.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xorg.conf.d/50-device.conf
new/etc/X11/xorg.conf.d/50-device.conf
--- old/etc/X11/xorg.conf.d/50-device.conf 2010-04-22 17:48:58.000000000
+0200
+++ new/etc/X11/xorg.conf.d/50-device.conf 2011-07-01 12:49:43.000000000
+0200
@@ -1,10 +1,15 @@
-Section "Device"
- Identifier "Default Device"
-
- #Driver "radeon"
-
- ## Required magic for radeon/radeonhd drivers; output name
- ## (here: "DVI-0") can be figured out via 'xrandr -q'
- #Option "monitor-DVI-0" "Default Monitor"
-
-EndSection
+# Having multiple "Device" sections is known to be problematic. Make
+# sure you don't have in use another one laying around e.g. in another
+# xorg.conf.d file or even a generic xorg.conf file. More details can
+# be found in https://bugs.freedesktop.org/show_bug.cgi?id=32430.
+#
+#Section "Device"
+# Identifier "Default Device"
+#
+# #Driver "radeon"
+#
+# ## Required magic for radeon/radeonhd drivers; output name
+# ## (here: "DVI-0") can be figured out via 'xrandr -q'
+# #Option "monitor-DVI-0" "Default Monitor"
+#
+#EndSection
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xorg.conf.d/50-monitor.conf
new/etc/X11/xorg.conf.d/50-monitor.conf
--- old/etc/X11/xorg.conf.d/50-monitor.conf 2010-04-22 17:48:52.000000000
+0200
+++ new/etc/X11/xorg.conf.d/50-monitor.conf 2011-07-01 12:49:53.000000000
+0200
@@ -1,11 +1,16 @@
-Section "Monitor"
- Identifier "Default Monitor"
-
- ## If your monitor doesn't support DDC you may override the
- ## defaults here
- #HorizSync 28-85
- #VertRefresh 50-100
-
- ## Add your mode lines here, use e.g the cvt tool
-
-EndSection
+# Having multiple "Monitor" sections is known to be problematic. Make
+# sure you don't have in use another one laying around e.g. in another
+# xorg.conf.d file or even a generic xorg.conf file. More details can
+# be found in https://bugs.freedesktop.org/show_bug.cgi?id=32430.
+#
+#Section "Monitor"
+# Identifier "Default Monitor"
+#
+# ## If your monitor doesn't support DDC you may override the
+# ## defaults here
+# #HorizSync 28-85
+# #VertRefresh 50-100
+#
+# ## Add your mode lines here, use e.g the cvt tool
+#
+#EndSection
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/etc/X11/xorg.conf.d/50-screen.conf
new/etc/X11/xorg.conf.d/50-screen.conf
--- old/etc/X11/xorg.conf.d/50-screen.conf 2010-04-22 17:48:47.000000000
+0200
+++ new/etc/X11/xorg.conf.d/50-screen.conf 2011-07-01 12:50:05.000000000
+0200
@@ -1,10 +1,15 @@
-Section "Screen"
- Identifier "Default Screen"
-
- Device "Default Device"
-
- ## Doesn't help for radeon/radeonhd drivers; use magic in
- ## 50-device.conf instead
- Monitor "Default Monitor"
-
-EndSection
+# Having multiple "Screen" sections is known to be problematic. Make
+# sure you don't have in use another one laying around e.g. in another
+# xorg.conf.d file or even a generic xorg.conf file. More details can
+# be found in https://bugs.freedesktop.org/show_bug.cgi?id=32430.
+#
+#Section "Screen"
+# Identifier "Default Screen"
+#
+# Device "Default Device"
+#
+# ## Doesn't help for radeon/radeonhd drivers; use magic in
+# ## 50-device.conf instead
+# Monitor "Default Monitor"
+#
+#EndSection
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
