From fc1172f787db0469f87be8bdb70e56a8b8c1fe08 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Thu, 18 Feb 2016 21:23:45 +0100 Subject: [PATCH] gnu: xf86-video-siliconmotion: Update to 1.7.8. * gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch: Delete file. * gnu-system.am (dist_patch_DATA): Remove it. * gnu/packages/xorg.scm (xf86-video-siliconmotion): Update to 1.7.8. [source]: Remove patch. --- gnu-system.am | 1 - ...f86-video-siliconmotion-remove-mibstore.patch | 16 ---------------- gnu/packages/xorg.scm | 7 ++----- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch diff --git a/gnu-system.am b/gnu-system.am index dee8fb7e38..3a06af09a4 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -773,7 +773,6 @@ dist_patch_DATA = \ gnu/packages/patches/xf86-video-mach64-glibc-2.20.patch \ gnu/packages/patches/xf86-video-nv-remove-mibstore.patch \ gnu/packages/patches/xf86-video-openchrome-glibc-2.20.patch \ - gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch \ gnu/packages/patches/xf86-video-sis-fix-exa-crash.patch \ gnu/packages/patches/xf86-video-sis-update-api.patch \ gnu/packages/patches/xf86-video-tdfx-remove-mibstore.patch \ diff --git a/gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch b/gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch deleted file mode 100644 index 5fd9100609..0000000000 --- a/gnu/packages/patches/xf86-video-siliconmotion-remove-mibstore.patch +++ /dev/null @@ -1,16 +0,0 @@ -Removes references to mibstore.h and miInitializeBackingStore, which -have been removed from xorg-server. Zack Rusin -wrote: "It was a noop for at least 5 years and it has been removed." -See: http://patches.openembedded.org/patch/46133/ - ---- xf86-video-siliconmotion-1.7.7/src/smi_driver.c.~1~ 2012-07-17 00:53:21.000000000 -0400 -+++ xf86-video-siliconmotion-1.7.7/src/smi_driver.c 2014-12-19 01:30:16.708884086 -0500 -@@ -1750,8 +1750,6 @@ - "Done writing mode. Register dump:\n"); - SMI_PrintRegs(pScrn); - -- miInitializeBackingStore(pScreen); -- - #ifdef HAVE_XMODES - xf86DiDGAInit(pScreen, (unsigned long)(pSmi->FBBase + pScrn->fbOffset)); - #endif diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 95481046de..edc02ec742 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -3132,7 +3132,7 @@ This driver is intended for ATI Rage 128 based cards.") (define-public xf86-video-siliconmotion (package (name "xf86-video-siliconmotion") - (version "1.7.7") + (version "1.7.8") (source (origin (method url-fetch) @@ -3142,10 +3142,7 @@ This driver is intended for ATI Rage 128 based cards.") ".tar.bz2")) (sha256 (base32 - "1an321kqvsxq0z35acwl99lc8hpdkayw0q180744ypcl8ffvbf47")) - (patches - (list - (search-patch "xf86-video-siliconmotion-remove-mibstore.patch"))))) + "1sqv0y31mi4zmh9yaxqpzg7p8y2z01j6qys433hb8n4yznllkm79")))) (build-system gnu-build-system) (inputs `(("xorg-server" ,xorg-server))) (native-inputs `(("pkg-config" ,pkg-config)))