add gbm java & build modifications

2 files changed, 47 insertions, 1 deletions

diff --git a/make/build-common.xml b/make/build-common.xml
index 97b0699fd..0967b6b0f 100644
--- a/make/build-common.xml
+++ b/make/build-common.xml
@@ -414,6 +414,8 @@
         <property name="newt-driver-intelgdl.jar" value="${build.newt}/newt-driver-intelgdl.jar" />    <!-- excluded from all -->
         <property name="newt-driver-bcm-old.jar"  value="${build.newt}/newt-driver-bcm-old.jar" />     <!-- excluded from all -->
         <property name="newt-driver-bcm-vc.jar"   value="${build.newt}/newt-driver-bcm-vc.jar" />
+        <property name="newt-driver-gbm.jar"      value="${build.newt}/newt-driver-gbm.jar" />
+
         <path id="newt_all_atoms.classpath">
             <pathelement location="${newt.jar}" />
             <pathelement location="${newt-ogl.jar}" />
@@ -426,6 +428,7 @@
             <pathelement location="${newt-driver-osx.jar}" />
             <pathelement location="${newt-driver-ios.jar}" />
             <pathelement location="${newt-driver-bcm-vc.jar}" />
+            <pathelement location="${newt-driver-gbm.jar}" />
         </path>
         <path id="newt_all-noawt_atoms.classpath">
             <pathelement location="${newt.jar}" />
@@ -436,6 +439,7 @@
             <pathelement location="${newt-driver-osx.jar}" />
             <pathelement location="${newt-driver-ios.jar}" />
             <pathelement location="${newt-driver-bcm-vc.jar}" />
+            <pathelement location="${newt-driver-gbm.jar}" />
         </path>
         <path id="newt_all-mobile_atoms.classpath">
             <pathelement location="${newt.jar}" />
@@ -445,6 +449,7 @@
             <pathelement location="${newt-driver-win.jar}" />
             <pathelement location="${newt-driver-ios.jar}" />
             <pathelement location="${newt-driver-bcm-vc.jar}" />
+            <pathelement location="${newt-driver-gbm.jar}" />
         </path>
         <path id="newt_all-android_atoms.classpath">
             <pathelement location="${newt.jar}" />
diff --git a/make/build-newt.xml b/make/build-newt.xml
index f33142e0a..447a41189 100644
--- a/make/build-newt.xml
+++ b/make/build-newt.xml
@@ -49,6 +49,7 @@
        setup.addNativeKD
        setup.addNativeIntelGDL
        setup.addNativeBroadcom  ( always true if 'isLinux' )
+       setup.addNativeGBM  ( always true if 'isLinux' )
 
    - Internal settings, may not be necessary to set them manually,
      since all JAR archives are orthogonal.
@@ -75,6 +76,10 @@
            <isset property="isLinux"/>
         </condition>
 
+        <condition property="setup.addNativeGBM">
+            <isset property="isLinux"/>
+        </condition>
+
         <condition property="setup.nonatives">
             <and>
                 <isfalse value="${isWindows}" />
@@ -85,6 +90,7 @@
                 <isfalse value="${setup.addNativeKD}" />
                 <isfalse value="${setup.addNativeIntelGDL}" />
                 <isfalse value="${setup.addNativeBroadcom}" />
+                <isfalse value="${setup.addNativeGBM}" />
             </and>
         </condition>
 
@@ -97,6 +103,7 @@
         <echo message="setup.addNativeKD: ${setup.addNativeKD}" />
         <echo message="setup.addNativeIntelGDL: ${setup.addNativeIntelGDL}" />
         <echo message="setup.addNativeBroadcom: ${setup.addNativeBroadcom}" />
+        <echo message="setup.addNativeGBM: ${setup.addNativeGBM}" />
         <echo message="setup.nonatives: ${setup.nonatives}" />
 
         <!-- partitioning -->
@@ -149,6 +156,9 @@
         <property name="java.part.driver.bcm.vc"
                   value="jogamp/newt/driver/bcm/vc/**"/>
 
+        <property name="java.part.driver.gbm"
+                  value="jogamp/newt/driver/gbm/**"/>
+
         <property name="java.part.driver.android"
                   value="jogamp/newt/driver/android/**"/>
 
@@ -235,6 +245,7 @@
         <mkdir dir="${src.generated.c}/IntelGDL" />
         <mkdir dir="${src.generated.c}/bcm/egl" />
         <mkdir dir="${src.generated.c}/bcm/vc/iv" />
+        <mkdir dir="${src.generated.c}/gbm" />
         <mkdir dir="${classes}" />
         <mkdir dir="${obj.newt}" />
     </target>
@@ -317,6 +328,25 @@
             <include name="jogamp/newt/driver/bcm/vc/iv/WindowDriver.java" />
         </javac>
 
+        <!-- create EGL GBM native headers -->
+        <javac srcdir="${src.java}"
+               destdir="${classes}"
+               excludes="${java.excludes.all} ${java.part.driver.android}"
+               nativeheaderdir="${src.generated.c}/gbm"
+               fork="yes"
+               includeAntRuntime="false"
+               memoryMaximumSize="${javac.memorymax}"
+               encoding="UTF-8"
+               source="${target.sourcelevel}" 
+               target="${target.targetlevel}"
+               bootclasspath="${target.rt.jar}"
+               debug="${javacdebug}" debuglevel="${javacdebuglevel}">
+            <classpath refid="jogl_nativewindow_gluegen.classpath"/>
+            <include name="jogamp/newt/driver/gbm/DisplayDriver.java" />
+            <include name="jogamp/newt/driver/gbm/ScreenDriver.java" />
+            <include name="jogamp/newt/driver/gbm/WindowDriver.java" />
+        </javac>
+
         <!-- create Windows native headers -->
         <javac srcdir="${src.java}"
                destdir="${classes}"
@@ -495,6 +525,12 @@
         <!-- syslibset libs="EGL"/ -->
       </linker>
 
+        <linker id="linker.cfg.linux.newt.bcm_vc" extends="linker.cfg.linux">
+            <syslibset libs="EGL"/>
+            <syslibset libs="gbm"/>
+            <syslibset libs="drm"/>
+        </linker>
+
       <linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux">
         <syslibset libs="EGL"/>
         <syslibset libs="GLES_CM"/>
@@ -863,6 +899,7 @@
           <include name="${rootrel.src.c}/IntelGDL.c"         if="setup.addNativeIntelGDL"/>
           <include name="${rootrel.src.c}/bcm_egl.c"          if="setup.addNativeBroadcom"/>
           <include name="${rootrel.src.c}/bcm_vc_iv.c"        if="setup.addNativeBroadcom"/>
+          <include name="${rootrel.src.c}/gbm.c"              if="setup.addNativeGBM"/>
         </patternset>
 
         <echo message="Compiling @{output.lib.name}" />
@@ -911,7 +948,7 @@
                 <includepath path="stub_includes/embedded/IntelGDL" if="setup.addNativeIntelGDL" />
                 <includepath path="${src.generated.c}/bcm/egl"      if="setup.addNativeBroadcom" />
                 <includepath path="${src.generated.c}/bcm/vc/iv"    if="setup.addNativeBroadcom" />
-    
+                <includepath path="${src.generated.c}/gbm"          if="setup.addNativeGBM" />
                 <!-- This must come last to not override real include paths -->
                 <!-- includepath path="stub_includes/macosx" if="isOSX" / -->
               </compiler>
@@ -1057,6 +1094,10 @@
             <fileset dir="${classes}"
                      includes="${java.part.driver.bcm.vc}"/>
         </jar>
+        <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-gbm.jar}" filesonly="true">
+            <fileset dir="${classes}"
+                     includes="${java.part.driver.gbm}"/>
+        </jar>
         <jar manifest="${build.newt}/manifest.mf" destfile="${newt-driver-intelgdl.jar}" filesonly="true">
             <fileset dir="${classes}"
                      includes="${java.part.driver.intelgdl}"/>