Your message dated Wed, 30 Aug 2017 19:40:28 +0000 with message-id <e1dn8qi-0000ba...@fasolo.debian.org> and subject line Bug#868936: fixed in vlc 2.2.6-5 has caused the Debian Bug report #868936, regarding vlc: port to libupnp-1.8 to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 868936: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=868936 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---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 <uklei...@debian.org> 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 <uklei...@debian.org> 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 000000000000..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 <vector> + #include <string> + +-#include <upnp/upnp.h> +-#include <upnp/upnptools.h> ++#include <upnp-1.8/upnp.h> ++#include <upnp-1.8/upnptools.h> + + #include <vlc_common.h> + +--- 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, &p_description_doc ); ++ i_res = UpnpDownloadXmlDoc( UpnpDiscovery_get_Location_cstr( p_discovery ), ++ &p_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( UpnpDiscovery_get_DeviceID_cstr( p_discovery ) ); + + } + break; + + case UPNP_EVENT_RECEIVED: + { +- Upnp_Event* p_e = ( Upnp_Event* )p_event; ++ const UpnpEvent* p_e = ( const UpnpEvent* )p_event; + +- MediaServer* p_server = p_sys->p_server_list->getServerBySID( p_e->Sid ); ++ MediaServer* p_server = p_sys->p_server_list->getServerBySID( UpnpEvent_get_SID_cstr( p_e ) ); + if ( p_server ) p_server->fetchContents(); + } + break; +@@ -380,9 +381,9 @@ + { + /* Re-subscribe. */ + +- Upnp_Event_Subscribe* p_s = ( Upnp_Event_Subscribe* )p_event; ++ const UpnpEventSubscribe* p_s = ( const UpnpEventSubscribe* )p_event; + +- MediaServer* p_server = p_sys->p_server_list->getServerBySID( p_s->Sid ); ++ MediaServer* p_server = p_sys->p_server_list->getServerBySID( UpnpEventSubscribe_get_SID_cstr( p_s ) ); + if ( p_server ) p_server->subscribeToContentDirectory(); + } + break; diff --git a/debian/patches/series b/debian/patches/series index 8733a5586d5e..34b9f10cb668 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,4 @@ 0011-codec-avcodec-check-avcodec-visible-sizes.patch 0012-decoder-check-visible-size-when-creating-buffer.patch 0013-codec-flac-fix-heap-write-overflow-on-frame-format-c.patch +0014-port-to-libupnp-1.8.patch -- 2.11.0
--- End Message ---
--- Begin Message ---Source: vlc Source-Version: 2.2.6-5 We believe that the bug you reported is fixed in the latest version of vlc, which is due to be installed in the Debian FTP archive. A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 868...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Sebastian Ramacher <sramac...@debian.org> (supplier of updated vlc package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@ftp-master.debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Format: 1.8 Date: Wed, 30 Aug 2017 20:57:06 +0200 Source: vlc Binary: vlc libvlc-dev libvlc5 libvlccore-dev libvlccore8 libvlc-bin vlc-bin vlc-data vlc-l10n vlc-plugin-base vlc-plugin-access-extra vlc-plugin-video-output vlc-plugin-video-splitter vlc-plugin-visualization vlc-plugin-skins2 vlc-plugin-qt vlc-plugin-fluidsynth vlc-plugin-jack vlc-plugin-notify vlc-plugin-sdl vlc-plugin-svg vlc-plugin-zvbi vlc-plugin-samba Architecture: source Version: 2.2.6-5 Distribution: unstable Urgency: medium Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers@lists.alioth.debian.org> Changed-By: Sebastian Ramacher <sramac...@debian.org> Description: libvlc-bin - tools for VLC's base library libvlc-dev - development files for libvlc libvlc5 - multimedia player and streamer library libvlccore-dev - development files for libvlccore libvlccore8 - base library for VLC and its modules vlc - multimedia player and streamer vlc-bin - binaries from VLC vlc-data - Common data for VLC vlc-l10n - Translations for VLC vlc-plugin-access-extra - multimedia player and streamer (extra access plugins) vlc-plugin-base - multimedia player and streamer (base plugins) vlc-plugin-fluidsynth - FluidSynth plugin for VLC vlc-plugin-jack - Jack audio plugins for VLC vlc-plugin-notify - LibNotify plugin for VLC vlc-plugin-qt - multimedia player and streamer (Qt plugin) vlc-plugin-samba - Samba plugin for VLC vlc-plugin-sdl - SDL video and audio output plugin for VLC vlc-plugin-skins2 - multimedia player and streamer (Skins2 plugin) vlc-plugin-svg - SVG plugin for VLC vlc-plugin-video-output - multimedia player and streamer (video output plugins) vlc-plugin-video-splitter - multimedia player and streamer (video splitter plugins) vlc-plugin-visualization - multimedia player and streamer (visualization plugins) vlc-plugin-zvbi - VBI teletext plugin for VLC Closes: 868936 Changes: vlc (2.2.6-5) unstable; urgency=medium . * debian/control: Bump Standards-Version. * debian/patches: Add support for libupnp 1.8. (Closes: #868936) Checksums-Sha1: 8a2f8039995513c326849af5409be220825496ee 6205 vlc_2.2.6-5.dsc 1a476b124fae657e65c0f0b721402ee79269aef4 80696 vlc_2.2.6-5.debian.tar.xz Checksums-Sha256: 4026881ead94211c79055d50766b2e6e95030df56bef8d01129289ccb4eb96cc 6205 vlc_2.2.6-5.dsc 707d5f0518ba37091083c6c389c6b756da5353302293f1b630b3725d2ba4bebd 80696 vlc_2.2.6-5.debian.tar.xz Files: 2c9cff8323fe72da1f7a441027875c05 6205 video optional vlc_2.2.6-5.dsc d0211d1db60762a93324ed37c62869ae 80696 video optional vlc_2.2.6-5.debian.tar.xz -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE94y6B4F7sUmhHTOQafL8UW6nGZMFAlmnD1EACgkQafL8UW6n GZPtxw//TthggGQu4a+oBIzZosWLBbvmU82K0iQwZ/eV/3QcvPLZB8CCrYKfk/g1 Xs/0fxMlH+l+UXlvlJ2JL1nwqU8jVpIDUTVgeDPENQ4XodrQxcDq2q9x6NR4U0vM r7N88Bnkz9BcSK/YqUJABZtbmtzQAwT/tLszE6+6922wL3rMHOar9Git58yV3O96 RnnJgFOIhXiPEcqu7uz1tToKU08xtf0yJbKOOzMJC7eQRRgIo/mknZ79ozNmKHVB JPkc9QI9T/YRfWR9WnaCKSWVAEY9H2o91UnrwHroQjjn1zwpfpGJaitVYD4myube RzQF4vMD1nU/bplzMWbdmh67lOs1N9pYWP/DpuFGfWbCvtvp7cc6UOboopQQn8de gtaasrGpJ8po6G9JhZe/B+tGJxPekCfcpG3Ho9/UtDHMzn79knigOGoTAwlsCnwk sQNpzsvI+rmbdLRQhq4/cVjOyk5bRnVaOsXr30XKrmEaJjl6UdpITluSgnqAbefr CBen7jc8EpMVfFli9p0Ej2RXv5c5sH2V1zpIGAZD31KjkrQSTTvVgVCMI7EJctPm Exys4+ZocJeSW54W7wNZqYh642M0wWazVgsG3a/SNS73QmEjZqE8RLHzvjk2PxSi Qz07hxGBMBrwVhlCaELsOQhTbne9rCnV57EA4r8llcShvHiZA1w= =p3wt -----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________ pkg-multimedia-maintainers mailing list pkg-multimedia-maintainers@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
