[packages/xorg-driver-video-amdgpu] - updated to 1.1.1 - added sysconfigdir patch (fixes configdir variable name inconsistency)

qboosh qboosh at pld-linux.org
Thu Sep 15 17:15:32 CEST 2016


commit 79f7c7ba012f7b773e23f133c2e2f1f88882b28f
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Thu Sep 15 17:17:08 2016 +0200

    - updated to 1.1.1
    - added sysconfigdir patch (fixes configdir variable name inconsistency)

 xorg-driver-video-amdgpu-sysconfigdir.patch | 24 ++++++++++++++++++++++++
 xorg-driver-video-amdgpu.spec               | 14 ++++++++------
 2 files changed, 32 insertions(+), 6 deletions(-)
---
diff --git a/xorg-driver-video-amdgpu.spec b/xorg-driver-video-amdgpu.spec
index a55e60e..c7d769f 100644
--- a/xorg-driver-video-amdgpu.spec
+++ b/xorg-driver-video-amdgpu.spec
@@ -6,17 +6,17 @@
 Summary:	X.org video driver for AMD Radeon GPUs
 Summary(pl.UTF-8):	Sterowniki obrazu X.org do układów graficznych AMD Radeon
 Name:		xorg-driver-video-amdgpu
-Version:	1.1.0
+Version:	1.1.1
 Release:	1
 License:	MIT
 Group:		X11/Applications
-Source0:	http://xorg.freedesktop.org/releases/individual/driver/xf86-video-amdgpu-%{version}.tar.bz2
-# Source0-md5:	89e62ee60b12f94e27ab76268bbbe778
-URL:		http://xorg.freedesktop.org/
+Source0:	https://xorg.freedesktop.org/releases/individual/driver/xf86-video-amdgpu-%{version}.tar.bz2
+# Source0-md5:	8b2e2852299b330da709d0526b2b8134
+Patch0:		%{name}-sysconfigdir.patch
+URL:		https://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
-%{?with_glamor:BuildRequires:	xorg-xserver-server-devel >= 1.16.0}
 BuildRequires:	libdrm-devel >= %{libdrm_ver}
 BuildRequires:	libtool
 BuildRequires:	pkgconfig >= 1:0.19
@@ -30,12 +30,13 @@ BuildRequires:	xorg-proto-xextproto-devel >= 7.0.99.1
 BuildRequires:	xorg-proto-xf86driproto-devel
 BuildRequires:	xorg-util-util-macros >= 1.8
 BuildRequires:	xorg-xserver-server-devel >= 1.9
+%{?with_glamor:BuildRequires:	xorg-xserver-server-devel >= 1.16.0}
 %{?requires_xorg_xserver_videodrv}
-%{?with_glamor:Requires:	xorg-xserver-server >= 1.16.0}
 Requires:	libdrm >= %{libdrm_ver}
 Requires:	xorg-xserver-libdri >= 1.9
 Requires:	xorg-xserver-libglx >= 1.9
 Requires:	xorg-xserver-server >= 1.9
+%{?with_glamor:Requires:	xorg-xserver-server >= 1.16.0}
 Provides:	xorg-driver-video
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -59,6 +60,7 @@ Obsługuje karty graficzne z rodziny CI i nowszych.
 
 %prep
 %setup -q -n xf86-video-amdgpu-%{version}
+%patch0 -p1
 
 %build
 %{__libtoolize}
diff --git a/xorg-driver-video-amdgpu-sysconfigdir.patch b/xorg-driver-video-amdgpu-sysconfigdir.patch
new file mode 100644
index 0000000..02dc026
--- /dev/null
+++ b/xorg-driver-video-amdgpu-sysconfigdir.patch
@@ -0,0 +1,24 @@
+--- xf86-video-amdgpu-1.1.1/configure.ac.orig	2016-09-15 08:51:54.000000000 +0200
++++ xf86-video-amdgpu-1.1.1/configure.ac	2016-09-15 16:38:50.395978648 +0200
+@@ -90,9 +90,9 @@
+ AC_ARG_WITH(xorg-conf-dir,
+             AS_HELP_STRING([--with-xorg-conf-dir=DIR],
+                            [Default xorg.conf.d directory [[default=$prefix/share/X11/xorg.conf.d/]]]),
+-            [xorgconfdir="$withval"],
+-            [xorgconfdir="$prefix/share/X11/xorg.conf.d"])
+-AC_SUBST(configdir)
++            [sysconfigdir="$withval"],
++	    [if test "x$sysconfigdir" = "x" ; then sysconfigdir="$prefix/share/X11/xorg.conf.d" ; fi])
++AC_SUBST(sysconfigdir)
+ AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
+ 
+ AC_ARG_ENABLE([udev],
+--- xf86-video-amdgpu-1.1.1/conf/Makefile.am.orig	2015-04-26 03:41:53.000000000 +0200
++++ xf86-video-amdgpu-1.1.1/conf/Makefile.am	2016-09-15 16:51:51.325969732 +0200
+@@ -20,5 +20,5 @@
+ 
+ 
+ if HAS_XORG_CONF_DIR
+-dist_config_DATA = 10-amdgpu.conf
++dist_sysconfig_DATA = 10-amdgpu.conf
+ endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-amdgpu.git/commitdiff/79f7c7ba012f7b773e23f133c2e2f1f88882b28f



More information about the pld-cvs-commit mailing list