diff options
author | 2011-03-07 05:28:40 +0800 | |
---|---|---|
committer | 2011-03-07 06:17:10 +0800 | |
commit | 962747653088f64eedbd2ceca19a51f48ba9486a (patch) | |
tree | 43bdf24efd28ad8dd7445f3b64a2e9fafe7780ab | |
parent | fixed glibc Manifest (diff) | |
download | loongson-962747653088f64eedbd2ceca19a51f48ba9486a.tar.gz loongson-962747653088f64eedbd2ceca19a51f48ba9486a.tar.bz2 loongson-962747653088f64eedbd2ceca19a51f48ba9486a.zip |
updated xf86-video-siliconmotion to 1.7.5, removed old version
Signed-off-by: Zhang Le <r0bertz@gentoo.org>
-rw-r--r-- | x11-drivers/xf86-video-siliconmotion/Manifest | 10 | ||||
-rw-r--r-- | x11-drivers/xf86-video-siliconmotion/files/98_sm712_CRT_enable.diff | 14 | ||||
-rw-r--r-- | x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.3-fix-loongson.patch | 182 | ||||
-rw-r--r-- | x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-loongson-video-accl.patch (renamed from x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.4-loongson-video-accl.patch) | 0 | ||||
-rw-r--r-- | x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.3.ebuild | 25 | ||||
-rw-r--r-- | x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild (renamed from x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.4.ebuild) | 7 |
6 files changed, 6 insertions, 232 deletions
diff --git a/x11-drivers/xf86-video-siliconmotion/Manifest b/x11-drivers/xf86-video-siliconmotion/Manifest index 437be36..0acf9d0 100644 --- a/x11-drivers/xf86-video-siliconmotion/Manifest +++ b/x11-drivers/xf86-video-siliconmotion/Manifest @@ -1,7 +1,3 @@ -AUX 98_sm712_CRT_enable.diff 663 RMD160 77886817676aa974799569240ac620455eed1590 SHA1 eb767d4410614779a0fdd455fc6cb1f1a6577cfa SHA256 d24016e40ee07a0cc1bedc1b9d3832c692b8a78453ac5a84bafab6ace4ff5da3 -AUX xf86-video-siliconmotion-1.7.3-fix-loongson.patch 4788 RMD160 a67bd3e41b170149679ecec39874c19a9f7fc70b SHA1 a570c486bb519477ca136af590531670c9d442c8 SHA256 0785b8fd501922f1359572eb0244d8f5696073c3121f3ada30f7e119c1914020 -AUX xf86-video-siliconmotion-1.7.4-loongson-video-accl.patch 3492 RMD160 9ae795229c795f9ff9d24885677e7a8c02314af7 SHA1 61965e73b26220b4385d5486b91d7e4bdbb0060b SHA256 5823ad7565389aed122346bf961e958328840b5e3cb8b331d9d16745f44e70d7 -DIST xf86-video-siliconmotion-1.7.3.tar.bz2 330623 RMD160 12c61e9785d280c4ab8cb253dc4879dffa8c5975 SHA1 f3edf5853a17c3725c11ea983edcf4b6bd54d10a SHA256 ebda468be42695c08ceaa4043da3cf5bcd5f9ab15d1482311fd6e826a8060b2b -DIST xf86-video-siliconmotion-1.7.4.tar.bz2 350035 RMD160 bf53ff99f3c5163a6935b5a255d5a5bd0fcdcea8 SHA1 3c0fd42fbd301e66104e4b9190796d102a034787 SHA256 b47511480fab5c517e12bd67a332f452d1718b32d53a6201edfc1c279e6e04d7 -EBUILD xf86-video-siliconmotion-1.7.3.ebuild 715 RMD160 14a40824bcfe740ac27a29afbeb90640940446f2 SHA1 7e148bd63a5123a4117d11c36142c4bdd819d05c SHA256 8026700fa31fb0833464143ddf625557786de07f7ddaf11e3db654c0f9ac4ca6 -EBUILD xf86-video-siliconmotion-1.7.4.ebuild 668 RMD160 faec5140cc7b1fcfdf255c2fb4506c0a923377ff SHA1 7081dc47f58ccd023a913946eef9167cae4f152a SHA256 29c1f6c35a04282062bfa917ec5f0e716be6ed4f0c6eeb7e8e39120792990eb5 +AUX xf86-video-siliconmotion-1.7.5-loongson-video-accl.patch 3492 RMD160 9ae795229c795f9ff9d24885677e7a8c02314af7 SHA1 61965e73b26220b4385d5486b91d7e4bdbb0060b SHA256 5823ad7565389aed122346bf961e958328840b5e3cb8b331d9d16745f44e70d7 +DIST xf86-video-siliconmotion-1.7.5.tar.bz2 351610 RMD160 10fc077e41c21f5eaff3603d80a80bfdd500945b SHA1 946acae0822d51da57abe8b7ed049691bd731589 SHA256 97dd597186029d5646923dde84f4c7f38080ce24c80fd127dcdb8fb36eec7913 +EBUILD xf86-video-siliconmotion-1.7.5.ebuild 634 RMD160 7be0393a5efe0e9b1c11e85a9ca1af4595864d48 SHA1 d9c1a322ab75c37f5ad074ddb0237488a74ebe02 SHA256 d3501c276f97215aca214a5852423e3d84f187544ee8563b302fa64210f24e67 diff --git a/x11-drivers/xf86-video-siliconmotion/files/98_sm712_CRT_enable.diff b/x11-drivers/xf86-video-siliconmotion/files/98_sm712_CRT_enable.diff deleted file mode 100644 index 9ff473a..0000000 --- a/x11-drivers/xf86-video-siliconmotion/files/98_sm712_CRT_enable.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- ../xx/xserver-xorg-video-siliconmotion-1.7.3/src/smi_driver.c 2010-03-09 23:39:23.451798382 +0800 -+++ xserver-xorg-video-siliconmotion-1.7.3/src/smi_driver.c 2010-03-10 10:36:58.835798871 +0800 -@@ -1805,6 +1797,11 @@ - pScreen->SaveScreen = SMI_SaveScreen; - pSmi->CloseScreen = pScreen->CloseScreen; - pScreen->CloseScreen = SMI_CloseScreen; -+ /* Added by Belcon to enable LCD Panel Control Select */ -+ if (pSmi->Chipset == SMI_LYNXEMplus) -+ { -+ VGAOUT8_INDEX (pSmi, VGA_SEQ_INDEX, VGA_SEQ_DATA, 0x22, 2); -+ } - - if ((IS_MSOC(pSmi) && - !xf86DPMSInit(pScreen, SMI501_DisplayPowerManagementSet, 0)) || diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.3-fix-loongson.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.3-fix-loongson.patch deleted file mode 100644 index e3b6974..0000000 --- a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.3-fix-loongson.patch +++ /dev/null @@ -1,182 +0,0 @@ -diff -ur orig/src/smi_video.c mod/src/smi_video.c ---- orig/src/smi_video.c 2010-02-05 13:11:18.000000000 +0100 -+++ mod/src/smi_video.c 2010-02-05 13:20:36.000000000 +0100 -@@ -276,6 +276,7 @@ - XVIMAGE_YUY2, - XVIMAGE_YV12, - XVIMAGE_I420, -+ XVIMAGE_UYVY, - { - FOURCC_RV15, /* id */ - XvRGB, /* type */ -@@ -1103,7 +1104,7 @@ - vpr00 |= 0x0010000E; - } else { - /* -- Bit 21 = 10: Vertical Interpolation = enabled -+ Bit 21 = 1: Vertical Interpolation = enabled - Bit 24 = 1: Select Video Window I Source Addr = 1 - 1= Video window I source addr = capture port buffer ? - */ -@@ -1464,6 +1465,117 @@ - LEAVE(); - } - -+static void myXVCopyYUV12ToPacked(const unsigned char *srcy, const unsigned char *srcv, const unsigned char *srcu, -+ unsigned char *dst, int srcPitchy, int srcPitchuv, int dstPitch, int h, int w) -+{ -+ int i, j; -+ unsigned char const *y, *u, *v; -+ int dstinc, yinc, uinc, vinc; -+ -+ y = srcy; -+ u = srcu; -+ v = srcv; -+ -+ dstinc = dstPitch - 2*w; -+ yinc = srcPitchy - w; -+ uinc = srcPitchuv - w/2; -+ vinc = srcPitchuv - w/2; -+ -+ for (i = 0; i < h; i++) { -+ asm ( -+// ".set arch=loongson2f\n\t" -+ ".set noreorder\n\t" -+ "move $8, %8 \n\t" -+ "1: \n\t" -+ "beqz $8, 2f \n\t" -+ "xor $f0, $f0, $f0 \n\t" -+ "ldc1 $f4, (%0) \n\t" -+ "punpcklbh $f2, $f4, $f0 \n\t" -+ "punpckhbh $f4, $f4, $f0 \n\t" -+ "ldc1 $f16, 8(%0) \n\t" -+ "punpcklbh $f14, $f16, $f0 \n\t" -+ "punpckhbh $f16, $f16, $f0 \n\t" -+ -+ "lwc1 $f8, (%1) \n\t" -+ "lwc1 $f12, (%2) \n\t" -+ "punpcklbh $f8, $f8, $f12 \n\t" -+ "punpcklbh $f6, $f0, $f8 \n\t" -+ "punpckhbh $f8, $f0, $f8 \n\t" -+ "lwc1 $f18, 4(%1) \n\t" -+ "lwc1 $f12, 4(%2) \n\t" -+ "punpcklbh $f18, $f18, $f12 \n\t" -+ "punpcklbh $f10, $f0, $f18 \n\t" -+ "punpckhbh $f12, $f0, $f18 \n\t" -+ -+ "or $f2, $f2, $f6 \n\t" -+ "or $f4, $f4, $f8 \n\t" -+ "or $f14, $f14, $f10 \n\t" -+ "or $f16, $f16, $f12 \n\t" -+ -+ "sdc1 $f2, (%3) \n\t" -+ "sdc1 $f4, 8(%3) \n\t" -+ "add %0, 16 \n\t" -+ "add %1, 8 \n\t" -+ "add %2, 8 \n\t" -+ "sdc1 $f14, 0x10(%3) \n\t" -+ "sdc1 $f16, 0x18(%3) \n\t" -+ "add $8, -1 \n\t" -+ "b 1b \n\t" -+ "add %3, 32 \n\t" -+ "2: \n\t" -+ ".set reorder\n\t" -+ : "=r" (y), "=r" (u), "=r" (v), "=r" (dst) -+ : "0" (y), "1" (u), "2" (v), "3" (dst), "r" (w>>4) -+ : "memory","$8" -+ ); -+ -+ asm ( -+// ".set arch=loongson2f\n\t" -+ ".set noreorder\n\t" -+ "move $8, %8 \n\t" -+ "1: \n\t" -+ "beqz $8, 2f \n\t" -+ "xor $f0, $f0, $f0 \n\t" -+ "ldc1 $f4, (%0) \n\t" -+ "punpcklbh $f2, $f4, $f0 \n\t" -+ "punpckhbh $f4, $f4, $f0 \n\t" -+ -+ "lwc1 $f8, (%1) \n\t" -+ "lwc1 $f12, (%2) \n\t" -+ "punpcklbh $f8, $f8, $f12 \n\t" -+ "punpcklbh $f6, $f0, $f8 \n\t" -+ "punpckhbh $f8, $f0, $f8 \n\t" -+ -+ "or $f2, $f2, $f6 \n\t" -+ "or $f4, $f4, $f8 \n\t" -+ -+ "sdc1 $f2, (%3) \n\t" -+ "sdc1 $f4, 8(%3) \n\t" -+ "add %0, 8 \n\t" -+ "add %1, 4 \n\t" -+ "add %2, 4 \n\t" -+ "add $8, -1 \n\t" -+ "b 1b \n\t" -+ "add %3, 16 \n\t" -+ "2:\n\t" -+ ".set reorder\n\t" -+ : "=r" (y), "=r" (u), "=r" (v), "=r" (dst) -+ : "0" (y), "1" (u), "2" (v), "3" (dst), "r" ((w&0xf)/8) -+ : "memory","$8" -+ ); -+ -+ for (j = (w&7)/2; j; j--) { -+ *dst++ = *y++; -+ *dst++ = *u++; -+ *dst++ = *y++; -+ *dst++ = *v++; -+ } -+ y += yinc; -+ u = (i%2) ? (u + uinc): (u - w/2); -+ v = (i%2) ? (v + vinc): (v - w/2); -+ dst += dstinc; -+ } -+} - - static int - SMI_PutImage( -@@ -1592,7 +1704,7 @@ - offset3 = tmp; - } - nLines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top; -- xf86XVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1), -+ myXVCopyYUV12ToPacked(buf + (top * srcPitch) + (left >> 1), - buf + offset2, buf + offset3, dstStart, - srcPitch, srcPitch2, dstPitch, nLines, - nPixels); -@@ -1747,7 +1859,7 @@ - { - SMIPtr pSmi = SMIPTR(pScrn); - CARD32 vpr00; -- int hstretch, vstretch; -+ uint_least32_t hstretch, vstretch; - - ENTER(); - -@@ -1774,13 +1886,13 @@ - } - - if (drw_w > vid_w) { -- hstretch = (2560 * vid_w / drw_w + 5) / 10; -+ hstretch = ((uint_least32_t)(vid_w - 1) << 16) / (drw_w - 1); - } else { - hstretch = 0; - } - - if (drw_h > vid_h) { -- vstretch = (2560 * vid_h / drw_h + 5) / 10; -+ vstretch = ((uint_least32_t)(vid_h - 1) << 16) / (drw_h - 1); - vpr00 |= 1 << 21; - } else { - vstretch = 0; -@@ -1791,7 +1903,8 @@ - WRITE_VPR(pSmi, 0x18, (dstBox->x2) | (dstBox->y2 << 16)); - WRITE_VPR(pSmi, 0x1C, offset >> 3); - WRITE_VPR(pSmi, 0x20, (pitch >> 3) | ((pitch >> 3) << 16)); -- WRITE_VPR(pSmi, 0x24, (hstretch << 8) | vstretch); -+ WRITE_VPR(pSmi, 0x24, (hstretch & 0xff00) | ((vstretch & 0xff00) >> 8)); -+ WRITE_VPR(pSmi, 0x68, ((hstretch & 0xff) << 8) | (vstretch & 0xff)); - - LEAVE(); - } diff --git a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.4-loongson-video-accl.patch b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-loongson-video-accl.patch index e310444..e310444 100644 --- a/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.4-loongson-video-accl.patch +++ b/x11-drivers/xf86-video-siliconmotion/files/xf86-video-siliconmotion-1.7.5-loongson-video-accl.patch diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.3.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.3.ebuild deleted file mode 100644 index 5699a80..0000000 --- a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.3.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.3.ebuild,v 1.4 2009/12/15 15:44:20 armin76 Exp $ - -# Must be before x-modular eclass is inherited -#SNAPSHOT="yes" -XDPVER=4 - -inherit x-modular - -DESCRIPTION="Silicon Motion video driver" -KEYWORDS="alpha amd64 ia64 x86 ~x86-fbsd" -RDEPEND=">=x11-base/xorg-server-1.0.99" -DEPEND="${RDEPEND} - x11-proto/fontsproto - x11-proto/randrproto - x11-proto/renderproto - x11-proto/videoproto - x11-proto/xextproto - x11-proto/xproto" - -PATCHES=( - "${FILESDIR}/${P}-fix-loongson.patch" - "${FILESDIR}/98_sm712_CRT_enable.diff" - ) diff --git a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.4.ebuild b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild index 10e8d85..0fa2df2 100644 --- a/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.4.ebuild +++ b/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.4.ebuild,v 1.1 2010/04/29 12:33:45 chithanh Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-siliconmotion/xf86-video-siliconmotion-1.7.5.ebuild,v 1.1 2011/02/28 16:34:06 chithanh Exp $ EAPI=3 inherit xorg-2 DESCRIPTION="Silicon Motion video driver" -KEYWORDS="~alpha ~amd64 ~ia64 ~x86 ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~ia64 ~x86 ~x86-fbsd ~mips" IUSE="" RDEPEND=">=x11-base/xorg-server-1.0.99" @@ -21,5 +21,4 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-loongson-video-accl.patch" - "${FILESDIR}/98_sm712_CRT_enable.diff" ) |