Thu Oct 13 13:28:13 2011 UTC ()
Fix build on SunOS.


(hans)
diff -r1.15 -r1.16 pkgsrc/multimedia/farsight2/distinfo
diff -r1.2 -r1.3 pkgsrc/multimedia/farsight2/patches/patch-aj
cvs diff -r1.15 -r1.16 pkgsrc/multimedia/farsight2/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/multimedia/farsight2/Attic/distinfo 2011/03/12 06:33:35 1.15
+++ pkgsrc/multimedia/farsight2/Attic/distinfo 2011/10/13 13:28:12 1.16
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1$NetBSD: distinfo,v 1.15 2011/03/12 06:33:35 obache Exp $ 1$NetBSD: distinfo,v 1.16 2011/10/13 13:28:12 hans Exp $
2 2
3SHA1 (farsight2-0.0.26.tar.gz) = 4d0e105a807075dd2a5c837aca92febdef6229a4 3SHA1 (farsight2-0.0.26.tar.gz) = 4d0e105a807075dd2a5c837aca92febdef6229a4
4RMD160 (farsight2-0.0.26.tar.gz) = 62e7b6f114040e0cd3e995439532a6937e0dbafa 4RMD160 (farsight2-0.0.26.tar.gz) = 62e7b6f114040e0cd3e995439532a6937e0dbafa
5Size (farsight2-0.0.26.tar.gz) = 1167062 bytes 5Size (farsight2-0.0.26.tar.gz) = 1167062 bytes
6SHA1 (patch-ab) = 27fd12ad2d1774cbeb7c11a4cee5b40e5ea97853 6SHA1 (patch-ab) = 27fd12ad2d1774cbeb7c11a4cee5b40e5ea97853
7SHA1 (patch-ai) = 6459729f80f592a2a333d683b05a139b499f46c6 7SHA1 (patch-ai) = 6459729f80f592a2a333d683b05a139b499f46c6
8SHA1 (patch-aj) = c8f92433243a5741403721bb248e4471a23583eb 8SHA1 (patch-aj) = d73bcbec6b7c8387a01ab391a52373080ba44e61
9SHA1 (patch-ak) = 591ab7b6afefc84443280b01c765492007686ff6 9SHA1 (patch-ak) = 591ab7b6afefc84443280b01c765492007686ff6
10SHA1 (patch-gst-libs_gst_farsight_Makefile.in) = e56468e52401548b0dac0225153abde1a5d548e3 10SHA1 (patch-gst-libs_gst_farsight_Makefile.in) = e56468e52401548b0dac0225153abde1a5d548e3
11SHA1 (patch-python_Makefile.in) = 7c9396e148958108deabb4286f8945edb10843fb 11SHA1 (patch-python_Makefile.in) = 7c9396e148958108deabb4286f8945edb10843fb
cvs diff -r1.2 -r1.3 pkgsrc/multimedia/farsight2/patches/Attic/patch-aj (expand / switch to unified diff)

--- pkgsrc/multimedia/farsight2/patches/Attic/patch-aj 2010/08/05 18:55:18 1.2
+++ pkgsrc/multimedia/farsight2/patches/Attic/patch-aj 2011/10/13 13:28:12 1.3
@@ -1,12 +1,40 @@ @@ -1,12 +1,40 @@
1$NetBSD: patch-aj,v 1.2 2010/08/05 18:55:18 drochner Exp $ 1$NetBSD: patch-aj,v 1.3 2011/10/13 13:28:12 hans Exp $
2 2
3--- gst-libs/gst/farsight/fs-interfaces.c.orig 2010-05-31 19:20:03.000000000 +0000 3--- gst-libs/gst/farsight/fs-interfaces.c.orig 2011-02-10 20:29:39.000000000 +0100
4+++ gst-libs/gst/farsight/fs-interfaces.c 4+++ gst-libs/gst/farsight/fs-interfaces.c 2011-10-12 18:58:16.132751166 +0200
5@@ -44,6 +44,7 @@ 5@@ -44,6 +44,10 @@
6 #include <sys/socket.h> 6 #include <sys/socket.h>
7 #include <ifaddrs.h> 7 #include <ifaddrs.h>
8 #endif 8 #endif
9+#include <netinet/in.h> 9+#include <netinet/in.h>
 10+#ifdef __sun
 11+#include <sys/sockio.h>
 12+#endif
10  13
11 #include <gst/gst.h> 14 #include <gst/gst.h>
12  15
 16@@ -327,8 +329,8 @@ gchar *
 17 fs_interfaces_get_ip_for_interface (gchar *interface_name)
 18 {
 19 union {
 20- struct sockaddr s_addr;
 21- struct sockaddr_in sin_addr;
 22+ struct sockaddr u_s_addr;
 23+ struct sockaddr_in u_sin_addr;
 24 } sockaddr_union;
 25 struct ifreq ifr;
 26 gint sockfd;
 27@@ -351,10 +353,10 @@ fs_interfaces_get_ip_for_interface (gcha
 28 }
 29
 30 close (sockfd);
 31- sockaddr_union.s_addr = ifr.ifr_addr;
 32+ sockaddr_union.u_s_addr = ifr.ifr_addr;
 33 GST_DEBUG ("Address for %s: %s", interface_name,
 34- inet_ntoa (sockaddr_union.sin_addr.sin_addr));
 35- return g_strdup (inet_ntoa (sockaddr_union.sin_addr.sin_addr));
 36+ inet_ntoa (sockaddr_union.u_sin_addr.sin_addr));
 37+ return g_strdup (inet_ntoa (sockaddr_union.u_sin_addr.sin_addr));
 38 }
 39
 40 #else /* G_OS_UNIX */