summaryrefslogtreecommitdiff
path: root/package/xorg-server
diff options
context:
space:
mode:
Diffstat (limited to 'package/xorg-server')
-rw-r--r--package/xorg-server/Makefile18
-rw-r--r--package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c135
-rw-r--r--package/xorg-server/patches/patch-ltmain_sh14
3 files changed, 14 insertions, 153 deletions
diff --git a/package/xorg-server/Makefile b/package/xorg-server/Makefile
index 92d5ddeaa..37fcb2df7 100644
--- a/package/xorg-server/Makefile
+++ b/package/xorg-server/Makefile
@@ -4,21 +4,21 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= xorg-server
-PKG_VERSION:= 1.7.6
-PKG_RELEASE:= 2
-PKG_MD5SUM:= ba0360b4ec1f6e541b264e45906bf5f2
+PKG_VERSION:= 1.9.3
+PKG_RELEASE:= 1
+PKG_MD5SUM:= b8e364bffd87291b593726696d39b4b5
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
+PKG_DEPENDS+= libxdmcp libxv libsm libice libx11 libxcb
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
+PKG_BUILDDEP+= libpciaccess openssl xf86dgaproto recordproto
PKG_URL:= http://www.x.org/
-PKG_SITES:= http://xorg.freedesktop.org/archive/individual/xserver/
+PKG_SITES:= ${MASTER_SITE_XORG}
PKG_CFLINE_XORG_SERVER:=depends on ADK_TARGET_WITH_VGA
@@ -32,8 +32,7 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,XORG_SERVER,${PKG_NAME},$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
CONFIGURE_ENV+= V=1
-CONFIGURE_ARGS+= \
- --with-fontdir=/usr/share/fonts/X11 \
+CONFIGURE_ARGS+= --with-fontdir=/usr/share/fonts/X11 \
--enable-dga \
--enable-xorg \
--enable-xv \
@@ -72,7 +71,6 @@ endif
post-install:
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/etc/X11
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/bin
- $(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/fonts
$(INSTALL_DIR) $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
@@ -83,8 +81,6 @@ post-install:
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules
${CP} ${WRKINST}/usr/lib/xorg/modules/extensions/*.so \
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/extensions
- ${CP} ${WRKINST}/usr/lib/xorg/modules/linux/*.so \
- $(IDIR_XORG_SERVER)/usr/lib/xorg/modules/linux
${CP} ${WRKINST}/usr/lib/xorg/modules/multimedia/*.so \
$(IDIR_XORG_SERVER)/usr/lib/xorg/modules/multimedia
-$(CP) $(TOPDIR)/target/$(ADK_TARGET)/xorg.conf \
diff --git a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c b/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
deleted file mode 100644
index 771d3a1e6..000000000
--- a/package/xorg-server/patches/patch-hw_xfree86_loader_sdksyms_c
+++ /dev/null
@@ -1,135 +0,0 @@
---- xorg-server-1.7.6.orig/hw/xfree86/loader/sdksyms.c 2010-03-17 01:56:04.000000000 +0100
-+++ xorg-server-1.7.6/hw/xfree86/loader/sdksyms.c 2010-05-14 15:54:56.232212764 +0200
-@@ -634,7 +634,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &NewCurrentScreen,
- (void *) &PointerConfinedToScreen,
- (void *) &GetSpritePosition,
-- (void *) &XineramaGetCursorScreen,
- (void *) &GEExtensions,
- (void *) &GERegisterExtension,
- (void *) &GEInitEvent,
-@@ -724,7 +723,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &PickPointer,
- (void *) &PickKeyboard,
- (void *) &IsInterferingGrab,
-- (void *) &ReinitializeRootWindow,
- (void *) &ScreenRestructured,
- (void *) &ffs,
- (void *) &AddCallback,
-@@ -874,8 +872,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &CreateLinearGradientPicture,
- (void *) &CreateRadialGradientPicture,
- (void *) &CreateConicalGradientPicture,
-- (void *) &PanoramiXRenderInit,
-- (void *) &PanoramiXRenderReset,
- (void *) &PictTransform_from_xRenderTransform,
- (void *) &xRenderTransform_from_PictTransform,
- (void *) &PictureTransformPoint,
-@@ -977,25 +973,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &ShmSegType,
- (void *) &ShmCompletionCode,
- (void *) &BadShmSegCode,
-- (void *) &PanoramiXNumScreens,
-- (void *) &panoramiXdataPtr,
-- (void *) &PanoramiXPixWidth,
-- (void *) &PanoramiXPixHeight,
-- (void *) &PanoramiXTranslateVisualID,
-- (void *) &PanoramiXConsolidate,
-- (void *) &PanoramiXCreateConnectionBlock,
-- (void *) &PanoramiXFindIDByScrnum,
-- (void *) &XineramaRegisterConnectionBlockCallback,
-- (void *) &XineramaDeleteResource,
-- (void *) &XineramaReinitData,
-- (void *) &XineramaScreenRegions,
-- (void *) &XRC_DRAWABLE,
-- (void *) &XRT_WINDOW,
-- (void *) &XRT_PIXMAP,
-- (void *) &XRT_GC,
-- (void *) &XRT_COLORMAP,
-- (void *) &XineramaVisualsEqualPtr,
-- (void *) &XineramaGetImageData,
- (void *) &xf86CreateI2CBusRec,
- (void *) &xf86DestroyI2CBusRec,
- (void *) &xf86I2CBusInit,
-@@ -1034,31 +1011,17 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &noTestExtensions,
- (void *) &dixScreenOrigins,
- (void *) &ConnectionInfo,
-- (void *) &DPMSStandbyTime,
-- (void *) &DPMSSuspendTime,
-- (void *) &DPMSOffTime,
-- (void *) &DPMSPowerLevel,
-- (void *) &DPMSEnabled,
-- (void *) &DPMSDisabledSwitch,
-- (void *) &DPMSCapableFlag,
-- (void *) &PanoramiXExtensionDisabledHack,
- (void *) &noCompositeExtension,
- (void *) &noDamageExtension,
- (void *) &noDbeExtension,
-- (void *) &noDPMSExtension,
-- (void *) &noGlxExtension,
- (void *) &noScreenSaverExtension,
- (void *) &noMITShmExtension,
- (void *) &noRRExtension,
- (void *) &noRenderExtension,
- (void *) &noResExtension,
- (void *) &noXFree86DGAExtension,
-- (void *) &noXFree86DRIExtension,
-- (void *) &noXFree86VidModeExtension,
- (void *) &noXFixesExtension,
-- (void *) &noPanoramiXExtension,
- (void *) &noXvExtension,
-- (void *) &noDRI2Extension,
- (void *) &defaultTextFont,
- (void *) &defaultCursorFont,
- (void *) &MaxClients,
-@@ -1193,7 +1156,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &ProcRRQueryOutputProperty,
- (void *) &ProcRRConfigureOutputProperty,
- (void *) &ProcRRDeleteOutputProperty,
-- (void *) &RRXineramaExtensionInit,
- (void *) &ExtensionModuleList,
- (void *) &LoadSubModule,
- (void *) &UnloadSubModule,
-@@ -1311,8 +1273,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &xf86ReconfigureLayout,
- (void *) &xf86CVTMode,
- (void *) &xf86DPMSInit,
-- (void *) &DPMSSet,
-- (void *) &DPMSSupported,
- (void *) &DGAInit,
- (void *) &DGAReInitModes,
- (void *) &xf86SetDGAMode,
-@@ -1570,8 +1530,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &DMTModes,
- (void *) &xf86ConfigFile,
- (void *) &xf86AllowMouseOpenFail,
-- (void *) &xf86VidModeDisabled,
-- (void *) &xf86VidModeAllowNonLocal,
- (void *) &xf86fpFlag,
- (void *) &xf86sFlag,
- (void *) &xf86bsEnableFlag,
-@@ -1937,7 +1895,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &ProcGrabButton,
- (void *) &ProcUngrabButton,
- (void *) &ProcRecolorCursor,
-- (void *) &PostSyntheticMotion,
- (void *) &SetDefaultFont,
- (void *) &QueueFontWakeup,
- (void *) &RemoveFontWakeup,
-@@ -2187,15 +2144,6 @@ _X_HIDDEN void *xorg_symbols[] = {
- (void *) &SProcUngrabButton,
- (void *) &SProcUngrabKey,
- (void *) &SProcWarpPointer,
-- (void *) &XaceHooks,
-- (void *) &XaceHook,
-- (void *) &XaceHookDispatch,
-- (void *) &XaceHookPropertyAccess,
-- (void *) &XaceHookSelectionAccess,
-- (void *) &XaceHookAuditEnd,
-- (void *) &XaceGetConnectionNumber,
-- (void *) &XaceIsLocal,
-- (void *) &XaceCensorImage,
- (void *) &XkbIndentText,
- (void *) &XkbAtomText,
- (void *) &XkbKeysymText,
diff --git a/package/xorg-server/patches/patch-ltmain_sh b/package/xorg-server/patches/patch-ltmain_sh
index 779bb5238..14906838e 100644
--- a/package/xorg-server/patches/patch-ltmain_sh
+++ b/package/xorg-server/patches/patch-ltmain_sh
@@ -1,11 +1,11 @@
---- xorg-server-1.7.6.orig/ltmain.sh 2010-02-05 04:18:39.000000000 +0100
-+++ xorg-server-1.7.6/ltmain.sh 2011-01-17 16:06:33.000000000 +0100
-@@ -4765,7 +4765,7 @@ func_mode_link ()
- # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
- # @file GCC response files
+--- xorg-server-1.9.3.orig/ltmain.sh 2010-12-13 20:59:07.000000000 +0100
++++ xorg-server-1.9.3/ltmain.sh 2011-01-24 17:03:34.000000000 +0100
+@@ -5840,7 +5840,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*|@*)
-+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto)
+ -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"
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-16 23:31:17 +0000