commit 1c41a56e537ef78287f432f4333263da7b33ce05
Author: Jakub Bogusz <[email protected]>
Date: Thu Dec 29 16:15:35 2016 +0100
- updated to 0.1.5
- removed obsolete patches
libcacard.patch | 21 ------------
xorg-driver-video-qxl-cast.patch | 11 -------
xorg-driver-video-qxl.spec | 20 +++++------
xserver-1.19.patch | 71 ----------------------------------------
4 files changed, 8 insertions(+), 115 deletions(-)
---
diff --git a/xorg-driver-video-qxl.spec b/xorg-driver-video-qxl.spec
index e39afaf..590ea08 100644
--- a/xorg-driver-video-qxl.spec
+++ b/xorg-driver-video-qxl.spec
@@ -9,16 +9,13 @@
Summary: X.org video driver for QXL virtual GPU
Summary(pl.UTF-8): Sterownik obrazu X.org dla wirtualnych procesorów
graficznych QXL
Name: xorg-driver-video-qxl
-Version: 0.1.4
-Release: 6
+Version: 0.1.5
+Release: 1
License: MIT
Group: X11/Applications
-Source0:
http://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-%{version}.tar.bz2
-# Source0-md5: 41e234f38fe8045eef7ade83c34f6dd4
-Patch0: %{name}-cast.patch
-Patch1: libcacard.patch
-Patch2: xserver-1.19.patch
-URL: http://xorg.freedesktop.org/
+Source0:
https://xorg.freedesktop.org/releases/individual/driver/xf86-video-qxl-%{version}.tar.bz2
+# Source0-md5: addb686fce597a452eecd8d8f9fddf15
+URL: https://xorg.freedesktop.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
%{?with_pcsc:BuildRequires: libcacard-devel}
@@ -30,12 +27,14 @@ BuildRequires: rpmbuild(macros) >= 1.389
BuildRequires: spice-protocol >= 0.12.0
%{?with_xspice:BuildRequires: spice-server-devel >= 0.6.3}
BuildRequires: udev-devel
+BuildRequires: xorg-lib-libXfont2-devel >= 2
BuildRequires: xorg-lib-libpciaccess-devel >= 0.10.0
BuildRequires: xorg-proto-fontsproto-devel
BuildRequires: xorg-proto-randrproto-devel
BuildRequires: xorg-proto-renderproto-devel
BuildRequires: xorg-proto-videoproto-devel
BuildRequires: xorg-proto-xf86dgaproto-devel
+BuildRequires: xorg-proto-xproto-devel
BuildRequires: xorg-util-util-macros >= 1.4
BuildRequires: xorg-xserver-server-devel >= 1.0.99.901
%{?requires_xorg_xserver_videodrv}
@@ -103,9 +102,6 @@ udostępnia wejście klawiatury i myszy oraz wyjście obrazu.
%prep
%setup -q -n xf86-video-qxl-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
%build
%{__libtoolize}
@@ -135,7 +131,7 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc COPYING ChangeLog README TODO
+%doc COPYING ChangeLog NEWS README TODO
%attr(755,root,root) %{_libdir}/xorg/modules/drivers/qxl_drv.so
%if %{with pcsc}
diff --git a/libcacard.patch b/libcacard.patch
deleted file mode 100644
index 8b5ffd5..0000000
--- a/libcacard.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- xf86-video-qxl-0.1.4/src/Makefile.am~ 2015-04-02 16:25:27.000000000
+0200
-+++ xf86-video-qxl-0.1.4/src/Makefile.am 2015-12-29 23:29:46.331193828
+0100
-@@ -31,6 +31,7 @@
- $(SPICE_PROTOCOL_CFLAGS) \
- $(XORG_CFLAGS) \
- $(PCIACCESS_CFLAGS) \
-+ $(LIBCACARD_CFLAGS) \
- $(CWARNFLAGS) \
- $(DRM_CFLAGS) \
- $(LIBUDEV_CFLAGS)
---- xf86-video-qxl-0.1.4/src/spiceccid/Makefile.am~ 2015-03-30
16:58:56.000000000 +0200
-+++ xf86-video-qxl-0.1.4/src/spiceccid/Makefile.am 2015-12-29
23:31:25.765454723 +0100
-@@ -19,7 +19,7 @@
- # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
--AM_CFLAGS = $(LIBPCSCLITE_CFLAGS)
-+AM_CFLAGS = $(LIBPCSCLITE_CFLAGS) $(LIBCACARD_CFLAGS)
-
- if BUILD_SPICECCID
- libspiceccid_la_LTLIBRARIES = libspiceccid.la
diff --git a/xorg-driver-video-qxl-cast.patch b/xorg-driver-video-qxl-cast.patch
deleted file mode 100644
index 35c3098..0000000
--- a/xorg-driver-video-qxl-cast.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-Fix "cast from pointer to integer of different size" warning when
sizeof(void*) != sizeof(uint64_t)
---- xf86-video-qxl-0.1.1/src/spiceqxl_display.c.orig 2013-10-20
16:53:29.000000000 +0200
-+++ xf86-video-qxl-0.1.1/src/spiceqxl_display.c 2013-10-20
21:46:26.895791164 +0200
-@@ -350,6 +350,6 @@
-
- void spiceqxl_display_monitors_config(qxl_screen_t *qxl)
- {
-- spice_qxl_monitors_config_async(&qxl->display_sin,
(QXLPHYSICAL)qxl->monitors_config,
-+ spice_qxl_monitors_config_async(&qxl->display_sin,
(QXLPHYSICAL)(uintptr_t)qxl->monitors_config,
- MEMSLOT_GROUP, 0);
- }
diff --git a/xserver-1.19.patch b/xserver-1.19.patch
deleted file mode 100644
index 4cd933a..0000000
--- a/xserver-1.19.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- xf86-video-chips-1.2.6/src/compat-api.h~ 2015-09-26 18:28:01.000000000
+0200
-+++ xf86-video-chips-1.2.6/src/compat-api.h 2016-11-28 09:12:37.337570460
+0100
-@@ -75,8 +75,13 @@
-
- #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
-
-+#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0)
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
-+#define BLOCKHANDLER_ARGS arg, pTimeout
-+#else
- #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer
pReadmask
- #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
-+#endif
-
- #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
- #define CLOSE_SCREEN_ARGS pScreen
-
-From cfergeau at redhat.com Tue Aug 4 08:53:26 2015
-From: cfergeau at redhat.com (Christophe Fergeau)
-Date: Tue, 4 Aug 2015 17:53:26 +0200
-Subject: [Spice-devel] [qxl 2/2] Fix compilation with newer Xorg versions
-In-Reply-To: <[email protected]>
-References: <[email protected]>
-Message-ID: <[email protected]>
-
-Xorg 1.18 stopped exporting some xfont related symbols in its
-headers/shared libraries, which causes QXL to fail to build:
-
-uxa-damage.c:947:5: error: implicit declaration of function
'QueryGlyphExtents' [-Werror=implicit-function-declaration]
- QueryGlyphExtents(font, charinfo, n, &extents);
-
-The missing definition can be found in xfont, so this commit addes the
-needed configure.ac checks and includes.
-Note that dixfontstr.h must be included before the xfont headers or this
-will cause compile-time warnings on older Xorg versions (eg 1.17)
----
- configure.ac | 2 +-
- src/uxa/uxa-damage.c | 3 +++
- 2 files changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6555a8d..7e95b01 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
- XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
-
- # Obtain compiler/linker options for the driver dependencies
--PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto
$REQUIRED_MODULES)
-+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto fontsproto xfont
$REQUIRED_MODULES)
-
-
- save_CFLAGS="$CFLAGS"
-diff --git a/src/uxa/uxa-damage.c b/src/uxa/uxa-damage.c
-index 6201712..a6d1ee3 100644
---- a/src/uxa/uxa-damage.c
-+++ b/src/uxa/uxa-damage.c
-@@ -33,6 +33,9 @@
- #include <stdlib.h>
- #include "uxa-priv.h"
-
- #include <X11/X.h>
-+#include <X11/fonts/font.h>
-+#include <X11/fonts/fontstruct.h>
-+#include <X11/fonts/fontutil.h>
- #include "scrnintstr.h"
- #include "windowstr.h"
- #include "dixfontstr.h"
---
-2.4.3
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-driver-video-qxl.git/commitdiff/1c41a56e537ef78287f432f4333263da7b33ce05
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
