Yet another external patch, the attached one adds an EXTERNAL_XINERAMA option that allows to link to the system's libXinerama library rather than using the internal copy of it.
I hoped that doing so would have fixed jconsole appearing between the two screens, but it didn't do so (gonna debug it soon); in the mean time it's still a nice thing to use it shared, as for those who actually use Xinerama, the library is for sure already loaded at any given time. -- Diego "Flameeyes" Pettenò http://farragut.flameeyes.is-a-geek.org/
Index: openjdk/j2se/make/sun/awt/mawt.gmk
===================================================================
--- openjdk.orig/j2se/make/sun/awt/mawt.gmk
+++ openjdk/j2se/make/sun/awt/mawt.gmk
@@ -58,7 +58,11 @@ else
FILES_c += $(TARGDIR)awt_motif21.c
FILES_c += $(TARGDIR)awt_Choice21.c
ifeq ($(PLATFORM), linux)
+ ifeq ($(EXTERNAL_LIBXINERAMA), true)
+ LIBXINERAMA = -lXinerama
+ else
FILES_c += $(TARGDIR)Xinerama.c
+ endif
endif
endif
@@ -179,7 +183,7 @@ ifeq ($(PLATFORM), linux)
OTHER_CFLAGS += -DMLIB_NO_LIBSUNMATH
OTHER_CFLAGS += -DMOTIF_VERSION=2
OTHER_CFLAGS += -DXMSTRINGDEFINES=1
-OTHER_LDLIBS = $(LIBXM) $(LIBXMU) $(LIBXTST) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
+OTHER_LDLIBS = $(LIBXM) $(LIBXMU) $(LIBXTST) $(LIBXINERAMA) -lXext $(LIBXT) $(LIBSM) $(LIBICE) -lX11 -lXi
endif
endif
Index: openjdk/j2se/make/sun/xawt/Makefile
===================================================================
--- openjdk.orig/j2se/make/sun/xawt/Makefile
+++ openjdk/j2se/make/sun/xawt/Makefile
@@ -53,7 +53,11 @@ AUTO_JAVA_PRUNE = WrapperGenerator.java
LDFLAGS += -L$(OPENWIN_LIB)
ifeq ($(PLATFORM), linux)
+ifeq ($(EXTERNAL_LIBXINERAMA), true)
+LDFLAGS += -lXinerama
+else
FILES_c += Xinerama.c
+endif
LDFLAGS += -lpthread
dummy := $(shell $(MKDIR) -p $(LIB_LOCATION))
endif
signature.asc
Description: PGP signature
