<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5320599569dd606cd10523cc441e1cf254ae3c6c">https://github.com/macports/macports-ports/commit/5320599569dd606cd10523cc441e1cf254ae3c6c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5320599569d libsdl2-powerpc: minor fix, revbump
</span>5320599569d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5320599569dd606cd10523cc441e1cf254ae3c6c
</span>Author: Sergey Fedorov <barracuda@macos-powerpc.org>
AuthorDate: Sun Dec 1 11:25:46 2024 +0800
<span style='display:block; white-space:pre;color:#404040;'> libsdl2-powerpc: minor fix, revbump
</span>---
devel/libsdl2-powerpc/Portfile | 14 ++--
devel/libsdl2-powerpc/files/0002-fix-x11.diff | 93 ++++++++++++++++++++++++---
2 files changed, 92 insertions(+), 15 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsdl2-powerpc/Portfile b/devel/libsdl2-powerpc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 54201f8ead0..5b3e27814b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsdl2-powerpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsdl2-powerpc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup github 1.0
</span> name libsdl2-powerpc
conflicts libsdl2-snowleopard
github.setup libsdl-org SDL 2.30.9 release-
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel multimedia
platforms {darwin < 11}
supported_archs ppc ppc64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -47,6 +47,7 @@ configure.args-append \
</span> --disable-pulseaudio \
--disable-video-cocoa \
--disable-video-opengl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-video-wayland \
</span> --disable-x11-shared \
--enable-video-x11 \
--x-includes=${prefix}/include \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,7 +93,8 @@ patchfiles-append 0003-hidapi-revert-a-commit-that-triggers-ICE-with-GCC.patch
</span> post-patch {
reinplace "s|@PREFIX@|${prefix}|g" \
${worksrcpath}/include/SDL_config_macosx.h \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/video/x11/SDL_x11opengl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/src/video/x11/SDL_x11opengl.c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/configure
</span> }
variant dbus description "Enable DBus support" {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -102,10 +104,11 @@ variant dbus description "Enable DBus support" {
</span> --disable-dbus --enable-dbus
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Not clear why, but enabling OpenGL may lead to system freezes.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# OpenGL via Mesa may lead to system freezes.
</span> # For now, do not enable by default.
variant opengl description "Enable OpenGL support" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Mesa dependency needed: https://trac.macports.org/ticket/61943
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Mesa dependency due to: https://trac.macports.org/ticket/61943
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We cannot depend on XQuartz.
</span> depends_lib-append \
port:mesa
configure.args-replace \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -126,9 +129,6 @@ variant samplerate description "Build with libsamplerate support" {
</span> --disable-libsamplerate --enable-libsamplerate
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- +opengl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-destroot {
set docdir ${prefix}/share/doc/${name}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libsdl2-powerpc/files/0002-fix-x11.diff b/devel/libsdl2-powerpc/files/0002-fix-x11.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5c5c73c9c9b..bb4dce9c580 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libsdl2-powerpc/files/0002-fix-x11.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libsdl2-powerpc/files/0002-fix-x11.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,76 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/SDL_config_macosx.h 2023-07-02 01:04:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/SDL_config_macosx.h 2023-07-23 05:28:30.000000000 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 93d4278f572935eaacd4bd0b0176afc6c9178b14 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Fri, 29 Nov 2024 07:09:49 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Sort out X11/OpenGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure | 28 +++++++++++++++-------------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include/SDL_config_macosx.h | 14 ++++++++------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/video/x11/SDL_x11opengl.c | 9 ++++++++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 31 insertions(+), 20 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git configure configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index cbae11e23..60605c44d 100755
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23776,10 +23776,10 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This isn't necessary for X11, but fixes GLX detection
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test "x$x_includes" = xNONE && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test "x$x_libraries" = xNONE && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test -d /opt/X11/include && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- test -d /opt/X11/lib; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x_includes="/opt/X11/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x_libraries="/opt/X11/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test -d @PREFIX@/include && \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ test -d @PREFIX@/lib; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x_includes="@PREFIX@/include"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x_libraries="@PREFIX@/lib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ esac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23876,6 +23876,8 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Standard set of common directories for X headers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Check X11 before X11Rn because it is often a symlink to the current release.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ac_x_header_dirs='
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@PREFIX@/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /usr/X11/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /usr/X11R7/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /usr/X11R6/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -24518,15 +24520,15 @@ fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ case "$host" in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-darwin*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Apple now puts this in /opt/X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x11_lib='/opt/X11/lib/libX11.6.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- x11ext_lib='/opt/X11/lib/libXext.6.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xcursor_lib='/opt/X11/lib/libXcursor.1.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xinput_lib='/opt/X11/lib/libXi.6.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xfixes_lib='/opt/X11/lib/libXfixes.3.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xrandr_lib='/opt/X11/lib/libXrandr.2.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xrender_lib='/opt/X11/lib/libXrender.1.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- xss_lib='/opt/X11/lib/libXss.1.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # MacPorts puts this in @PREFIX@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x11_lib='@PREFIX@/lib/libX11.6.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ x11ext_lib='@PREFIX@/lib/libXext.6.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xcursor_lib='@PREFIX@/lib/libXcursor.1.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xinput_lib='@PREFIX@/lib/libXi.6.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xfixes_lib='@PREFIX@/lib/libXfixes.3.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xrandr_lib='@PREFIX@/lib/libXrandr.2.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xrender_lib='@PREFIX@/lib/libXrender.1.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ xss_lib='@PREFIX@/lib/libXss.1.dylib'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *-*-openbsd*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ x11_lib='libX11.so'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git include/SDL_config_macosx.h include/SDL_config_macosx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 2db760a9f..aea6a0c99 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- include/SDL_config_macosx.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ include/SDL_config_macosx.h
</span> @@ -182,14 +182,16 @@
#define SDL_TIMER_UNIX 1
/* Enable various video drivers */
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if !defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
</span> #define SDL_VIDEO_DRIVER_COCOA 1
+#endif
#define SDL_VIDEO_DRIVER_DUMMY 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -23,15 +89,26 @@
</span> #define SDL_VIDEO_DRIVER_X11_XDBE 1
#define SDL_VIDEO_DRIVER_X11_XRANDR 1
#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/video/x11/SDL_x11opengl.c 2023-07-02 01:04:05.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/video/x11/SDL_x11opengl.c 2023-07-23 07:49:24.000000000 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,7 +40,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/video/x11/SDL_x11opengl.c src/video/x11/SDL_x11opengl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index da252615f..2255c479f 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/video/x11/SDL_x11opengl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/video/x11/SDL_x11opengl.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,6 +21,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "../../SDL_internal.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(__MACOSX__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef SDL_VIDEO_DRIVER_X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "SDL_x11video.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -40,7 +44,7 @@
</span> */
#define DEFAULT_OPENGL "libGL.so"
#elif defined(__MACOSX__)
-#define DEFAULT_OPENGL "/opt/X11/lib/libGL.1.dylib"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <AvailabilityMacros.h>
</span> +#define DEFAULT_OPENGL "@PREFIX@/lib/libGL.1.dylib"
#elif defined(__QNXNTO__)
#define DEFAULT_OPENGL "libGL.so.3"
</pre><pre style='margin:0'>
</pre>