[SCM] vlc/master: Drop patches that were merged upstream
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 17 01:33:31 UTC 2014
The following commit has been merged in the master branch:
commit 960613b6a3d98f3f0a583a87cf1e9229bbe848ae
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat Aug 16 18:43:17 2014 -0400
Drop patches that were merged upstream
diff --git a/debian/patches/freerdp-1.1.0-beta2-API.patch b/debian/patches/freerdp-1.1.0-beta2-API.patch
deleted file mode 100644
index 0c8ed1c..0000000
--- a/debian/patches/freerdp-1.1.0-beta2-API.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-Description: support FreeRDP 1.1.0-beta2 API
-Origin: upstream,
- http://git.videolan.org/?p=vlc/vlc-2.2.git;a=commit;h=14c90980a039175db436beb65419b8146c056db5
-Bug-Debian: https://bugs.debian.org/757951
-Last-Update: 2014-08-15
-
-diff --git a/modules/access/rdp.c b/modules/access/rdp.c
-index 8b6d12d..2011cfb 100644
---- a/modules/access/rdp.c
-+++ b/modules/access/rdp.c
-@@ -41,6 +41,22 @@
- #include <freerdp/channels/channels.h>
- #include <freerdp/gdi/gdi.h>
-
-+#if !defined(FREERDP_INTERFACE_VERSION)
-+# include <freerdp/version.h>
-+#endif
-+
-+#if !defined(FREERDP_VERSION_MAJOR) || \
-+ (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 ))
-+# define SoftwareGdi sw_gdi
-+# define Fullscreen fullscreen
-+# define ServerHostname hostname
-+# define Username username
-+# define Password password
-+# define ServerPort port
-+# define EncryptionMethods encryption
-+# define ContextSize context_size
-+#endif
-+
- #include <errno.h>
- #ifdef HAVE_POLL
- # include <poll.h>
-@@ -198,15 +214,15 @@ static bool preConnectHandler( freerdp *p_instance )
- demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys;
-
- /* Configure connexion */
-- p_instance->settings->sw_gdi = true; /* render in buffer */
-- p_instance->settings->fullscreen = true;
-- p_instance->settings->hostname = strdup( p_sys->psz_hostname );
-- p_instance->settings->username =
-+ p_instance->settings->SoftwareGdi = true; /* render in buffer */
-+ p_instance->settings->Fullscreen = true;
-+ p_instance->settings->ServerHostname = strdup( p_sys->psz_hostname );
-+ p_instance->settings->Username =
- var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "user" );
-- p_instance->settings->password =
-+ p_instance->settings->Password =
- var_InheritString( p_vlccontext->p_demux, CFG_PREFIX "password" );
-- p_instance->settings->port = p_sys->i_port;
-- p_instance->settings->encryption =
-+ p_instance->settings->ServerPort = p_sys->i_port;
-+ p_instance->settings->EncryptionMethods =
- var_InheritBool( p_vlccontext->p_demux, CFG_PREFIX "encrypt" );
-
- return true;
-@@ -217,9 +233,16 @@ static bool postConnectHandler( freerdp *p_instance )
- vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context;
-
- msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
-+#if (FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 )
-+ p_instance->settings->DesktopWidth,
-+ p_instance->settings->DesktopHeight,
-+ p_instance->settings->ColorDepth
-+#else
- p_instance->settings->width,
- p_instance->settings->height,
-- p_instance->settings->color_depth );
-+ p_instance->settings->color_depth
-+#endif
-+ );
-
- p_instance->update->DesktopResize = desktopResizeHandler;
- p_instance->update->BeginPaint = beginPaintHandler;
-@@ -415,7 +438,7 @@ static int Open( vlc_object_t *p_this )
- p_sys->p_instance->Authenticate = authenticateHandler;
-
- /* Set up context handlers and let it be allocated */
-- p_sys->p_instance->context_size = sizeof( vlcrdp_context_t );
-+ p_sys->p_instance->ContextSize = sizeof( vlcrdp_context_t );
- freerdp_context_new( p_sys->p_instance );
-
- vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_sys->p_instance->context;
-
diff --git a/debian/patches/hurd.patch b/debian/patches/hurd.patch
index b57ef69..acd0314 100644
--- a/debian/patches/hurd.patch
+++ b/debian/patches/hurd.patch
@@ -11,7 +11,7 @@ Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Forwarded: not-needed
--- a/src/posix/thread.c
+++ b/src/posix/thread.c
-@@ -327,7 +327,7 @@ void vlc_cond_init (vlc_cond_t *p_condva
+@@ -300,7 +300,7 @@ void vlc_cond_init (vlc_cond_t *p_condva
if (unlikely(pthread_condattr_init (&attr)))
abort ();
@@ -20,7 +20,7 @@ Forwarded: not-needed
vlc_clock_setup ();
pthread_condattr_setclock (&attr, vlc_clock_id);
#endif
-@@ -929,7 +929,7 @@ mtime_t mdate (void)
+@@ -874,7 +874,7 @@ mtime_t mdate (void)
*/
void mwait (mtime_t deadline)
{
@@ -29,7 +29,7 @@ Forwarded: not-needed
vlc_clock_setup ();
/* If the deadline is already elapsed, or within the clock precision,
* do not even bother the system timer. */
-@@ -956,7 +956,7 @@ void msleep (mtime_t delay)
+@@ -901,7 +901,7 @@ void msleep (mtime_t delay)
{
struct timespec ts = mtime_to_ts (delay);
diff --git a/debian/patches/pnap-grammar.patch b/debian/patches/pnap-grammar.patch
deleted file mode 100644
index f0da5d8..0000000
--- a/debian/patches/pnap-grammar.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Edward Wang <edward.c.wang at compdigitec.com>
-Date: Sat, 13 Jul 2013 15:38:49 -0400
-Origin: upstream, http://git.videolan.org/?p=vlc.git;a=commitdiff;h=69d75edde2c5b7f70f238d7f7546cc418c3f18ea
-
---- a/modules/gui/qt4/dialogs/firstrun.cpp
-+++ b/modules/gui/qt4/dialogs/firstrun.cpp
-@@ -69,16 +69,16 @@ void FirstRun::buildPrivDialog()
- QGroupBox *blabla = new QGroupBox( qtr( "Privacy and Network Access Policy" ) );
- QGridLayout *blablaLayout = new QGridLayout( blabla );
- QLabel *text = new QLabel( qtr(
-- "<p>In order to protect your privacy, the <i>VLC media player</i> "
-+ "<p>In order to protect your privacy, <i>VLC media player</i> "
- "does <b>not</b> collect personal data or transmit them, "
- "not even in anonymized form, to anyone."
- "</p>\n"
- "<p>Nevertheless, <i>VLC</i> is able to automatically retrieve "
- "information about the media in your playlist from third party "
-- "Internet-based services. That includes covert arts, track names, "
-- "authoring and other meta-data."
-+ "Internet-based services. This includes cover art, track names, "
-+ "artist names and other meta-data."
- "</p>\n"
-- "That may entail identifying some of your media files to third party "
-+ "Consequently, this may entail identifying some of your media files to third party "
- "entities. Therefore the <i>VLC</i> developers require your express "
- "consent for the media player to access the Internet automatically."
- "</p>\n"
---
-1.7.10.4
-
diff --git a/debian/patches/series b/debian/patches/series
index 3e87aa3..27e280c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-pnap-grammar.patch
hurd.patch
-freerdp-1.1.0-beta2-API.patch
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list