Hello community,
here is the log from the commit of package xorg-x11-driver-video for
openSUSE:Factory
checked in at Tue Jun 14 12:21:39 CEST 2011.
--------
--- xorg-x11-driver-video/xorg-x11-driver-video.changes 2011-05-02
12:55:34.000000000 +0200
+++
/mounts/work_src_done/STABLE/xorg-x11-driver-video/xorg-x11-driver-video.changes
2011-05-31 13:50:51.000000000 +0200
@@ -1,0 +2,36 @@
+Tue May 31 11:49:11 UTC 2011 - e...@suse.de
+
+- remove support for HALlib for Matrox driver.
+
+-------------------------------------------------------------------
+Wed May 25 12:31:57 UTC 2011 - e...@suse.de
+
+- remove xf86-video-intel-buildfix.diff:
+ The function type has been adjusted already.
+
+-------------------------------------------------------------------
+Wed May 25 12:22:21 UTC 2011 - e...@suse.de
+
+- remove xf86-video-fbdev.diff:
+ Noone uses this code path any more today.
+
+-------------------------------------------------------------------
+Wed May 25 09:14:01 UTC 2011 - e...@suse.de
+
+- remove xf86-video-vmware-10.15.2.diff:
+ According to https://bugs.freedesktop.org/show_bug.cgi?id=14208
+ this bug has been fixed in the vmware driver in version 10.16.9.
+
+-------------------------------------------------------------------
+Wed May 25 08:48:25 UTC 2011 - e...@suse.de
+
+- remove xf86-video-rendition.diff:
+ Doesn't seem to be required for build any more.
+ Let's see where it breaks in the build system.
+
+-------------------------------------------------------------------
+Wed May 25 07:54:53 UTC 2011 - e...@suse.de
+
+- Minor cleanup in spec file.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
HALlib-4.1.tar.gz
xf86-video-fbdev.diff
xf86-video-intel-buildfix.diff
xf86-video-mga-hal.diff
xf86-video-rendition.diff
xf86-video-trident-1.3.3.dif
xf86-video-vmware-10.15.2.diff
New:
----
xf86-video-trident-1.3.3.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-driver-video.spec ++++++
--- /var/tmp/diff_new_pack.Eg0gKn/_old 2011-06-14 12:20:25.000000000 +0200
+++ /var/tmp/diff_new_pack.Eg0gKn/_new 2011-06-14 12:20:25.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: 67
+Release: 69
License: MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -65,7 +65,6 @@
Source38: xf86-video-vesa-2.3.0.tar.bz2
Source41: xf86-video-vmware-11.0.3.tar.bz2
Source42: xf86-video-voodoo-1.2.4.tar.bz2
-Source44: HALlib-4.1.tar.gz
Source45: xf86-video-intel-2.15.0.tar.bz2
Source46: xf86-video-ati-6.14.1.tar.bz2
Source51: xf86-video-geode-2.11.10.tar.bz2
@@ -81,25 +80,18 @@
Source101: kms-blacklist.tar.bz2
%endif
Source102: xorg-confd-snippets.tar.bz2
+
Patch10: xf86-video-tdfx.diff
-Patch12: xf86-video-mga-hal.diff
-Patch14: xf86-video-rendition.diff
-Patch35: xf86-video-trident-1.3.3.dif
+Patch35: xf86-video-trident-1.3.3.diff
Patch46: xf86-video-ati.diff
-Patch47: xf86-video-vmware-10.15.2.diff
Patch56: xf86-video-mga-g200se-swcursor.diff
Patch64: xf86-video-vesa_DefaultRefresh.diff
Patch68: xf86-video-ati-bug474071-fix2.diff
Patch69: xf86-video-ati-ia64_screen_blank.diff
-Patch71: xf86-video-fbdev.diff
Patch104: xf86-video-ati-disable-dri-bug437651-ia64only.diff
-Patch130: xf86-video-intel-buildfix.diff
Patch131: xf86-video-ati-bug519261-increase-virtual.diff
Patch132: xf86-video-nv-bug519261-increase-virtual.diff
Patch137: xf86-video-newport-commit-48f48e5.diff
-#Patch140: xf86-video-ati-6.7.197-r128-xvideo.patch
-#Patch141: xf86-video-ati-theatre.patch
-#Patch142: xf86-video-ati-theatre-pciaccess.patch
Patch143: xf86-video-xgi-buildfix.diff
Patch144: xf86-video-xgi-symbols.diff
Patch145: xf86-video-xgixp-symbols.diff
@@ -123,27 +115,17 @@
%patch35 -p0
popd
pushd xf86-video-mga-*
-tar xzf %{SOURCE44} -C src
-%ifarch %ix86
-%patch12
-%endif
%patch56
popd
pushd xf86-video-tdfx-*
%patch10
popd
-pushd xf86-video-rendition-*
-%patch14
-popd
pushd xf86-video-ati-*
%patch46
%ifarch ia64
%patch104 -p1
%endif
popd
-pushd xf86-video-vmware-*
-%patch47
-popd
pushd xf86-video-vesa-*
%patch64 -p1
popd
@@ -152,11 +134,7 @@
%patch69 -p2
%patch131 -p1
popd
-pushd xf86-video-fbdev-*
-%patch71
-popd
pushd xf86-video-intel-*
-%patch130 -p0
%patch150 -p1
### disabled for now (bnc #687802)
#%patch155 -p1
@@ -167,12 +145,6 @@
pushd xf86-video-newport-*
%patch137 -p1
popd
-#cp
xf86-video-ati-*/src/{generic_bus.h,theatre_reg.h,theatre.h,theatre_detect.h,theatre_detect.c,theatre_detect_module.c,theatre.c,theatre_module.c}
xf86-video-r128-*/src
-#pushd xf86-video-r128-*
-#%patch140 -p1
-#%patch141 -p1
-#%patch142 -p1
-#popd
pushd xf86-video-xgi-*
%patch143 -p1
%patch144 -p1
@@ -198,15 +170,6 @@
for dir in $(ls -d xf86-video-*) intel-gpu-tools-*; do
make -C $dir install DESTDIR=$RPM_BUILD_ROOT
done
-%ifarch %ix86
-pushd xf86-video-mga-*/src
-gcc -m32 \
- -o $RPM_BUILD_ROOT%{_libdir}/xorg/modules/drivers/mgahal_drv.so \
- -shared \
- .libs/mga_halmod.o .libs/clientlx.o HALlib/mgaHALlib.a \
- -Wl,-Bstatic -Wl,-Bdynamic
-popd
-%endif
tar xf $RPM_SOURCE_DIR/sax2-hwinfo-data.tar.gz -C $RPM_BUILD_ROOT
%if %broken_kms_blacklist
tar xf $RPM_SOURCE_DIR/kms-blacklist.tar.bz2 -C $RPM_BUILD_ROOT
++++++ xf86-video-trident-1.3.3.diff ++++++
Index: src/blade_accel_exa.c
===================================================================
--- src/blade_accel_exa.c.orig
+++ src/blade_accel_exa.c
@@ -253,6 +253,7 @@ static void WaitMarker(ScreenPtr pScreen
static Bool PrepareAccess(PixmapPtr pPix, int index)
{
+ return 0;
}
static void FinishAccess(PixmapPtr pPix, int index)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
