Date: Sun, 29 Sep 2013 23:46:47 +0000 (UTC) From: Niclas Zeising <zeising@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328762 - in head/x11-servers/xorg-server: . files Message-ID: <201309292346.r8TNklOV038494@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: zeising Date: Sun Sep 29 23:46:47 2013 New Revision: 328762 URL: http://svnweb.freebsd.org/changeset/ports/328762 Log: Fix patches. Remove two unneeded ones, and add new patches to fix sparc64. This was missed in the mesa update. This syncs x11-server/xorg-server with the xorg development repo Bump portrevision again in case. Apologies for the churn! Obtained from: xorg development repo Added: head/x11-servers/xorg-server/files/extra-new-arch-sparc64 (contents, props changed) head/x11-servers/xorg-server/files/extra-old-arch-sparc64 (contents, props changed) Deleted: head/x11-servers/xorg-server/files/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c head/x11-servers/xorg-server/files/extra-servermd.h Modified: head/x11-servers/xorg-server/Makefile Modified: head/x11-servers/xorg-server/Makefile ============================================================================== --- head/x11-servers/xorg-server/Makefile Sun Sep 29 23:40:13 2013 (r328761) +++ head/x11-servers/xorg-server/Makefile Sun Sep 29 23:46:47 2013 (r328762) @@ -35,20 +35,18 @@ OPTIONS_EXCLUDE_sparc64= HAL .if defined(WITH_NEW_XORG) XORG_VERSION= 1.12.4 -XORG_REVISION= 2 +XORG_REVISION= 3 PLIST_SUB+= OLD="@comment " NEW="" EXTRA_PATCHES+= ${FILESDIR}/extra-clang \ ${FILESDIR}/extra-configure .else XORG_VERSION= 1.7.7 -XORG_REVISION= 9 +XORG_REVISION= 10 PLIST_SUB+= OLD="" NEW="@comment " EXTRA_PATCHES+= ${FILESDIR}/extra-Xext-xace.c \ - ${FILESDIR}/extra-Xserver-hw-xfree86-os-support-bsd-sparc64_video.c \ ${FILESDIR}/extra-Xserver-os-xprintf.c \ ${FILESDIR}/extra-include_eventstr.h \ ${FILESDIR}/extra-os-utils.c \ - ${FILESDIR}/extra-servermd.h \ ${FILESDIR}/extra-dix_events.c \ ${FILESDIR}/extra-Xserver-hw-xfree86-common-xf86Config.c .endif @@ -153,6 +151,11 @@ PLIST_SUB+= PPC_NA="" .if ${ARCH} == sparc64 PLIST_SUB+= SPARC64="" PLIST_SUB+= SPARC64_NA="@comment " +.if defined(WITH_NEW_XORG) +EXTRA_PATCHES+= ${FILESDIR}/extra-new-arch-sparc64 +.else +EXTRA_PATCHES+= ${FILESDIR}/extra-old-arch-sparc64 +.endif .else PLIST_SUB+= SPARC64="@comment " PLIST_SUB+= SPARC64_NA="" Added: head/x11-servers/xorg-server/files/extra-new-arch-sparc64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-servers/xorg-server/files/extra-new-arch-sparc64 Sun Sep 29 23:46:47 2013 (r328762) @@ -0,0 +1,12 @@ +--- hw/xfree86/os-support/bsd/bsd_init.c.orig 2012-05-17 19:09:03.000000000 +0200 ++++ hw/xfree86/os-support/bsd/bsd_init.c 2013-09-01 20:45:36.000000000 +0200 +@@ -230,6 +230,9 @@ + * Add cases for other *BSD that behave the same. + */ + #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++#if defined(__sparc64__) ++ pci_system_init_dev_mem(fd); ++#endif + uname(&uts); + i = atof(uts.release) * 100; + if (i >= 310) Added: head/x11-servers/xorg-server/files/extra-old-arch-sparc64 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-servers/xorg-server/files/extra-old-arch-sparc64 Sun Sep 29 23:46:47 2013 (r328762) @@ -0,0 +1,13 @@ +--- hw/xfree86/os-support/bsd/sparc64_video.c.orig 2008-10-02 21:01:25.000000000 +0000 ++++ hw/xfree86/os-support/bsd/sparc64_video.c 2009-03-29 19:55:40.000000000 +0000 +@@ -52,6 +52,10 @@ + pVidMem->mapMem = sparc64MapVidMem; + pVidMem->unmapMem = sparc64UnmapVidMem; + pVidMem->initialised = TRUE; ++ ++#if defined(__FreeBSD__) ++ pci_system_init_dev_mem(xf86Info.screenFd); ++#endif + } + + static pointer
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309292346.r8TNklOV038494>