diff --git a/0001-codec-vpx-Detect-libvpx-1.8.0.patch b/0001-codec-vpx-Detect-libvpx-1.8.0.patch deleted file mode 100644 index f6cd66f..0000000 --- a/0001-codec-vpx-Detect-libvpx-1.8.0.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 5575fe3eb3fd46bada8662268b74d03493476a84 Mon Sep 17 00:00:00 2001 -From: Danny Milosavljevic -Date: Mon, 11 Feb 2019 16:07:12 +0100 -Subject: [PATCH] codec: vpx: Detect libvpx 1.8.0 and, if detected, use fewer - frame formats in the chroma_table - -Signed-off-by: Steve Lhomme ---- - modules/codec/vpx.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -Index: vlc-3.0.6/modules/codec/vpx.c -=================================================================== ---- vlc-3.0.6.orig/modules/codec/vpx.c 2018-03-29 14:04:52.000000000 +0200 -+++ vlc-3.0.6/modules/codec/vpx.c 2019-02-18 12:14:23.944856133 +0100 -@@ -116,6 +116,7 @@ static const struct - { VLC_CODEC_I440, VPX_IMG_FMT_I440, 8, 0 }, - - { VLC_CODEC_YV12, VPX_IMG_FMT_YV12, 8, 0 }, -+#if VPX_IMAGE_ABI_VERSION < 5 - { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 }, - { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 }, - { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 }, -@@ -128,7 +129,7 @@ static const struct - - { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 }, - { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 }, -- -+#endif - { VLC_CODEC_GBR_PLANAR, VPX_IMG_FMT_I444, 8, 1 }, - { VLC_CODEC_GBR_PLANAR_10L, VPX_IMG_FMT_I44416, 10, 1 }, - diff --git a/0002-Add-Avahi-implementation-for-chromecast-renderer-dis.patch b/0002-Add-Avahi-implementation-for-chromecast-renderer-dis.patch index 19b97bb..f4a5225 100644 --- a/0002-Add-Avahi-implementation-for-chromecast-renderer-dis.patch +++ b/0002-Add-Avahi-implementation-for-chromecast-renderer-dis.patch @@ -8,10 +8,10 @@ Subject: [PATCH 2/2] Add Avahi implementation for chromecast renderer modules/services_discovery/avahi.c | 246 ++++++++++++++++++++++++----- 1 file changed, 209 insertions(+), 37 deletions(-) -diff --git a/modules/services_discovery/avahi.c b/modules/services_discovery/avahi.c -index aa58c7f673..527e08a2e9 100644 ---- a/modules/services_discovery/avahi.c -+++ b/modules/services_discovery/avahi.c +Index: vlc-3.0.7.1/modules/services_discovery/avahi.c +=================================================================== +--- vlc-3.0.7.1.orig/modules/services_discovery/avahi.c ++++ vlc-3.0.7.1/modules/services_discovery/avahi.c @@ -33,6 +33,7 @@ #include #include @@ -57,7 +57,6 @@ index aa58c7f673..527e08a2e9 100644 AvahiThreadedPoll *poll; AvahiClient *client; vlc_dictionary_t services_name_to_input_item; --}; + vlc_object_t *parent; + bool renderer; +} discovery_sys_t; @@ -70,7 +69,7 @@ index aa58c7f673..527e08a2e9 100644 +struct services_discovery_sys_t +{ + discovery_sys_t s; -+}; + }; static const struct { @@ -92,7 +91,7 @@ index aa58c7f673..527e08a2e9 100644 }; #define NB_PROTOCOLS (sizeof(protocols) / sizeof(*protocols)) -+/***************************************************************************** + /***************************************************************************** + * helpers + *****************************************************************************/ +static void add_renderer( const char *psz_protocol, const char *psz_name, @@ -178,7 +177,7 @@ index aa58c7f673..527e08a2e9 100644 + } +} + - /***************************************************************************** ++/***************************************************************************** * client_callback *****************************************************************************/ static void client_callback( AvahiClient *c, AvahiClientState state, @@ -263,7 +262,7 @@ index aa58c7f673..527e08a2e9 100644 vlc_dictionary_insert( &p_sys->services_name_to_input_item, name, p_input ); services_discovery_AddItem( p_sd, p_input ); -@@ -238,8 +364,8 @@ static void browse_callback( +@@ -237,8 +363,8 @@ static void browse_callback( { VLC_UNUSED(b); VLC_UNUSED(flags); @@ -274,7 +273,7 @@ index aa58c7f673..527e08a2e9 100644 if( event == AVAHI_BROWSER_NEW ) { if( avahi_service_resolver_new( p_sys->client, interface, protocol, -@@ -247,22 +373,32 @@ static void browse_callback( +@@ -246,22 +372,32 @@ static void browse_callback( 0, resolve_callback, userdata ) == NULL ) { @@ -311,7 +310,7 @@ index aa58c7f673..527e08a2e9 100644 vlc_dictionary_remove_value_for_key( &p_sys->services_name_to_input_item, name, NULL, NULL ); -@@ -273,46 +409,41 @@ static void browse_callback( +@@ -279,46 +415,41 @@ static void clear_item( void* p_item, vo /***************************************************************************** * Open: initialize and create stuff *****************************************************************************/ @@ -367,7 +366,7 @@ index aa58c7f673..527e08a2e9 100644 goto error; } } -@@ -333,13 +464,39 @@ error: +@@ -339,13 +470,39 @@ error: return VLC_EGENERIC; } @@ -410,8 +409,8 @@ index aa58c7f673..527e08a2e9 100644 avahi_threaded_poll_stop( p_sys->poll ); avahi_client_free( p_sys->client ); -@@ -348,3 +505,18 @@ static void Close( vlc_object_t *p_this ) - vlc_dictionary_clear( &p_sys->services_name_to_input_item, NULL, NULL ); +@@ -354,3 +511,18 @@ static void Close( vlc_object_t *p_this + vlc_dictionary_clear( &p_sys->services_name_to_input_item, clear_item, NULL ); free( p_sys ); } + @@ -429,6 +428,3 @@ index aa58c7f673..527e08a2e9 100644 + vlc_renderer_discovery_sys *p_sys = p_rd->p_sys; + CloseCommon( &p_sys->s ); +} --- -2.20.1 - diff --git a/vlc-3.0.6.tar.xz b/vlc-3.0.6.tar.xz deleted file mode 100644 index 2084cba..0000000 --- a/vlc-3.0.6.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3 -size 25699704 diff --git a/vlc-3.0.7.1.tar.xz b/vlc-3.0.7.1.tar.xz new file mode 100644 index 0000000..6e23273 --- /dev/null +++ b/vlc-3.0.7.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0655804371096772f06104b75c21cde8a76e3b6c8a2fdadc97914f082c6264f5 +size 26052372 diff --git a/vlc-libssh2-ECDSA-version.patch b/vlc-libssh2-ECDSA-version.patch deleted file mode 100644 index 219f1f0..0000000 --- a/vlc-libssh2-ECDSA-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 11449b5cd8b415768e010d9b7c1d6ba3cea21f82 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= -Date: Wed, 20 Mar 2019 05:20:30 +0200 -Subject: [PATCH] sftp: fix version for ECDSA known hosts (fixes #22060) - -1.8.x is a stable branch, separate from the feature branch that contains -the ECDSA support. ---- - modules/access/sftp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/access/sftp.c b/modules/access/sftp.c -index e420b91ca9..dc7f6cc27f 100644 ---- a/modules/access/sftp.c -+++ b/modules/access/sftp.c -@@ -307,7 +307,7 @@ static int Open( vlc_object_t* p_this ) - case LIBSSH2_HOSTKEY_TYPE_DSS: - knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_SSHDSS; - break; --#if LIBSSH2_VERSION_NUM >= 0x010801 -+#if LIBSSH2_VERSION_NUM >= 0x010900 - case LIBSSH2_HOSTKEY_TYPE_ECDSA_256: - knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_ECDSA_256; - break; --- -2.11.0 - - diff --git a/vlc.changes b/vlc.changes index 65f9fbc..ed2d478 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Fri Jun 14 17:14:13 UTC 2019 - Dominique Leuenberger + +- Update to version 3.0.7.1: + + Access: Update libbluray to 1.1.2. + + Video Output: + * Fix hardware acceleration with some AMD drivers + * Improve direct3d11 HDR support +- Changes from version 3.0.7: + + Access: + * Improve Blu-ray support + * Fix sftp module build with libssh >= 1.8.1 + + Audio output: + * Fix pass-through on Android-23 + * Fix DirectSound drain + + Demux: Improve MP4 support + + Video Output: + * Fix 12 bits sources playback with Direct3D11 + * Fix crash on iOS + * Fix midstream aspect-ratio changes when Windows hardware decoding is on + * Fix HLG display with Direct3D11 + + Stream Output: Improve Chromecast support with new ChromeCast apps + + Misc: + * Update Youtube, Dailymotion, Vimeo, Soundcloud scripts + * Work around busy looping when playing an invalid item with loop enabled + + Updated translations. +- Drop vlc-libssh2-ECDSA-version.patch and 0001-codec-vpx-Detect-libvpx-1.8.0.patch: fixed upstream +- Rebase patches/0002-Add-Avahi-implementation-for-chromecast-renderer-dis.patch + ------------------------------------------------------------------- Thu May 16 09:33:50 UTC 2019 - Fabian Vogt diff --git a/vlc.spec b/vlc.spec index cd03298..6311a9d 100644 --- a/vlc.spec +++ b/vlc.spec @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -33,7 +33,7 @@ %bcond_with faad %bcond_with fdk_aac Name: vlc -Version: 3.0.6 +Version: 3.0.7.1 Release: 0 Summary: Graphical media player License: GPL-2.0-or-later AND LGPL-2.1-or-later @@ -57,10 +57,6 @@ Patch100: vlc-projectM-qt5.patch Patch101: 0001-Fix-leaking-AvahiServiceResolver-in-the-error-paths.patch # PATCH-FIX-UPSTREAM 0002-Add-Avahi-implementation-for-chromecast-renderer-dis.patch -- Use Avahi for discovery, microdns is not available Patch102: 0002-Add-Avahi-implementation-for-chromecast-renderer-dis.patch -# PATCH-FIX-UPSTREAM 0001-codec-vpx-Detect-libvpx-1.8.0.patch -- Fix building vlc with libvpx 1.8.0 -Patch103: 0001-codec-vpx-Detect-libvpx-1.8.0.patch -# PATCH-FIX-UPSTREAM vlc-libssh2-ECDSA-version.patch dimstar@opensuse.org -- sftp: fix version for ECDSA known hosts (fixes #22060) -Patch104: vlc-libssh2-ECDSA-version.patch BuildRequires: Mesa-devel BuildRequires: SDL-devel >= 1.2.10 BuildRequires: aalib-devel @@ -225,15 +221,15 @@ BuildRequires: pkgconfig(ncursesw) # Those are dependencies which are NOT provided in openSUSE, mostly for legal reasons. %if 0%{?BUILD_ORIG} BuildRequires: libxvidcore-devel +BuildRequires: pkgconfig(libdca) >= 0.0.5 +BuildRequires: pkgconfig(x264) >= 0.8.6 +BuildRequires: pkgconfig(x265) %if %{with faad} BuildRequires: libfaad-devel %endif %if %{with fdk_aac} BuildRequires: pkgconfig(fdk-aac) %endif -BuildRequires: pkgconfig(libdca) >= 0.0.5 -BuildRequires: pkgconfig(x264) >= 0.8.6 -BuildRequires: pkgconfig(x265) %endif %description @@ -389,8 +385,6 @@ default when `vlc` is invoked from an X session. %endif %patch101 -p1 %patch102 -p1 -%patch103 -p1 -%patch104 -p1 ### And LUA 5.3.1 has some more API changes if pkg-config --atleast-version 5.3.1 lua; then