[SCM] liblivemedia/master: Drop 022_synchronous_rtspclient.patch.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Mon Dec 24 01:38:42 UTC 2012
The following commit has been merged in the master branch:
commit f5d5ecdac96dc4799d02371be32d15c268d5450f
Author: Benjamin Drung <bdrung at debian.org>
Date: Mon Dec 24 02:12:16 2012 +0100
Drop 022_synchronous_rtspclient.patch.
The old, synchronous "RTSPClient" interface is deprecated. Any code that
happens to depend upon the old interface needs to explicitly be updated - by
"#define"ing RTSPCLIENT_SYNCHRONOUS_INTERFACE - so that it can continue using
it.
See http://lists.live555.com/pipermail/live-devel/2012-December/016267.html
diff --git a/debian/patches/022_synchronous_rtspclient.patch b/debian/patches/022_synchronous_rtspclient.patch
deleted file mode 100644
index 4a2e591..0000000
--- a/debian/patches/022_synchronous_rtspclient.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Description: Re-enable synchronous interface in RTSPClient to avoid API breakage.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: not-needed
----
- liveMedia/RTSPClient.cpp | 3 ---
- liveMedia/include/RTSPClient.hh | 2 --
- 2 files changed, 5 deletions(-)
-
---- liblivemedia.orig/liveMedia/RTSPClient.cpp
-+++ liblivemedia/liveMedia/RTSPClient.cpp
-@@ -1756,7 +1756,6 @@ RTSPClient::RequestRecord* RTSPClient::R
- }
-
-
--#ifdef RTSPCLIENT_SYNCHRONOUS_INTERFACE
- // Implementation of the old (synchronous) "RTSPClient" interface, using the new (asynchronous) interface:
- RTSPClient* RTSPClient::createNew(UsageEnvironment& env,
- int verbosityLevel,
-@@ -2076,5 +2075,3 @@ void RTSPClient::timeoutHandlerForSyncIn
- // Signal a break from the event loop (thereby returning from the blocking command):
- fWatchVariableForSyncInterface = ~0;
- }
--
--#endif
---- liblivemedia.orig/liveMedia/include/RTSPClient.hh
-+++ liblivemedia/liveMedia/include/RTSPClient.hh
-@@ -306,7 +306,6 @@ private:
- unsigned fSessionCookieCounter;
- Boolean fHTTPTunnelingConnectionIsPending;
-
--#ifdef RTSPCLIENT_SYNCHRONOUS_INTERFACE
- // Old "RTSPClient" interface, which performs synchronous (blocking) operations.
- // This will eventually go away, so new applications should not use it.
- public:
-@@ -365,7 +364,6 @@ private: // used to implement the old in
- char fWatchVariableForSyncInterface;
- char* fResultString;
- int fResultCode;
--#endif
- };
-
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index 8d894dd..bd87a8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
020_invalid_casts.patch
021_ip_mreq_source.patch
-022_synchronous_rtspclient.patch
--
liblivemedia packaging
More information about the pkg-multimedia-commits
mailing list