git: 6ac6a72d1c89 - main - graphics/jogamp-jogl: modernize patches
Ronald Klop <[email protected]>
| Newsgroups | gmane.os.freebsd.devel.cvs.ports |
|---|---|
| Message-ID | <[email protected]> |
The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=6ac6a72d1c89a765a40e6e3328be1c616e024ec5 commit 6ac6a72d1c89a765a40e6e3328be1c616e024ec5 Author: Ronald Klop <[email protected]> AuthorDate: 2026-08-18 17:02:54 +0000 Commit: Ronald Klop <[email protected]> CommitDate: 2026-08-18 17:10:04 +0000 graphics/jogamp-jogl: modernize patches Ran: make patch; rm files/*; make makepatch. This renames a patch and splits patch-freebsd to 3 separate patch files. Manually checked that the patches are equal. Approved by: no maintainer --- graphics/jogamp-jogl/files/patch-freebsd | 180 --------------------- ...common.xml => patch-jogl_make_build-common.xml} | 0 .../files/patch-jogl_make_build-jogl.xml | 66 ++++++++ .../files/patch-jogl_make_build-nativewindow.xml | 42 +++++ .../files/patch-jogl_make_build-newt.xml | 72 +++++++++ 5 files changed, 180 insertions(+), 180 deletions(-) diff --git a/graphics/jogamp-jogl/files/patch-freebsd b/graphics/jogamp-jogl/files/patch-freebsd deleted file mode 100644 index fee35c5c2457..000000000000 --- a/graphics/jogamp-jogl/files/patch-freebsd +++ /dev/null @@ -1,180 +0,0 @@ ---- jogl/make/build-jogl.xml.orig 2025-08-30 10:26:30 UTC -+++ jogl/make/build-jogl.xml -@@ -1239,8 +1239,7 @@ - <!-- Note that we can use the base setups in the gluegen-cpptasks for most of these --> - - <compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd"> -- <!-- Need to force X11R6 headers on to include path after stub_includes --> -- <includepath path="stub_includes/opengl"/> -+ <!-- Force /usr/local/include headers on to include path after all others to fix build with clang --> - <compilerarg value="-idirafter" /> - <compilerarg value="/usr/local/include" /> - </compiler> -@@ -1259,7 +1258,7 @@ - - <!-- linker configuration --> - -- <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd"> -+ <linker id="linker.cfg.freebsd.x86.jogl.x11" extends="linker.cfg.freebsd.x86"> - <syslibset dir="/usr/local/lib" libs="X11"/> - </linker> - -@@ -1267,6 +1266,14 @@ - <syslibset dir="/usr/local/lib" libs="X11"/> - </linker> - -+ <linker id="linker.cfg.freebsd.ppc64.jogl.x11" extends="linker.cfg.freebsd.ppc64"> -+ <syslibset dir="/usr/local/lib" libs="X11"/> -+ </linker> -+ -+ <linker id="linker.cfg.freebsd.ppc64le.jogl.x11" extends="linker.cfg.freebsd.ppc64le"> -+ <syslibset dir="/usr/local/lib" libs="X11"/> -+ </linker> -+ - <linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux"> - <syslibset libs="X11"/> - </linker> -@@ -1489,7 +1496,7 @@ - <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86"> - <echo message="FreeBSD" /> - <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> -- <property name="linker.cfg.id.os" value="linker.cfg.freebsd.jogl.x11" /> -+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.x86.jogl.x11" /> - </target> - - <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64"> -@@ -1498,7 +1505,19 @@ - <property name="linker.cfg.id.os" value="linker.cfg.freebsd.amd64.jogl.x11" /> - </target> - -- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" /> -+ <target name="c.configure.freebsd.ppc64" depends="c.configure.x11" if="isFreeBSDPpc64"> -+ <echo message="FreeBSD" /> -+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> -+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc64.jogl.x11" /> -+ </target> -+ -+ <target name="c.configure.freebsd.ppc64le" depends="c.configure.x11" if="isFreeBSDPpc64le"> -+ <echo message="FreeBSD" /> -+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> -+ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc64le.jogl.x11" /> -+ </target> -+ -+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD" /> - - <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> - <echo message="HP-UX" /> ---- jogl/make/build-nativewindow.xml.orig 2025-08-30 10:26:30 UTC -+++ jogl/make/build-nativewindow.xml -@@ -508,6 +508,18 @@ - <syslibset dir="/usr/local/lib" libs="Xrender"/> - </linker> - -+ <linker id="linker.cfg.freebsd.ppc64.nativewindow.x11" extends="linker.cfg.freebsd.ppc64"> -+ <syslibset dir="/usr/local/lib" libs="X11" /> -+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> -+ <syslibset dir="/usr/local/lib" libs="Xrender"/> -+ </linker> -+ -+ <linker id="linker.cfg.freebsd.ppc64le.nativewindow.x11" extends="linker.cfg.freebsd.ppc64le"> -+ <syslibset dir="/usr/local/lib" libs="X11" /> -+ <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> -+ <syslibset dir="/usr/local/lib" libs="Xrender"/> -+ </linker> -+ - <linker id="linker.cfg.linux.nativewindow.drm" extends="linker.cfg.linux"> - <syslibset libs="drm"/> - <syslibset libs="gbm"/> -@@ -783,7 +795,19 @@ - <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.amd64.nativewindow.x11" /> - </target> - -- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" /> -+ <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64"> -+ <echo message="FreeBSD.Ppc64" /> -+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> -+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64.nativewindow.x11" /> -+ </target> -+ -+ <target name="c.configure.freebsd.ppc64le" if="isFreeBSDPpc64le"> -+ <echo message="FreeBSD.Ppc64le" /> -+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> -+ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64le.nativewindow.x11" /> -+ </target> -+ -+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11,c.configure.freebsd.ppc64,c.configure.freebsd.ppc64le" if="isFreeBSD" /> - - <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> - <echo message="HP-UX" /> ---- jogl/make/build-newt.xml.orig 2025-08-30 10:26:30 UTC -+++ jogl/make/build-newt.xml -@@ -493,7 +493,7 @@ - - <!-- linker configuration --> - -- <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd"> -+ <linker id="linker.cfg.freebsd.x86.newt.x11" extends="linker.cfg.freebsd.x86"> - <linkerarg value="-L/usr/local/lib"/> - <syslibset libs="X11"/> - <syslibset libs="Xrandr"/> -@@ -509,6 +509,20 @@ - <syslibset libs="Xi"/> - </linker> - -+ <linker id="linker.cfg.freebsd.ppc64.newt.x11" extends="linker.cfg.freebsd.ppc64"> -+ <linkerarg value="-L/usr/local/lib"/> -+ <syslibset libs="X11"/> -+ <syslibset libs="Xrandr"/> -+ <syslibset libs="Xcursor"/> -+ </linker> -+ -+ <linker id="linker.cfg.freebsd.ppc64le.newt.x11" extends="linker.cfg.freebsd.ppc64le"> -+ <linkerarg value="-L/usr/local/lib"/> -+ <syslibset libs="X11"/> -+ <syslibset libs="Xrandr"/> -+ <syslibset libs="Xcursor"/> -+ </linker> -+ - <linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux"> - <syslibset libs="EGL"/> - <syslibset libs="GLES_CM"/> -@@ -837,8 +851,8 @@ - <target name="c.configure.freebsd.x86" if="isFreeBSDX86"> - <echo message="FreeBSD.x86" /> - <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> -- <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.newt.x11" -- else="linker.cfg.freebsd"> -+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.x86.newt.x11" -+ else="linker.cfg.freebsd.x86"> - <isset property="isX11" /> - </condition> - <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> -@@ -854,7 +868,27 @@ - <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> - </target> - -- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/> -+ <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64"> -+ <echo message="FreeBSD.Ppc64" /> -+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> -+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64.newt.x11" -+ else="linker.cfg.freebsd.ppc64"> -+ <isset property="isX11" /> -+ </condition> -+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> -+ </target> -+ -+ <target name="c.configure.freebsd.ppc64le" if="isFreeBSDPpc64le"> -+ <echo message="FreeBSD.Ppc64le" /> -+ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> -+ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64le.newt.x11" -+ else="linker.cfg.freebsd.ppc64le"> -+ <isset property="isX11" /> -+ </condition> -+ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> -+ </target> -+ -+ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD"/> - - <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> - <echo message="HP-UX" /> diff --git a/graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml b/graphics/jogamp-jogl/files/patch-jogl_make_build-common.xml similarity index 100% rename from graphics/jogamp-jogl/files/patch-jogl__make__build-common.xml rename to graphics/jogamp-jogl/files/patch-jogl_make_build-common.xml diff --git a/graphics/jogamp-jogl/files/patch-jogl_make_build-jogl.xml b/graphics/jogamp-jogl/files/patch-jogl_make_build-jogl.xml new file mode 100644 index 000000000000..2263f0775032 --- /dev/null +++ b/graphics/jogamp-jogl/files/patch-jogl_make_build-jogl.xml @@ -0,0 +1,66 @@ +--- jogl/make/build-jogl.xml.orig 2025-08-30 10:26:30 UTC ++++ jogl/make/build-jogl.xml +@@ -1239,8 +1239,7 @@ + <!-- Note that we can use the base setups in the gluegen-cpptasks for most of these --> + + <compiler id="compiler.cfg.freebsd.jogl" extends="compiler.cfg.freebsd"> +- <!-- Need to force X11R6 headers on to include path after stub_includes --> +- <includepath path="stub_includes/opengl"/> ++ <!-- Force /usr/local/include headers on to include path after all others to fix build with clang --> + <compilerarg value="-idirafter" /> + <compilerarg value="/usr/local/include" /> + </compiler> +@@ -1259,7 +1258,7 @@ + + <!-- linker configuration --> + +- <linker id="linker.cfg.freebsd.jogl.x11" extends="linker.cfg.freebsd"> ++ <linker id="linker.cfg.freebsd.x86.jogl.x11" extends="linker.cfg.freebsd.x86"> + <syslibset dir="/usr/local/lib" libs="X11"/> + </linker> + +@@ -1267,6 +1266,14 @@ + <syslibset dir="/usr/local/lib" libs="X11"/> + </linker> + ++ <linker id="linker.cfg.freebsd.ppc64.jogl.x11" extends="linker.cfg.freebsd.ppc64"> ++ <syslibset dir="/usr/local/lib" libs="X11"/> ++ </linker> ++ ++ <linker id="linker.cfg.freebsd.ppc64le.jogl.x11" extends="linker.cfg.freebsd.ppc64le"> ++ <syslibset dir="/usr/local/lib" libs="X11"/> ++ </linker> ++ + <linker id="linker.cfg.linux.jogl.x11" extends="linker.cfg.linux"> + <syslibset libs="X11"/> + </linker> +@@ -1489,7 +1496,7 @@ + <target name="c.configure.freebsd.x86" depends="c.configure.x11" if="isFreeBSDX86"> + <echo message="FreeBSD" /> + <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> +- <property name="linker.cfg.id.os" value="linker.cfg.freebsd.jogl.x11" /> ++ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.x86.jogl.x11" /> + </target> + + <target name="c.configure.freebsd.amd64" depends="c.configure.x11" if="isFreeBSDAMD64"> +@@ -1498,7 +1505,19 @@ + <property name="linker.cfg.id.os" value="linker.cfg.freebsd.amd64.jogl.x11" /> + </target> + +- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" /> ++ <target name="c.configure.freebsd.ppc64" depends="c.configure.x11" if="isFreeBSDPpc64"> ++ <echo message="FreeBSD" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> ++ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc64.jogl.x11" /> ++ </target> ++ ++ <target name="c.configure.freebsd.ppc64le" depends="c.configure.x11" if="isFreeBSDPpc64le"> ++ <echo message="FreeBSD" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.jogl" /> ++ <property name="linker.cfg.id.os" value="linker.cfg.freebsd.ppc64le.jogl.x11" /> ++ </target> ++ ++ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD" /> + + <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> + <echo message="HP-UX" /> diff --git a/graphics/jogamp-jogl/files/patch-jogl_make_build-nativewindow.xml b/graphics/jogamp-jogl/files/patch-jogl_make_build-nativewindow.xml new file mode 100644 index 000000000000..63f11b808bcb --- /dev/null +++ b/graphics/jogamp-jogl/files/patch-jogl_make_build-nativewindow.xml @@ -0,0 +1,42 @@ +--- jogl/make/build-nativewindow.xml.orig 2025-08-30 10:26:30 UTC ++++ jogl/make/build-nativewindow.xml +@@ -508,6 +508,18 @@ + <syslibset dir="/usr/local/lib" libs="Xrender"/> + </linker> + ++ <linker id="linker.cfg.freebsd.ppc64.nativewindow.x11" extends="linker.cfg.freebsd.ppc64"> ++ <syslibset dir="/usr/local/lib" libs="X11" /> ++ <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> ++ <syslibset dir="/usr/local/lib" libs="Xrender"/> ++ </linker> ++ ++ <linker id="linker.cfg.freebsd.ppc64le.nativewindow.x11" extends="linker.cfg.freebsd.ppc64le"> ++ <syslibset dir="/usr/local/lib" libs="X11" /> ++ <syslibset dir="/usr/local/lib" libs="Xxf86vm" /> ++ <syslibset dir="/usr/local/lib" libs="Xrender"/> ++ </linker> ++ + <linker id="linker.cfg.linux.nativewindow.drm" extends="linker.cfg.linux"> + <syslibset libs="drm"/> + <syslibset libs="gbm"/> +@@ -783,7 +795,19 @@ + <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.amd64.nativewindow.x11" /> + </target> + +- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD" /> ++ <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64"> ++ <echo message="FreeBSD.Ppc64" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> ++ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64.nativewindow.x11" /> ++ </target> ++ ++ <target name="c.configure.freebsd.ppc64le" if="isFreeBSDPpc64le"> ++ <echo message="FreeBSD.Ppc64le" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.nativewindow" /> ++ <property name="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64le.nativewindow.x11" /> ++ </target> ++ ++ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11,c.configure.freebsd.ppc64,c.configure.freebsd.ppc64le" if="isFreeBSD" /> + + <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> + <echo message="HP-UX" /> diff --git a/graphics/jogamp-jogl/files/patch-jogl_make_build-newt.xml b/graphics/jogamp-jogl/files/patch-jogl_make_build-newt.xml new file mode 100644 index 000000000000..cb9819bf59a8 --- /dev/null +++ b/graphics/jogamp-jogl/files/patch-jogl_make_build-newt.xml @@ -0,0 +1,72 @@ +--- jogl/make/build-newt.xml.orig 2025-08-30 10:26:30 UTC ++++ jogl/make/build-newt.xml +@@ -493,7 +493,7 @@ + + <!-- linker configuration --> + +- <linker id="linker.cfg.freebsd.newt.x11" extends="linker.cfg.freebsd"> ++ <linker id="linker.cfg.freebsd.x86.newt.x11" extends="linker.cfg.freebsd.x86"> + <linkerarg value="-L/usr/local/lib"/> + <syslibset libs="X11"/> + <syslibset libs="Xrandr"/> +@@ -509,6 +509,20 @@ + <syslibset libs="Xi"/> + </linker> + ++ <linker id="linker.cfg.freebsd.ppc64.newt.x11" extends="linker.cfg.freebsd.ppc64"> ++ <linkerarg value="-L/usr/local/lib"/> ++ <syslibset libs="X11"/> ++ <syslibset libs="Xrandr"/> ++ <syslibset libs="Xcursor"/> ++ </linker> ++ ++ <linker id="linker.cfg.freebsd.ppc64le.newt.x11" extends="linker.cfg.freebsd.ppc64le"> ++ <linkerarg value="-L/usr/local/lib"/> ++ <syslibset libs="X11"/> ++ <syslibset libs="Xrandr"/> ++ <syslibset libs="Xcursor"/> ++ </linker> ++ + <linker id="linker.cfg.linux.newt.bcm_egl" extends="linker.cfg.linux"> + <syslibset libs="EGL"/> + <syslibset libs="GLES_CM"/> +@@ -837,8 +851,8 @@ + <target name="c.configure.freebsd.x86" if="isFreeBSDX86"> + <echo message="FreeBSD.x86" /> + <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> +- <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.newt.x11" +- else="linker.cfg.freebsd"> ++ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.x86.newt.x11" ++ else="linker.cfg.freebsd.x86"> + <isset property="isX11" /> + </condition> + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> +@@ -854,7 +868,27 @@ + <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> + </target> + +- <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.x11" if="isFreeBSD"/> ++ <target name="c.configure.freebsd.ppc64" if="isFreeBSDPpc64"> ++ <echo message="FreeBSD.Ppc64" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> ++ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64.newt.x11" ++ else="linker.cfg.freebsd.ppc64"> ++ <isset property="isX11" /> ++ </condition> ++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> ++ </target> ++ ++ <target name="c.configure.freebsd.ppc64le" if="isFreeBSDPpc64le"> ++ <echo message="FreeBSD.Ppc64le" /> ++ <property name="compiler.cfg.id" value="compiler.cfg.freebsd.newt" /> ++ <condition property="linker.cfg.id.oswin" value="linker.cfg.freebsd.ppc64le.newt.x11" ++ else="linker.cfg.freebsd.ppc64le"> ++ <isset property="isX11" /> ++ </condition> ++ <echo message="linker.cfg.id.oswin ${linker.cfg.id.oswin}" /> ++ </target> ++ ++ <target name="c.configure.freebsd" depends="c.configure.freebsd.x86,c.configure.freebsd.amd64,c.configure.freebsd.ppc64,c.configure.x11,c.configure.freebsd.ppc64le" if="isFreeBSD"/> + + <target name="c.configure.hpux" depends="c.configure.x11" if="isHPUX"> + <echo message="HP-UX" />