<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/e98297fb51e06b5dfc4604de045f291dc503f81c">https://github.com/macports/macports-ports/commit/e98297fb51e06b5dfc4604de045f291dc503f81c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit e98297fb51e06b5dfc4604de045f291dc503f81c
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sat Sep 17 09:16:57 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> sdl12-compat: update to 1.2.56
</span>---
devel/sdl12-compat/Portfile | 13 ++++-----
devel/sdl12-compat/files/CMakeLists.txt.patch | 22 ---------------
devel/sdl12-compat/files/SDL_stdinc.h.patch | 40 ---------------------------
3 files changed, 5 insertions(+), 70 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/sdl12-compat/Portfile b/devel/sdl12-compat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d18135d3401..fc143d3df48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/sdl12-compat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/sdl12-compat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,7 @@ PortSystem 1.0
</span> PortGroup cmake 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libsdl-org sdl12-compat 1.2.52 release-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libsdl-org sdl12-compat 1.2.56 release-
</span> categories devel multimedia
platforms macosx freebsd
license zlib
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,14 +18,12 @@ long_description \
</span> homepage https://www.libsdl.org/
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 93b7a1a35ef9ad2a26859a0b88167d1c3cef2bff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5bd7942703575554670a8767ae030f7921a0ac3c5e2fd173a537b7c7a8599014
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5d5c4232a51c866fa182275589e73db79b1ae090 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 f62f3e15f95aade366ee6c03f291e8825c4689390a6be681535259a877259c58
</span>
depends_lib port:libsdl2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles CMakeLists.txt.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL2path.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDL_stdinc.h.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles SDL2path.patch
</span> post-patch {
reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/src/SDL12_compat.c
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,6 +46,6 @@ post-destroot {
</span> set docdir ${prefix}/share/doc/${name}
xinstall -d ${destroot}${docdir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 -W ${worksrcpath} BUGS.txt COMPATIBILITY.md LICENSE.txt README.md \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} BUGS.md COMPATIBILITY.md LICENSE.txt README.md \
</span> ${destroot}${docdir}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/sdl12-compat/files/CMakeLists.txt.patch b/devel/sdl12-compat/files/CMakeLists.txt.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6caa9c5930a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/sdl12-compat/files/CMakeLists.txt.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix relative path in install_name.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2022-03-04 01:56:56.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2022-08-28 06:15:00.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,7 +74,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_link_libraries(SDL PRIVATE dl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set_target_properties(SDL PROPERTIES INSTALL_NAME_DIR "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(SDL PROPERTIES COMPILE_DEFINITIONS "_THREAD_SAFE")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_target_properties(SDL PROPERTIES LINK_FLAGS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "-Wl,-compatibility_version,${DYLIB_COMPAT_VERSION} -Wl,-current_version,${DYLIB_CURRENT_VERSION}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2022-03-04 01:56:56.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2022-09-05 12:05:50.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(OSX_SRCS "src/SDL12_compat_objc.m")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_source_files_properties(${OSX_SRCS} PROPERTIES LANGUAGE C)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # the following matches SDL-1.2 Xcode project file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(DYLIB_COMPAT_VERSION 1.0.0 CACHE STRING "library compatibility version")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(DYLIB_COMPAT_VERSION 12.0.0 CACHE STRING "library compatibility version")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(DYLIB_CURRENT_VERSION 12.52.0 CACHE STRING "library current version")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_directories("/opt/X11/include") # hack.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(CMAKE_VERSION VERSION_LESS 3.9)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/sdl12-compat/files/SDL_stdinc.h.patch b/devel/sdl12-compat/files/SDL_stdinc.h.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b10c3a63c17..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/sdl12-compat/files/SDL_stdinc.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 70106dd3c2f8b3ebf3fe428a7001185b7dca42f3 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Joshua Root <jmr@macports.org>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Mon, 29 Aug 2022 10:20:37 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Make include logic closer to real SDL 1.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-This should offer better compatibility in some cases.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include/SDL/SDL_stdinc.h | 10 ++++------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 4 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/include/SDL/SDL_stdinc.h b/include/SDL/SDL_stdinc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index aa070c4cb..d604b0392 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- include/SDL/SDL_stdinc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ include/SDL/SDL_stdinc.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,10 +83,9 @@ SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_STDIO_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_STDLIB_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(HAVE_STDLIB_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_MALLOC_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(HAVE_MALLOC_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <malloc.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_STDDEF_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,10 +100,9 @@ SDL_COMPILE_TIME_ASSERT(enum, sizeof(SDL_DUMMY_ENUM) == sizeof(int));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_STRINGS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <strings.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_INTTYPES_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(HAVE_INTTYPES_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <inttypes.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef HAVE_STDINT_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(HAVE_STDINT_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stdint.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_CTYPE_H
</span></pre><pre style='margin:0'>
</pre>