alarm/xf86-video-armsoc-odroid fix

This commit is contained in:
Kevin Mihelich 2014-07-30 02:20:41 +00:00
parent 7f0d99b01a
commit 3c9f1a583d
2 changed files with 35 additions and 3 deletions

View file

@ -14,14 +14,21 @@ makedepends=('git' 'pkgconfig' 'xorg-server-devel' 'resourceproto' 'scrnsaverpro
options=('!libtool') options=('!libtool')
conflicts=(xf86-video-armsoc) conflicts=(xf86-video-armsoc)
provides=(xf86-video-armsoc) provides=(xf86-video-armsoc)
source=("$pkgname::git+https://github.com/mdrjr/xf86-video-armsoc.git#commit=${_commit}") source=("$pkgname::git+https://github.com/mdrjr/xf86-video-armsoc.git#commit=${_commit}"
md5sums=('SKIP') 'xorg.patch')
md5sums=('SKIP'
'3e27624156b65b23431c77f38f155620')
pkgver() { pkgver() {
cd $pkgname cd $pkgname
echo $(git rev-list --count makepkg).$(git rev-parse --short makepkg) echo $(git rev-list --count makepkg).$(git rev-parse --short makepkg)
} }
prepare() {
cd $pkgname
patch -p1 -i ../xorg.patch
}
build() { build() {
cd $pkgname cd $pkgname
@ -35,4 +42,3 @@ package() {
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
} }

View file

@ -0,0 +1,26 @@
diff -urN a/src/armsoc_driver.c b/src/armsoc_driver.c
--- a/src/armsoc_driver.c 2014-07-29 20:17:16.708546536 -0600
+++ b/src/armsoc_driver.c 2014-07-29 20:17:48.503440926 -0600
@@ -1060,7 +1060,7 @@
/* Initialize backing store: */
xf86SetBackingStore(pScreen);
- fbdev = xf86GetOptValString(pARMSOC->pOptionInfo,
+ fbdev = (char *)xf86GetOptValString(pARMSOC->pOptionInfo,
OPTION_INIT_FROM_FBDEV);
if (fbdev && *fbdev != '\0') {
if (ARMSOCCopyFB(pScrn, fbdev)) {
diff -urN a/src/drmmode_display.c b/src/drmmode_display.c
--- a/src/drmmode_display.c 2014-07-29 20:17:16.708546536 -0600
+++ b/src/drmmode_display.c 2014-07-29 20:17:52.533427544 -0600
@@ -353,8 +353,8 @@
drmmode_crtc->last_good_y = crtc->y;
drmmode_crtc->last_good_rotation = crtc->rotation;
if (drmmode_crtc->last_good_mode) {
- if (drmmode_crtc->last_good_mode->name)
- free(drmmode_crtc->last_good_mode->name);
+ //if (drmmode_crtc->last_good_mode->name)
+ // free(drmmode_crtc->last_good_mode->name);
free(drmmode_crtc->last_good_mode);
}
drmmode_crtc->last_good_mode = xf86DuplicateMode(&crtc->mode);