From patchwork Tue Jan 31 18:37:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 722146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vCZlM55fxz9sCG for ; Wed, 1 Feb 2017 05:38:23 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E6BEA30E67; Tue, 31 Jan 2017 18:38:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id XxGRNL2am80s; Tue, 31 Jan 2017 18:38:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2BC7830E7D; Tue, 31 Jan 2017 18:38:09 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 4A95A1C0949 for ; Tue, 31 Jan 2017 18:38:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 443A088AE8 for ; Tue, 31 Jan 2017 18:38:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id nchezgoJ59nW for ; Tue, 31 Jan 2017 18:38:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout06.t-online.de (mailout06.t-online.de [194.25.134.19]) by hemlock.osuosl.org (Postfix) with ESMTPS id EC14788A9A for ; Tue, 31 Jan 2017 18:38:00 +0000 (UTC) Received: from fwd36.aul.t-online.de (fwd36.aul.t-online.de [172.20.26.137]) by mailout06.t-online.de (Postfix) with SMTP id 14DE941C82F7; Tue, 31 Jan 2017 19:37:59 +0100 (CET) Received: from fli4l.lan.fli4l (ZeckfcZcghAtS8g7HbTGP422bKty6s+fv+jfY6jWC6sEnDUowjD454h9xDPXw8HwHV@[84.191.196.209]) by fwd36.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1cYdJR-0JcFJg0; Tue, 31 Jan 2017 19:37:53 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:52354 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.88) (envelope-from ) id 1cYdJQ-0000X3-Ch; Tue, 31 Jan 2017 19:37:52 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Tue, 31 Jan 2017 19:37:37 +0100 Message-Id: <20170131183750.15481-3-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170131183750.15481-1-bernd.kuhls@t-online.de> References: <20170131183750.15481-1-bernd.kuhls@t-online.de> X-ID: ZeckfcZcghAtS8g7HbTGP422bKty6s+fv+jfY6jWC6sEnDUowjD454h9xDPXw8HwHV X-TOI-MSGID: 27f58940-307d-41d1-9fa8-6716bdbedc44 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 03/16] package/x11r7/xdriver_xf86-video-mga: bump version to 1.6.5 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Removed 0002-abi23.patch, applied upstream. Signed-off-by: Bernd Kuhls --- .../x11r7/xdriver_xf86-video-mga/0002-abi23.patch | 33 ---------------------- .../xdriver_xf86-video-mga.hash | 4 +-- .../xdriver_xf86-video-mga.mk | 2 +- 3 files changed, 3 insertions(+), 36 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch diff --git a/package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch deleted file mode 100644 index b2b691789..000000000 --- a/package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch +++ /dev/null @@ -1,33 +0,0 @@ -From df094bfffe4ef097bfd9a569f2d2e35649c1a3c7 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 19 Jul 2016 10:03:56 -0400 -Subject: Adapt Block/WakeupHandler signature for ABI 23 - -Signed-off-by: Adam Jackson ---- -Downloaded from -https://cgit.freedesktop.org/xorg/driver/xf86-video-mga/commit/?id=df094bfffe4ef097bfd9a569f2d2e35649c1a3c7 - -Signed-off-by: Bernd Kuhls - -diff --git a/src/compat-api.h b/src/compat-api.h -index 6bc946f..89976e4 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -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 --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash index 081577d4a..0187e6fbb 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-February/002533.html -sha256 48c6690b6751c76f53de64f8dbeaa9d6c62dbcfe890c768fd87167951247d44f xf86-video-mga-1.6.4.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002765.html +sha256 b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422 xf86-video-mga-1.6.5.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 771ec18ce..065a68ea6 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_MGA_VERSION = 1.6.4 +XDRIVER_XF86_VIDEO_MGA_VERSION = 1.6.5 XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_MGA_LICENSE = MIT