From patchwork Sat Apr 18 12:40:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 462285 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id DDC93140309 for ; Sat, 18 Apr 2015 22:42:15 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D5F4D91B72; Sat, 18 Apr 2015 12:42:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5p+l94iQi1pu; Sat, 18 Apr 2015 12:42:07 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1A16691AA6; Sat, 18 Apr 2015 12:41:30 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 6AF091C1EA6 for ; Sat, 18 Apr 2015 12:41:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 6466E95698 for ; Sat, 18 Apr 2015 12:41:04 +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 hQZA0SJ3PmXS for ; Sat, 18 Apr 2015 12:41:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout05.t-online.de (mailout05.t-online.de [194.25.134.82]) by hemlock.osuosl.org (Postfix) with ESMTPS id F2624956E5 for ; Sat, 18 Apr 2015 12:40:59 +0000 (UTC) Received: from fwd18.aul.t-online.de (fwd18.aul.t-online.de [172.20.26.244]) by mailout05.t-online.de (Postfix) with SMTP id 6D5978A65B for ; Sat, 18 Apr 2015 14:40:58 +0200 (CEST) Received: from fli4l.lan.fli4l (Ee9fswZpQhFzrRjV9Ze2LjNCJoUxqfroGp57GQhvFQRVVJwfz80fSy4QMU39LhTgnT@[79.247.149.14]) by fwd18.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1YjS3H-106Ing0; Sat, 18 Apr 2015 14:40:51 +0200 Received: from fli4lbuild64.lan.fli4l ([192.168.1.51]:51710) by fli4l.lan.fli4l with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.85) (envelope-from ) id 1YjS3G-0007wb-Hy; Sat, 18 Apr 2015 14:40:51 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 18 Apr 2015 14:40:18 +0200 Message-Id: <1429360844-12625-6-git-send-email-bernd.kuhls@t-online.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1429360844-12625-1-git-send-email-bernd.kuhls@t-online.de> References: <1429360844-12625-1-git-send-email-bernd.kuhls@t-online.de> X-ID: Ee9fswZpQhFzrRjV9Ze2LjNCJoUxqfroGp57GQhvFQRVVJwfz80fSy4QMU39LhTgnT X-TOI-MSGID: 3f7c5e13-8ffe-4005-869b-fe543c456216 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 06/32] package/x11r7/xdriver_xf86-video-trident: bump version to 1.3.7, add hash 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 patches committed upstream: http://lists.x.org/archives/xorg-announce/2015-March/002558.html Signed-off-by: Bernd Kuhls --- .../xdriver_xf86-video-trident/0001-mibstore.patch | 34 ----------------- .../xdriver_xf86-video-trident/0002-xaa.patch | 39 -------------------- .../xdriver_xf86-video-trident.hash | 2 + .../xdriver_xf86-video-trident.mk | 2 +- 4 files changed, 3 insertions(+), 74 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-trident/0001-mibstore.patch delete mode 100644 package/x11r7/xdriver_xf86-video-trident/0002-xaa.patch create mode 100644 package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-mibstore.patch b/package/x11r7/xdriver_xf86-video-trident/0001-mibstore.patch deleted file mode 100644 index efdd6ac..0000000 --- a/package/x11r7/xdriver_xf86-video-trident/0001-mibstore.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 30787294c837aefa8820b6f76f00fe30d4e54181 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 12:55:01 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-trident/commit/?id=30787294c837aefa8820b6f76f00fe30d4e54181 - -Signed-off-by: Bernd Kuhls - -diff --git a/src/trident_driver.c b/src/trident_driver.c -index dc12b76..408c870 100644 ---- a/src/trident_driver.c -+++ b/src/trident_driver.c -@@ -56,7 +56,6 @@ - - #include "mipointer.h" - --#include "mibstore.h" - #include "shadow.h" - #include "trident.h" - #include "trident_regs.h" -@@ -3037,7 +3036,6 @@ TRIDENTScreenInit(SCREEN_INIT_ARGS_DECL) - TridentAccelInit(pScreen); - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* Initialise cursor functions */ --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xdriver_xf86-video-trident/0002-xaa.patch b/package/x11r7/xdriver_xf86-video-trident/0002-xaa.patch deleted file mode 100644 index 0750002..0000000 --- a/package/x11r7/xdriver_xf86-video-trident/0002-xaa.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 48c15909691e28ad2c188a2978b1c8ef3d9d8760 Mon Sep 17 00:00:00 2001 -From: Timo Aaltonen -Date: Wed, 26 Sep 2012 08:01:26 +0000 -Subject: Fix loading the driver without XAA - ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-trident/commit/?id=48c15909691e28ad2c188a2978b1c8ef3d9d8760 - -Signed-off-by: Bernd Kuhls - -diff --git a/src/trident_dga.c b/src/trident_dga.c -index 0263aa7..c4b5b9a 100644 ---- a/src/trident_dga.c -+++ b/src/trident_dga.c -@@ -37,10 +37,10 @@ - static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **, - int *, int *, int *); - static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr); --static void TRIDENT_Sync(ScrnInfoPtr); - static int TRIDENT_GetViewport(ScrnInfoPtr); - static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int); - #ifdef HAVE_XAA_H -+static void TRIDENT_Sync(ScrnInfoPtr); - static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long); - static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int); - #if 0 -@@ -56,8 +56,8 @@ DGAFunctionRec TRIDENTDGAFuncs = { - TRIDENT_SetMode, - TRIDENT_SetViewport, - TRIDENT_GetViewport, -- TRIDENT_Sync, - #ifdef HAVE_XAA_H -+ TRIDENT_Sync, - TRIDENT_FillRect, - TRIDENT_BlitRect, - #if 0 --- -cgit v0.9.0.2-2-gbebe diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash new file mode 100644 index 0000000..e92c948 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -0,0 +1,2 @@ +# From http://lists.x.org/archives/xorg-announce/2015-March/002558.html +sha256 ecd518de627a0d49e17c158bfc72ab657386c6907c91ef89fa09332558e413ae xf86-video-trident-1.3.7.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 7a45e3f..a136e87 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.6 +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.7 XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT