Bug 179229 - x11-servers/xorg-server extra-arch-powerpc patch needs to be regenerated
Summary: x11-servers/xorg-server extra-arch-powerpc patch needs to be regenerated
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-x11 (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-02 20:50 UTC by Justin Hibbits
Modified: 2013-06-14 15:47 UTC (History)
0 users

See Also:

Attachments
extra-arch-powerpc (407 bytes, application/octet-stream)
2013-06-04 02:17 UTC, Justin Hibbits 		no flags Details
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Justin Hibbits freebsd_committer freebsd_triage 2013-06-02 20:50:00 UTC 
The extra-arch-powerpc patch fails to apply when using WITH_NEW_XORG=yes.  The hw/xfree86/os-support/bsd/ppc_video.c file was reformatted, resulting in several lines being removed as well as indent being changed, since xorg-server 1.7.7
Comment 1 Mark Linimon freebsd_committer freebsd_triage 2013-06-03 12:28:36 UTC 
Responsible Changed
From-To: freebsd-bugs->freebsd-x11

ports PR.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-06-14 15:39:31 UTC 
Author: zeising
Date: Fri Jun 14 14:39:18 2013
New Revision: 320937
URL: http://svnweb.freebsd.org/changeset/ports/320937

Log:
  Fix patching on powerpc with new xorg.
  
  PR:		ports/179229
  Submitted by:	jhibbits (PR), zeising (patch)

Added:
  head/x11-servers/xorg-server/files/extra-new-arch-powerpc
     - copied, changed from r320890, head/x11-servers/xorg-server/files/extra-arch-powerpc
  head/x11-servers/xorg-server/files/extra-old-arch-powerpc
     - copied unchanged from r320890, head/x11-servers/xorg-server/files/extra-arch-powerpc
Deleted:
  head/x11-servers/xorg-server/files/extra-arch-powerpc
Modified:
  head/x11-servers/xorg-server/Makefile

Modified: head/x11-servers/xorg-server/Makefile
==============================================================================
--- head/x11-servers/xorg-server/Makefile	Fri Jun 14 14:36:08 2013	(r320936)
+++ head/x11-servers/xorg-server/Makefile	Fri Jun 14 14:39:18 2013	(r320937)
@@ -127,7 +127,11 @@ PLIST_SUB+=	IA64_NA=""
 
 .if ${ARCH} == powerpc || ${ARCH} == powerpc64
 PLIST_SUB+=	PPC_NA="@comment "
-EXTRA_PATCHES=	${.CURDIR}/files/extra-arch-powerpc
+.if defined(WITH_NEW_XORG)
+EXTRA_PATCHES=	${.CURDIR}/files/extra-new-arch-powerpc
+.else
+EXTRA_PATCHES=	${.CURDIR}/files/extra-old-arch-powerpc
+.endif
 .else
 PLIST_SUB+=	PPC_NA=""
 .endif

Copied and modified: head/x11-servers/xorg-server/files/extra-new-arch-powerpc (from r320890, head/x11-servers/xorg-server/files/extra-arch-powerpc)
==============================================================================
--- head/x11-servers/xorg-server/files/extra-arch-powerpc	Fri Jun 14 08:15:44 2013	(r320890, copy source)
+++ head/x11-servers/xorg-server/files/extra-new-arch-powerpc	Fri Jun 14 14:39:18 2013	(r320937)
@@ -1,14 +1,14 @@
---- hw/xfree86/os-support/bsd/ppc_video.c.orig	2008-01-02 12:29:21.000000000 +0000
-+++ hw/xfree86/os-support/bsd/ppc_video.c	2008-01-02 12:29:00.000000000 +0000
-@@ -164,7 +164,11 @@
+--- hw/xfree86/os-support/bsd/ppc_video.c.orig	2012-05-17 19:09:03.000000000 +0200
++++ hw/xfree86/os-support/bsd/ppc_video.c	2013-06-03 13:46:05.165578200 +0200
+@@ -135,7 +135,11 @@
+ {
  
-         if (ioBase != MAP_FAILED)
-         {
+     if (ioBase != MAP_FAILED) {
 +#if defined(__FreeBSD__)
-+		munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
++        munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
 +#else
-                 munmap(__UNVOLATILE(ioBase), 0x10000);
+         munmap(__UNVOLATILE(ioBase), 0x10000);
 +#endif
-                 ioBase = MAP_FAILED;
-         }
+         ioBase = MAP_FAILED;
+     }
  }

Copied: head/x11-servers/xorg-server/files/extra-old-arch-powerpc (from r320890, head/x11-servers/xorg-server/files/extra-arch-powerpc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/x11-servers/xorg-server/files/extra-old-arch-powerpc	Fri Jun 14 14:39:18 2013	(r320937, copy of r320890, head/x11-servers/xorg-server/files/extra-arch-powerpc)
@@ -0,0 +1,14 @@
+--- hw/xfree86/os-support/bsd/ppc_video.c.orig	2008-01-02 12:29:21.000000000 +0000
++++ hw/xfree86/os-support/bsd/ppc_video.c	2008-01-02 12:29:00.000000000 +0000
+@@ -164,7 +164,11 @@
+ 
+         if (ioBase != MAP_FAILED)
+         {
++#if defined(__FreeBSD__)
++		munmap(__DEVOLATILE(unsigned char *, ioBase), 0x10000);
++#else
+                 munmap(__UNVOLATILE(ioBase), 0x10000);
++#endif
+                 ioBase = MAP_FAILED;
+         }
+ }
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Niclas Zeising freebsd_committer freebsd_triage 2013-06-14 15:47:58 UTC 
State Changed
From-To: open->closed

Fixed, thanks for the report!