Bug#868936: vlc: port to libupnp-1.8

2017-08-30 Thread Sebastian Ramacher 
Hi Uwe

On 2017-08-30 10:20:03, Uwe Kleine-König wrote:
> On 08/29/2017 09:24 PM, Sebastian Ramacher wrote:
> > Control: clone -1 -2
> > Control: reassign -2 libupnp1.8-dev 1:1.8.2-1
> > Control: retitle -2 libupnp1.8-dev: Please take over libupnp-dev
> > Control: block -1 by -2
> > 
> > As the title says, please take over libupnp-dev and coordinate the 
> > transition
> > with the release team.
> 
> This is the eventual plan and the reason I'm working on getting rdeps of
> libupnp6 to move to the new libupnp1.8. Then libupnp6 can go away and I
> maintain a package less :-)

Then please follow the normal library transition procedure:
- Prepare a libupnp-dev provided by pupnp-1.8 in experimental.
- If reverse build dependencies of libupnp-dev do not build with the version in
  experimental, file bugs.
- Coordinate the transition with the release team.

This avoid a lot of really unnecessary changes in build dependencies.

Thanks!

> I'd like to create patches for all rdeps first though and vlc is my
> stalking-horse. Once vlc is converted I want to address the other
> affected packages.

A patch for 1.8 support has been merged. Once the transition starts, vlc will
switch to 1.8.

Cheers
-- 
Sebastian Ramacher


signature.asc
Description: PGP signature
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#868936: vlc: port to libupnp-1.8

2017-08-30 Thread Uwe Kleine-König 
Hello Sebastian,

On 08/29/2017 09:24 PM, Sebastian Ramacher wrote:
> Control: clone -1 -2
> Control: reassign -2 libupnp1.8-dev 1:1.8.2-1
> Control: retitle -2 libupnp1.8-dev: Please take over libupnp-dev
> Control: block -1 by -2
> 
> As the title says, please take over libupnp-dev and coordinate the transition
> with the release team.

This is the eventual plan and the reason I'm working on getting rdeps of
libupnp6 to move to the new libupnp1.8. Then libupnp6 can go away and I
maintain a package less :-)

I'd like to create patches for all rdeps first though and vlc is my
stalking-horse. Once vlc is converted I want to address the other
affected packages.

Best regards
Uwe



signature.asc
Description: OpenPGP digital signature
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Processed: Re: Bug#868936: vlc: port to libupnp-1.8

2017-08-29 Thread Debian Bug Tracking System 
Processing control commands:

> clone -1 -2
Bug #868936 [vlc] vlc: port to libupnp-1.8
Bug 868936 cloned as bug 873656
> reassign -2 libupnp1.8-dev 1:1.8.2-1
Bug #873656 [vlc] vlc: port to libupnp-1.8
Bug reassigned from package 'vlc' to 'libupnp1.8-dev'.
No longer marked as found in versions vlc/2.2.6-4.
Ignoring request to alter fixed versions of bug #873656 to the same values 
previously set
Bug #873656 [libupnp1.8-dev] vlc: port to libupnp-1.8
Marked as found in versions pupnp-1.8/1:1.8.2-1.
> retitle -2 libupnp1.8-dev: Please take over libupnp-dev
Bug #873656 [libupnp1.8-dev] vlc: port to libupnp-1.8
Changed Bug title to 'libupnp1.8-dev: Please take over libupnp-dev' from 'vlc: 
port to libupnp-1.8'.
> block -1 by -2
Bug #868936 [vlc] vlc: port to libupnp-1.8
868936 was not blocked by any bugs.
868936 was not blocking any bugs.
Added blocking bug(s) of 868936: 873656

-- 
868936: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=868936
873656: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=873656
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#868936: vlc: port to libupnp-1.8

2017-08-29 Thread Sebastian Ramacher 
Control: clone -1 -2
Control: reassign -2 libupnp1.8-dev 1:1.8.2-1
Control: retitle -2 libupnp1.8-dev: Please take over libupnp-dev
Control: block -1 by -2

As the title says, please take over libupnp-dev and coordinate the transition
with the release team.

Cheers

On 2017-08-29 21:05:27, Uwe Kleine-König wrote:
> Control: reassign -1 vlc 2.2.6-4
> 
> Hello,
> 
> On Fri, Jul 28, 2017 at 05:05:35PM +0200, Jean-Baptiste Kempf wrote:
> > Hello Sebastian, Bugreporters,
> > 
> > On Fri, 21 Jul 2017, at 14:58, Sebastian Ramacher wrote:
> > > > On Thu, Jul 20, 2017 at 02:34:42PM +0200, Sebastian Ramacher wrote:
> > > > > > currently there are two versions of libupnp in the archive 
> > > > > > (libupnp6 and
> > > > > > libupnp-1.8-10). To be able to remove libupnp6 (i.e. the older of 
> > > > > > the
> > > > > > two) it is necessary to port vlc (and all other rdepends) to
> > > > > > libupnp-1.8.
> > > > > > 
> > > > > > The patch below implements this for vlc. With this applied I can 
> > > > > > still
> > > > > > playback videos with vlc.
> > > > > 
> > > > > As long as the adoption to upnp 1.8 requires to add -1.8 everywhere 
> > > > > (are we
> > > > > supposed to change it to -1.9 next month with the next upstream 
> > > > > release?), this
> > > > > was explicitly NAKed upstream.
> > > > 
> > > > Which upstream? vlc I suppose? Do you have a link to the discussion
> > > > handy?
> > > 
> > > Yes, vlc upstream. This was over IRC and I don't have logs. But I'm sure
> > > J-B will repeat it if necessary (CCed)
> > 
> > Sure.
> > 
> > Since when releasing a new version of a library requires changing all
> > the includes and all the pkg-config detection?
> > 
> > SO names are done to notate API/ABI changes within a library and
> > PKG-CONFIG files are done to show where to find the includes folder and
> > how to link.
> > 
> > If you do a moderate breaking change, you change the API, the ABI, and
> > bump the library version name majorly. And people linking against you
> > will need to adapt, when they bump the requirements. This was done for
> > almost every minor C/C++ library, since forever.
> > 
> > So, sorry, but this way of renaming the headers folder name and changing
> > the .pc files is completely backward; and sorry, totally not justified,
> > because it's justified for complete rewrites, not for a moderate change.
> 
> OK, libupnp-1.8 was fixed in 1.8.2, I added the updated patch at the end
> of the mail. I hope it is acceptable as is now. I'm rereassigning back
> to vlc accordingly.
> 
> One thing I'd like to point out to prevent surprises: Theoretically
> libupnp should also compile and work on Windows. Depending on how much
> you (vlc) care about your Windows port you might want to evaluate that
> first. I quickly tried to compile libupnp on Windows which failed, but
> the same is true for the 1.6 branch, so this might just be me being
> unable to use the Windows compiler.
> 
> Best regards
> Uwe
> 
> From 7ccf2d2ed3dcc23bbd6f2a3dbf6ba428fc641d1f Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= 
> Date: Wed, 19 Jul 2017 17:26:52 +0200
> Subject: [PATCH] Port vlc to libupnp-1.8
> 
> ---
>  debian/changelog  |  6 ++
>  debian/control|  2 +-
>  debian/patches/0014-port-to-libupnp-1.8.patch | 94 
> +++
>  debian/patches/series |  1 +
>  4 files changed, 102 insertions(+), 1 deletion(-)
>  create mode 100644 debian/patches/0014-port-to-libupnp-1.8.patch
> 
> diff --git a/debian/changelog b/debian/changelog
> index 767b9c2567eb..7476b8575930 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,9 @@
> +vlc (2.2.6-5) UNRELEASED; urgency=medium
> +
> +  * port to libupnp-1.8
> +
> + -- Uwe Kleine-König   Tue, 29 Aug 2017 18:48:43 +
> +
>  vlc (2.2.6-4) unstable; urgency=medium
>  
>* debian/upstream: Add DEP-12 metadata.
> diff --git a/debian/control b/debian/control
> index c9ae459a5545..84bcaa7e9eb6 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -86,7 +86,7 @@ Build-Depends: autopoint,
> libtheora-dev (>= 1.0),
> libtwolame-dev (>= 0.3.8),
> libudev-dev [linux-any],
> -   libupnp-dev,
> +   libupnp1.8-dev,
> libv4l-dev [linux-any],
> libva-dev [kfreebsd-any linux-any],
> libvcdinfo-dev (>= 0.7.22),
> diff --git a/debian/patches/0014-port-to-libupnp-1.8.patch 
> b/debian/patches/0014-port-to-libupnp-1.8.patch
> new file mode 100644
> index ..8e842412cd0c
> --- /dev/null
> +++ b/debian/patches/0014-port-to-libupnp-1.8.patch
> @@ -0,0 +1,94 @@
> +--- a/modules/services_discovery/upnp.cpp
>  b/modules/services_discovery/upnp.cpp
> +@@ -80,7 +80,7 @@
> + /*
> +  * Local prototypes
> +  */
> +-static int Callback( Upnp_EventType event_type, void* p_event, void* 
>

Processed: Re: Bug#868936: vlc: port to libupnp-1.8

2017-08-29 Thread Debian Bug Tracking System 
Processing control commands:

> reassign -1 vlc 2.2.6-4
Bug #868936 [pupnp-1.8] vlc: port to libupnp-1.8
Bug reassigned from package 'pupnp-1.8' to 'vlc'.
No longer marked as found in versions 1:1.8.1-1.
Ignoring request to alter fixed versions of bug #868936 to the same values 
previously set
Bug #868936 [vlc] vlc: port to libupnp-1.8
Marked as found in versions vlc/2.2.6-4.

-- 
868936: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=868936
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Processed: Re: Bug#868936: vlc: port to libupnp-1.8

2017-07-20 Thread Debian Bug Tracking System 
Processing control commands:

> reassign -1 pupnp-1.8 1:1.8.1-1
Bug #868936 [src:vlc] vlc: port to libupnp-1.8
Bug reassigned from package 'src:vlc' to 'pupnp-1.8'.
No longer marked as found in versions vlc/2.2.6-3.
Ignoring request to alter fixed versions of bug #868936 to the same values 
previously set
Bug #868936 [pupnp-1.8] vlc: port to libupnp-1.8
There is no source info for the package 'pupnp-1.8' at version '1:1.8.1-1' with 
architecture ''
Unable to make a source version for version '1:1.8.1-1'
Marked as found in versions 1:1.8.1-1.

-- 
868936: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=868936
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#868936: vlc: port to libupnp-1.8

2017-07-20 Thread Sebastian Ramacher 
Control: reassign -1 pupnp-1.8 1:1.8.1-1

Hi

On 2017-07-19 18:26:25, Uwe Kleine-König wrote:
> Package: src:vlc
> Version: 2.2.6-3ukl1
> Severity: wishlist
> Tags: patch
> 
> Hello,
> 
> currently there are two versions of libupnp in the archive (libupnp6 and
> libupnp-1.8-10). To be able to remove libupnp6 (i.e. the older of the
> two) it is necessary to port vlc (and all other rdepends) to
> libupnp-1.8.
> 
> The patch below implements this for vlc. With this applied I can still
> playback videos with vlc.

As long as the adoption to upnp 1.8 requires to add -1.8 everywhere (are we
supposed to change it to -1.9 next month with the next upstream release?), this
was explicitly NAKed upstream. So please fix the include paths and the name of
the pkg-config module to point back to upnp.

All other parts of the patch can be done with a simple SONAME bump and a normal
library transition and adding calls to UpnpDiscovery_get_*_cstr depending on the
upnp version.

Cheers

> Best regards and thanks
> Uwe
> 
> -->8--
> From: Uwe Kleine-König 
> Date: Wed, 19 Jul 2017 17:26:52 +0200
> Subject: [PATCH] Port vlc to libupnp-1.8
> 
> ---
>  debian/changelog  |   6 ++
>  debian/control|   2 +-
>  debian/patches/0014-port-to-libupnp-1.8.patch | 107 
> ++
>  debian/patches/series |   1 +
>  4 files changed, 115 insertions(+), 1 deletion(-)
>  create mode 100644 debian/patches/0014-port-to-libupnp-1.8.patch
> 
> diff --git a/debian/changelog b/debian/changelog
> index fffe2478af58..c9cc38b82630 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,9 @@
> +vlc (2.2.6-4) UNRELEASED; urgency=medium
> +
> +  * Port to libupnp-1.8
> +
> + -- Uwe Kleine-König   Wed, 19 Jul 2017 17:25:10 +0200
> +
>  vlc (2.2.6-3) unstable; urgency=medium
>  
>[ Mateusz Łukasik ]
> diff --git a/debian/control b/debian/control
> index b9c6addd8c3f..601971f80e55 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -87,7 +87,7 @@ Build-Depends: autopoint,
> libtheora-dev (>= 1.0),
> libtwolame-dev (>= 0.3.8),
> libudev-dev [linux-any],
> -   libupnp-dev,
> +   libupnp-1.8-dev,
> libv4l-dev [linux-any],
> libva-dev [kfreebsd-any linux-any],
> libvcdinfo-dev (>= 0.7.22),
> diff --git a/debian/patches/0014-port-to-libupnp-1.8.patch 
> b/debian/patches/0014-port-to-libupnp-1.8.patch
> new file mode 100644
> index ..a24f42c7417b
> --- /dev/null
> +++ b/debian/patches/0014-port-to-libupnp-1.8.patch
> @@ -0,0 +1,107 @@
> +--- a/configure.ac
>  b/configure.ac
> +@@ -4040,7 +4040,7 @@
> + dnl
> + dnl UPnP Plugin (Intel SDK)
> + dnl
> +-PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto])
> ++PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp-1.8], [Intel UPNP 
> SDK],[auto])
> + 
> + EXTEND_HELP_STRING([Misc options:])
> + 
> +--- a/modules/services_discovery/upnp.hpp
>  b/modules/services_discovery/upnp.hpp
> +@@ -28,8 +28,8 @@
> + #include 
> + #include 
> + 
> +-#include 
> +-#include 
> ++#include 
> ++#include 
> + 
> + #include 
> + 
> +--- a/modules/services_discovery/upnp.cpp
>  b/modules/services_discovery/upnp.cpp
> +@@ -80,7 +80,7 @@
> + /*
> +  * Local prototypes
> +  */
> +-static int Callback( Upnp_EventType event_type, void* p_event, void* 
> p_user_data );
> ++static int Callback( Upnp_EventType event_type, const void* p_event, void* 
> p_user_data );
> + 
> + const char* xml_getChildElementValue( IXML_Element* p_parent,
> +   const char*   psz_tag_name );
> +@@ -325,7 +325,7 @@
> + /*
> +  * Handles all UPnP events
> +  */
> +-static int Callback( Upnp_EventType event_type, void* p_event, void* 
> p_user_data )
> ++static int Callback( Upnp_EventType event_type, const void* p_event, void* 
> p_user_data )
> + {
> + services_discovery_t* p_sd = ( services_discovery_t* ) p_user_data;
> + services_discovery_sys_t* p_sys = p_sd->p_sys;
> +@@ -336,22 +336,23 @@
> + case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
> + case UPNP_DISCOVERY_SEARCH_RESULT:
> + {
> +-struct Upnp_Discovery* p_discovery = ( struct Upnp_Discovery* 
> )p_event;
> ++const UpnpDiscovery* p_discovery = ( const UpnpDiscovery* )p_event;
> + 
> + IXML_Document *p_description_doc = 0;
> + 
> + int i_res;
> +-i_res = UpnpDownloadXmlDoc( p_discovery->Location, 
> _description_doc );
> ++i_res = UpnpDownloadXmlDoc( UpnpDiscovery_get_Location_cstr( 
> p_discovery ),
> ++_description_doc );
> + if ( i_res != UPNP_E_SUCCESS )
> + {
> + msg_Warn( p_sd, "Could not download device description! "
> + "Fetching data from %s failed: %s",
> +-

Bug#868936: vlc: port to libupnp-1.8

2017-07-19 Thread Sebastian Ramacher 
Control: found -1 2.2.6-3
Control: notfound -1 2.2.6-3ukl1
Control: tags -1 + upstream

Hi Uwe

On 2017-07-19 18:26:25, Uwe Kleine-König wrote:
> currently there are two versions of libupnp in the archive (libupnp6 and
> libupnp-1.8-10). To be able to remove libupnp6 (i.e. the older of the
> two) it is necessary to port vlc (and all other rdepends) to
> libupnp-1.8.
> 
> The patch below implements this for vlc. With this applied I can still
> playback videos with vlc.

Thanks for the patch. Please get the upstream parts of the patch included
upstream first [1]. (Ideally it would be applied to both current master, i.e.
3.0, and 2.2.x.) We will then cherry-pick it from there.

Cheers

[1] https://wiki.videolan.org/Git/#Submitting_patches

> 
> Best regards and thanks
> Uwe
> 
> -->8--
> From: Uwe Kleine-König 
> Date: Wed, 19 Jul 2017 17:26:52 +0200
> Subject: [PATCH] Port vlc to libupnp-1.8
> 
> ---
>  debian/changelog  |   6 ++
>  debian/control|   2 +-
>  debian/patches/0014-port-to-libupnp-1.8.patch | 107 
> ++
>  debian/patches/series |   1 +
>  4 files changed, 115 insertions(+), 1 deletion(-)
>  create mode 100644 debian/patches/0014-port-to-libupnp-1.8.patch
> 
> diff --git a/debian/changelog b/debian/changelog
> index fffe2478af58..c9cc38b82630 100644
> --- a/debian/changelog
> +++ b/debian/changelog
> @@ -1,3 +1,9 @@
> +vlc (2.2.6-4) UNRELEASED; urgency=medium
> +
> +  * Port to libupnp-1.8
> +
> + -- Uwe Kleine-König   Wed, 19 Jul 2017 17:25:10 +0200
> +
>  vlc (2.2.6-3) unstable; urgency=medium
>  
>[ Mateusz Łukasik ]
> diff --git a/debian/control b/debian/control
> index b9c6addd8c3f..601971f80e55 100644
> --- a/debian/control
> +++ b/debian/control
> @@ -87,7 +87,7 @@ Build-Depends: autopoint,
> libtheora-dev (>= 1.0),
> libtwolame-dev (>= 0.3.8),
> libudev-dev [linux-any],
> -   libupnp-dev,
> +   libupnp-1.8-dev,
> libv4l-dev [linux-any],
> libva-dev [kfreebsd-any linux-any],
> libvcdinfo-dev (>= 0.7.22),
> diff --git a/debian/patches/0014-port-to-libupnp-1.8.patch 
> b/debian/patches/0014-port-to-libupnp-1.8.patch
> new file mode 100644
> index ..a24f42c7417b
> --- /dev/null
> +++ b/debian/patches/0014-port-to-libupnp-1.8.patch
> @@ -0,0 +1,107 @@
> +--- a/configure.ac
>  b/configure.ac
> +@@ -4040,7 +4040,7 @@
> + dnl
> + dnl UPnP Plugin (Intel SDK)
> + dnl
> +-PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto])
> ++PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp-1.8], [Intel UPNP 
> SDK],[auto])

Ugh, why does everything gain a -1.8 suffix?

> + 
> + EXTEND_HELP_STRING([Misc options:])
> + 
> +--- a/modules/services_discovery/upnp.hpp
>  b/modules/services_discovery/upnp.hpp
> +@@ -28,8 +28,8 @@
> + #include 
> + #include 
> + 
> +-#include 
> +-#include 
> ++#include 
> ++#include 
> + 
> + #include 
> + 
> +--- a/modules/services_discovery/upnp.cpp
>  b/modules/services_discovery/upnp.cpp
> +@@ -80,7 +80,7 @@
> + /*
> +  * Local prototypes
> +  */
> +-static int Callback( Upnp_EventType event_type, void* p_event, void* 
> p_user_data );
> ++static int Callback( Upnp_EventType event_type, const void* p_event, void* 
> p_user_data );
> + 
> + const char* xml_getChildElementValue( IXML_Element* p_parent,
> +   const char*   psz_tag_name );
> +@@ -325,7 +325,7 @@
> + /*
> +  * Handles all UPnP events
> +  */
> +-static int Callback( Upnp_EventType event_type, void* p_event, void* 
> p_user_data )
> ++static int Callback( Upnp_EventType event_type, const void* p_event, void* 
> p_user_data )
> + {
> + services_discovery_t* p_sd = ( services_discovery_t* ) p_user_data;
> + services_discovery_sys_t* p_sys = p_sd->p_sys;
> +@@ -336,22 +336,23 @@
> + case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
> + case UPNP_DISCOVERY_SEARCH_RESULT:
> + {
> +-struct Upnp_Discovery* p_discovery = ( struct Upnp_Discovery* 
> )p_event;
> ++const UpnpDiscovery* p_discovery = ( const UpnpDiscovery* )p_event;
> + 
> + IXML_Document *p_description_doc = 0;
> + 
> + int i_res;
> +-i_res = UpnpDownloadXmlDoc( p_discovery->Location, 
> _description_doc );
> ++i_res = UpnpDownloadXmlDoc( UpnpDiscovery_get_Location_cstr( 
> p_discovery ),
> ++_description_doc );
> + if ( i_res != UPNP_E_SUCCESS )
> + {
> + msg_Warn( p_sd, "Could not download device description! "
> + "Fetching data from %s failed: %s",
> +-p_discovery->Location, UpnpGetErrorMessage( 
> i_res ) );
> ++UpnpDiscovery_get_Location_cstr( p_discovery ), 
> UpnpGetErrorMessage( i_res ) );
> +

Processed: Re: Bug#868936: vlc: port to libupnp-1.8

2017-07-19 Thread Debian Bug Tracking System 
Processing control commands:

> found -1 2.2.6-3
Bug #868936 [src:vlc] vlc: port to libupnp-1.8
Marked as found in versions vlc/2.2.6-3.
> notfound -1 2.2.6-3ukl1
Bug #868936 [src:vlc] vlc: port to libupnp-1.8
The source 'vlc' and version '2.2.6-3ukl1' do not appear to match any binary 
packages
No longer marked as found in versions vlc/2.2.6-3ukl1.
> tags -1 + upstream
Bug #868936 [src:vlc] vlc: port to libupnp-1.8
Added tag(s) upstream.

-- 
868936: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=868936
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems

___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#868936: vlc: port to libupnp-1.8

2017-07-19 Thread Uwe Kleine-König 
Package: src:vlc
Version: 2.2.6-3ukl1
Severity: wishlist
Tags: patch

Hello,

currently there are two versions of libupnp in the archive (libupnp6 and
libupnp-1.8-10). To be able to remove libupnp6 (i.e. the older of the
two) it is necessary to port vlc (and all other rdepends) to
libupnp-1.8.

The patch below implements this for vlc. With this applied I can still
playback videos with vlc.

Best regards and thanks
Uwe

-->8--
From: Uwe Kleine-König 
Date: Wed, 19 Jul 2017 17:26:52 +0200
Subject: [PATCH] Port vlc to libupnp-1.8

---
 debian/changelog  |   6 ++
 debian/control|   2 +-
 debian/patches/0014-port-to-libupnp-1.8.patch | 107 ++
 debian/patches/series |   1 +
 4 files changed, 115 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/0014-port-to-libupnp-1.8.patch

diff --git a/debian/changelog b/debian/changelog
index fffe2478af58..c9cc38b82630 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vlc (2.2.6-4) UNRELEASED; urgency=medium
+
+  * Port to libupnp-1.8
+
+ -- Uwe Kleine-König   Wed, 19 Jul 2017 17:25:10 +0200
+
 vlc (2.2.6-3) unstable; urgency=medium
 
   [ Mateusz Łukasik ]
diff --git a/debian/control b/debian/control
index b9c6addd8c3f..601971f80e55 100644
--- a/debian/control
+++ b/debian/control
@@ -87,7 +87,7 @@ Build-Depends: autopoint,
libtheora-dev (>= 1.0),
libtwolame-dev (>= 0.3.8),
libudev-dev [linux-any],
-   libupnp-dev,
+   libupnp-1.8-dev,
libv4l-dev [linux-any],
libva-dev [kfreebsd-any linux-any],
libvcdinfo-dev (>= 0.7.22),
diff --git a/debian/patches/0014-port-to-libupnp-1.8.patch 
b/debian/patches/0014-port-to-libupnp-1.8.patch
new file mode 100644
index ..a24f42c7417b
--- /dev/null
+++ b/debian/patches/0014-port-to-libupnp-1.8.patch
@@ -0,0 +1,107 @@
+--- a/configure.ac
 b/configure.ac
+@@ -4040,7 +4040,7 @@
+ dnl
+ dnl UPnP Plugin (Intel SDK)
+ dnl
+-PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp], [Intel UPNP SDK],[auto])
++PKG_ENABLE_MODULES_VLC([UPNP], [upnp], [libupnp-1.8], [Intel UPNP SDK],[auto])
+ 
+ EXTEND_HELP_STRING([Misc options:])
+ 
+--- a/modules/services_discovery/upnp.hpp
 b/modules/services_discovery/upnp.hpp
+@@ -28,8 +28,8 @@
+ #include 
+ #include 
+ 
+-#include 
+-#include 
++#include 
++#include 
+ 
+ #include 
+ 
+--- a/modules/services_discovery/upnp.cpp
 b/modules/services_discovery/upnp.cpp
+@@ -80,7 +80,7 @@
+ /*
+  * Local prototypes
+  */
+-static int Callback( Upnp_EventType event_type, void* p_event, void* 
p_user_data );
++static int Callback( Upnp_EventType event_type, const void* p_event, void* 
p_user_data );
+ 
+ const char* xml_getChildElementValue( IXML_Element* p_parent,
+   const char*   psz_tag_name );
+@@ -325,7 +325,7 @@
+ /*
+  * Handles all UPnP events
+  */
+-static int Callback( Upnp_EventType event_type, void* p_event, void* 
p_user_data )
++static int Callback( Upnp_EventType event_type, const void* p_event, void* 
p_user_data )
+ {
+ services_discovery_t* p_sd = ( services_discovery_t* ) p_user_data;
+ services_discovery_sys_t* p_sys = p_sd->p_sys;
+@@ -336,22 +336,23 @@
+ case UPNP_DISCOVERY_ADVERTISEMENT_ALIVE:
+ case UPNP_DISCOVERY_SEARCH_RESULT:
+ {
+-struct Upnp_Discovery* p_discovery = ( struct Upnp_Discovery* 
)p_event;
++const UpnpDiscovery* p_discovery = ( const UpnpDiscovery* )p_event;
+ 
+ IXML_Document *p_description_doc = 0;
+ 
+ int i_res;
+-i_res = UpnpDownloadXmlDoc( p_discovery->Location, _description_doc 
);
++i_res = UpnpDownloadXmlDoc( UpnpDiscovery_get_Location_cstr( 
p_discovery ),
++  _description_doc );
+ if ( i_res != UPNP_E_SUCCESS )
+ {
+ msg_Warn( p_sd, "Could not download device description! "
+ "Fetching data from %s failed: %s",
+-p_discovery->Location, UpnpGetErrorMessage( i_res 
) );
++UpnpDiscovery_get_Location_cstr( p_discovery ), 
UpnpGetErrorMessage( i_res ) );
+ return i_res;
+ }
+ 
+ MediaServer::parseDeviceDescription( p_description_doc,
+-p_discovery->Location, p_sd );
++UpnpDiscovery_get_Location_cstr(p_discovery), p_sd );
+ 
+ ixmlDocument_free( p_description_doc );
+ }
+@@ -359,18 +360,18 @@
+ 
+ case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE:
+ {
+-struct Upnp_Discovery* p_discovery = ( struct Upnp_Discovery* 
)p_event;
++const UpnpDiscovery* p_discovery = ( const UpnpDiscovery* )p_event;
+ 
+-p_sys->p_server_list->removeServer( p_discovery->DeviceId );
++p_sys->p_server_list->removeServer(