jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-08-02 07:57:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

xorg: Bump xlib_libXxf86dga to version 1.1.4

Browse Source 
- remove patches applied upstream

thanks to Jerzy Grzegorek for the hint

Signed-off-by: Bernd Kuhls <berndkuhls@hotmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Bernd Kuhls 2014-01-06 21:40:10 +01:00 committed by Peter Korsgaard
parent 5b838cabde
commit 8c969f7786
3 changed files with 1 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0001-fix-compilation.patch
View File

@ -1,27 +0,0 @@
Backported from d4f89f7f42484963575b4c7d2fa694051e111e76
Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
---
From d4f89f7f42484963575b4c7d2fa694051e111e76 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Fri, 09 Mar 2012 10:48:14 +0000
Subject: Include <stdint.h> for uintptr_t
Found-by: Tinderbox
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index 32f455b..964de18 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -21,6 +21,7 @@ Copyright (c) 1995,1996 The XFree86 Project, Inc
#include <X11/extensions/extutil.h>
#include <stdio.h>
+#include <stdint.h>
/* If you change this, change the Bases[] array below as well */
#define MAX_HEADS 16
--
cgit v0.9.0.2-2-gbebe

28
package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga-0002-fix-compilation.patch
View File

@ -1,28 +0,0 @@
Backported from 56b5a5887349e9d0e1d28da157fe6441ca691f56
Signed-off-by: Jesper Baekdahl <jbb@gamblify.com>
---
From 56b5a5887349e9d0e1d28da157fe6441ca691f56 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu, 08 Mar 2012 19:49:36 +0000
Subject: Build fix when sizeof(off_t) > sizeof(void *)
https://trac.macports.org/ticket/33532
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
---
diff --git a/src/XF86DGA2.c b/src/XF86DGA2.c
index e81b486..32f455b 100644
--- a/src/XF86DGA2.c
+++ b/src/XF86DGA2.c
@@ -928,7 +928,7 @@ DGAMapPhysical(
if ((pMap->fd = open(name, O_RDWR)) < 0)
return False;
pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
- MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
+ MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(uintptr_t)base);
if (pMap->virtual == (void *)-1)
return False;
mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);
--
cgit v0.9.0.2-2-gbebe

2
package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
XLIB_LIBXXF86DGA_VERSION = 1.1.3 XLIB_LIBXXF86DGA_VERSION = 1.1.4
XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2 XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2
XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXXF86DGA_LICENSE = MIT XLIB_LIBXXF86DGA_LICENSE = MIT