From caa9266d8e1f2384c8d969087b84ec2241f31bb89b45d667a66665a9a4281f9e Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 18 Mar 2014 13:34:16 +0000 Subject: [PATCH 1/3] Accepting request 226522 from home:tobijk:X11:XOrg - Update to latest git version bdc412044f6ced056cd57320d1b2ee0d967c219 - Add conditional for X-Server internal glamor vs standalone glamor OBS-URL: https://build.opensuse.org/request/show/226522 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-ati?expand=0&rev=33 --- xf86-video-ati-7.3.0.1.tar.bz2 | 3 +++ xf86-video-ati-7.3.0.tar.bz2 | 3 --- xf86-video-ati.changes | 6 ++++++ xf86-video-ati.spec | 8 ++++++-- 4 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 xf86-video-ati-7.3.0.1.tar.bz2 delete mode 100644 xf86-video-ati-7.3.0.tar.bz2 diff --git a/xf86-video-ati-7.3.0.1.tar.bz2 b/xf86-video-ati-7.3.0.1.tar.bz2 new file mode 100644 index 0000000..7c0456e --- /dev/null +++ b/xf86-video-ati-7.3.0.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76ae4029bcc2169bdd9f73cfcf08b95d3083880208a98a3eb9f6e6bdfb579742 +size 311913 diff --git a/xf86-video-ati-7.3.0.tar.bz2 b/xf86-video-ati-7.3.0.tar.bz2 deleted file mode 100644 index 9357449..0000000 --- a/xf86-video-ati-7.3.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:107c072c4919a996e04f47afdb53d5946a3ad574f270b8c560ef8b3a032046fe -size 816346 diff --git a/xf86-video-ati.changes b/xf86-video-ati.changes index 7e30878..c4bcd81 100644 --- a/xf86-video-ati.changes +++ b/xf86-video-ati.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 17 19:58:26 UTC 2014 - tobias.johannes.klausmann@mni.thm.de + +- Update to latest git version bdc412044f6ced056cd57320d1b2ee0d967c219 +- Add conditional for X-Server internal glamor vs standalone glamor + ------------------------------------------------------------------- Thu Jan 30 10:42:16 UTC 2014 - sndirsch@suse.com diff --git a/xf86-video-ati.spec b/xf86-video-ati.spec index f9bcd4a..617317e 100644 --- a/xf86-video-ati.spec +++ b/xf86-video-ati.spec @@ -16,8 +16,10 @@ # +%define xserver_glamor 0 + Name: xf86-video-ati -Version: 7.3.0 +Version: 7.3.0.1 Release: 0 Summary: ATI video driver for the Xorg X server License: MIT @@ -34,7 +36,9 @@ BuildRequires: pkgconfig(fontsproto) # Libdrm 2.4.36 needed for kms BuildRequires: pkgconfig(libdrm) >= 2.4.36 # Glamor is new and we want that now +%if !%xserver_glamor BuildRequires: pkgconfig(glamor) >= 0.3.1 +%endif BuildRequires: pkgconfig(libdrm_radeon) >= 2.4.36 BuildRequires: pkgconfig(libudev) BuildRequires: pkgconfig(pciaccess) >= 0.8.0 @@ -44,7 +48,7 @@ BuildRequires: pkgconfig(videoproto) BuildRequires: pkgconfig(xextproto) BuildRequires: pkgconfig(xf86driproto) BuildRequires: pkgconfig(xorg-macros) >= 1.8 -BuildRequires: pkgconfig(xorg-server) >= 1.3 +BuildRequires: pkgconfig(xorg-server) >= 1.15 BuildRequires: pkgconfig(xproto) # This was part of the xorg-x11-driver-video package up to version 7.6 Conflicts: xorg-x11-driver-video <= 7.6 From 05986e08b74818d5b1d03c96a59103784f09e527a087e1cb6abe44870cf0e17d Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Tue, 18 Mar 2014 13:39:16 +0000 Subject: [PATCH 2/3] - remove URL in specfile sourceline for snapshot tarball in the hope to be accepted by buildservice now OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-ati?expand=0&rev=34 --- xf86-video-ati.changes | 6 ++++++ xf86-video-ati.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/xf86-video-ati.changes b/xf86-video-ati.changes index c4bcd81..a98d07c 100644 --- a/xf86-video-ati.changes +++ b/xf86-video-ati.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Mar 18 13:38:46 UTC 2014 - sndirsch@suse.com + +- remove URL in specfile sourceline for snapshot tarball in the + hope to be accepted by buildservice now + ------------------------------------------------------------------- Mon Mar 17 19:58:26 UTC 2014 - tobias.johannes.klausmann@mni.thm.de diff --git a/xf86-video-ati.spec b/xf86-video-ati.spec index 617317e..e46243b 100644 --- a/xf86-video-ati.spec +++ b/xf86-video-ati.spec @@ -25,7 +25,8 @@ Summary: ATI video driver for the Xorg X server License: MIT Group: System/X11/Servers/XF86_4 Url: http://xorg.freedesktop.org/ -Source0: http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2 +#http://xorg.freedesktop.org/releases/individual/driver/ +Source0: %{name}-%{version}.tar.bz2 BuildRequires: Mesa-devel BuildRequires: autoconf >= 2.60 From b84ab963f502b8f165e94c1ad7bf22bc6b55f8abdd110d6c46b3eac27c855b0a Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 19 Mar 2014 16:17:35 +0000 Subject: [PATCH 3/3] Accepting request 226760 from home:tobijk:X11:XOrg we have the new xserver in X11:XOrg, lets pull the glamor trigger OBS-URL: https://build.opensuse.org/request/show/226760 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-ati?expand=0&rev=35 --- xf86-video-ati.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xf86-video-ati.spec b/xf86-video-ati.spec index e46243b..044de39 100644 --- a/xf86-video-ati.spec +++ b/xf86-video-ati.spec @@ -16,7 +16,7 @@ # -%define xserver_glamor 0 +%define xserver_glamor 1 Name: xf86-video-ati Version: 7.3.0.1