From 1a42d10ee93f8220add717ba50cdbebf1b507863 Mon Sep 17 00:00:00 2001 From: Benjamin Legendre Date: Thu, 10 Nov 2016 23:10:26 +0100 Subject: [PATCH] Upgraded to kernel 4.4.0.47.68 and Groovymame 0.179 --- CHANGELOG.md | 2 ++ Makefile | 36 ++++++++++++------------------ README.md | 2 +- doc/15khz-package-documentation.md | 6 ++--- src/avga3000-4.4.diff | 2 +- 5 files changed, 21 insertions(+), 27 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94afc50..fccfd4b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ CHANGELOG Current ------- +- Upgraded supported kernel version to Ubuntu-4.4.0-47.68 +- Upgraded to Groovymame 0.179 - Improved Xorg configuration documentation - Added support + doc for "One CRT Only" Xorg config layout diff --git a/Makefile b/Makefile index 7930aaa..06a8de8 100644 --- a/Makefile +++ b/Makefile @@ -6,10 +6,12 @@ SHELL = /bin/sh DESTDIR = /usr/local +# To see current kernel version go to http://kernel.ubuntu.com/git/ + UBUNTU_VERSION = xenial KERNEL_BASE_VERSION = 4.4.0 -KERNEL_ABI_NUMBER = 31 -KERNEL_UPLOAD_NUMBER = 50 +KERNEL_ABI_NUMBER = 47 +KERNEL_UPLOAD_NUMBER = 68 KERNEL_GIT_URL = git://kernel.ubuntu.com/ubuntu/ubuntu-$(UBUNTU_VERSION).git KERNEL_GIT_TAG = Ubuntu-$(KERNEL_BASE_VERSION)-$(KERNEL_ABI_NUMBER).$(KERNEL_UPLOAD_NUMBER) @@ -27,11 +29,10 @@ LINUX_15KHZ_PATCH = src/linux-4.2.diff LINUX_AT9200_PATCH = src/ati9200_pllfix-3.19.diff LINUX_AVGA3000_PATCH = src/avga3000-4.4.diff -MAME_SRC_PKG_URL = https://github.com/mamedev/mame/releases/download/mame0170/mame0170s.zip -MAME_SRC_PKG = vendor/mame0170s.zip -GROOVYMAME_HI_PATCH_URL = https://54c0ab1f0b10beedc11517491db5e9770a1c66c6.googledrive.com/host/0B5iMjDor3P__aEFpcVNkVW5jbEE/v0.170_015l/hi_0170.diff -GROOVYMAME_HI_PATCH = vendor/groovymame-patchs/hi.diff -GROOVYMAME_PATCH_URL = https://54c0ab1f0b10beedc11517491db5e9770a1c66c6.googledrive.com/host/0B5iMjDor3P__aEFpcVNkVW5jbEE/v0.170_015l/0170_groovymame_015l.diff +MAME_VERSION = 0179 +MAME_SRC_PKG_URL = https://github.com/mamedev/mame/archive/mame$(MAME_VERSION).tar.gz +MAME_SRC_PKG = vendor/mame$(MAME_VERSION).tar.gz +GROOVYMAME_PATCH_URL = https://doc-0c-ak-docs.googleusercontent.com/docs/securesc/ha0ro937gcuc7l7deffksulhg5h7mbp1/idfvl16oj1bnpbpiimst02jseila9fpl/1478714400000/14540090406451835757/*/0B5iMjDor3P__WjNRdkg1clkxUzQ?e=download GROOVYMAME_PATCH = vendor/groovymame-patchs/groovymame.diff GROOVYMAME_BIN = vendor/mame/mame64 @@ -188,16 +189,12 @@ $(XSERVER_XORG_VIDEO_NOUVEAU_DEB_SRC): mkdir -p vendor cd vendor && apt-get source xserver-xorg-video-nouveau -$(GROOVYMAME_BIN): $(MAME_SRC_PKG) \ - $(GROOVYMAME_HI_PATCH) \ - $(GROOVYMAME_PATCH) +$(GROOVYMAME_BIN): $(GROOVYMAME_PATCH) \ + $(MAME_SRC_PKG) rm -rf vendor/mame - cd vendor && unzip $(realpath $(MAME_SRC_PKG)) - mkdir vendor/mame - cd vendor/mame && unzip ../mame.zip - rm vendor/mame.zip - cd vendor/mame && patch -p0 --binary < $(realpath $(GROOVYMAME_HI_PATCH)) - cd vendor/mame && patch -p0 --binary < $(realpath $(GROOVYMAME_PATCH)) + cd vendor && tar xvf $(realpath $(MAME_SRC_PKG)) + mv vendor/mame-mame$(MAME_VERSION) vendor/mame + cd vendor/mame && patch -p0 -E --binary < $(realpath $(GROOVYMAME_PATCH)) cd vendor/mame && MAKEFLAGS= MFLAGS= make $(MAME_SRC_PKG): @@ -205,14 +202,9 @@ $(MAME_SRC_PKG): wget -O $(MAME_SRC_PKG) $(MAME_SRC_PKG_URL) touch $(MAME_SRC_PKG) -$(GROOVYMAME_HI_PATCH): - mkdir -p $(dir $(GROOVYMAME_HI_PATCH)) - wget -O $(GROOVYMAME_HI_PATCH) $(GROOVYMAME_HI_PATCH_URL) - touch $(GROOVYMAME_HI_PATCH) - $(GROOVYMAME_PATCH): mkdir -p $(dir $(GROOVYMAME_PATCH)) - wget -O $(GROOVYMAME_PATCH) $(GROOVYMAME_PATCH_URL) + curl $(GROOVYMAME_PATCH_URL) | tr -d "\r" > $(GROOVYMAME_PATCH) touch $(GROOVYMAME_PATCH) $(SWITCHRES_BIN): $(SWITCHRES_SRC_PKG) diff --git a/README.md b/README.md index 73225a0..d97abfb 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ pieces of softwares. ```bash $ sudo apt-get update - $ sudo apt-get build-dep linux-image-4.4.0-31-generic + $ sudo apt-get build-dep linux-image-4.4.0-47-generic $ sudo apt-get build-dep mame vice xserver-xorg-video-nouveau $ sudo apt-get install fakeroot qt5-default qtbase5-dev \ qtbase5-dev-tools git unrar libxml2-dev libsdl1.2-dev diff --git a/doc/15khz-package-documentation.md b/doc/15khz-package-documentation.md index c27fac2..e115250 100755 --- a/doc/15khz-package-documentation.md +++ b/doc/15khz-package-documentation.md @@ -88,9 +88,9 @@ is not easier but can be adjusted to fit setups which differ a little. The provided makefile automates the build of the following: -- **Linux kernel Ubuntu-4.4.0-31.50**, patched using 15khz patchs. +- **Linux kernel Ubuntu-4.4.0-47.68**, patched using 15khz patchs. - **nouveau drivers 1.0.11**, patched to support low resolutions -- **Mame 0.170**, patched with the groovymame patch. +- **Mame 0.179**, patched with the groovymame patch. - **Vice 2.4** — a Commodore 64 emulator — with the SDL support. SDL version of vice has a better support for full screen native resolution. @@ -101,7 +101,7 @@ The provided makefile automates the build of the following: ``` {.sourceCode .bash} $ sudo apt-get update - $ sudo apt-get build-dep linux-image-4.4.0-24-generic + $ sudo apt-get build-dep linux-image-4.4.0-47-generic $ sudo apt-get build-dep mame vice xserver-xorg-video-nouveau $ sudo apt-get install fakeroot qt5-default qtbase5-dev \ qtbase5-dev-tools git unrar libxml2-dev libsdl1.2-dev diff --git a/src/avga3000-4.4.diff b/src/avga3000-4.4.diff index 8742b6d..41ae17c 100755 --- a/src/avga3000-4.4.diff +++ b/src/avga3000-4.4.diff @@ -86,7 +86,7 @@ index 8f28524..a1ec8a3 100644 + p2pll->pll_out_min = 50000; + } + - if (crev >= 4) { + if (((frev < 2) && (crev >= 4)) || (frev >= 2)) { p1pll->lcd_pll_out_min = le16_to_cpu(firmware_info->info_14.usLcdMinPixelClockPLL_Output) * 100; diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c