[SCM] multicat/master: Remove patches
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Jan 10 14:35:09 UTC 2016
The following commit has been merged in the master branch:
commit 87e0f881623b6bc5117251968af6f1addca1362f
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Jan 10 14:57:08 2016 +0100
Remove patches
Included upstream
diff --git a/debian/patches/0001-nonlinux.patch b/debian/patches/0001-nonlinux.patch
deleted file mode 100644
index 127856c..0000000
--- a/debian/patches/0001-nonlinux.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Add POLLRDHUP on architectures which don't define it.
-From: http://bugs.debian.org/660139
----
- multicat.c | 4 ++++
- util.c | 11 ++++++++++-
- 2 files changed, 14 insertions(+), 1 deletion(-)
-
---- multicat.orig/multicat.c
-+++ multicat/multicat.c
-@@ -42,6 +42,10 @@
- #include <pthread.h>
- #include <poll.h>
-
-+#ifndef POLLRDHUP
-+#define POLLRDHUP 0
-+#endif
-+
- #include <bitstream/ietf/rtp.h>
- #include <bitstream/mpeg/ts.h>
-
---- multicat.orig/util.c
-+++ multicat/util.c
-@@ -214,6 +214,7 @@ void real_Sleep( uint64_t i_delay )
- *****************************************************************************/
- static int GetInterfaceIndex( const char *psz_name )
- {
-+#ifndef __FreeBSD__
- int i_fd;
- struct ifreq ifr;
-
-@@ -235,6 +236,9 @@ static int GetInterfaceIndex( const char
- close( i_fd );
-
- return ifr.ifr_ifindex;
-+#else
-+ return 0;
-+#endif
- }
-
- /*****************************************************************************
-@@ -568,6 +572,7 @@ normal_bind:
- if ( bind_addr.ss.ss_family == AF_INET
- && IN_MULTICAST( ntohl(bind_addr.sin.sin_addr.s_addr)) )
- {
-+#ifdef IP_ADD_SOURCE_MEMBERSHIP /* unavailable on GNU Hurd */
- if ( connect_addr.ss.ss_family != AF_UNSPEC )
- {
- /* Source-specific multicast */
-@@ -586,7 +591,10 @@ normal_bind:
- &connect_addr );
- exit(EXIT_FAILURE);
- }
-- else if ( i_bind_if_index )
-+ else
-+#endif
-+#ifndef __FreeBSD__
-+ if ( i_bind_if_index )
- {
- /* Linux-specific interface-bound multicast */
- struct ip_mreqn imr;
-@@ -603,6 +611,7 @@ normal_bind:
- exit(EXIT_FAILURE);
- }
- else
-+#endif
- {
- /* Regular multicast */
- struct ip_mreq imr;
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 5564d33..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-nonlinux.patch
--
multicat packaging
More information about the pkg-multimedia-commits
mailing list