[SCM] libdvbpsi/master: Refresh patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Aug 19 09:34:56 UTC 2013


The following commit has been merged in the master branch:
commit 8e9333dfe8decc30f33f4c6b61221b510dc6a7ce
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Aug 19 10:34:46 2013 +0100

    Refresh patches.

diff --git a/debian/patches/fix-kfreebsd-build.patch b/debian/patches/fix-kfreebsd-build.patch
index 18843b7..4e7e5cd 100644
--- a/debian/patches/fix-kfreebsd-build.patch
+++ b/debian/patches/fix-kfreebsd-build.patch
@@ -3,11 +3,16 @@ Description: Fix build failure on kfreebsd
  {udp,tcp}_open to create sockets with SOCK_CLOEXEC. If SOCK_CLOEXEC is not
  available, FD_CLOEXEC is set instead.
 Author: Sebastian Ramacher <sramacher at debian.org>
-Last-Update: 2013-07-24
+Last-Update: 2013-08-19
 
---- libdvbpsi-1.0.0.orig/examples/dvbinfo/udp.c
-+++ libdvbpsi-1.0.0/examples/dvbinfo/udp.c
-@@ -49,6 +49,11 @@
+---
+ examples/dvbinfo/tcp.c |   27 ++++++++++++++++++++++++++-
+ examples/dvbinfo/udp.c |   27 ++++++++++++++++++++++++++-
+ 2 files changed, 52 insertions(+), 2 deletions(-)
+
+--- libdvbpsi.orig/examples/dvbinfo/udp.c
++++ libdvbpsi/examples/dvbinfo/udp.c
+@@ -47,6 +47,11 @@
  #   include <arpa/inet.h>
  #endif
  
@@ -19,7 +24,7 @@ Last-Update: 2013-07-24
  #include <assert.h>
  
  #include "udp.h"
-@@ -213,13 +218,33 @@ int udp_open(const char *interface, cons
+@@ -211,13 +216,33 @@ int udp_open(const char *interface, cons
  
      for (struct addrinfo *ptr = addr; ptr != NULL; ptr = ptr->ai_next )
      {
@@ -53,7 +58,7 @@ Last-Update: 2013-07-24
          /* Increase the receive buffer size to 1/2MB (8Mb/s during 1/2s)
           * to avoid packet loss caused in case of scheduling hiccups */
          setsockopt (s_ctl, SOL_SOCKET, SO_RCVBUF,
-@@ -259,7 +284,7 @@ ssize_t udp_read(int fd, void *buf, size
+@@ -257,7 +282,7 @@ ssize_t udp_read(int fd, void *buf, size
  {
      ssize_t err;
  again:
@@ -62,9 +67,9 @@ Last-Update: 2013-07-24
      if (err < 0)
      {
          switch(errno)
---- libdvbpsi-1.0.0.orig/examples/dvbinfo/tcp.c
-+++ libdvbpsi-1.0.0/examples/dvbinfo/tcp.c
-@@ -52,6 +52,11 @@
+--- libdvbpsi.orig/examples/dvbinfo/tcp.c
++++ libdvbpsi/examples/dvbinfo/tcp.c
+@@ -50,6 +50,11 @@
  #   include <arpa/inet.h>
  #endif
  
@@ -76,7 +81,7 @@ Last-Update: 2013-07-24
  #include "tcp.h"
  
  #ifdef HAVE_SYS_SOCKET_H
-@@ -100,13 +105,33 @@ int tcp_open(const char *ipaddress, int
+@@ -98,13 +103,33 @@ int tcp_open(const char *ipaddress, int
  
      for (struct addrinfo *ptr = addr; ptr != NULL; ptr = ptr->ai_next )
      {
@@ -110,7 +115,7 @@ Last-Update: 2013-07-24
          setsockopt (s_ctl, SOL_SOCKET, SO_REUSEADDR, &(int){ 1 }, sizeof (int));
  
          result = connect( s_ctl, ptr->ai_addr, ptr->ai_addrlen );
-@@ -128,7 +153,7 @@ ssize_t tcp_read(int fd, void *buf, size
+@@ -126,7 +151,7 @@ ssize_t tcp_read(int fd, void *buf, size
  {
      ssize_t err;
  again:

-- 
libdvbpsi packaging



More information about the pkg-multimedia-commits mailing list