summaryrefslogtreecommitdiff
path: root/package/xorg-server
diff options
context:
space:
mode:
Diffstat (limited to 'package/xorg-server')
-rw-r--r--package/xorg-server/Makefile22
-rw-r--r--package/xorg-server/files/xorg.conf.lemote-yeelong5
-rw-r--r--package/xorg-server/patches/patch-fb_fb_h13
-rw-r--r--package/xorg-server/patches/patch-hw_kdrive_linux_linux_c13
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_common_compiler_h58
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_dri_dri_h11
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h11
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c13
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c56
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h14
-rw-r--r--package/xorg-server/patches/patch-ltmain_sh11
11 files changed, 11 insertions, 216 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index fef274746..e766b685d 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -4,19 +4,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xorg-server
-PKG_VERSION:= 1.12.2
-PKG_RELEASE:= 3
-PKG_MD5SUM:= a95c896fbe8322c3c8d518a13eb74c7a
+PKG_VERSION:= 1.15.0
+PKG_RELEASE:= 1
+PKG_MD5SUM:= faf04f1213f9a476997a774254b3abce
PKG_DESCR:= Xorg server
PKG_SECTION:= x11/server
PKG_DEPENDS:= libopenssl libxfont pixman libpciaccess libxkbfile
PKG_DEPENDS+= libfontenc xkeyboard-config xkbcomp libxau libxaw
PKG_DEPENDS+= libxmu libxpm libxrender libxt libxxf86dga libxext
PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb libgcc librt
+PKG_DEPENDS+= libxshmfence libfreetype libfontenc
PKG_BUILDDEP:= libX11 randrproto renderproto fixesproto damageproto
PKG_BUILDDEP+= scrnsaverproto resourceproto fontsproto videoproto
PKG_BUILDDEP+= compositeproto evieext libxkbfile libXfont pixman
PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto recordproto
+PKG_BUILDDEP+= xineramaproto
PKG_URL:= http://www.x.org/
PKG_SITES:= ${MASTER_SITE_XORG}
PKG_NEED_CXX:= 1
@@ -28,7 +30,7 @@ PKG_ARCH_DEPENDS:= !m68k
PKG_FLAVOURS_XORG_SERVER:= WITH_DRI WITH_KDRIVE
PKGFS_WITH_DRI:= mesalib
PKGFD_WITH_DRI:= enable DRI/DRI2 support
-PKGFB_WITH_DRI:= xf86driproto glproto dri2proto MesaLib
+PKGFB_WITH_DRI:= xf86driproto glproto MesaLib
PKGFD_WITH_KDRIVE:= Build Kdrive Xfbdev server
PKG_CHOICES_XORG_SERVER:= WITH_GCRYPT WITH_CRYPTO
@@ -57,9 +59,10 @@ CONFIGURE_ENV+= V=1
CONFIGURE_ARGS+= --enable-dga \
--enable-xorg \
--enable-xv \
- --enable-xaa \
--enable-vgahw \
--enable-dpms \
+ --enable-xinerama \
+ --disable-docs \
--disable-aiglx \
--disable-config-hal \
--disable-config-udev \
@@ -68,7 +71,6 @@ CONFIGURE_ARGS+= --enable-dga \
--disable-xf86bigfont \
--disable-xf86vidmode \
--disable-xfake \
- --disable-xinerama \
--disable-xnest \
--disable-xselinux \
--disable-xcsecurity \
@@ -85,9 +87,9 @@ CONFIGURE_ARGS+= --disable-kdrive --disable-xfbdev
endif
ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
-CONFIGURE_ARGS+= --enable-dri --enable-dri2 --enable-glx
+CONFIGURE_ARGS+= --enable-dri --enable-dri2 --enable-dri3 --enable-glx
else
-CONFIGURE_ARGS+= --disable-dri --disable-dri2 --disable-glx
+CONFIGURE_ARGS+= --disable-dri --disable-dri2 --disable-dri3 --disable-glx
endif
ifeq (${ADK_TARGET_SYSTEM_LEMOTE_YEELONG},y)
@@ -117,10 +119,6 @@ ifeq (${ADK_TARGET_SYSTEM_SHARP_ZAURUS},y)
${CP} ./files/xorg.conf.sharp-zaurus \
$(IDIR_XORG_SERVER)/etc/X11/xorg.conf
endif
-ifeq (${ADK_PACKAGE_XORG_SERVER_WITH_DRI},y)
- ${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*dri*.so \
- $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
-endif
# add m4 file to host directory
$(INSTALL_DIR) $(STAGING_HOST_DIR)/usr/share/aclocal
$(CP) ${WRKINST}/usr/share/aclocal/xorg-server.m4 \
diff --git a/package/xorg-server/files/xorg.conf.lemote-yeelong b/package/xorg-server/files/xorg.conf.lemote-yeelong
index 042471020..c6204c590 100644
--- a/package/xorg-server/files/xorg.conf.lemote-yeelong
+++ b/package/xorg-server/files/xorg.conf.lemote-yeelong
@@ -12,13 +12,10 @@ Section "Module"
Load "vgahw"
Load "fb"
Load "exa"
- Load "xaa"
Load "int10"
Load "ddc"
Load "i2c"
Load "vbe"
- Disable "glx"
- Disable "dri"
EndSection
Section "Device"
@@ -27,7 +24,7 @@ Section "Device"
VendorName "Silicon Motion, Inc."
BoardName "SM712 LynxEM+"
BusID "PCI:0:8:0"
- Option "AccelMethod" "XAA"
+ Option "AccelMethod" "EXA"
Option "pci_burst" "true"
Option "PanelSize" "1024x600"
EndSection
diff --git a/package/xorg-server/patches/patch-fb_fb_h b/package/xorg-server/patches/patch-fb_fb_h
deleted file mode 100644
index 9118bec68..000000000
--- a/package/xorg-server/patches/patch-fb_fb_h
+++ /dev/null
@@ -1,13 +0,0 @@
- Fix for xf86-video-siliconmotion in 16bpp with XAA, see:
- http://groups.google.com/group/loongson-dev/browse_thread/thread/570549e3d7894fef/5f04b3d9370adfd2
---- xorg-server-1.12.2.orig/fb/fb.h 2012-05-29 22:04:19.000000000 +0200
-+++ xorg-server-1.12.2/fb/fb.h 2013-04-30 10:33:00.000000000 +0200
-@@ -70,7 +70,7 @@
- #define FBPREFIX(x) fb##x
- #define WRITE(ptr, val) (*(ptr) = (val))
- #define READ(ptr) (*(ptr))
--#define MEMCPY_WRAPPED(dst, src, size) memcpy((dst), (src), (size))
-+#define MEMCPY_WRAPPED(dst, src, size) memmove((dst), (src), (size))
- #define MEMSET_WRAPPED(dst, val, size) memset((dst), (val), (size))
-
- #endif
diff --git a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c b/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c
deleted file mode 100644
index 2a8477cb8..000000000
--- a/package/xorg-server/patches/patch-hw_kdrive_linux_linux_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- xorg-server-1.12.2.orig/hw/kdrive/linux/linux.c 2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/kdrive/linux/linux.c 2013-12-22 20:10:03.000000000 +0100
-@@ -66,8 +66,8 @@ static void
- LinuxCheckChown(char *file)
- {
- struct stat st;
-- __uid_t u;
-- __gid_t g;
-+ uid_t u;
-+ gid_t g;
-
- if (stat(file, &st) < 0)
- return;
diff --git a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h b/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
deleted file mode 100644
index 8a5f29ebd..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_common_compiler_h
+++ /dev/null
@@ -1,58 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/common/compiler.h 2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/common/compiler.h 2013-04-30 10:52:21.000000000 +0200
-@@ -710,26 +710,26 @@ xf86WriteMmio32LeNB(__volatile__ void *b
- #define PORT_SIZE short
- #endif
-
--_X_EXPORT unsigned int IOPortBase; /* Memory mapped I/O port area */
-+_X_EXPORT volatile unsigned char *ioBase; /* Memory mapped I/O port area */
-
- static __inline__ void
- outb(unsigned PORT_SIZE port, unsigned char val)
- {
-- *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
-+ *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) + ioBase) =
- val;
- }
-
- static __inline__ void
- outw(unsigned PORT_SIZE port, unsigned short val)
- {
-- *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
-+ *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) + ioBase) =
- val;
- }
-
- static __inline__ void
- outl(unsigned PORT_SIZE port, unsigned int val)
- {
-- *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + IOPortBase) =
-+ *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) + ioBase) =
- val;
- }
-
-@@ -737,21 +737,21 @@ static __inline__ unsigned int
- inb(unsigned PORT_SIZE port)
- {
- return *(volatile unsigned char *) (((unsigned PORT_SIZE) (port)) +
-- IOPortBase);
-+ ioBase);
- }
-
- static __inline__ unsigned int
- inw(unsigned PORT_SIZE port)
- {
- return *(volatile unsigned short *) (((unsigned PORT_SIZE) (port)) +
-- IOPortBase);
-+ ioBase);
- }
-
- static __inline__ unsigned int
- inl(unsigned PORT_SIZE port)
- {
- return *(volatile unsigned int *) (((unsigned PORT_SIZE) (port)) +
-- IOPortBase);
-+ ioBase);
- }
-
- #if defined(__mips__)
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h b/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h
deleted file mode 100644
index 0e3d1974a..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_dri_dri_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- xorg-server-1.7.5.orig/hw/xfree86/dri/dri.h 2009-08-11 06:00:23.000000000 +0200
-+++ xorg-server-1.7.5/hw/xfree86/dri/dri.h 2010-04-21 19:59:22.000000000 +0200
-@@ -38,7 +38,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN
- #include <pciaccess.h>
-
- #include "scrnintstr.h"
--#include "xf86dri.h"
-+#include <X11/dri/xf86dri.h>
-
- typedef int DRISyncType;
-
diff --git a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h b/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
deleted file mode 100644
index 6f45382eb..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_dri_sarea_h
+++ /dev/null
@@ -1,11 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/dri/sarea.h 2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/dri/sarea.h 2013-04-30 10:33:00.000000000 +0200
-@@ -41,6 +41,8 @@
- /* SAREA area needs to be at least a page */
- #if defined(__alpha__)
- #define SAREA_MAX 0x2000
-+#elif defined(__mips__)
-+#define SAREA_MAX 0x4000
- #elif defined(__ia64__)
- #define SAREA_MAX 0x10000 /* 64kB */
- #else
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
deleted file mode 100644
index fd8fcfced..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_init_c
+++ /dev/null
@@ -1,13 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/os-support/linux/lnx_init.c 2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/os-support/linux/lnx_init.c 2013-04-30 10:33:00.000000000 +0200
-@@ -75,8 +75,8 @@ xf86OpenConsole(void)
- struct vt_mode VT;
- struct vt_stat vts;
- MessageType from = X_PROBED;
-- char *tty0[] = { "/dev/tty0", "/dev/vc/0", NULL };
-- char *vcs[] = { "/dev/vc/%d", "/dev/tty%d", NULL };
-+ char *tty0[] = { "/dev/tty0", NULL };
-+ char *vcs[] = { "/dev/tty%d", NULL };
-
- if (serverGeneration == 1) {
-
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c b/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
deleted file mode 100644
index 4dbf01589..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_linux_lnx_video_c
+++ /dev/null
@@ -1,56 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/os-support/linux/lnx_video.c 2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/os-support/linux/lnx_video.c 2013-04-30 10:49:01.000000000 +0200
-@@ -472,7 +472,7 @@ unmapVidMem(int ScreenNum, pointer Base,
- /* I/O Permissions section */
- /***************************************************************************/
-
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- volatile unsigned char *ioBase = NULL;
-
- #ifndef __NR_pciconfig_iobase
-@@ -484,7 +484,7 @@ volatile unsigned char *ioBase = NULL;
- Bool
- xf86EnableIO(void)
- {
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- int fd;
- unsigned int ioBase_phys;
- #endif
-@@ -492,8 +492,12 @@ xf86EnableIO(void)
- if (ExtendedEnabled)
- return TRUE;
-
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
-+#ifdef __powerpc__
- ioBase_phys = syscall(__NR_pciconfig_iobase, 2, 0, 0);
-+#else
-+ ioBase_phys = 0x1fd00000;
-+#endif
-
- fd = open("/dev/mem", O_RDWR);
- if (ioBase == NULL) {
-@@ -511,7 +515,7 @@ xf86EnableIO(void)
- #endif
- }
- close(fd);
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__s390__) && !defined(__arm__) && !defined(__m32r__) && !defined(__nds32__)
- if (ioperm(0, 1024, 1) || iopl(3)) {
- if (errno == ENODEV)
- ErrorF("xf86EnableIOPorts: no I/O ports found\n");
-@@ -537,10 +541,10 @@ xf86DisableIO(void)
- {
- if (!ExtendedEnabled)
- return;
--#if defined(__powerpc__)
-+#if defined(__powerpc__) || defined(__mips__)
- munmap(ioBase, 0x20000);
- ioBase = NULL;
--#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__mips__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
-+#elif !defined(__mc68000__) && !defined(__sparc__) && !defined(__sh__) && !defined(__hppa__) && !defined(__arm__) && !defined(__s390__) && !defined(__m32r__) && !defined(__nds32__)
- iopl(0);
- ioperm(0, 1024, 0);
- #endif
diff --git a/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h b/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h
deleted file mode 100644
index cd1c5c15c..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_os-support_xf86_OSlib_h
+++ /dev/null
@@ -1,14 +0,0 @@
---- xorg-server-1.12.2.orig/hw/xfree86/os-support/xf86_OSlib.h 2012-05-17 19:09:03.000000000 +0200
-+++ xorg-server-1.12.2/hw/xfree86/os-support/xf86_OSlib.h 2013-10-29 15:23:18.000000000 +0100
-@@ -178,11 +178,7 @@
- #include <sys/types.h>
- #include <assert.h>
-
--#ifdef __linux__
--#include <termio.h>
--#else /* __GLIBC__ */
- #include <termios.h>
--#endif
- #ifdef __sparc__
- #include <sys/param.h>
- #endif
diff --git a/package/xorg-server/patches/patch-ltmain_sh b/package/xorg-server/patches/patch-ltmain_sh
deleted file mode 100644
index eedadf67e..000000000
--- a/package/xorg-server/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- xorg-server-1.12.2.orig/ltmain.sh 2012-05-29 22:06:05.000000000 +0200
-+++ xorg-server-1.12.2/ltmain.sh 2013-04-30 10:33:00.000000000 +0200
-@@ -5853,7 +5853,7 @@ func_mode_link ()
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
- -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
-- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
-+ -O*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*)
- func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
- func_append compile_command " $arg"