Hello community, here is the log from the commit of package xorg-x11-driver-video for openSUSE:Factory checked in at 2012-05-08 12:06:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-03-26 15:38:14.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-driver-video.new/xorg-x11-driver-video.changes 2012-05-08 12:06:29.000000000 +0200 @@ -1,0 +2,38 @@ +Tue Apr 24 18:58:31 UTC 2012 - vuntz@opensuse.org + +- Change xf86-video-qxl Requires to Recommends, as recent versions + of xf86-video-qxl don't build on openSUSE <= 12.1 due to the + requirement on spice. For all our practical needs, the Recommends + matches what we need anyway. +- This makes xorg-x11-driver-video installable on openSUSE <= 12.1 + again. + +------------------------------------------------------------------- +Thu Apr 19 15:57:15 UTC 2012 - vuntz@opensuse.org + +- Add compatibility Requires on xf86-video-chips, as it's back at + Egbert Eich's request. + +------------------------------------------------------------------- +Wed Apr 18 21:18:35 UTC 2012 - vuntz@opensuse.org + +- Split drivers in their own source packages: xf86-video-ark + xf86-video-ast xf86-video-ati xf86-video-cirrus xf86-video-dummy + xf86-video-fbdev xf86-video-geode xf86-video-glint + xf86-video-i128 xf86-video-intel xf86-video-mach64 xf86-video-mga + xf86-video-neomagic xf86-video-newport xf86-video-nv + xf86-video-qxl xf86-video-r128 xf86-video-savage + xf86-video-siliconmotion xf86-video-sis xf86-video-tdfx + xf86-video-tga xf86-video-trident xf86-video-v4l xf86-video-vesa + xf86-video-vmware xf86-video-voodoo +- Split intel-gpu-tools in its own source package. +- Drop drivers that are unmaintained upstream: xf86-video-apm + xf86-video-chips xf86-video-i740 xf86-video-rendition + xf86-video-s3 xf86-video-s3virge xf86-video-sisusb + xf86-video-tseng xf86-video-xgi xf86-video-xgixp +- Bump version to 7.6_1 since the split packages have a Conflicts + with xorg-x11-driver-video <= 7.6. +- Add a README.meta file to explain the goal of this compatibility + metapackage. + +------------------------------------------------------------------- Old: ---- U_API-compat-fix-for-DRAWABLE_BUFFER.patch U_xgi-Fix-build-on-bigendian.patch baselibs.conf intel-gpu-tools-1.0.2-20101210-292ae45.tar.bz2 xf86-video-apm-1.2.3.tar.bz2 xf86-video-ark-0.7.3.tar.bz2 xf86-video-ast-0.93.9.tar.bz2 xf86-video-ati-6.14.3.tar.bz2 xf86-video-ati-bug474071-fix2.diff xf86-video-ati-bug519261-increase-virtual.diff xf86-video-ati-disable-dri-bug437651-ia64only.diff xf86-video-ati-ia64_screen_blank.diff xf86-video-ati.diff xf86-video-chips-1.2.4.tar.bz2 xf86-video-cirrus-1.3.2.tar.bz2 xf86-video-dummy-0.3.4.tar.bz2 xf86-video-fbdev-0.4.2.tar.bz2 xf86-video-geode-2.11.12.tar.bz2 xf86-video-glint-1.2.6.tar.bz2 xf86-video-i128-1.3.4.tar.bz2 xf86-video-i740-1.3.2.tar.bz2 xf86-video-intel-2.18.0.tar.bz2 xf86-video-intel-copyfb.diff xf86-video-intel-dell_backlight.diff xf86-video-mach64-6.9.0.tar.bz2 xf86-video-mga-1.4.13.tar.bz2 xf86-video-mga-g200se-swcursor.diff xf86-video-neomagic-1.2.5.tar.bz2 xf86-video-newport-0.2.3.tar.bz2 xf86-video-newport-commit-48f48e5.diff xf86-video-nv-2.1.18.tar.bz2 xf86-video-nv-bug519261-increase-virtual.diff xf86-video-qxl-0.0.13.tar.bz2 xf86-video-r128-6.8.1.tar.bz2 xf86-video-rendition-4.2.4.tar.bz2 xf86-video-s3-0.6.3.tar.bz2 xf86-video-s3virge-1.10.4.tar.bz2 xf86-video-savage-2.3.2.tar.bz2 xf86-video-siliconmotion-1.7.5.tar.bz2 xf86-video-sis-0.10.3.tar.bz2 xf86-video-sisusb-0.9.4.tar.bz2 xf86-video-tdfx-1.4.3.tar.bz2 xf86-video-tdfx.diff xf86-video-tga-1.2.1.tar.bz2 xf86-video-trident-1.3.3.diff xf86-video-trident-1.3.4.tar.bz2 xf86-video-tseng-1.2.4.tar.bz2 xf86-video-v4l-0.2.0.tar.bz2 xf86-video-vesa-2.3.0.tar.bz2 xf86-video-vesa_DefaultRefresh.diff xf86-video-vmware-11.0.3.tar.bz2 xf86-video-voodoo-1.2.4.tar.bz2 xf86-video-xgi-1.6.0.tar.bz2 xf86-video-xgi-buildfix.diff xf86-video-xgi-symbols.diff xf86-video-xgixp-1.8.0.tar.bz2 xf86-video-xgixp-symbols.diff New: ---- README.meta ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video.spec ++++++ --- /var/tmp/diff_new_pack.CWYke5/_old 2012-05-08 12:06:31.000000000 +0200 +++ /var/tmp/diff_new_pack.CWYke5/_new 2012-05-08 12:06:31.000000000 +0200 @@ -20,221 +20,83 @@ %define broken_kms_blacklist 0 Name: xorg-x11-driver-video -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 -%else -BuildRequires: xcb-util-0_3_6-devel -%endif -Url: http://xorg.freedesktop.org/ -Version: 7.6 +Version: 7.6_1 Release: 0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build -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: 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 +Summary: Compatibility metapackage for 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 -Source2: xf86-video-ast-0.93.9.tar.bz2 -Source4: xf86-video-chips-1.2.4.tar.bz2 -Source5: xf86-video-cirrus-1.3.2.tar.bz2 -Source7: xf86-video-dummy-0.3.4.tar.bz2 -Source8: xf86-video-fbdev-0.4.2.tar.bz2 -Source9: xf86-video-glint-1.2.6.tar.bz2 -Source10: xf86-video-i128-1.3.4.tar.bz2 -Source11: xf86-video-i740-1.3.2.tar.bz2 -Source14: xf86-video-mga-1.4.13.tar.bz2 -Source15: xf86-video-neomagic-1.2.5.tar.bz2 -Source16: xf86-video-newport-0.2.3.tar.bz2 -Source18: xf86-video-nv-2.1.18.tar.bz2 -Source19: xf86-video-rendition-4.2.4.tar.bz2 -Source20: xf86-video-s3-0.6.3.tar.bz2 -Source21: xf86-video-s3virge-1.10.4.tar.bz2 -Source22: xf86-video-savage-2.3.2.tar.bz2 -Source23: xf86-video-siliconmotion-1.7.5.tar.bz2 -Source24: xf86-video-sis-0.10.3.tar.bz2 -Source25: xf86-video-sisusb-0.9.4.tar.bz2 -Source33: xf86-video-tdfx-1.4.3.tar.bz2 -Source34: xf86-video-tga-1.2.1.tar.bz2 -Source35: xf86-video-trident-1.3.4.tar.bz2 -Source36: xf86-video-tseng-1.2.4.tar.bz2 -Source37: xf86-video-v4l-0.2.0.tar.bz2 -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 -Source45: xf86-video-intel-2.18.0.tar.bz2 -Source46: xf86-video-ati-6.14.3.tar.bz2 -Source51: xf86-video-geode-2.11.12.tar.bz2 -Source54: xf86-video-mach64-6.9.0.tar.bz2 -Source55: xf86-video-r128-6.8.1.tar.bz2 -Source56: intel-gpu-tools-1.0.2-20101210-292ae45.tar.bz2 -Source57: xf86-video-xgi-1.6.0.tar.bz2 -Source58: xf86-video-xgixp-1.8.0.tar.bz2 -Source59: xf86-video-qxl-0.0.13.tar.bz2 -Source99: baselibs.conf +Url: http://xorg.freedesktop.org/ +Source0: README.meta %if %broken_kms_blacklist Source101: kms-blacklist.tar.bz2 %endif Source102: xorg-confd-snippets.tar.bz2 - -Patch10: xf86-video-tdfx.diff -Patch35: xf86-video-trident-1.3.3.diff -Patch46: xf86-video-ati.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 -Patch104: xf86-video-ati-disable-dri-bug437651-ia64only.diff -Patch131: xf86-video-ati-bug519261-increase-virtual.diff -Patch132: xf86-video-nv-bug519261-increase-virtual.diff -Patch137: xf86-video-newport-commit-48f48e5.diff -%ifnarch %arm -Patch143: xf86-video-xgi-buildfix.diff -Patch144: xf86-video-xgi-symbols.diff -Patch145: xf86-video-xgixp-symbols.diff -%endif -Patch150: xf86-video-intel-dell_backlight.diff -Patch155: xf86-video-intel-copyfb.diff -%ifnarch %arm -Patch157: U_xgi-Fix-build-on-bigendian.patch -Patch158: U_API-compat-fix-for-DRAWABLE_BUFFER.patch -%endif +# For directory ownership +BuildRequires: xorg-x11-server +Requires: xorg-x11-server +Supplements: xorg-x11-server +## Requires of packages that we split away from xorg-x11-driver-video +Requires: intel-gpu-tools +Requires: xf86-video-ark +Requires: xf86-video-ast +Requires: xf86-video-ati +Requires: xf86-video-chips +Requires: xf86-video-cirrus +Requires: xf86-video-dummy +Requires: xf86-video-fbdev +Requires: xf86-video-geode +Requires: xf86-video-glint +Requires: xf86-video-i128 +Requires: xf86-video-intel +Requires: xf86-video-mach64 +Requires: xf86-video-mga +Requires: xf86-video-neomagic +Requires: xf86-video-newport +Requires: xf86-video-nv +Requires: xf86-video-r128 +Requires: xf86-video-savage +Requires: xf86-video-siliconmotion +Requires: xf86-video-sis +Requires: xf86-video-tdfx +Requires: xf86-video-tga +Requires: xf86-video-trident +Requires: xf86-video-v4l +Requires: xf86-video-vesa +Requires: xf86-video-vmware +Requires: xf86-video-voodoo +Recommends: xf86-video-qxl +## End Requires of packages that we split away from xorg-x11-driver-video +BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildArch: noarch %description -This package contains X.Org video drivers. - - +This package is a compatibility metapackage. It used to contain the +X.Org video drivers. %prep -%setup -q -T -c %{name} -for i in $RPM_SOURCE_DIR/xf86-video-*.tar.bz2; do tar -xjf "$i"; done -tar -xjf "%{SOURCE56}" -# Geode LX/GX is x86 only -%ifnarch %ix86 -rm -rf xf86-video-geode* -%endif -pushd xf86-video-trident-1.3.4 -%patch35 -p0 -popd -pushd xf86-video-mga-* -%patch56 -popd -pushd xf86-video-tdfx-* -%patch10 -popd -pushd xf86-video-ati-* -%patch46 -%ifarch ia64 -%patch104 -p1 -%endif -popd -pushd xf86-video-vesa-* -%patch64 -p1 -popd -pushd xf86-video-ati-* -%patch68 -p2 -%patch69 -p2 -%patch131 -p1 -popd -pushd xf86-video-intel-* -%patch150 -p1 -### 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 -pushd xf86-video-newport-* -%patch137 -p1 -popd -# Don't build the xgi{,xp} drivers on ARM to fix the build on this platform -%ifarch %arm -rm -rf xf86-video-xgi-* xf86-video-xgixp-* -%else -pushd xf86-video-xgi-* -%patch143 -p1 -%patch144 -p1 -%patch157 -p1 -popd -pushd xf86-video-xgixp-* -%patch145 -p1 -%patch158 -p1 -popd -%endif +%setup -c -T +cp %{SOURCE0} . %build -for dir in $(ls -d xf86-video-*) intel-gpu-tools-*; do - CONFIG_OPTS="" - pushd $dir - case $dir in - xf86-video-mga-*) rm -f configure ;; - xf86-video-intel-*) CONFIG_OPTS="-enable-uxa --disable-sna --disable-glamor" ;; - *) ;; - esac - test -f configure || autoreconf -fi - %configure $CONFIG_OPTS CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" - make %{?_smp_mflags} - popd -done %install -for dir in $(ls -d xf86-video-*) intel-gpu-tools-*; do - make -C $dir install DESTDIR=$RPM_BUILD_ROOT -done %if %broken_kms_blacklist tar xf $RPM_SOURCE_DIR/kms-blacklist.tar.bz2 -C $RPM_BUILD_ROOT %endif tar xf $RPM_SOURCE_DIR/xorg-confd-snippets.tar.bz2 -C $RPM_BUILD_ROOT -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - %files %defattr(-,root,root) -%dir /etc/X11/xorg.conf.d -%if %broken_kms_blacklist -%config /etc/X11/kms-blacklist.local -/etc/X11/kms-blacklist.nouveau -/etc/X11/kms-blacklist.radeon -/etc/modprobe.d/99-kms.conf -%endif -/usr/bin/intel_* -%ifarch %ix86 x86_64 -%{_libdir}/lib* -%endif -%{_libdir}/xorg/modules/ -%{_mandir}/man1/* -%{_mandir}/man4/* +%doc README.meta %if %broken_kms_blacklist /sbin/kms_loader.sh -%endif -%config /etc/X11/xorg.conf.d/* +%config %{_sysconfdir}/X11/kms-blacklist.local +%{_sysconfdir}/X11/kms-blacklist.nouveau +%{_sysconfdir}/X11/kms-blacklist.radeon +%{_sysconfdir}/modprobe.d/99-kms.conf +%endif +%config %{_sysconfdir}/X11/xorg.conf.d/50-device.conf +%config %{_sysconfdir}/X11/xorg.conf.d/50-monitor.conf +%config %{_sysconfdir}/X11/xorg.conf.d/50-screen.conf %changelog ++++++ README.meta ++++++ This package is a metapackage, created for compatibility. Please use instead the following packages: xf86-video-ark xf86-video-ast xf86-video-ati xf86-video-chips xf86-video-cirrus xf86-video-dummy xf86-video-fbdev xf86-video-geode xf86-video-glint xf86-video-i128 xf86-video-intel xf86-video-mach64 xf86-video-mga xf86-video-neomagic xf86-video-newport xf86-video-nv xf86-video-qxl xf86-video-r128 xf86-video-savage xf86-video-siliconmotion xf86-video-sis xf86-video-tdfx xf86-video-tga xf86-video-trident xf86-video-v4l xf86-video-vesa xf86-video-vmware xf86-video-voodoo -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org