Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at 2012-03-05 18:02:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-driver-video (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-driver-video.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xorg-x11-driver-video", Maintainer is "sndirsch@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-driver-video/xorg-x11-driver-video.changes 2012-02-27 18:38:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-driver-video.new/xorg-x11-driver-video.changes 2012-03-05 18:02:55.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 27 16:31:56 CET 2012 - meissner@suse.de + +- disable building the Intel driver on non-intel x86* platforms. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.zOXUWh/_old 2012-03-05 18:02:57.000000000 +0100 +++ /var/tmp/diff_new_pack.zOXUWh/_new 2012-03-05 18:02:57.000000000 +0100 @@ -15,12 +15,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define broken_kms_blacklist 0 Name: xorg-x11-driver-video -BuildRequires: Mesa-devel libdrm-devel libtool pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk +BuildRequires: Mesa-devel +BuildRequires: libdrm-devel +BuildRequires: libtool +BuildRequires: pkgconfig +BuildRequires: xorg-x11-proto-devel +BuildRequires: xorg-x11-server-sdk BuildRequires: pkgconfig(xvmc) %if %suse_version > 1210 BuildRequires: xcb-util-devel @@ -29,18 +33,24 @@ %endif Url: http://xorg.freedesktop.org/ Version: 7.6 -Release: 77 -License: MIT +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Group: System/X11/Servers/XF86_4 -Provides: xorg-x11-driver-video-nvidia 855resolution 915resolution -Provides: intel-i810-xorg-x11 xorg-x11-driver-video-intel +Provides: 855resolution +Provides: 915resolution +Provides: intel-i810-xorg-x11 +Provides: xorg-x11-driver-video-intel +Provides: xorg-x11-driver-video-nvidia Requires: VIDEO_ABI_VERSION = 10 Requires: libdrm >= 2.4.21 -Obsoletes: xorg-x11-driver-video-nvidia 855resolution 915resolution -Obsoletes: intel-i810-xorg-x11 xorg-x11-driver-video-intel +Obsoletes: 855resolution +Obsoletes: 915resolution +Obsoletes: intel-i810-xorg-x11 +Obsoletes: xorg-x11-driver-video-intel +Obsoletes: xorg-x11-driver-video-nvidia Supplements: xorg-x11-server Summary: X.Org video drivers +License: MIT +Group: System/X11/Servers/XF86_4 ExcludeArch: s390 s390x Source0: xf86-video-apm-1.2.3.tar.bz2 Source1: xf86-video-ark-0.7.3.tar.bz2 @@ -150,6 +160,12 @@ ### disabled for now (bnc #687802) #%patch155 -p1 popd + +# only available on Intel 32 and 64bit I think. +%ifnarch %ix86 x86_64 +rm -rf xf86-video-intel-* +%endif + pushd xf86-video-nv-* %patch132 -p1 popd @@ -212,7 +228,9 @@ /etc/modprobe.d/99-kms.conf %endif /usr/bin/intel_* +%ifarch %ix86 x86_64 %{_libdir}/lib* +%endif %{_libdir}/xorg/modules/ %{_mandir}/man1/* %{_mandir}/man4/* -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org