diff --git a/media-libs/liblo/liblo-0.28.recipe b/media-libs/liblo/liblo-0.29.recipe similarity index 86% rename from media-libs/liblo/liblo-0.28.recipe rename to media-libs/liblo/liblo-0.29.recipe index 88990a82d..8374958a2 100644 --- a/media-libs/liblo/liblo-0.28.recipe +++ b/media-libs/liblo/liblo-0.29.recipe @@ -8,9 +8,9 @@ COPYRIGHT="2008-2012 Stephen Sinclair 2005 Martin Habets 2005-2006 Steve Harris" LICENSE="GNU LGPL v2.1" -REVISION="3" +REVISION="1" SOURCE_URI="http://prdownloads.sourceforge.net/liblo/liblo-$portVersion.tar.gz" -CHECKSUM_SHA256="da94a9b67b93625354dd89ff7fe31e5297fc9400b6eaf7378c82ee1caf7db909" +CHECKSUM_SHA256="ace1b4e234091425c150261d1ca7070cece48ee3c228a5612d048116d864c06a" PATCHES="liblo-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" @@ -20,7 +20,8 @@ PROVIDES=" liblo$secondaryArchSuffix = $portVersion compat >= 0 cmd:oscdump cmd:oscsend - lib:liblo$secondaryArchSuffix = 7.2.0 compat >= 7 + cmd:oscsendfile + lib:liblo$secondaryArchSuffix = 7.3.0 compat >= 7 " REQUIRES=" haiku$secondaryArchSuffix @@ -28,7 +29,7 @@ REQUIRES=" PROVIDES_devel=" liblo${secondaryArchSuffix}_devel = $portVersion compat >= 0 - devel:liblo$secondaryArchSuffix = 7.2.0 compat >= 7 + devel:liblo$secondaryArchSuffix = 7.3.0 compat >= 7 " REQUIRES_devel=" liblo$secondaryArchSuffix == $portVersion base diff --git a/media-libs/liblo/patches/liblo-0.28.patchset b/media-libs/liblo/patches/liblo-0.29.patchset similarity index 78% rename from media-libs/liblo/patches/liblo-0.28.patchset rename to media-libs/liblo/patches/liblo-0.29.patchset index 676d94bcd..aebdd62fc 100644 --- a/media-libs/liblo/patches/liblo-0.28.patchset +++ b/media-libs/liblo/patches/liblo-0.29.patchset @@ -1,14 +1,14 @@ -From 3f117d160feaf021ad42655441a4c51cadbfc575 Mon Sep 17 00:00:00 2001 +From 7d4e32d4fc3a5a4bdd2a627e95484ff0ee53bbd6 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 20 May 2014 16:30:21 +0000 Subject: haiku patch diff --git a/configure.ac b/configure.ac -index c487d18..80bf8da 100644 +index 0633284..ac241fa 100644 --- a/configure.ac +++ b/configure.ac -@@ -139,7 +139,7 @@ else +@@ -151,7 +151,7 @@ else fi # Checks for libraries. @@ -18,32 +18,31 @@ index c487d18..80bf8da 100644 AC_CHECK_FUNCS([getifaddrs]) -- -2.2.2 +2.13.1 -From c11874bebdc9abf0bdd7be7f15ef9e0665c8897d Mon Sep 17 00:00:00 2001 +From 55c690cde0588db2c5c1d1d861bb541c50c8e57e Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 20 May 2014 16:51:04 +0000 Subject: check getifaddrs diff --git a/lo/lo_cpp.h b/lo/lo_cpp.h -index 79db0b6..7675380 100644 +index c2141b0..058171a 100644 --- a/lo/lo_cpp.h +++ b/lo/lo_cpp.h -@@ -184,12 +184,19 @@ namespace lo { - +@@ -227,11 +227,19 @@ namespace lo { std::string url() const - { return std::string(lo_address_get_url(address)?:""); } -- + { auto s(lo_address_get_url(address)); return std::string(s?s:""); } + +#ifdef HAVE_GETIFADDRS std::string iface() const - { return std::string(lo_address_get_iface(address)?:""); } + { auto s(lo_address_get_iface(address)); return std::string(s?s:""); } void set_iface(const string_type &iface, const string_type &ip) - { lo_address_set_iface(address, iface._s?:0, ip._s?:0); } + { lo_address_set_iface(address, iface, ip); } +#else -+ std::string iface() const ++ std::string iface() const + { return std::string(""); } + + void set_iface(const string_type &iface, const string_type &ip) @@ -53,20 +52,20 @@ index 79db0b6..7675380 100644 int set_tcp_nodelay(int enable) { return lo_address_set_tcp_nodelay(address, enable); } -- -2.2.2 +2.13.1 -From 24cc2875cef6982156531f986fa5517be49677b0 Mon Sep 17 00:00:00 2001 +From 9e432508abf5c6c4886a541b3a4ae4049602e507 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Tue, 20 May 2014 22:09:52 +0000 Subject: gcc2 build fix diff --git a/examples/example_tcp_echo_server.c b/examples/example_tcp_echo_server.c -index 93af99b..b675e92 100644 +index 11ff1b9..9b09bb9 100644 --- a/examples/example_tcp_echo_server.c +++ b/examples/example_tcp_echo_server.c -@@ -46,6 +46,9 @@ void ctrlc(int sig) +@@ -48,6 +48,9 @@ void ctrlc(int sig) int main(int argc, char *argv[]) { @@ -76,7 +75,7 @@ index 93af99b..b675e92 100644 const char *port = "7770"; int do_send = 0; -@@ -55,13 +58,13 @@ int main(int argc, char *argv[]) +@@ -57,13 +60,13 @@ int main(int argc, char *argv[]) } /* start a new server on port 7770 */ @@ -92,7 +91,7 @@ index 93af99b..b675e92 100644 /* add method that will match the path /quit with no args */ lo_server_thread_add_method(st, "/quit", "", quit_handler, NULL); -@@ -75,14 +78,14 @@ int main(int argc, char *argv[]) +@@ -77,14 +80,14 @@ int main(int argc, char *argv[]) printf("Listening on TCP port %s\n", port); @@ -109,7 +108,7 @@ index 93af99b..b675e92 100644 1, 2.0f, "3"); if (r < 0) printf("Error sending initial message.\n"); -@@ -115,6 +118,7 @@ int echo_handler(const char *path, const char *types, lo_arg ** argv, +@@ -117,6 +120,7 @@ int echo_handler(const char *path, const char *types, lo_arg ** argv, int argc, void *data, void *user_data) { int i; @@ -117,7 +116,7 @@ index 93af99b..b675e92 100644 lo_message m = (lo_message)data; lo_address a = lo_message_get_source(m); lo_server s = (lo_server)user_data; -@@ -142,7 +146,7 @@ int echo_handler(const char *path, const char *types, lo_arg ** argv, +@@ -144,7 +148,7 @@ int echo_handler(const char *path, const char *types, lo_arg ** argv, return 0; } @@ -127,7 +126,7 @@ index 93af99b..b675e92 100644 printf("Error sending back message, socket may have closed.\n"); else diff --git a/src/address.c b/src/address.c -index 5acf694..b6ce1c5 100644 +index 8b50fdd..0018db9 100644 --- a/src/address.c +++ b/src/address.c @@ -627,6 +627,9 @@ int lo_inaddr_find_iface(lo_inaddr t, int fam, @@ -154,7 +153,7 @@ index 5acf694..b6ce1c5 100644 if (!ifa->ifa_addr) { ifa = ifa->ifa_next; diff --git a/src/message.c b/src/message.c -index 7980ccf..28a2bd5 100644 +index 0813587..eeb43cb 100644 --- a/src/message.c +++ b/src/message.c @@ -259,6 +259,7 @@ int lo_message_add_varargs_internal(lo_message msg, const char *types, @@ -163,8 +162,8 @@ index 7980ccf..28a2bd5 100644 #ifndef USE_ANSI_C +{ void *i = va_arg(ap, void *); - if (((unsigned long)i & 0xFFFFFFFFUL) - != ((unsigned long)LO_MARKER_A & 0xFFFFFFFFUL)) + if (((UINT_PTR)i & 0xFFFFFFFFUL) + != ((UINT_PTR)LO_MARKER_A & 0xFFFFFFFFUL)) @@ -281,6 +282,7 @@ int lo_message_add_varargs_internal(lo_message msg, const char *types, "mismatching types and data at\n%s:%d, exiting.\n", file, line); @@ -174,10 +173,10 @@ index 7980ccf..28a2bd5 100644 va_end(ap); diff --git a/src/server.c b/src/server.c -index 3d01e88..0521bfc 100644 +index 01fa08f..f86a3cd 100644 --- a/src/server.c +++ b/src/server.c -@@ -1275,6 +1275,7 @@ int lo_server_wait(lo_server s, int timeout) +@@ -1319,6 +1319,7 @@ int lo_server_wait(lo_server s, int timeout) { if (s->protocol == LO_TCP) { @@ -185,7 +184,7 @@ index 3d01e88..0521bfc 100644 int sock = accept(s->sockets[0].fd, (struct sockaddr *) &addr, &addr_len); -@@ -1286,7 +1287,7 @@ int lo_server_wait(lo_server s, int timeout) +@@ -1330,7 +1331,7 @@ int lo_server_wait(lo_server s, int timeout) lo_timetag_now(&now); @@ -195,18 +194,18 @@ index 3d01e88..0521bfc 100644 sched_timeout = lo_server_next_event_delay(s) * 1000; timeout -= (int)(diff*1000); diff --git a/src/test_bidirectional_tcp.c b/src/test_bidirectional_tcp.c -index 0408df3..226595e 100644 +index 9292a0b..d49aa1c 100644 --- a/src/test_bidirectional_tcp.c +++ b/src/test_bidirectional_tcp.c -@@ -28,6 +28,7 @@ int generic_handler(const char *path, const char *types, lo_arg ** argv, - +@@ -34,6 +34,7 @@ unsigned sendthread(void *arg) void *sendthread(void *arg) + #endif { + lo_address a; lo_server s = lo_server_new_with_proto("7772", LO_TCP, 0); if (!s) { printf("no server2\n"); exit(1); } -@@ -35,7 +36,7 @@ void *sendthread(void *arg) +@@ -41,7 +42,7 @@ void *sendthread(void *arg) lo_server_add_method(s, 0, 0, generic_handler, s); @@ -215,7 +214,7 @@ index 0408df3..226595e 100644 lo_send_from(a, s, LO_TT_IMMEDIATE, "/test", 0); -@@ -55,6 +56,7 @@ void *sendthread(void *arg) +@@ -61,6 +62,7 @@ void *sendthread(void *arg) int main() { @@ -223,14 +222,14 @@ index 0408df3..226595e 100644 /* start a new server on port 7770 */ lo_server s = lo_server_new_with_proto("7771", LO_TCP, 0); if (!s) { printf("no server\n"); exit(1); } -@@ -64,7 +66,6 @@ int main() - - printf("%p.server fd: %d\n", s, lo_server_get_socket_fd(s)); - +@@ -73,7 +75,6 @@ int main() + #ifdef HAVE_WIN32_THREADS + HANDLE thr = (HANDLE)_beginthreadex(NULL, 0, &sendthread, s, 0, NULL); + #else - pthread_t thr; pthread_create(&thr, 0, sendthread, s); + #endif - printf("%p.receiving1..\n", s); -- -2.2.2 +2.13.1