diff options
| -rw-r--r-- | Ports/AvailablePorts.md | 2 | ||||
| -rwxr-xr-x | Ports/SDL2_net/package.sh | 17 | ||||
| -rw-r--r-- | Ports/SDL2_net/patches/0001-Undefine-SIOCGIFCONF-on-serenity.patch | 4 | ||||
| -rw-r--r-- | Ports/SDL2_net/patches/0002-Include-sys-select.h.patch | 21 | ||||
| -rw-r--r-- | Ports/SDL2_net/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch (renamed from Ports/SDL2_net/patches/0003-libtool-Enable-shared-library-support-for-SerenityOS.patch) | 34 | ||||
| -rw-r--r-- | Ports/SDL2_net/patches/ReadMe.md | 7 |
6 files changed, 22 insertions, 63 deletions
diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index e239e54ea5..85b6ec36f7 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -217,7 +217,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`SDL2_gfx`](SDL2_gfx/) | SDL2\_gfx (Graphics primitives add-on for SDL2) | 1.0.4 | https://sourceforge.net/projects/sdl2gfx/ | | [`SDL2_image`](SDL2_image/) | SDL2\_image (Image loading add-on for SDL2) | 2.6.2 | https://github.com/libsdl-org/SDL_image | | [`SDL2_mixer`](SDL2_mixer/) | SDL2\_mixer (Audio mixer add-on for SDL2) | 2.6.2 | https://github.com/libsdl-org/SDL_mixer | -| [`SDL2_net`](SDL2_net/) | SDL2\_net (network add-on for SDL2) | 2.0.1 | https://www.libsdl.org/projects/SDL_net/ | +| [`SDL2_net`](SDL2_net/) | SDL2\_net (Network add-on for SDL2) | 2.2.0 | https://github.com/libsdl-org/SDL_net | | [`SDL2_sound`](SDL2_sound/) | SDL2\_sound (Abstract soundfile decoder add-on for SDL2) | | https://github.com/icculus/SDL_sound | | [`SDL2_ttf`](SDL2_ttf/) | SDL2\_ttf (TrueType Font add-on for SDL2) | 2.0.18 | https://www.libsdl.org/projects/SDL_ttf/ | | [`SDL_mixer`](SDL_mixer/) | SDL\_mixer (Audio mixer add-on for SDL 1.2) | 1.2.12 | https://www.libsdl.org/projects/SDL_mixer/release-1.2.html | diff --git a/Ports/SDL2_net/package.sh b/Ports/SDL2_net/package.sh index f3291a466e..4bfe6194b3 100755 --- a/Ports/SDL2_net/package.sh +++ b/Ports/SDL2_net/package.sh @@ -1,9 +1,12 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=SDL2_net -version=2.0.1 -useconfigure=true -use_fresh_config_sub=true -configopts=("--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local" "--disable-static" "--enable-shared") -files="https://www.libsdl.org/projects/SDL_net/release/SDL2_net-${version}.tar.gz SDL2_net-${version}.tar.gz 15ce8a7e5a23dafe8177c8df6e6c79b6749a03fff1e8196742d3571657609d21" -auth_type=sha256 +port='SDL2_net' +version='2.2.0' +useconfigure='true' +configopts=( + "--with-sdl-prefix=${SERENITY_INSTALL_ROOT}/usr/local" + "--disable-static" + "--enable-shared" +) +files="https://github.com/libsdl-org/SDL_net/releases/download/release-${version}/SDL2_net-${version}.tar.gz SDL2_net-${version}.tar.gz 4e4a891988316271974ff4e9585ed1ef729a123d22c08bd473129179dc857feb" +auth_type='sha256' depends=("SDL2") diff --git a/Ports/SDL2_net/patches/0001-Undefine-SIOCGIFCONF-on-serenity.patch b/Ports/SDL2_net/patches/0001-Undefine-SIOCGIFCONF-on-serenity.patch index 767883b754..3029f8632e 100644 --- a/Ports/SDL2_net/patches/0001-Undefine-SIOCGIFCONF-on-serenity.patch +++ b/Ports/SDL2_net/patches/0001-Undefine-SIOCGIFCONF-on-serenity.patch @@ -9,10 +9,10 @@ FIXME: We don't know why yet. 1 file changed, 4 insertions(+) diff --git a/SDLnet.c b/SDLnet.c -index 53d125a..87eab4c 100644 +index 24eb05b..847b185 100644 --- a/SDLnet.c +++ b/SDLnet.c -@@ -184,6 +184,10 @@ const char *SDLNet_ResolveIP(const IPaddress *ip) +@@ -218,6 +218,10 @@ const char *SDLNet_ResolveIP(const IPaddress *ip) return inet_ntoa(in); } diff --git a/Ports/SDL2_net/patches/0002-Include-sys-select.h.patch b/Ports/SDL2_net/patches/0002-Include-sys-select.h.patch deleted file mode 100644 index ed33ade088..0000000000 --- a/Ports/SDL2_net/patches/0002-Include-sys-select.h.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Gunnar Beutner <gbeutner@serenityos.org> -Date: Wed, 16 Jun 2021 11:08:32 +0200 -Subject: [PATCH] Include sys/select.h - ---- - SDLnetsys.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/SDLnetsys.h b/SDLnetsys.h -index 6f6dfae..bd9139d 100644 ---- a/SDLnetsys.h -+++ b/SDLnetsys.h -@@ -46,6 +46,7 @@ typedef int socklen_t; - #include <iphlpapi.h> - #else /* UNIX */ - #include <sys/types.h> -+#include <sys/select.h> - #ifdef __FreeBSD__ - #include <sys/socket.h> - #endif diff --git a/Ports/SDL2_net/patches/0003-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/SDL2_net/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch index 9e23627822..6fb73cfc86 100644 --- a/Ports/SDL2_net/patches/0003-libtool-Enable-shared-library-support-for-SerenityOS.patch +++ b/Ports/SDL2_net/patches/0002-libtool-Enable-shared-library-support-for-SerenityOS.patch @@ -13,15 +13,15 @@ Fix that by just adding the appropriate configuration options for automatically using libtool, without having to manually link the static library into a shared library. --- - configure | 34 ++++++++++++++++++++++++++++++++++ - 1 file changed, 34 insertions(+) + configure | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) diff --git a/configure b/configure -index 8c1d2d4..8ea327f 100755 +index 216f37b..ca3f8cc 100755 --- a/configure +++ b/configure -@@ -4487,6 +4487,10 @@ sysv4 | sysv4.3*) - tpf*) +@@ -5104,6 +5104,10 @@ tpf*) + os2*) lt_cv_deplibs_check_method=pass_all ;; + @@ -31,7 +31,7 @@ index 8c1d2d4..8ea327f 100755 esac fi -@@ -7272,6 +7276,10 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7777,6 +7781,10 @@ printf %s "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_static='-Bstatic' ;; @@ -42,7 +42,7 @@ index 8c1d2d4..8ea327f 100755 *) lt_prog_compiler_can_build_shared=no ;; -@@ -8508,6 +8516,10 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9065,6 +9073,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ hardcode_shlibpath_var=no ;; @@ -53,25 +53,7 @@ index 8c1d2d4..8ea327f 100755 *) ld_shlibs=no ;; -@@ -9410,6 +9422,17 @@ uts4*) - shlibpath_var=LD_LIBRARY_PATH - ;; - -+serenity*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}${versuffix} ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}${major}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ dynamic_linker='SerenityOS LibELF' -+ ;; -+ - *) - dynamic_linker=no - ;; -@@ -14947,6 +14970,17 @@ uts4*) +@@ -9990,6 +10002,17 @@ uts4*) shlibpath_var=LD_LIBRARY_PATH ;; diff --git a/Ports/SDL2_net/patches/ReadMe.md b/Ports/SDL2_net/patches/ReadMe.md index 6939e02b29..adf14e8d5d 100644 --- a/Ports/SDL2_net/patches/ReadMe.md +++ b/Ports/SDL2_net/patches/ReadMe.md @@ -6,12 +6,7 @@ Undefine 'SIOCGIFCONF' on serenity FIXME: We don't know why yet. -## `0002-Include-sys-select.h.patch` - -Include sys/select.h - - -## `0003-libtool-Enable-shared-library-support-for-SerenityOS.patch` +## `0002-libtool-Enable-shared-library-support-for-SerenityOS.patch` libtool: Enable shared library support for SerenityOS |