pkg: pine64: linux-megi: upgrade to opi-6.0-20221004-1652

Signed-off-by: Danct12 <danct12@disroot.org>
dreemurrs-embedded · Oct 9, 2022 · 8b51d3b · 8b51d3b
1 parent dfb6c8b
commit 8b51d3b
Show file tree

Hide file tree

Showing 4 changed files with 123 additions and 97 deletions.
diff --git a/PKGBUILDS/pine64/linux-megi/0004-revert-fbcon-remove-soft-scrollback-code.patch b/PKGBUILDS/pine64/linux-megi/0004-revert-fbcon-remove-soft-scrollback-code.patch
@@ -312,7 +312,7 @@
  		struct vc_data *conp2 = vc_cons[logo_shown].d;
 
 @@ -2406,6 +2602,9 @@ static int fbcon_do_set_font(struct vc_d
- 	int resize;
+ 	int resize, ret, old_userfont, old_width, old_height, old_charcount;
  	char *old_data = NULL;
 
 +	if (con_is_visible(vc) && softback_lines)
@@ -330,7 +330,7 @@
  	} else if (con_is_visible(vc)
  		   && vc->vc_mode == KD_TEXT) {
  		fbcon_clear_margins(vc, 0);
-@@ -2582,7 +2783,19 @@ static void fbcon_set_palette(struct vc_
+@@ -2605,7 +2806,19 @@ static void fbcon_set_palette(struct vc_
 
  static u16 *fbcon_screen_pos(const struct vc_data *vc, int offset)
  {
@@ -351,7 +351,7 @@
  }
 
  static unsigned long fbcon_getxy(struct vc_data *vc, unsigned long pos,
-@@ -2596,7 +2809,22 @@ static unsigned long fbcon_getxy(struct
+@@ -2619,7 +2832,22 @@ static unsigned long fbcon_getxy(struct
 
  		x = offset % vc->vc_cols;
  		y = offset / vc->vc_cols;
@@ -374,7 +374,7 @@
  	} else {
  		/* Should not happen */
  		x = y = 0;
-@@ -2624,11 +2852,106 @@ static void fbcon_invert_region(struct v
+@@ -2647,11 +2875,106 @@ static void fbcon_invert_region(struct v
  			a = ((a) & 0x88ff) | (((a) & 0x7000) >> 4) |
  			    (((a) & 0x0700) << 4);
  		scr_writew(a, p++);
@@ -481,7 +481,7 @@
  	return 0;
  }
 
-@@ -2692,6 +3015,8 @@ static void fbcon_modechanged(struct fb_
+@@ -2715,6 +3038,8 @@ static void fbcon_modechanged(struct fb_
 
  		fbcon_set_palette(vc, color_table);
  		update_screen(vc);
@@ -490,7 +490,7 @@
  	}
  }
 
-@@ -3154,6 +3479,7 @@ static const struct consw fb_con = {
+@@ -3177,6 +3502,7 @@ static const struct consw fb_con = {
  	.con_font_get 		= fbcon_get_font,
  	.con_font_default	= fbcon_set_def_font,
  	.con_set_palette 	= fbcon_set_palette,

diff --git a/PKGBUILDS/pine64/linux-megi/PKGBUILD b/PKGBUILDS/pine64/linux-megi/PKGBUILD
@@ -5,7 +5,7 @@ buildarch=8
 
 pkgbase=linux-megi
 _desc="Megous Kernel"
-pkgver=5.19.8
+pkgver=6.0
 pkgrel=1
 arch=('aarch64')
 url="https://github.com/megous/linux"
@@ -15,7 +15,7 @@ makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' '
 options=('!strip')
 
 # Source
-_commit="b8fd52d433a566c54a58fcec65fb479efd15bff2"
+_commit="b16232c6156de17e1dfdb63fdaea8e317baa07a7"
 source=("linux-$_commit.tar.gz::https://github.com/megous/linux/archive/${_commit}.tar.gz"
         'config'
         'linux.preset'
@@ -245,21 +245,21 @@ for _p in "${pkgname[@]}"; do
   }"
 done
 
-md5sums=('2b5d0e431f1f5dbcd0427424c109b96d'
-         'f59ccfcbeb6b84e9ddb149da3eeaeb85'
+md5sums=('08231f9a89fa90566eaf9e3ae9e42d33'
+         'ac23f06dd3e2303de67ef8e13ed8e0e3'
          '86d4a35722b5410e3b29fc92dae15d4b'
          'ce6c81ad1ad1f8b333fd6077d47abdaf'
          '3dc88030a8f2f5a5f97266d99b149f77'
          '10d200e0a964f24cdb744678a758e22b'
-         '75dac30d08e3a91871c072c016d1ab90'
+         'ed972b8da2887aef963e63268b055cd3'
          '7d80f76f1647afa00de320f5866484a1'
          '85d8339bc3d5daf45aa579d578ef0255'
          'd0fd6bd627223d4c9fc001ffff9df401'
          '3182f25beb0b76e8abd2e9de8213351d'
          '60e9d1ccba52bd2634fbe8034b110e36'
          'a31a435ab6cd8e7a47601159d665ce50'
          'fed6ae4ac4c3f56178fa4aca6c934d6f'
-         '11dfbbc5f70c29a3f78dd638303e5822'
+         'c52849cc82994edbd8ec665a2a6048a3'
          'b796ce863a8ce07d8e01623577fcf659'
          'cd3d72f7f71192225f2126abe11800a9'
          'a6407dceae1838f5aa27450401a91be6'