[libjogl2-java] 01/01: Fix remaining occurrences of env.TARGET_PLATFORM_ROOT.

[Gilles Filippini]

This is an automated email from the git hooks/post-receive script.

pini pushed a commit to branch master
in repository libjogl2-java.

commit fbd95087fff3ff90dc8794268901f45542db7f84
Author: Gilles Filippini <pini at debian.org>
Date:   Sat Oct 17 11:15:17 2015 +0200

    Fix remaining occurrences of env.TARGET_PLATFORM_ROOT.
---
 debian/changelog              |  7 +++++++
 debian/patches/arm-build.diff | 30 +++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6ecc2c5..d8c150e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libjogl2-java (2.3.2+dfsg-3) UNRELEASED; urgency=medium
+
+  * Fix again patch arm-build.diff because of remaining occurrences
+    of env.TARGET_PLATFORM_ROOT (fix FTBFS on arm64).
+
+ -- Gilles Filippini <pini at debian.org>  Sat, 17 Oct 2015 11:13:21 +0200
+
 libjogl2-java (2.3.2+dfsg-2) experimental; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/arm-build.diff b/debian/patches/arm-build.diff
index 64464d8..eaef5d3 100644
--- a/debian/patches/arm-build.diff
+++ b/debian/patches/arm-build.diff
@@ -31,7 +31,7 @@ Index: libjogl2-java/make/build-jogl.xml
          <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
          <compilerarg value="-idirafter" />
          <compilerarg value="/usr/include" />
-@@ -1223,8 +1236,8 @@
+@@ -1223,12 +1236,12 @@
          <syslibset libs="X11"/>
        </linker>
  
@@ -42,6 +42,11 @@ Index: libjogl2-java/make/build-jogl.xml
        </linker>
  
        <linker id="linker.cfg.linux.aarch64.jogl.x11" extends="linker.cfg.linux.aarch64">
+-        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11"/>
++        <syslibset libs="X11"/>
+       </linker>
+ 
+       <linker id="linker.cfg.android.jogl" extends="linker.cfg.android">
 @@ -1316,10 +1329,10 @@
        <property name="linker.cfg.id.os"                    value="linker.cfg.linux.amd64.jogl.x11" />
      </target>
@@ -180,7 +185,7 @@ Index: libjogl2-java/make/build-newt.xml
          <!-- Need to force /usr/include headers on to include path (after all others), due to crosscompiler usage -->
          <compilerarg value="-idirafter" />
          <compilerarg value="/usr/include" />
-@@ -341,10 +354,9 @@
+@@ -341,20 +354,19 @@
          <!--syslibset libs="X11-xcb" /-->
        </linker>
  
@@ -194,7 +199,12 @@ Index: libjogl2-java/make/build-newt.xml
        </linker>
  
        <linker id="linker.cfg.linux.aarch64.newt.x11" extends="linker.cfg.linux.aarch64">
-@@ -354,7 +366,7 @@
+-        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="X11" />
+-        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xrandr" />
+-        <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" libs="Xcursor" />
++        <syslibset libs="X11" />
++        <syslibset libs="Xrandr" />
++        <syslibset libs="Xcursor" />
        </linker>
  
        <linker id="linker.cfg.android.newt" extends="linker.cfg.android">
@@ -285,3 +295,17 @@ Index: libjogl2-java/make/scripts/tests-linux-armv7hf.sh
 +. $spath/tests.sh  `which java` -DummyArg ../build-linux-armv7hf $*
 +
 +
+Index: libjogl2-java/make/build-oculusvr.xml
+===================================================================
+--- libjogl2-java.orig/make/build-oculusvr.xml
++++ libjogl2-java/make/build-oculusvr.xml
+@@ -637,8 +637,7 @@
+                 <syslibset libs="ws2_32"                                       if="isWindows"/>
+ 
+                 <syslibset libs="X11 Xrandr udev m"                            if="isLinux" unless="isLinuxARMv6" />
+-                <syslibset dir="${env.TARGET_PLATFORM_ROOT}/usr/lib" 
+-                           libs="X11 Xrandr udev m"                            if="isLinuxARMv6" />
++                <syslibset libs="X11 Xrandr udev m"                            if="isLinuxARMv6" />
+ 
+                 <syslibset dir="/usr/local/lib" libs="X11 Xrandr udev m"       if="isFreeBSD"/>
+                 <syslibset dir="/usr/lib" libs="X11 Xrandr udev m"             if="isHPUX"/>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjogl2-java.git