[SCM] liblivemedia/master: Refresh patches.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Thu Nov 22 13:16:52 UTC 2012


The following commit has been merged in the master branch:
commit 30f0ccb5a3dbceb230467b1c0bdb87e65450ba6e
Author: Alessio Treglia <alessio at debian.org>
Date:   Thu Nov 22 12:42:31 2012 +0000

    Refresh patches.

diff --git a/debian/patches/021_ip_mreq_source.diff b/debian/patches/021_ip_mreq_source.diff
index 16afcee..5eadff1 100644
--- a/debian/patches/021_ip_mreq_source.diff
+++ b/debian/patches/021_ip_mreq_source.diff
@@ -4,7 +4,7 @@
 
 --- liblivemedia.orig/groupsock/GroupsockHelper.cpp
 +++ liblivemedia/groupsock/GroupsockHelper.cpp
-@@ -441,12 +441,14 @@ Boolean socketLeaveGroup(UsageEnvironmen
+@@ -444,12 +444,14 @@ Boolean socketLeaveGroup(UsageEnvironmen
  // commands, and a special structure (ip_mreq_source).  If the include files
  // didn't define these, we do so here:
  #if !defined(IP_ADD_SOURCE_MEMBERSHIP)
diff --git a/debian/patches/022_synchronous_rtspclient.patch b/debian/patches/022_synchronous_rtspclient.patch
index beeaf72..4a2e591 100644
--- a/debian/patches/022_synchronous_rtspclient.patch
+++ b/debian/patches/022_synchronous_rtspclient.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- liblivemedia.orig/liveMedia/RTSPClient.cpp
 +++ liblivemedia/liveMedia/RTSPClient.cpp
-@@ -1691,7 +1691,6 @@ RTSPClient::RequestRecord* RTSPClient::R
+@@ -1756,7 +1756,6 @@ RTSPClient::RequestRecord* RTSPClient::R
  }
  
  
@@ -16,7 +16,7 @@ Forwarded: not-needed
  // Implementation of the old (synchronous) "RTSPClient" interface, using the new (asynchronous) interface:
  RTSPClient* RTSPClient::createNew(UsageEnvironment& env,
  				  int verbosityLevel,
-@@ -2011,5 +2010,3 @@ void RTSPClient::timeoutHandlerForSyncIn
+@@ -2076,5 +2075,3 @@ void RTSPClient::timeoutHandlerForSyncIn
    // Signal a break from the event loop (thereby returning from the blocking command):
    fWatchVariableForSyncInterface = ~0;
  }
@@ -24,7 +24,7 @@ Forwarded: not-needed
 -#endif
 --- liblivemedia.orig/liveMedia/include/RTSPClient.hh
 +++ liblivemedia/liveMedia/include/RTSPClient.hh
-@@ -288,7 +288,6 @@ private:
+@@ -306,7 +306,6 @@ private:
    unsigned fSessionCookieCounter;
    Boolean fHTTPTunnelingConnectionIsPending;
  
@@ -32,7 +32,7 @@ Forwarded: not-needed
    // Old "RTSPClient" interface, which performs synchronous (blocking) operations.
    // This will eventually go away, so new applications should not use it.
  public:
-@@ -347,7 +346,6 @@ private: // used to implement the old in
+@@ -365,7 +364,6 @@ private: // used to implement the old in
    char fWatchVariableForSyncInterface;
    char* fResultString;
    int fResultCode;

-- 
liblivemedia packaging



More information about the pkg-multimedia-commits mailing list