xserver: Branch 'server-1.14-branch' - 4 commits

[Matt Dew]

 hw/xfree86/common/xf86Bus.c      |    5 ++++-
 hw/xquartz/X11Controller.m       |    2 +-
 hw/xquartz/bundle/Info.plist.cpp |    4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 384588bd8408d50b1b29b174af75c7b1cd3ff60d
Merge: 6cc5efa 7ddc6f7
Author: Matt Dew <marcoz at osource.org>
Date:   Sat Nov 16 15:27:35 2013 -0700

    Merge commit '7ddc6f7f1ed0e0f85b2d617c59d75d5de1cd2d5a' into server-1.14-branch

commit 7ddc6f7f1ed0e0f85b2d617c59d75d5de1cd2d5a
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Fri Nov 8 14:55:33 2013 -0800

    xfree86: Fix build without libpciaccess
    
    Regression fix from commit 04ab07ca19236d6c9a947e065fb69b0dd0d16639
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Reviewed-by: Connor Behan <connor.behan at gmail.com>
    (cherry picked from commit 4a251f5883b042cd902c192060a0be2b11148f2b)

diff --git a/hw/xfree86/common/xf86Bus.c b/hw/xfree86/common/xf86Bus.c
index 329d0b3..d463e91 100644
--- a/hw/xfree86/common/xf86Bus.c
+++ b/hw/xfree86/common/xf86Bus.c
@@ -266,9 +266,12 @@ xf86IsEntityPrimary(int entityIndex)
 {
     EntityPtr pEnt = xf86Entities[entityIndex];
 
+#ifdef XSERVER_LIBPCIACCESS
     if (primaryBus.type == BUS_PLATFORM && pEnt->bus.type == BUS_PCI)
 	return MATCH_PCI_DEVICES(pEnt->bus.id.pci, primaryBus.id.plat->pdev);
-    else if (primaryBus.type != pEnt->bus.type)
+#endif
+
+    if (primaryBus.type != pEnt->bus.type)
         return FALSE;
 
     switch (pEnt->bus.type) {
commit c6fd9c11f7302f4ac77bce37687c8bbffbf8ed65
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Nov 10 11:40:27 2013 -0800

    XQuartz: Don't sleep forever on exit if usleep() returns an error
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit f70a8bf3714d89bccaad36841ef9149e91ad3bba)

diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index 737db42..3d094bf 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -936,7 +936,7 @@ extern char *bundle_id_prefix;
 
 - (void) applicationWillTerminate:(NSNotification *)aNotification
 {
-    unsigned remain;
+    int remain;
     [X11App prefs_synchronize];
 
     /* shutdown the X server, it will exit () for us. */
commit c82a90815cef2d92f6aabb2b0991b3cda71d23c4
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date:   Sun Nov 10 11:26:49 2013 -0800

    XQuartz: Update Info.plist copyright years
    
    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    (cherry picked from commit ebcc1c214c466582d7b92826b4860256fd9c582a)

diff --git a/hw/xquartz/bundle/Info.plist.cpp b/hw/xquartz/bundle/Info.plist.cpp
index 905952a..4b4a894 100644
--- a/hw/xquartz/bundle/Info.plist.cpp
+++ b/hw/xquartz/bundle/Info.plist.cpp
@@ -39,9 +39,9 @@
 	<key>LSApplicationCategoryType</key>
 		<string>public.app-category.utilities</string>
 	<key>NSHumanReadableCopyright</key>
-		<string>© 2003-2012 Apple Inc.
+		<string>© 2003-2013 Apple Inc.
 © 2003 XFree86 Project, Inc.
-© 2003-2012 X.org Foundation, Inc.
+© 2003-2013 X.org Foundation, Inc.
 </string>
 	<key>NSMainNibFile</key>
 		<string>main</string>