From 765c24e16f179dcb8af159da7d6e5f49ac6df7c2 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sun, 14 Feb 2021 12:48:14 +0100 Subject: [PATCH] love: link against libnetwork --- games-engines/love/love-11.2.recipe | 7 +- games-engines/love/patches/love-11.2.patchset | 67 +++++++++++++++++-- 2 files changed, 67 insertions(+), 7 deletions(-) diff --git a/games-engines/love/love-11.2.recipe b/games-engines/love/love-11.2.recipe index a551683c5..f6bc0025c 100644 --- a/games-engines/love/love-11.2.recipe +++ b/games-engines/love/love-11.2.recipe @@ -4,7 +4,7 @@ It's free, open-source, and works also on Windows, Mac OS X and Linux." HOMEPAGE="http://love2d.org/" COPYRIGHT="2010-2018 Löve" LICENSE="Zlib" -REVISION="2" +REVISION="3" SOURCE_URI="https://bitbucket.org/rude/love/downloads/love-$portVersion-linux-src.tar.gz" CHECKSUM_SHA256="6aaf8104fc35bb8bbd7865986b98079e7564ffdb374ea4d33604b46b458444f6" PATCHES="love-$portVersion.patchset" @@ -75,18 +75,23 @@ BUILD_REQUIRES=" devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake cmd:awk cmd:cmp cmd:dd cmd:diff cmd:gcc$secondaryArchSuffix cmd:ld$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:pkg_config$secondaryArchSuffix " BUILD() { + autoreconf -fi runConfigure ./configure make $jobArgs diff --git a/games-engines/love/patches/love-11.2.patchset b/games-engines/love/patches/love-11.2.patchset index 9c3a440e5..886555318 100644 --- a/games-engines/love/patches/love-11.2.patchset +++ b/games-engines/love/patches/love-11.2.patchset @@ -1,4 +1,4 @@ -From 54940c74788c7448aef59ed905382f325d2e0725 Mon Sep 17 00:00:00 2001 +From c54427cc117d031d9eb3dbce07340de9229660ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sat, 6 May 2017 11:09:02 +0200 Subject: Add Haiku to the known platforms @@ -18,10 +18,10 @@ index 8180f6a..72b2496 100644 # define LOVE_LINUX 1 #endif -- -2.21.0 +2.30.0 -From 7c7271e6df5942b92772e3c66729ac7544d9157a Mon Sep 17 00:00:00 2001 +From a975efb2a9af608abb8c0e9a213ff27fa04037e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sat, 6 May 2017 11:18:30 +0200 Subject: Build fix for Haiku @@ -54,10 +54,10 @@ index d85a947..3a9d441 100644 // Check if xdg-open already completed (or failed.) int status = 0; -- -2.21.0 +2.30.0 -From 7aa2107230bf7b8ec1322f38bd16e87a87bcfadb Mon Sep 17 00:00:00 2001 +From fefdfa8ca95a20e939de01dcd9a1a729d93c9ce0 Mon Sep 17 00:00:00 2001 From: begasus Date: Fri, 26 Apr 2019 19:14:39 +0200 Subject: Build fix for Haiku #2 @@ -77,5 +77,60 @@ index 7bf8010..9e3b43f 100644 #endif -- -2.21.0 +2.30.0 + + +From 823e7ebebfafc3b11e0d125671a8f00310a71e7f Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Sun, 14 Feb 2021 11:49:17 +0100 +Subject: links against libnetwork + + +diff --git a/configure.ac b/configure.ac +index 781680c..9fbaeb1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,6 +64,7 @@ ACLOVE_DEP_SDL2 + ACLOVE_DEP_LIBM + ACLOVE_DEP_ZLIB + ACLOVE_DEP_PTHREAD ++ACLOVE_DEP_SOCKET + + # Conditional dependencies + AS_VAR_IF([enable_module_audio], [yes], [ACLOVE_DEP_OPENAL], []) +diff --git a/platform/unix/deps.m4 b/platform/unix/deps.m4 +index 42938d9..af4c10f 100644 +--- a/platform/unix/deps.m4 ++++ b/platform/unix/deps.m4 +@@ -25,6 +25,16 @@ AC_DEFUN([ACLOVE_DEP_SDL2], [ + AC_DEFUN([ACLOVE_DEP_PTHREAD], [ + AC_SEARCH_LIBS([pthread_create], [pthread], [], [LOVE_MSG_ERROR([the POSIX threads library])])]) + ++AC_DEFUN([ACLOVE_DEP_SOCKET], [ ++ AC_CHECK_FUNCS(connect,,[ ++ AC_CHECK_LIB(network,connect,[ ++ LIBS_SOCKET="-lnetwork" ++ AC_SUBST([LIBS_SOCKET],[]) ++ ]) ++ ]) ++]) ++ ++ + # does not use pkg-config because of the FILE_OFFSET_BITS.. bit + AC_DEFUN([ACLOVE_DEP_MPG123], [ + AC_SEARCH_LIBS([mpg123_open_feed], [mpg123], [], +diff --git a/src/Makefile.am b/src/Makefile.am +index 0d87ac4..df3e874 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1023,6 +1023,7 @@ endif + + if LOVE_LIBRARY_LUASOCKET + liblove_la_SOURCES += $(liblove_library_luasocket) ++liblove_la_LIBADD += $(LIBS_SOCKET) + endif + + if LOVE_LIBRARY_LZ4 +-- +2.30.0