cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rework patches that were submitted upstream

Browse Source
This commit is contained in:
jasper 2014-03-09 19:53:21 +00:00
parent ac1ae0d289
commit f40b594162
5 changed files with 52 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/farstream/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.14 2013/06/21 22:38:12 sthen Exp $
# $OpenBSD: Makefile,v 1.15 2014/03/09 19:53:21 jasper Exp $
COMMENT= audio/video communications framework
DISTNAME= farstream-0.2.3
REVISION= 0
REVISION= 1
CATEGORIES= net devel
SHARED_LIBS += farstream-0.2 0.1 # 3.0

16
net/farstream/patches/patch-tests_check_testutils_c
View File

@ -1,11 +1,15 @@
$OpenBSD: patch-tests_check_testutils_c,v 1.3 2013/03/26 13:56:48 jasper Exp $
--- tests/check/testutils.c.orig Tue Mar 26 14:50:53 2013
+++ tests/check/testutils.c Tue Mar 26 14:54:06 2013
@@ -28,6 +28,7 @@
$OpenBSD: patch-tests_check_testutils_c,v 1.4 2014/03/09 19:53:21 jasper Exp $
#ifdef HAVE_GETIFADDRS
Include <netinet/in.h> for struct sin_addr,
https://bugs.freedesktop.org/show_bug.cgi?id=75714
--- tests/check/testutils.c.orig Mon Mar 3 15:36:28 2014
+++ tests/check/testutils.c Mon Mar 3 15:38:37 2014
@@ -30,6 +30,7 @@
#include <sys/socket.h>
+ #include <netinet/in.h>
#include <ifaddrs.h>
#include <net/if.h>
+ #include <netinet/in.h>
#include <arpa/inet.h>
#endif

12
net/farstream/patches/patch-tests_check_transmitter_stunalternd_c
View File

@ -1,7 +1,11 @@
$OpenBSD: patch-tests_check_transmitter_stunalternd_c,v 1.1.1.1 2012/04/05 16:02:30 jasper Exp $
--- tests/check/transmitter/stunalternd.c.orig Wed Apr 4 22:58:18 2012
+++ tests/check/transmitter/stunalternd.c Wed Apr 4 22:58:33 2012
@@ -38,6 +38,7 @@
$OpenBSD: patch-tests_check_transmitter_stunalternd_c,v 1.2 2014/03/09 19:53:21 jasper Exp $
Include <sys/uio.h> for struct iovec.
https://bugs.freedesktop.org/show_bug.cgi?id=75716
--- tests/check/transmitter/stunalternd.c.orig Thu Apr 4 20:28:45 2013
+++ tests/check/transmitter/stunalternd.c Mon Mar 3 15:11:33 2014
@@ -37,6 +37,7 @@
#include <getopt.h>
#include <errno.h>
#include <limits.h>

24
net/farstream/patches/patch-transmitters_multicast_fs-multicast-transmitter_c
View File

@ -1,15 +1,23 @@
$OpenBSD: patch-transmitters_multicast_fs-multicast-transmitter_c,v 1.2 2012/09/28 14:26:11 jasper Exp $
--- transmitters/multicast/fs-multicast-transmitter.c.orig Tue Sep 25 22:23:53 2012
+++ transmitters/multicast/fs-multicast-transmitter.c Fri Sep 28 14:27:29 2012
@@ -55,7 +55,10 @@
$OpenBSD: patch-transmitters_multicast_fs-multicast-transmitter_c,v 1.3 2014/03/09 19:53:21 jasper Exp $
From c217975266aa3ad379b613a9b154f757432413df Mon Sep 17 00:00:00 2001
From: Olivier Crête <olivier.crete@collabora.com>
Date: Tue, 25 Jun 2013 14:38:24 +0000
Subject: multicast: Remove not required non-standard header
From 8b99315a911e82aaaac31566c33d0a2d7f3483b1 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 14 Feb 2014 03:03:09 +0000
Subject: transmitters: include <netinet/in.h> for IPPROTO_*
--- transmitters/multicast/fs-multicast-transmitter.c.orig Mon Mar 3 15:03:19 2014
+++ transmitters/multicast/fs-multicast-transmitter.c Mon Mar 3 15:07:24 2014
@@ -54,7 +54,7 @@
# define close closesocket
#else /*G_OS_WIN32*/
# include <netdb.h>
# include <sys/socket.h>
-# include <netinet/ip.h>
+# include <netinet/in.h>
+# ifndef __OpenBSD__
+# include <netinet/ip.h>
+# endif /* !__OpenBSD__ */
# include <arpa/inet.h>
#endif /*G_OS_WIN32*/

25
net/farstream/patches/patch-transmitters_rawudp_fs-rawudp-transmitter_h
View File

@ -1,17 +1,22 @@
$OpenBSD: patch-transmitters_rawudp_fs-rawudp-transmitter_h,v 1.2 2012/09/28 14:26:11 jasper Exp $
--- transmitters/rawudp/fs-rawudp-transmitter.h.orig Tue Sep 11 18:25:41 2012
+++ transmitters/rawudp/fs-rawudp-transmitter.h Fri Sep 28 14:27:29 2012
@@ -33,6 +33,13 @@
$OpenBSD: patch-transmitters_rawudp_fs-rawudp-transmitter_h,v 1.3 2014/03/09 19:53:21 jasper Exp $
include <sys/socket.h> for setsockopt(2),
https://bugs.freedesktop.org/show_bug.cgi?id=75713
From 8b99315a911e82aaaac31566c33d0a2d7f3483b1 Mon Sep 17 00:00:00 2001
From: Ryan Lortie <desrt@desrt.ca>
Date: Fri, 14 Feb 2014 03:03:09 +0000
Subject: transmitters: include <netinet/in.h> for IPPROTO_*
--- transmitters/rawudp/fs-rawudp-transmitter.h.orig Thu Apr 4 20:25:09 2013
+++ transmitters/rawudp/fs-rawudp-transmitter.h Mon Mar 3 15:18:57 2014
@@ -33,7 +33,9 @@
#ifdef G_OS_WIN32
# include <ws2tcpip.h>
#else /*G_OS_WIN32*/
+# include <sys/types.h>
+# include <netdb.h>
+# include <sys/socket.h>
+# include <netinet/in.h>
+# ifndef __OpenBSD__
+# include <netinet/ip.h>
+# endif /* !__OpenBSD__ */
# include <arpa/inet.h>
+# include <netinet/in.h>
#endif /*G_OS_WIN32*/
G_BEGIN_DECLS