Merge branch 'master' of git+ssh://openadk.org/git/openadk

3 files changed, 27 insertions, 6 deletions

diff --git a/package/xf86-video-siliconmotion/patches/patch-src_Makefile_in b/package/xf86-video-siliconmotion/patches/patch-src_Makefile_in
new file mode 100644
index 000000000..141955000
--- /dev/null
+++ b/package/xf86-video-siliconmotion/patches/patch-src_Makefile_in
@@ -0,0 +1,11 @@
+--- xf86-video-siliconmotion-1.7.7.orig/src/Makefile.in	2012-07-17 08:28:17.000000000 +0200
++++ xf86-video-siliconmotion-1.7.7/src/Makefile.in	2014-03-14 18:09:06.901850694 +0100
+@@ -288,7 +288,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) $(PCIACCESS_CFLAGS)
++AM_CFLAGS = $(XORG_CFLAGS) $(PCIACCESS_CFLAGS)
+ siliconmotion_drv_la_LTLIBRARIES = siliconmotion_drv.la
+ siliconmotion_drv_la_LDFLAGS = -module -avoid-version
+ siliconmotion_drv_ladir = @moduledir@/drivers
diff --git a/package/xf86-video-siliconmotion/patches/patch-src_smi_driver_c b/package/xf86-video-siliconmotion/patches/patch-src_smi_driver_c
new file mode 100644
index 000000000..eedd62fcc
--- /dev/null
+++ b/package/xf86-video-siliconmotion/patches/patch-src_smi_driver_c
@@ -0,0 +1,11 @@
+--- xf86-video-siliconmotion-1.7.7.orig/src/smi_driver.c	2012-07-17 06:53:21.000000000 +0200
++++ xf86-video-siliconmotion-1.7.7/src/smi_driver.c	2014-03-14 18:39:37.307139846 +0100
+@@ -1750,8 +1750,6 @@ SMI_ScreenInit(SCREEN_INIT_ARGS_DECL)
+ 		   "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/package/xf86-video-siliconmotion/patches/loongson.patch b/package/xf86-video-siliconmotion/patches/patch-src_smi_video_c
index 2b9041516..e12a74839 100644
--- a/package/xf86-video-siliconmotion/patches/loongson.patch
+++ b/package/xf86-video-siliconmotion/patches/patch-src_smi_video_c
@@ -1,7 +1,6 @@
-diff -Nur xf86-video-siliconmotion-1.7.4/src/smi_video.c xf86-video-siliconmotion-1.7.4-loongson/src/smi_video.c
---- xf86-video-siliconmotion-1.7.4/src/smi_video.c	2010-02-25 08:33:07.000000000 +0100
-+++ xf86-video-siliconmotion-1.7.4-loongson/src/smi_video.c	2012-03-13 04:18:18.634989344 +0100
-@@ -276,6 +276,7 @@
+--- xf86-video-siliconmotion-1.7.7.orig/src/smi_video.c	2012-07-17 06:53:21.000000000 +0200
++++ xf86-video-siliconmotion-1.7.7/src/smi_video.c	2014-03-14 18:35:37.546382342 +0100
+@@ -275,6 +275,7 @@ static XF86ImageRec SMI_VideoImages[] =
      XVIMAGE_YUY2,
      XVIMAGE_YV12,
      XVIMAGE_I420,
@@ -9,7 +8,7 @@ diff -Nur xf86-video-siliconmotion-1.7.4/src/smi_video.c xf86-video-siliconmotio
      {
  	FOURCC_RV15,			/* id				*/
  	XvRGB,				/* type				*/
-@@ -1464,6 +1465,117 @@
+@@ -1461,6 +1462,117 @@ SMI_QueryBestSize(
      LEAVE();
  }
  
@@ -127,7 +126,7 @@ diff -Nur xf86-video-siliconmotion-1.7.4/src/smi_video.c xf86-video-siliconmotio
  
  static int
  SMI_PutImage(
-@@ -1592,7 +1704,7 @@
+@@ -1592,7 +1704,7 @@ SMI_PutImage(
  		offset3 = tmp;
  	    }
  	    nLines = ((((y2 + 0xffff) >> 16) + 1) & ~1) - top;