summaryrefslogtreecommitdiffstats
path: root/meta-multimedia
diff options
context:
space:
mode:
authorRafaël Carré <funman@videolan.org>2016-03-03 16:50:29 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2016-03-07 13:02:19 +0100
commitfcb3d8912f7576aa603752ec0134155e0a44aa60 (patch)
treed1966a15f23bc867a3070c422a1878a107e61e7d /meta-multimedia
parent232d0d6df57c1aa2ad6f42fff4ddf037add81c95 (diff)
downloadmeta-openembedded-fcb3d8912f7576aa603752ec0134155e0a44aa60.tar.gz
vlc: update to 2.2.2
Drop rdp.c patch obsoleted by upstream changes Signed-off-by: Rafaël Carré <funman@videolan.org> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch19
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb (renamed from meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb)5
2 files changed, 2 insertions, 22 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch b/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch
deleted file mode 100644
index 8e554a980..000000000
--- a/meta-multimedia/recipes-multimedia/vlc/vlc/0009-fix-rdp-module.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1--- a/modules/access/rdp.c 2015-10-22 19:42:24.447445250 +0000
2+++ b/modules/access/rdp.c 2015-10-22 19:42:46.570445248 +0000
3@@ -428,8 +428,6 @@
4 if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0;
5 p_sys->i_frame_interval = 1000000 / p_sys->f_fps;
6
7- freerdp_channels_global_init();
8-
9 p_sys->p_instance = freerdp_new();
10 if ( !p_sys->p_instance )
11 {
12@@ -504,7 +502,6 @@
13
14 freerdp_disconnect( p_sys->p_instance );
15 freerdp_free( p_sys->p_instance );
16- freerdp_channels_global_uninit();
17
18 if ( p_sys->p_block )
19 block_Release( p_sys->p_block );
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb
index fa9d11a11..5b1583958 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.1.bb
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc_2.2.2.bb
@@ -11,8 +11,7 @@ SRC_URI += "file://0001-enable-subdir-objects.patch \
11 file://0006-make-opencv-configurable.patch \ 11 file://0006-make-opencv-configurable.patch \
12 file://0007-use-vorbisidec.patch \ 12 file://0007-use-vorbisidec.patch \
13 file://0008-fix-luaL-checkint.patch \ 13 file://0008-fix-luaL-checkint.patch \
14 file://0009-fix-rdp-module.patch \
15" 14"
16 15
17SRC_URI[md5sum] = "42273945758b521c408fabc7fd6d9946" 16SRC_URI[md5sum] = "f98d60f0f59ef72b6e3407f2ff09bda6"
18SRC_URI[sha256sum] = "543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb" 17SRC_URI[sha256sum] = "9ad23128be16f9b40ed772961272cb0748ed8e4aa1bc79c129e589feebea5fb5"