[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2024-03-16 Thread Sam James 
commit: b359a8fd43d7d49eafb2533e61417a1241719134
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 17 03:59:17 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 17 03:59:17 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b359a8fd

media-video/vlc: fix another modern C issue

Closes: https://bugs.gentoo.org/926261
Signed-off-by: Sam James  gentoo.org>

 media-video/vlc/files/vlc-3.0.20-c99-2.patch |  23 ++
 media-video/vlc/vlc-3.0.20-r4.ebuild | 519 +++
 2 files changed, 542 insertions(+)

diff --git a/media-video/vlc/files/vlc-3.0.20-c99-2.patch 
b/media-video/vlc/files/vlc-3.0.20-c99-2.patch
new file mode 100644
index ..56397d913d8e
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.20-c99-2.patch
@@ -0,0 +1,23 @@
+https://bugs.gentoo.org/926261
+https://code.videolan.org/videolan/vlc/-/commit/770789f265761fc7ab2de69ca105fec4ad93d9e2
+
+From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= 
+Date: Mon, 26 Feb 2018 20:36:29 +0200
+Subject: [PATCH] chromaprint: missing cast
+
+(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547)
+Signed-off-by: Steve Lhomme 
+--- a/modules/stream_out/chromaprint.c
 b/modules/stream_out/chromaprint.c
+@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, 
sout_stream_id_sys_t *id,
+ if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer )
+ {
+ if(! chromaprint_feed( p_sys->p_chromaprint_ctx,
+-   p_buf->p_buffer,
++   (int16_t *)p_buf->p_buffer,
+p_buf->i_buffer / BYTESPERSAMPLE ) )
+ msg_Warn( p_stream, "feed error" );
+ id->i_samples -= i_samples;
+-- 
+GitLab

diff --git a/media-video/vlc/vlc-3.0.20-r4.ebuild 
b/media-video/vlc/vlc-3.0.20-r4.ebuild
new file mode 100644
index ..d6d49549dc8b
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.20-r4.ebuild
@@ -0,0 +1,519 @@
+# Copyright 2000-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = * ]] ; then
+   if [[ ${PV%.} != ${PV} ]] ; then
+   EGIT_BRANCH="3.0.x"
+   fi
+   EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git;
+   inherit git-r3
+else
+   if [[ ${MY_P} = ${P} ]] ; then
+   
SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz;
+   else
+   
SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz;
+   fi
+   KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86"
+fi
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files 
and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/;
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast 
dav1d dbus
+   dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac 
fluidsynth
+   fontconfig +gcrypt gme keyring gstreamer +gui ieee1394 jack jpeg kate
+   libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc 
live lua
+   macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses 
nfs ogg
+   omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba 
sdl-image
+   sftp shout sid skins soxr speex srt ssl svg taglib theora tremor 
truetype twolame
+   udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi
+   cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx 
cpu_flags_x86_sse
+"
+REQUIRED_USE="
+   chromecast? ( encode )
+   directx? ( ffmpeg )
+   fontconfig? ( truetype )
+   libcaca? ( X )
+   libtar? ( skins )
+   libtiger? ( kate )
+   lua? ( ${LUA_REQUIRED_USE} )
+   skins? ( archive gui truetype X xml )
+   ssl? ( gcrypt )
+   vaapi? ( ffmpeg X )
+   vdpau? ( ffmpeg X )
+"
+BDEPEND="
+   >=sys-devel/gettext-0.19.8
+   virtual/pkgconfig
+   lua? ( ${LUA_DEPS} )
+   amd64? ( dev-lang/yasm )
+   wayland? ( dev-util/wayland-scanner )
+   x86? ( dev-lang/yasm )
+"
+# https://code.videolan.org/videolan/vlc/-/issues/17626 (bug #861143)
+   append-flags -fno-strict-aliasing
+   filter-lto
+
+   # Compatibility fix for Samba 4.
+   use samba && append-cppflags "-I${ESYSROOT}/usr/include/samba-4.0"
+
+   if use x86; then
+   # We need to disable -fstack-check if use >=gcc 4.8.0. bug 
#46
+   append-cflags $(test-flags-CC -fno-stack-check)
+   # Bug 569774
+   replace-flags -Os -O2
+   fi
+
+

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2023-05-26 Thread Sam James 
commit: e269d743a4ffd1a74e8efeeb2b088bfb2da47b72
Author: Sam James  gentoo  org>
AuthorDate: Sat May 27 02:16:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 27 02:16:51 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e269d743

media-video/vlc: rebase live patches

Closes: https://bugs.gentoo.org/901995
Signed-off-by: Sam James  gentoo.org>

 patch => vlc--configure-lua-version.patch} | 24 +-
 .../vlc/files/vlc--fix-libtremor-libs.patch| 20 ++
 media-video/vlc/vlc-.ebuild|  5 ++---
 3 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/media-video/vlc/files/vlc-configure_lua_version.patch 
b/media-video/vlc/files/vlc--configure-lua-version.patch
similarity index 82%
rename from media-video/vlc/files/vlc-configure_lua_version.patch
rename to media-video/vlc/files/vlc--configure-lua-version.patch
index 2628075535a6..d0ac9493a0fd 100644
--- a/media-video/vlc/files/vlc-configure_lua_version.patch
+++ b/media-video/vlc/files/vlc--configure-lua-version.patch
@@ -1,10 +1,12 @@
-Only look for one single version of Lua: the one pointed to by the
-pkgconfig package 'lua'. The wrapper set up by lua eclasses will take care
-of the rest.
+From 543ae8e4118dd902e5ec9464caf315213e317089 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sat, 27 May 2023 03:14:49 +0100
+Subject: [PATCH 2/2] foo3
 
 a/configure.ac 2021-06-11 12:20:01.222417096 +0200
-+++ b/configure.ac 2021-06-11 12:21:00.257419197 +0200
-@@ -1907,44 +1907,10 @@
+Signed-off-by: Sam James 
+--- a/configure.ac
 b/configure.ac
+@@ -1847,43 +1847,10 @@ AC_ARG_ENABLE([lua],
  [disable LUA scripting support (default enabled)]))
  if test "${enable_lua}" != "no"
  then
@@ -45,11 +47,13 @@ of the rest.
 - AS_IF([test "${have_lua_lib}" = "yes"], [
 -   AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], [ have_lua=yes ], []) ])
 -  ])
--
 +  PKG_CHECK_MODULES(LUA, lua,
 +[ have_lua=yes ],
 +[ have_lua=no ]
-+)
-   if test "x${have_lua}" != "xyes" ;  then
++  )
+ 
+   if test "${have_lua}" != "yes" ;  then
AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces 
(rc, telnet, http) as well as many other custom scripts. Use --disable-lua to 
ignore this error.])
-   fi
+-- 
+2.40.1
+

diff --git a/media-video/vlc/files/vlc--fix-libtremor-libs.patch 
b/media-video/vlc/files/vlc--fix-libtremor-libs.patch
new file mode 100644
index ..690cb73acfc4
--- /dev/null
+++ b/media-video/vlc/files/vlc--fix-libtremor-libs.patch
@@ -0,0 +1,20 @@
+From 9f8193bd55f7b75c213a60a48a3302f009bdf054 Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sat, 27 May 2023 03:13:38 +0100
+Subject: [PATCH 1/2] foo1
+
+Signed-off-by: Sam James 
+--- a/modules/codec/Makefile.am
 b/modules/codec/Makefile.am
+@@ -332,7 +332,7 @@ codec_LTLIBRARIES += $(LTLIBdaala)
+ libtremor_plugin_la_SOURCES = codec/vorbis.c
+ libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_TREMOR
+ libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+-libtremor_plugin_la_LIBADD = -lvorbisdec -logg
++libtremor_plugin_la_LIBADD = $(VORBIS_LIBS) $(OGG_LIBS)
+ EXTRA_LTLIBRARIES += libtremor_plugin.la
+ codec_LTLIBRARIES += $(LTLIBtremor)
+ 
+-- 
+2.40.1
+

diff --git a/media-video/vlc/vlc-.ebuild b/media-video/vlc/vlc-.ebuild
index d46d85184e77..f27bd375a84e 100644
--- a/media-video/vlc/vlc-.ebuild
+++ b/media-video/vlc/vlc-.ebuild
@@ -230,9 +230,8 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-   "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-   "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-   "${FILESDIR}"/${PN}-configure_lua_version.patch
+   "${FILESDIR}"/${PN}--fix-libtremor-libs.patch # build system
+   "${FILESDIR}"/${PN}--configure-lua-version.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README.md doc/fortunes.txt )

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2023-05-13 Thread Sam James 
commit: a15de2a067817db7ed034d0c12b7c7c3ba83e7b9
Author: Sam James  gentoo  org>
AuthorDate: Sat May 13 22:42:45 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May 13 22:49:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a15de2a0

media-video/vlc: backport FLAC CRC fix

Closes: https://bugs.gentoo.org/903665
Signed-off-by: Sam James  gentoo.org>

 media-video/vlc/files/vlc-3.0.18-flac-crc.patch |  90 
 media-video/vlc/vlc-3.0.18-r1.ebuild| 518 
 2 files changed, 608 insertions(+)

diff --git a/media-video/vlc/files/vlc-3.0.18-flac-crc.patch 
b/media-video/vlc/files/vlc-3.0.18-flac-crc.patch
new file mode 100644
index ..5e4d896bc7e7
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.18-flac-crc.patch
@@ -0,0 +1,90 @@
+https://bugs.gentoo.org/903665
+https://code.videolan.org/videolan/vlc/-/commit/c2dd4bfefe079e49db1789eb76be3885e4fc31b4
+
+(changed VLC_TICKS_INVALID -> VLC_TS_INVALID to avoid needing 
https://code.videolan.org/videolan/vlc/-/commit/0b4dff80ac381dd7de75125c70145a206a01eed8
 too.)
+
+From c2dd4bfefe079e49db1789eb76be3885e4fc31b4 Mon Sep 17 00:00:00 2001
+From: Francois Cartegnie 
+Date: Mon, 7 Nov 2022 15:02:57 +0100
+Subject: [PATCH] packetizer: flac: fix CRC from emulated sync
+
+also skips some memcpy
+
+refs #27454 #27477
+
+(cherry picked from commit c14b5aa6a7bd3aa25fa951e2b4136aff70f5702a)
+--- a/modules/packetizer/flac.c
 b/modules/packetizer/flac.c
+@@ -78,6 +78,7 @@ struct decoder_sys_t
+ 
+ size_t i_last_frame_size;
+ uint16_t crc;
++size_t i_buf_offset; /* in final buffer before crc check / validation / 
retry */
+ size_t i_buf;
+ uint8_t *p_buf;
+ 
+@@ -386,6 +387,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t 
**pp_block)
+ p_sys->headerinfo = headerinfo;
+ p_sys->i_state = STATE_NEXT_SYNC;
+ p_sys->i_offset = FLAC_FRAME_SIZE_MIN;
++p_sys->i_buf_offset = 0;
+ p_sys->crc = 0;
+ 
+ /* We have to read until next frame sync code to compute current 
frame size
+@@ -461,6 +463,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t 
**pp_block)
+ block_SkipBytes( _sys->bytestream, FLAC_HEADER_SIZE_MAX + 2 );
+ block_BytestreamFlush( _sys->bytestream );
+ p_sys->crc = 0;
++p_sys->i_buf_offset = 0;
+ p_sys->i_offset = 0;
+ p_sys->i_state = STATE_NOSYNC;
+ p_sys->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY;
+@@ -484,10 +487,12 @@ static block_t *Packetize(decoder_t *p_dec, block_t 
**pp_block)
+ }
+ 
+ /* Copy from previous sync point up to to current (offset) */
+-block_PeekOffsetBytes( _sys->bytestream, 0, p_sys->p_buf, 
p_sys->i_offset );
++block_PeekOffsetBytes( _sys->bytestream, p_sys->i_buf_offset,
++   _sys->p_buf[p_sys->i_buf_offset],
++p_sys->i_offset - p_sys->i_buf_offset );
+ 
+ /* update crc to include this data chunk */
+-for( size_t i = 0; i < p_sys->i_offset - 2; i++ )
++for( size_t i = p_sys->i_buf_offset; i < p_sys->i_offset - 2; i++ 
)
+ p_sys->crc = flac_crc16( p_sys->crc, p_sys->p_buf[i] );
+ 
+ uint16_t stream_crc = GetWBE(_sys->p_buf[p_sys->i_offset - 2]);
+@@ -497,6 +502,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t 
**pp_block)
+ /* Add the 2 last bytes which were not the CRC sum, and go 
for next sync point */
+ p_sys->crc = flac_crc16( p_sys->crc, 
p_sys->p_buf[p_sys->i_offset - 2] );
+ p_sys->crc = flac_crc16( p_sys->crc, 
p_sys->p_buf[p_sys->i_offset - 1] );
++p_sys->i_buf_offset = p_sys->i_offset;
+ p_sys->i_offset += 1;
+ p_sys->i_state = !pp_block ? STATE_NOSYNC : STATE_NEXT_SYNC;
+ break; /* continue */
+@@ -513,6 +519,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t 
**pp_block)
+ block_BytestreamFlush( _sys->bytestream );
+ p_sys->i_offset = 0;
+ p_sys->crc = 0;
++p_sys->i_buf_offset = 0;
+ 
+ if( block_BytestreamRemaining(_sys->bytestream) > 0 || pp_block 
== NULL /* drain */)
+ p_sys->i_state = STATE_SEND_DATA;
+@@ -553,6 +560,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t 
**pp_block)
+ else
+ free( p_sys->p_buf );
+ 
++p_sys->i_buf_offset = 0;
+ p_sys->i_buf = 0;
+ p_sys->p_buf = NULL;
+ p_sys->i_offset = 0;
+@@ -587,6 +595,7 @@ static int Open(vlc_object_t *p_this)
+ p_sys->b_stream_info = false;
+ p_sys->i_last_frame_size = FLAC_FRAME_SIZE_MIN;
+ p_sys->headerinfo.i_pts  = VLC_TS_INVALID;
++p_sys->i_buf_offset  = 0;
+ p_sys->i_buf = 0;
+ p_sys->p_buf = NULL;
+ p_sys->i_next_block_flags = 0;

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2021-11-07 Thread Andreas Sturmlechner 
commit: 4e8c7bab64a398c03dc1f937034631fc545ec346
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov  7 12:11:55 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov  7 15:41:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e8c7bab

media-video/vlc: Drop 3.0.14-r7

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/vlc/Manifest   |   1 -
 media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch |  32 --
 media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch |  48 --
 media-video/vlc/vlc-3.0.14-r7.ebuild   | 514 -
 4 files changed, 595 deletions(-)

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 7098c1b0265..fecc89d899f 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,2 +1 @@
-DIST vlc-3.0-3.0.14.tar.gz 3435 BLAKE2B 
e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597
 SHA512 
6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 
1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff
 SHA512 
35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298

diff --git a/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch 
b/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch
deleted file mode 100644
index aaa61a546ad..000
--- a/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-https://bugs.gentoo.org/767796
-
-From: Robert-André Mauchin 
-Date: Mon, 14 Dec 2020 02:23:52 + (+0100)
-Subject: hls: add missing  include
-X-Git-Url: 
https://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=3aea33378b0b317b99fce2eeaca8b31bf7cc6aba
-
-hls: add missing  include
-
-Compilation would fail with:
-
-> error: 'numeric_limits' is not a member of 'std'
-
-without this include because of some hardening build
-flags mandated on Fedora Linux, with GCC 11.
-
-Refs #25325
-
-Signed-off-by: Robert-André Mauchin 
-Signed-off-by: Alexandre Janniaux 

-
 a/modules/demux/hls/playlist/Parser.cpp
-+++ b/modules/demux/hls/playlist/Parser.cpp
-@@ -42,6 +42,7 @@
- #include 
- #include 
- #include 
-+#include 
- 
- using namespace adaptive;
- using namespace adaptive::playlist;

diff --git a/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch 
b/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch
deleted file mode 100644
index 3832b2a1877..000
--- a/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-https://bugs.gentoo.org/767796
-
-From: Robert-André Mauchin 
-Date: Mon, 14 Dec 2020 02:23:52 + (+0100)
-Subject: adaptive: add missing  include
-X-Git-Url: 
https://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=e3de1b709b258d2b0e316d927f5c828bdb1a738a
-
-adaptive: add missing  include
-
-Compilation would fail with:
-
-> error: 'numeric_limits' is not a member of 'std'
-
-without this include because of some hardening build
-flags mandated on Fedora Linux, with GCC 11.
-
-Refs #25325
-
-Signed-off-by: Robert-André Mauchin 
-Signed-off-by: Alexandre Janniaux 

-
 a/modules/demux/adaptive/playlist/Inheritables.cpp
-+++ b/modules/demux/adaptive/playlist/Inheritables.cpp
-@@ -29,3 +29,4 @@
-+#include 
- 
- using namespace adaptive::playlist;
- using namespace adaptive;
 a/modules/demux/adaptive/playlist/SegmentInformation.cpp
-+++ b/modules/demux/adaptive/playlist/SegmentInformation.cpp
-@@ -34,6 +34,7 @@
- 
- #include 
- #include 
-+#include 
- 
- using namespace adaptive::playlist;
- 
 a/modules/demux/adaptive/playlist/SegmentTimeline.cpp
-+++ b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
-@@ -29,5 +29,6 @@
- 
- #include 
-+#include 
- 
- using namespace adaptive::playlist;
- 

diff --git a/media-video/vlc/vlc-3.0.14-r7.ebuild 
b/media-video/vlc/vlc-3.0.14-r7.ebuild
deleted file mode 100644
index dadbb25cc1a..000
--- a/media-video/vlc/vlc-3.0.14-r7.ebuild
+++ /dev/null
@@ -1,514 +0,0 @@
-# Copyright 2000-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..2} )
-
-MY_PV="${PV/_/-}"
-MY_PV="${MY_PV/-beta/-test}"
-MY_P="${PN}-${MY_PV}"
-if [[ ${PV} = * ]] ; then
-   if [[ ${PV%.} != ${PV} ]] ; then
-   
EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.}.git;
-   else
-   EGIT_REPO_URI="https://git.videolan.org/git/vlc.git;
-   fi
-   inherit git-r3
-else
-   SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 
1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
-   S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
-   #if

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2021-08-31 Thread Pacho Ramos 
commit: 9b58b43511a8bee125a758df926024d29a54b017
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Aug 31 19:06:43 2021 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Aug 31 19:06:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b58b435

media-video/vlc: Update lua patch

Thanks-to: Sven Eden
Closes: https://bugs.gentoo.org/795378
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Pacho Ramos  gentoo.org>

 .../vlc/files/vlc-configure_lua_version.patch  | 55 ++
 media-video/vlc/vlc-.ebuild|  2 +-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/media-video/vlc/files/vlc-configure_lua_version.patch 
b/media-video/vlc/files/vlc-configure_lua_version.patch
new file mode 100644
index 000..2628075535a
--- /dev/null
+++ b/media-video/vlc/files/vlc-configure_lua_version.patch
@@ -0,0 +1,55 @@
+Only look for one single version of Lua: the one pointed to by the
+pkgconfig package 'lua'. The wrapper set up by lua eclasses will take care
+of the rest.
+
+--- a/configure.ac 2021-06-11 12:20:01.222417096 +0200
 b/configure.ac 2021-06-11 12:21:00.257419197 +0200
+@@ -1907,44 +1907,10 @@
+ [disable LUA scripting support (default enabled)]))
+ if test "${enable_lua}" != "no"
+ then
+-  PKG_CHECK_MODULES(LUA, lua5.2, [ have_lua=yes ], [:])
+-
+-  AS_IF([test "${have_lua}" != "yes"], [
+-AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead])
+-PKG_CHECK_MODULES(LUA, lua5.1, [ have_lua=yes ], [:]) ])
+-
+-  AS_IF([test "${have_lua}" != "yes"], [
+-AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead])
+-PKG_CHECK_MODULES(LUA, lua >= 5.1, [ have_lua=yes ], [:]) ])
+-
+-  AS_IF([test "${have_lua}" != "yes"], [
+- AC_MSG_WARN([${LUA_PKG_ERRORS}, trying manual detection instead])
+- have_lua_lib=no
+- AC_CHECK_LIB( lua5.2 , luaL_newstate, [
+-   LUA_LIBS="-llua5.2"
+-   have_lua_lib=yes], [])
+-
+- AS_IF([test "${have_lua_lib}" != "yes"], [
+-   AC_CHECK_LIB( lua5.1 , luaL_newstate, [
+- LUA_LIBS="-llua5.1"
+- have_lua_lib=yes], [] ) ])
+-
+- AS_IF([test "${have_lua_lib}" != "yes"], [
+-   AC_CHECK_LIB( lua51 , luaL_newstate, [
+- LUA_LIBS="-llua51"
+- have_lua_lib=yes], [] ) ])
+-
+- AS_IF([test "${have_lua_lib}" != "yes"], [
+-   AC_CHECK_LIB( lua , luaL_newstate,
+- [LUA_LIBS="-llua"
+-  have_lua_lib=yes],
+- [ have_lua=no ], [-lm] ) ])
+-
+- dnl If we found any lib, check that we have the headers too
+- AS_IF([test "${have_lua_lib}" = "yes"], [
+-   AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], [ have_lua=yes ], []) ])
+-  ])
+-
++  PKG_CHECK_MODULES(LUA, lua,
++[ have_lua=yes ],
++[ have_lua=no ]
++)
+   if test "x${have_lua}" != "xyes" ;  then
+   AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces 
(rc, telnet, http) as well as many other custom scripts. Use --disable-lua to 
ignore this error.])
+   fi

diff --git a/media-video/vlc/vlc-.ebuild b/media-video/vlc/vlc-.ebuild
index 09a8d54ca6e..88345ff41a5 100644
--- a/media-video/vlc/vlc-.ebuild
+++ b/media-video/vlc/vlc-.ebuild
@@ -233,7 +233,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-   "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
+   "${FILESDIR}"/${PN}-configure_lua_version.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2021-06-22 Thread Sam James 
commit: 8601c25969eb70175e33127baed860cabdda3e7b
Author: John Helmert III  gentoo  org>
AuthorDate: Mon Jun 21 23:59:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 22 18:43:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8601c259

media-video/vlc: revbumps for live api patch

Bug: https://bugs.gentoo.org/795798
Signed-off-by: John Helmert III  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/21376
Signed-off-by: Sam James  gentoo.org>

 .../files/vlc-3.0.14-fix-live-address-api.patch|  53 +++
 media-video/vlc/vlc-3.0.14-r2.ebuild   | 514 
 media-video/vlc/vlc-3.0.16-r2.ebuild   | 515 +
 3 files changed, 1082 insertions(+)

diff --git a/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch 
b/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch
new file mode 100644
index 000..2d6f86f0aba
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch
@@ -0,0 +1,53 @@
+Needed for https://bugs.gentoo.org/795798 and
+https://code.videolan.org/videolan/vlc/-/issues/25473
+
+From 94845266b705dc9de7921408531b9d7704f4458f Mon Sep 17 00:00:00 2001
+From: Dominic Mayers 
+Date: Sun, 28 Mar 2021 04:37:54 -0400
+Subject: [PATCH] Get addr by ref. from getConnectionEndpointAddress.
+
+Fixes issue #25473 in code.videolan.org. The maintainers of live555 changed
+connectionEndpointAddresss to getConnectionEndpointAddress, which now provides
+the address value by reference. Before, connectionEndpointAddresss returned
+the value. So, in modules/access/live555.cpp, we must first get the value and
+then pass it to IsMulticastAddress.  The code will not compile with the recent
+live555 unless we also modify modules/access/Makefile.am - a different patch.
+---
+ modules/access/live555.cpp | 7 +--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
+index 01c535ca5b..95e15e35d9 100644
+--- a/modules/access/live555.cpp
 b/modules/access/live555.cpp
+@@ -60,6 +60,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ extern "C" {
+ #include "../access/mms/asf.h"  /* Who said ugly ? */
+@@ -727,7 +728,8 @@ static int SessionsSetup( demux_t *p_demux )
+ unsigned const thresh = 20; /* RTP reorder threshold .2 second 
(default .1) */
+ const char *p_sess_lang = NULL;
+ const char *p_lang;
+-
++struct sockaddr_storage addr;
++
+ b_rtsp_tcp= var_CreateGetBool( p_demux, "rtsp-tcp" ) ||
+ var_GetBool( p_demux, "rtsp-http" );
+ i_client_port = var_InheritInteger( p_demux, "rtp-client-port" );
+@@ -850,7 +852,8 @@ static int SessionsSetup( demux_t *p_demux )
+ if( !p_sys->b_multicast )
+ {
+ /* We need different rollover behaviour for multicast */
+-p_sys->b_multicast = IsMulticastAddress( 
sub->connectionEndpointAddress() );
++sub->getConnectionEndpointAddress(addr);
++p_sys->b_multicast = IsMulticastAddress( addr );
+ }
+ 
+ tk = (live_track_t*)malloc( sizeof( live_track_t ) );
+-- 
+2.25.1
+

diff --git a/media-video/vlc/vlc-3.0.14-r2.ebuild 
b/media-video/vlc/vlc-3.0.14-r2.ebuild
new file mode 100644
index 000..06e953113a2
--- /dev/null
+++ b/media-video/vlc/vlc-3.0.14-r2.ebuild
@@ -0,0 +1,514 @@
+# Copyright 2000-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..2} )
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+if [[ ${PV} = * ]] ; then
+   if [[ ${PV%.} != ${PV} ]] ; then
+   
EGIT_REPO_URI="https://git.videolan.org/git/vlc/vlc-${PV%.}.git;
+   else
+   EGIT_REPO_URI="https://git.videolan.org/git/vlc.git;
+   fi
+   inherit git-r3
+else
+   SRC_URI="https://code.videolan.org/videolan/vlc-$(ver_cut 
1-2)/-/archive/${PV}/vlc-$(ver_cut 1-2)-${PV}.tar.gz"
+   S="${WORKDIR}/${PN}-$(ver_cut 1-2)-${PV}"
+   #if [[ ${MY_P} = ${P} ]] ; then
+   #   
SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz;
+   #else
+   #   
SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz;
+   #fi
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86"
+fi
+
+inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg
+
+DESCRIPTION="Media player and framework with support for most multimedia files 
and streaming"
+HOMEPAGE="https://www.videolan.org/vlc/;
+
+LICENSE="LGPL-2.1 GPL-2"
+SLOT="0/5-9" # vlc - vlccore
+
+IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast
+   dav1d dbus dc1394 debug directx dts +dvbpsi dvd +encode faad fdk 
+ffmpeg flac
+   fluidsynth fontconfig +gcrypt gme gnome-keyring gstreamer ieee1394 jack 
jpeg kate
+

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2021-04-23 Thread Sergei Trofimovich 
commit: 8cbc565e4786eacec418155e7a1efe1e5a89ed22
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Apr 23 08:09:36 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Apr 23 08:09:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cbc565e

media-video/vlc: tweak for gcc-11

Reported-by: Geoff Leach
Closes: https://bugs.gentoo.org/767796
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch | 32 +++
 media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch | 48 ++
 media-video/vlc/vlc-3.0.12.1-r100.ebuild   |  1 +
 3 files changed, 81 insertions(+)

diff --git a/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch 
b/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch
new file mode 100644
index 000..aaa61a546ad
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.12.1-limits-p1.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/767796
+
+From: Robert-André Mauchin 
+Date: Mon, 14 Dec 2020 02:23:52 + (+0100)
+Subject: hls: add missing  include
+X-Git-Url: 
https://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=3aea33378b0b317b99fce2eeaca8b31bf7cc6aba
+
+hls: add missing  include
+
+Compilation would fail with:
+
+> error: 'numeric_limits' is not a member of 'std'
+
+without this include because of some hardening build
+flags mandated on Fedora Linux, with GCC 11.
+
+Refs #25325
+
+Signed-off-by: Robert-André Mauchin 
+Signed-off-by: Alexandre Janniaux 
+---
+
+--- a/modules/demux/hls/playlist/Parser.cpp
 b/modules/demux/hls/playlist/Parser.cpp
+@@ -42,6 +42,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ using namespace adaptive;
+ using namespace adaptive::playlist;

diff --git a/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch 
b/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch
new file mode 100644
index 000..3832b2a1877
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.12.1-limits-p2.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/767796
+
+From: Robert-André Mauchin 
+Date: Mon, 14 Dec 2020 02:23:52 + (+0100)
+Subject: adaptive: add missing  include
+X-Git-Url: 
https://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=e3de1b709b258d2b0e316d927f5c828bdb1a738a
+
+adaptive: add missing  include
+
+Compilation would fail with:
+
+> error: 'numeric_limits' is not a member of 'std'
+
+without this include because of some hardening build
+flags mandated on Fedora Linux, with GCC 11.
+
+Refs #25325
+
+Signed-off-by: Robert-André Mauchin 
+Signed-off-by: Alexandre Janniaux 
+---
+
+--- a/modules/demux/adaptive/playlist/Inheritables.cpp
 b/modules/demux/adaptive/playlist/Inheritables.cpp
+@@ -29,3 +29,4 @@
++#include 
+ 
+ using namespace adaptive::playlist;
+ using namespace adaptive;
+--- a/modules/demux/adaptive/playlist/SegmentInformation.cpp
 b/modules/demux/adaptive/playlist/SegmentInformation.cpp
+@@ -34,6 +34,7 @@
+ 
+ #include 
+ #include 
++#include 
+ 
+ using namespace adaptive::playlist;
+ 
+--- a/modules/demux/adaptive/playlist/SegmentTimeline.cpp
 b/modules/demux/adaptive/playlist/SegmentTimeline.cpp
+@@ -29,5 +29,6 @@
+ 
+ #include 
++#include 
+ 
+ using namespace adaptive::playlist;
+ 

diff --git a/media-video/vlc/vlc-3.0.12.1-r100.ebuild 
b/media-video/vlc/vlc-3.0.12.1-r100.ebuild
index 4463b83fc27..b2480e09873 100644
--- a/media-video/vlc/vlc-3.0.12.1-r100.ebuild
+++ b/media-video/vlc/vlc-3.0.12.1-r100.ebuild
@@ -236,6 +236,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290
"${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch
"${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062
+   "${FILESDIR}"/${PN}-3.0.12.1-limits-p{1,2}.patch # bug 767796
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2019-08-01 Thread Andreas Sturmlechner 
commit: 552671e74c9871abb81f1505e8f56b29f769be28
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug  1 15:34:07 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug  1 15:34:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=552671e7

media-video/vlc: Security cleanup

Bug: https://bugs.gentoo.org/688642
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/vlc/Manifest   |   1 -
 media-video/vlc/files/vlc-3.0.6-libav.patch|  12 -
 media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch |  35 --
 media-video/vlc/files/vlc-3.0.6-sftp.patch |  24 -
 media-video/vlc/metadata.xml   |   2 -
 media-video/vlc/vlc-3.0.6-r1.ebuild| 502 -
 6 files changed, 576 deletions(-)

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index ee054fc54b8..e0939fc1c2b 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,2 +1 @@
-DIST vlc-3.0.6.tar.xz 25699704 BLAKE2B 
91c43fa3ceb6f55a3808c64a661ca453f0872f01eecc801921eb1b9f9cc462478b1fcd6f7cc36f33b7e1085320710b27a42a3b7b49dd74338fe63a3a46f36b0f
 SHA512 
7c72e98f30ce5c5a94d74e097fa9960442f89240079b042a729f8a33dd7fedee2538c86c99738ccef2eb27f29055f0221d4c70316e3312c5ebba9565eaa15c52
 DIST vlc-3.0.7.1.tar.xz 26052372 BLAKE2B 
349e967ff00db2fd5ea1a62deb12009ff0d85c56a82774aa4fedf7bffecd21b0c8c745f41eb4b9b4d36aaddcce95e79146901f318d18eab99f08e347841a8008
 SHA512 
6b99ae0564630a7a7ca9187c3bb954c601e384522ce93460b73f2dbf31787ce5828daca9f31c781b97db77872d76b6a3e871ff3401d70f1b5829fee7c4e847fd

diff --git a/media-video/vlc/files/vlc-3.0.6-libav.patch 
b/media-video/vlc/files/vlc-3.0.6-libav.patch
deleted file mode 100644
index 08e13f15fb6..000
--- a/media-video/vlc/files/vlc-3.0.6-libav.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 a/modules/codec/avcodec/fourcc.c  2019-02-27 22:57:55.878463261 +0100
-+++ a/modules/codec/avcodec/fourcc.c_orig 2018-10-28 12:11:19.0 +0100
-@@ -182,7 +182,9 @@
- /* AV_CODEC_ID_V210X */
- { VLC_CODEC_TMV, AV_CODEC_ID_TMV },
- { VLC_CODEC_V210, AV_CODEC_ID_V210 },
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 ) && 
LIBAVCODEC_VERSION_MICRO >= 100
- { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV },
-+#endif
- /* AV_CODEC_ID_DPX */
- { VLC_CODEC_MAD, AV_CODEC_ID_MAD },
- { VLC_CODEC_FRWU, AV_CODEC_ID_FRWU },

diff --git a/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch 
b/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch
deleted file mode 100644
index 1b58a03cc8c..000
--- a/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch
+++ /dev/null
@@ -1,35 +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(-)
-
-diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c
-index f03c7fae62..59b3acdef7 100644
 a/modules/codec/vpx.c
-+++ b/modules/codec/vpx.c
-@@ -117,6 +117,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 },
-@@ -129,7 +130,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 },
- 
--- 
-2.11.0
-

diff --git a/media-video/vlc/files/vlc-3.0.6-sftp.patch 
b/media-video/vlc/files/vlc-3.0.6-sftp.patch
deleted file mode 100644
index 3092bf5a47c..000
--- a/media-video/vlc/files/vlc-3.0.6-sftp.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 11449b5cd8b415768e010d9b7c1d6ba3cea21f82 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?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 e420b91ca93..dc7f6cc27f7 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

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2019-03-10 Thread Andreas Sturmlechner 
commit: 765c34a126f7868aba8df652d753d06e074b7baf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Mar  9 23:34:51 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 10 09:34:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=765c34a1

media-video/vlc: Drop obsolete patch

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/vlc/files/vlc-2.2.4-libav-11.7.patch | 10 --
 media-video/vlc/vlc-3.0.4.ebuild |  1 -
 media-video/vlc/vlc-3.0.6-r1.ebuild  |  1 -
 media-video/vlc/vlc-3.0..ebuild  |  1 -
 media-video/vlc/vlc-.ebuild  |  1 -
 5 files changed, 14 deletions(-)

diff --git a/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch 
b/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch
deleted file mode 100644
index 932223632d7..000
--- a/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/modules/codec/avcodec/audio.c2016-09-10 13:46:51.066453337 -0700
-+++ a/modules/codec/avcodec/audio.c2016-09-10 13:42:26.061451090 -0700
-@@ -38,6 +38,7 @@ 
- 
- #include 
- #include 
-+#include 
- 
- #include "avcodec.h"
- 

diff --git a/media-video/vlc/vlc-3.0.4.ebuild b/media-video/vlc/vlc-3.0.4.ebuild
index 16570f46d8f..9b065f61c1c 100644
--- a/media-video/vlc/vlc-3.0.4.ebuild
+++ b/media-video/vlc/vlc-3.0.4.ebuild
@@ -226,7 +226,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-   "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 )
 

diff --git a/media-video/vlc/vlc-3.0.6-r1.ebuild 
b/media-video/vlc/vlc-3.0.6-r1.ebuild
index 61aba8e4538..721a2f9460e 100644
--- a/media-video/vlc/vlc-3.0.6-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.6-r1.ebuild
@@ -230,7 +230,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-   "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
"${FILESDIR}"/${P}-libvpx-1.8.0.patch # bug 677606
"${FILESDIR}"/${P}-fdk-aac-2.0.0.patch # bug 672290

diff --git a/media-video/vlc/vlc-3.0..ebuild 
b/media-video/vlc/vlc-3.0..ebuild
index 74f7c1d116e..d76f7c6455a 100644
--- a/media-video/vlc/vlc-3.0..ebuild
+++ b/media-video/vlc/vlc-3.0..ebuild
@@ -230,7 +230,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-   "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 )
 

diff --git a/media-video/vlc/vlc-.ebuild b/media-video/vlc/vlc-.ebuild
index 060a5ca89ae..2fa147be48f 100644
--- a/media-video/vlc/vlc-.ebuild
+++ b/media-video/vlc/vlc-.ebuild
@@ -233,7 +233,6 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-   "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
 )

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2019-02-27 Thread Thomas Raschbacher 
commit: 2ecc010a8cf7a9e8a22e8ca24e927102bb2c433b
Author: Thomas Raschbacher  gentoo  org>
AuthorDate: Wed Feb 27 22:20:05 2019 +
Commit: Thomas Raschbacher  gentoo  org>
CommitDate: Wed Feb 27 22:20:05 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ecc010a

media-video/vlc: fix libav compile bug

Closes: https://bugs.gentoo.org/show_bug.cgi?id=676032
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Thomas Raschbacher  gentoo.org>

 media-video/vlc/files/vlc-3.0.6-libav.patch | 12 
 media-video/vlc/vlc-3.0.6-r1.ebuild |  1 +
 2 files changed, 13 insertions(+)

diff --git a/media-video/vlc/files/vlc-3.0.6-libav.patch 
b/media-video/vlc/files/vlc-3.0.6-libav.patch
new file mode 100644
index 000..08e13f15fb6
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-libav.patch
@@ -0,0 +1,12 @@
+--- a/modules/codec/avcodec/fourcc.c  2019-02-27 22:57:55.878463261 +0100
 a/modules/codec/avcodec/fourcc.c_orig 2018-10-28 12:11:19.0 +0100
+@@ -182,7 +182,9 @@
+ /* AV_CODEC_ID_V210X */
+ { VLC_CODEC_TMV, AV_CODEC_ID_TMV },
+ { VLC_CODEC_V210, AV_CODEC_ID_V210 },
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 50, 100 ) && 
LIBAVCODEC_VERSION_MICRO >= 100
+ { VLC_CODEC_VUYA, AV_CODEC_ID_AYUV },
++#endif
+ /* AV_CODEC_ID_DPX */
+ { VLC_CODEC_MAD, AV_CODEC_ID_MAD },
+ { VLC_CODEC_FRWU, AV_CODEC_ID_FRWU },

diff --git a/media-video/vlc/vlc-3.0.6-r1.ebuild 
b/media-video/vlc/vlc-3.0.6-r1.ebuild
index b803e74a18e..519aa96447b 100644
--- a/media-video/vlc/vlc-3.0.6-r1.ebuild
+++ b/media-video/vlc/vlc-3.0.6-r1.ebuild
@@ -234,6 +234,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
"${FILESDIR}"/${P}-libvpx-1.8.0.patch # bug 677606
"${FILESDIR}"/${P}-fdk-aac-2.0.0.patch # bug 672290
+   "${FILESDIR}"/${P}-libav.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2019-02-24 Thread Andreas Sturmlechner 
commit: 315cd1cf34c962f988d7a7806a0e9843da0ff77e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 24 17:22:27 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 24 18:01:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315cd1cf

media-video/vlc: Fix build with libvpx-1.8.0, fdk-aac-2.0.0

Thanks-to: jospezial  gmx.de>
Bug: https://bugs.gentoo.org/677606
Bug: https://bugs.gentoo.org/672290
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../vlc/files/vlc-3.0.6-fdk-aac-2.0.0.patch|  84 
 media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch |  35 ++
 media-video/vlc/vlc-3.0.6-r1.ebuild| 501 +
 3 files changed, 620 insertions(+)

diff --git a/media-video/vlc/files/vlc-3.0.6-fdk-aac-2.0.0.patch 
b/media-video/vlc/files/vlc-3.0.6-fdk-aac-2.0.0.patch
new file mode 100644
index 000..a5104d1df6d
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-fdk-aac-2.0.0.patch
@@ -0,0 +1,84 @@
+From 6ea9b13fe82fae2b25b7371c6c36d6296db28ccb Mon Sep 17 00:00:00 2001
+From: Antonio Larrosa 
+Date: Thu, 14 Feb 2019 10:09:30 +0100
+Subject: [PATCH] Fix building vlc with libfdk-aac v2
+
+When flushing the encoder, we now need to provide non-null buffer
+parameters for everything, even if they are unused.
+
+The encoderDelay parameter has been replaced by two, nDelay and
+nDelayCore.
+
+This is based on:
+https://git.libav.org/?p=libav.git;a=commitdiff_plain;h=141c960e21d2860e354f9b90df136184dd00a9a8;hp=c8bca9fe466f810fd484e2c6db7ef7bc83b5a943
+
+Signed-off-by: Jean-Baptiste Kempf 
+---
+ modules/codec/fdkaac.c | 27 +--
+ 1 file changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/modules/codec/fdkaac.c b/modules/codec/fdkaac.c
+index e0b3088c4a..3ac7b756a3 100644
+--- a/modules/codec/fdkaac.c
 b/modules/codec/fdkaac.c
+@@ -92,6 +92,11 @@ static void CloseEncoder(vlc_object_t *);
+ #define SIGNALING_COMPATIBLE 1
+ #define SIGNALING_HIERARCHICAL 2
+ 
++#define FDKENC_VER_AT_LEAST(vl0, vl1) \
++(defined(AACENCODER_LIB_VL0) && \
++((AACENCODER_LIB_VL0 > vl0) || \
++ (AACENCODER_LIB_VL0 == vl0 && AACENCODER_LIB_VL1 >= vl1)))
++
+ static const int pi_aot_values[] = { PROFILE_AAC_LC, PROFILE_AAC_HE, 
PROFILE_AAC_HE_v2, PROFILE_AAC_LD, PROFILE_AAC_ELD };
+ static const char *const ppsz_aot_descriptions[] =
+ { N_("AAC-LC"), N_("HE-AAC"), N_("HE-AAC-v2"), N_("AAC-LD"), N_("AAC-ELD") };
+@@ -288,7 +293,11 @@ static int OpenEncoder(vlc_object_t *p_this)
+ p_sys->i_maxoutputsize = 768*p_enc->fmt_in.audio.i_channels;
+ p_enc->fmt_in.audio.i_bitspersample = 16;
+ p_sys->i_frame_size = info.frameLength;
++#if FDKENC_VER_AT_LEAST(4, 0)
++p_sys->i_encoderdelay = info.nDelay;
++#else
+ p_sys->i_encoderdelay = info.encoderDelay;
++#endif
+ 
+ p_enc->fmt_out.i_extra = info.confSize;
+ if (p_enc->fmt_out.i_extra) {
+@@ -351,21 +360,27 @@ static block_t *EncodeAudio(encoder_t *p_enc, block_t 
*p_aout_buf)
+ int out_identifier = OUT_BITSTREAM_DATA;
+ int out_size, out_elem_size;
+ void *in_ptr, *out_ptr;
++uint8_t dummy_buf[1];
+ 
+ if (unlikely(i_samples == 0)) {
+ // this forces the encoder to purge whatever is left in the 
internal buffer
++/* Must be a non-null pointer, even if it's a dummy. We could use
++ * the address of anything else on the stack as well. */
++in_ptr= dummy_buf;
++in_size   = 0;
++
+ in_args.numInSamples = -1;
+ } else {
+ in_ptr = p_buffer + (i_samples - 
i_samples_left)*p_enc->fmt_in.audio.i_channels;
+ in_size = 2*p_enc->fmt_in.audio.i_channels*i_samples_left;
+-in_elem_size = 2;
+ in_args.numInSamples = 
p_enc->fmt_in.audio.i_channels*i_samples_left;
+-in_buf.numBufs = 1;
+-in_buf.bufs = _ptr;
+-in_buf.bufferIdentifiers = _identifier;
+-in_buf.bufSizes = _size;
+-in_buf.bufElSizes = _elem_size;
+ }
++in_elem_size = 2;
++in_buf.numBufs = 1;
++in_buf.bufs = _ptr;
++in_buf.bufferIdentifiers = _identifier;
++in_buf.bufSizes = _size;
++in_buf.bufElSizes = _elem_size;
+ block_t *p_block;
+ p_block = block_Alloc(p_sys->i_maxoutputsize);
+ p_block->i_buffer = p_sys->i_maxoutputsize;
+-- 
+2.11.0
+

diff --git a/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch 
b/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch
new file mode 100644
index 000..1b58a03cc8c
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.6-libvpx-1.8.0.patch
@@ -0,0 +1,35 @@
+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

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2018-11-08 Thread Andreas Sturmlechner 
commit: 5a97a737fad7205a3c79274e2b504ba7fb38871a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Nov  8 10:40:55 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Nov  8 12:28:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a97a737

media-video/vlc: Drop 3.0.3-r1

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-video/vlc/Manifest   |   1 -
 media-video/vlc/files/vlc-3.0.1-qt-5.11.patch  |  10 -
 .../vlc/files/vlc-3.0.3-fix-disable-vlm.patch  |  42 --
 media-video/vlc/files/vlc-3.0.3-fribidi-1.patch|  80 
 media-video/vlc/metadata.xml   |   1 -
 media-video/vlc/vlc-3.0.3-r1.ebuild| 500 -
 6 files changed, 634 deletions(-)

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 0b46d050985..efd915c5fd9 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,2 +1 @@
-DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B 
dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20
 SHA512 
1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab
 DIST vlc-3.0.4.tar.xz 24934112 BLAKE2B 
b8e680e178f5d34b187d5ee613a75e247b9ef500b18843a6c987479d1afc2e723111a7d3f2ac2ec8c2f34cbd36e2e7a9c0e0add6e594418fc429ec8878f0b1b0
 SHA512 
55c5a45a1573d559f8d62272dc446bebfb328bd48f938e634693a45032e1a3095148e634de5bc53a3a3c0e4858f7df3ed7e5dc91f3f5447e47d0ab5775171271

diff --git a/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch 
b/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch
deleted file mode 100644
index c99d8988247..000
--- a/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch
+++ /dev/null
@@ -1,10 +0,0 @@
 a/modules/gui/qt/components/simple_preferences.cpp 2018-01-25 
17:57:40.0 +0100
-+++ b/modules/gui/qt/components/simple_preferences.cpp 2018-03-18 
21:08:51.212556781 +0100
-@@ -33,6 +33,7 @@
- #include 
- #include 
- 
-+#include 
- #include 
- #include 
- #include 

diff --git a/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch 
b/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch
deleted file mode 100644
index fe4eecb8e76..000
--- a/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 49450a4ab90bba8530764c5cdb95d648aeda7d52 Mon Sep 17 00:00:00 2001
-From: =?utf8?q?Hugo=20Beauz=C3=A9e-Luyssen?= 
-Date: Mon, 28 May 2018 18:25:15 +0200
-Subject: [PATCH] qt: Fix build with --disable-vlm
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Fix #20495
-
-(cherry picked from commit 44a635bd4ae16fec5295f6f8aee4dd2ffd7e97d8)
-Signed-off-by: Hugo Beauzée-Luyssen 

- modules/gui/qt/Makefile.am | 5 -
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/modules/gui/qt/Makefile.am b/modules/gui/qt/Makefile.am
-index cb77b14d96..c67f4afc13 100644
 a/modules/gui/qt/Makefile.am
-+++ b/modules/gui/qt/Makefile.am
-@@ -191,7 +191,6 @@ nodist_libqt_plugin_la_SOURCES = \
-   gui/qt/dialogs/open.moc.cpp \
-   gui/qt/dialogs/openurl.moc.cpp \
-   gui/qt/dialogs/podcast_configuration.moc.cpp \
--  gui/qt/dialogs/vlm.moc.cpp \
-   gui/qt/dialogs/firstrun.moc.cpp \
-   gui/qt/dialogs/extensions.moc.cpp \
-   gui/qt/dialogs/fingerprintdialog.moc.cpp \
-@@ -445,6 +444,10 @@ EXTRA_DIST += gui/qt/vlc.qrc $(libqt_plugin_la_RES)
- 
- nodist_libqt_plugin_la_SOURCES += gui/qt/resources.cpp
- 
-+if ENABLE_VLM
-+nodist_libqt_plugin_la_SOURCES += gui/qt/dialogs/vlm.moc.cpp
-+endif
-+
- gui/qt/resources.cpp: gui/qt/vlc.qrc $(libqt_plugin_la_RES)
-   $(AM_V_GEN)$(RCC) -name vlc -o $@ $<
- 
--- 
-2.11.0
-

diff --git a/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch 
b/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch
deleted file mode 100644
index 4431025a21e..000
--- a/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 26e2d3906658c30f2f88f4b1bc9630ec43bf5525 Mon Sep 17 00:00:00 2001
-From: Shaleen Jain 
-Date: Sun, 25 Feb 2018 18:42:27 +0530
-Subject: [PATCH] fribidi: update for version 1.0
-
-Update functions deprecated in version 1.0 when building with release 1.0 and
-above.
-
-Signed-off-by: Thomas Guillem 

- modules/text_renderer/freetype/text_layout.c | 24 
- 1 file changed, 24 insertions(+)
-
-diff --git a/modules/text_renderer/freetype/text_layout.c 
b/modules/text_renderer/freetype/text_layout.c
-index 13efd567b46..1a28786d097 100644
 a/modules/text_renderer/freetype/text_layout.c
-+++ b/modules/text_renderer/freetype/text_layout.c
-@@ -153,6 +153,9 @@ typedef struct paragraph_t
- 
- #ifdef HAVE_FRIBIDI
- FriBidiCharType *p_types;
-+#if FRIBIDI_MAJOR_VERSION >= 1
-+FriBidiBracketType  *p_btypes;
-+#endif
- FriBidiLevel

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2018-03-18 Thread Andreas Sturmlechner 
commit: 4f8d76c3fcb3aa286e47a13fed339d6d9a416c84
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 18 20:03:14 2018 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 18 20:21:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f8d76c3

media-video/vlc: 3.0.1 version bump

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 media-video/vlc/Manifest  |  1 +
 media-video/vlc/files/vlc-3.0.1-qt-5.11.patch | 10 ++
 media-video/vlc/{vlc-3.0..ebuild => vlc-3.0.1.ebuild} |  1 +
 media-video/vlc/vlc-3.0..ebuild   |  1 +
 4 files changed, 13 insertions(+)

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index b1a6a36d2b0..0d3f41676c7 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,2 +1,3 @@
 DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 
10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9
 SHA512 
adde16f4b4bd2d94f104bb3b5df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a
 DIST vlc-3.0.0.tar.xz 25191148 BLAKE2B 
8f0826f5586a304df4cc53acae768377a53bbd9a1c6578b4dcd39a4e1fb627d2e6f6f2f6ce3abacfb9ebc2a9fb1bae179938bbf88644aa9070f49675cc10fcf1
 SHA512 
9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7
+DIST vlc-3.0.1.tar.xz 25174040 BLAKE2B 
10121ef74f90ee7103d5958b49b7b187a3b8a1cd0bb36a9d97f409a7500285594d89721cb17add80d2a3d8d0f607ed4ec46986b9a9faa4a9d7c67c1eb7d60dca
 SHA512 
f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c

diff --git a/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch 
b/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch
new file mode 100644
index 000..c99d8988247
--- /dev/null
+++ b/media-video/vlc/files/vlc-3.0.1-qt-5.11.patch
@@ -0,0 +1,10 @@
+--- a/modules/gui/qt/components/simple_preferences.cpp 2018-01-25 
17:57:40.0 +0100
 b/modules/gui/qt/components/simple_preferences.cpp 2018-03-18 
21:08:51.212556781 +0100
+@@ -33,6 +33,7 @@
+ #include 
+ #include 
+ 
++#include 
+ #include 
+ #include 
+ #include 

diff --git a/media-video/vlc/vlc-3.0..ebuild 
b/media-video/vlc/vlc-3.0.1.ebuild
similarity index 99%
copy from media-video/vlc/vlc-3.0..ebuild
copy to media-video/vlc/vlc-3.0.1.ebuild
index afb90b0cb92..d5c58fe473b 100644
--- a/media-video/vlc/vlc-3.0..ebuild
+++ b/media-video/vlc/vlc-3.0.1.ebuild
@@ -225,6 +225,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+   "${FILESDIR}"/${P}-qt-5.11.patch # TODO upstream
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )

diff --git a/media-video/vlc/vlc-3.0..ebuild 
b/media-video/vlc/vlc-3.0..ebuild
index afb90b0cb92..b8110319455 100644
--- a/media-video/vlc/vlc-3.0..ebuild
+++ b/media-video/vlc/vlc-3.0..ebuild
@@ -225,6 +225,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
"${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch # bug #593460
"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
+   "${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2017-12-09 Thread Andreas Sturmlechner 
commit: eebfeb8ba4114e8ee2a7f047a57fcc59281c6a29
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Dec  9 13:20:43 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec  9 13:52:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eebfeb8b

media-video/vlc: Fix configure with slotted >=net-libs/libupnp-1.8

Package-Manager: Portage-2.3.17, Repoman-2.3.6

 .../vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch | 24 ++
 media-video/vlc/vlc-2.2..ebuild|  2 ++
 media-video/vlc/vlc-3.0..ebuild|  2 ++
 media-video/vlc/vlc-.ebuild|  2 ++
 4 files changed, 30 insertions(+)

diff --git a/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch 
b/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch
new file mode 100644
index 000..ab501e4e67a
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.8-libupnp-slot-1.8.patch
@@ -0,0 +1,24 @@
+--- a/modules/services_discovery/upnp.hpp  2015-05-19 15:32:38.0 
+0200
 b/modules/services_discovery/upnp.hpp  2017-12-09 14:07:08.551654458 
+0100
+@@ -28,8 +28,8 @@
+ #include 
+ #include 
+ 
+-#include 
+-#include 
++#include 
++#include 
+ 
+ #include 
+ 
+--- a/configure.ac 2017-12-09 14:09:12.956370304 +0100
 b/configure.ac 2017-12-09 14:13:25.236710362 +0100
+@@ -4046,7 +4046,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:])
+ 

diff --git a/media-video/vlc/vlc-2.2..ebuild 
b/media-video/vlc/vlc-2.2..ebuild
index 1b50d864a4b..223c1ec8989 100644
--- a/media-video/vlc/vlc-2.2..ebuild
+++ b/media-video/vlc/vlc-2.2..ebuild
@@ -230,6 +230,8 @@ src_unpack() {
 src_prepare() {
default
 
+   has_version '>=net-libs/libupnp-1.8.0' && eapply 
"${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
# Remove unnecessary warnings about unimplemented pragmas on gcc for 
now.
# Need to recheck this with gcc 4.9 and every subsequent minor bump of 
gcc.
#

diff --git a/media-video/vlc/vlc-3.0..ebuild 
b/media-video/vlc/vlc-3.0..ebuild
index 0492df5372d..1eeebe1b56d 100644
--- a/media-video/vlc/vlc-3.0..ebuild
+++ b/media-video/vlc/vlc-3.0..ebuild
@@ -251,6 +251,8 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
default
 
+   has_version '>=net-libs/libupnp-1.8.0' && eapply 
"${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
# Bootstrap when we are on a git checkout.
if [[ ${PV} = * ]] ; then
./bootstrap

diff --git a/media-video/vlc/vlc-.ebuild b/media-video/vlc/vlc-.ebuild
index 0492df5372d..1eeebe1b56d 100644
--- a/media-video/vlc/vlc-.ebuild
+++ b/media-video/vlc/vlc-.ebuild
@@ -251,6 +251,8 @@ S="${WORKDIR}/${MY_P}"
 src_prepare() {
default
 
+   has_version '>=net-libs/libupnp-1.8.0' && eapply 
"${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch
+
# Bootstrap when we are on a git checkout.
if [[ ${PV} = * ]] ; then
./bootstrap

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2017-08-29 Thread Andreas Sturmlechner 
commit: eff19da8e22050be19180b57c3df1984db7bd23f
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 29 19:37:03 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 29 19:40:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eff19da8

media-video/vlc: Fix segfault

Reported-by: dekbertu  gmx.de>
Thanks-to: Joakim Tjernlund  infinera.com>
Gentoo-bug: 629294
Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../vlc/files/vlc-2.2.6-decoder-lock-scope.patch   | 34 ++
 .../{vlc-2.2..ebuild => vlc-2.2.6-r2.ebuild}   |  8 ++---
 media-video/vlc/vlc-2.2..ebuild|  4 +--
 3 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch 
b/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch
new file mode 100644
index 000..2e8064446d0
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch
@@ -0,0 +1,34 @@
+X-Git-Url: 
https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9
+
+--- a/src/input/decoder.c
 b/src/input/decoder.c
+@@ -1162,7 +1162,10 @@
+ b_paused = p_owner->b_paused;
+ 
+ if (!p_audio)
++{
++vlc_mutex_unlock( _owner->lock );
+ break;
++}
+ 
+ /* */
+ int i_rate = INPUT_RATE_DEFAULT;
+@@ -1180,6 +1183,9 @@
+ 
+ if( unlikely(p_owner->b_paused != b_paused) )
+ continue; /* race with input thread? retry... */
++
++vlc_mutex_unlock( _owner->lock );
++
+ if( p_aout == NULL )
+ b_reject = true;
+ 
+@@ -1199,7 +1205,6 @@
+ 
+ break;
+ }
+-vlc_mutex_unlock( _owner->lock );
+ }
+ 
+ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
+ 

diff --git a/media-video/vlc/vlc-2.2..ebuild 
b/media-video/vlc/vlc-2.2.6-r2.ebuild
similarity index 98%
copy from media-video/vlc/vlc-2.2..ebuild
copy to media-video/vlc/vlc-2.2.6-r2.ebuild
index ea1b3f17fea..62e7d7e9ef2 100644
--- a/media-video/vlc/vlc-2.2..ebuild
+++ b/media-video/vlc/vlc-2.2.6-r2.ebuild
@@ -196,10 +196,10 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
 
# Patch up incompatibilities and reconfigure autotools.
-   "${FILESDIR}"/${PN}--libva-1.2.1-compat.patch
+#  "${FILESDIR}"/${PN}--libva-1.2.1-compat.patch
 
# Fix up broken audio when skipping using a fixed reversed bisected 
commit.
-   "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
+#  "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch
 
# Bug #541678
"${FILESDIR}"/qt4-select.patch
@@ -214,8 +214,8 @@ PATCHES=(
# Bug #589396
"${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
 
-   # Bug #594126
-   "${FILESDIR}"/${PN}-2.2.4-decoder-lock-scope.patch
+   # Bug #594126, #629294
+   "${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch
"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
 
# Bug #593460

diff --git a/media-video/vlc/vlc-2.2..ebuild 
b/media-video/vlc/vlc-2.2..ebuild
index ea1b3f17fea..069a19e151f 100644
--- a/media-video/vlc/vlc-2.2..ebuild
+++ b/media-video/vlc/vlc-2.2..ebuild
@@ -214,8 +214,8 @@ PATCHES=(
# Bug #589396
"${FILESDIR}"/${PN}-2.2.4-cxx0x.patch
 
-   # Bug #594126
-   "${FILESDIR}"/${PN}-2.2.4-decoder-lock-scope.patch
+   # Bug #594126, #629294
+   "${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch
"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch
 
# Bug #593460

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2016-11-26 Thread Michael Palimaka 
commit: 6ffd3e6806dc84eabb4ca910038a4628304b8db2
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Nov 26 15:34:39 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov 26 18:00:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ffd3e68

media-video/vlc: Drop USE=media-library, fix some ALSA issues

Upstream seems unwilling to fix it in 2.2 branch.

Gentoo-bug: 594126, 592784

Package-Manager: portage-2.3.0

 .../vlc/files/vlc-2.2.4-alsa-large-buffers.patch   | 47 ++
 .../vlc/files/vlc-2.2.4-decoder-lock-scope.patch   | 47 ++
 media-video/vlc/metadata.xml   |  1 -
 media-video/vlc/vlc-2.2.1-r1.ebuild|  2 +-
 media-video/vlc/vlc-2.2.4.ebuild   |  2 +-
 media-video/vlc/vlc-2.2..ebuild|  6 ++-
 6 files changed, 101 insertions(+), 4 deletions(-)

diff --git a/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch 
b/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch
new file mode 100644
index ..b5a9ff7
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-alsa-large-buffers.patch
@@ -0,0 +1,47 @@
+X-Git-Url: 
https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules%2Faudio_output%2Falsa.c;h=4e9fd53592d048baa8b57f30df15ab5806139d07;hp=2d1f99e9cb743bca12c6bdf32cc84a92d07fda8b;hb=47f74a83c161173b0d15e95dab8ceb7c97de51b4;hpb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a
+
+diff --git a/modules/audio_output/alsa.c b/modules/audio_output/alsa.c
+index 2d1f99e..4e9fd53 100644
+--- a/modules/audio_output/alsa.c
 b/modules/audio_output/alsa.c
+@@ -495,6 +495,15 @@ static int Start (audio_output_t *aout, 
audio_sample_format_t *restrict fmt)
+ }
+ sys->rate = fmt->i_rate;
+ 
++#if 1 /* work-around for period-long latency outputs (e.g. PulseAudio): */
++param = AOUT_MIN_PREPARE_TIME;
++val = snd_pcm_hw_params_set_period_time_near (pcm, hw, , NULL);
++if (val)
++{
++msg_Err (aout, "cannot set period: %s", snd_strerror (val));
++goto error;
++}
++#endif
+ /* Set buffer size */
+ param = AOUT_MAX_ADVANCE_TIME;
+ val = snd_pcm_hw_params_set_buffer_time_near (pcm, hw, , NULL);
+@@ -503,14 +512,22 @@ static int Start (audio_output_t *aout, 
audio_sample_format_t *restrict fmt)
+ msg_Err (aout, "cannot set buffer duration: %s", snd_strerror (val));
+ goto error;
+ }
+-
+-param = AOUT_MIN_PREPARE_TIME;
++#if 0
++val = snd_pcm_hw_params_get_buffer_time (hw, , NULL);
++if (val)
++{
++msg_Warn (aout, "cannot get buffer time: %s", snd_strerror(val));
++param = AOUT_MIN_PREPARE_TIME;
++}
++else
++param /= 2;
+ val = snd_pcm_hw_params_set_period_time_near (pcm, hw, , NULL);
+ if (val)
+ {
+ msg_Err (aout, "cannot set period: %s", snd_strerror (val));
+ goto error;
+ }
++#endif
+ 
+ /* Commit hardware parameters */
+ val = snd_pcm_hw_params (pcm, hw);

diff --git a/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch 
b/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch
new file mode 100644
index ..51a2cdc
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch
@@ -0,0 +1,47 @@
+X-Git-Url: 
https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9
+
+--- a/src/input/decoder.c
 b/src/input/decoder.c
+@@ -1162,7 +1162,10 @@
+ b_paused = p_owner->b_paused;
+ 
+ if (!p_audio)
++{
++vlc_mutex_unlock( _owner->lock );
+ break;
++}
+ 
+ /* */
+ int i_rate = INPUT_RATE_DEFAULT;
+@@ -1180,6 +1183,9 @@
+ 
+ if( unlikely(p_owner->b_paused != b_paused) )
+ continue; /* race with input thread? retry... */
++
++vlc_mutex_unlock( _owner->lock );
++
+ if( p_aout == NULL )
+ b_reject = true;
+ 
+@@ -1199,7 +1205,6 @@
+ 
+ break;
+ }
+-vlc_mutex_unlock( _owner->lock );
+ }
+ 
+ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block )
+@@ -1961,11 +1966,10 @@
+ 
+ /* Parameters changed, restart the aout */
+ vlc_mutex_lock( _owner->lock );
+-
+-aout_DecDelete( p_owner->p_aout );
+ p_owner->p_aout = NULL;
+-
+ vlc_mutex_unlock( _owner->lock );
++aout_DecDelete( p_owner->p_aout );
++
+ input_resource_PutAout( p_owner->p_resource, p_aout );
+ }
+ 

diff --git a/media-video/vlc/metadata.xml b/media-video/vlc/metadata.xml
index ec1f07d..a1e4706 100644
--- a/media-video/vlc/metadata.xml
+++ b/media-video/vlc/metadata.xml
@@ -47,7 +47,6 @@
Enables Mac OS X quartz text 
module.
Enables Mac OS X qtkit module: 
qtcapture (video) and qtsound

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2016-11-26 Thread Michael Palimaka 
commit: 10178f81e58442231dda913dfd878491d1515e0b
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Sat Oct 22 11:18:31 2016 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Sat Nov 26 18:00:09 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10178f81

media-video/vlc: Fix build with Qt 5.7.0

Gentoo-bug: 589396

Package-Manager: portage-2.3.0

 media-video/vlc/files/vlc-2.2.4-cxx0x.patch |  11 ++
 media-video/vlc/files/vlc-2.2.4-qt57.patch  | 284 
 media-video/vlc/vlc-2.2.4.ebuild|   4 +
 media-video/vlc/vlc-2.2..ebuild |   3 +
 4 files changed, 302 insertions(+)

diff --git a/media-video/vlc/files/vlc-2.2.4-cxx0x.patch 
b/media-video/vlc/files/vlc-2.2.4-cxx0x.patch
new file mode 100644
index ..cb3d635
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-cxx0x.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac 2016-09-21 07:10:58.885508665 +0200
 b/configure.ac 2016-09-21 07:19:17.835725004 +0200
+@@ -3746,7 +3746,7 @@
+ PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [
+   PKG_CHECK_MODULES([QTX11], [Qt5X11Extras], [
+   VLC_ADD_LIBS([qt4],[${QTX11_LIBS}])
+-  VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11])
++  VLC_ADD_CXXFLAGS([qt4],[${QTX11_CFLAGS} -DQT5_HAS_X11 -std=c++0x])
+   PKG_CHECK_MODULES([XI], [xi], [
+ VLC_ADD_LIBS([qt4], [${XI_LIBS}])
+ VLC_ADD_CXXFLAGS([qt4], [${XI_CFLAGS} -DHAVE_XI])

diff --git a/media-video/vlc/files/vlc-2.2.4-qt57.patch 
b/media-video/vlc/files/vlc-2.2.4-qt57.patch
new file mode 100644
index ..97472a6
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.4-qt57.patch
@@ -0,0 +1,284 @@
+As the 2.2 headers are still using vlc_atomics (picture)
+we cannot have a way to avoid collisions with early
+or late  inclusion when using GCC >= 4.7
+
+Conditionals in vlc_atomic won't work.
+
+Happens in ProjectM and Qt5.
+---
+ modules/gui/qt4/actions_manager.cpp|  2 ++
+ modules/gui/qt4/adapters/seekpoints.cpp|  4 +--
+ modules/gui/qt4/adapters/seekpoints.hpp|  4 +--
+ modules/gui/qt4/components/controller.cpp  |  2 ++
+ .../gui/qt4/components/playlist/playlist_model.hpp |  4 +--
+ modules/gui/qt4/components/playlist/views.cpp  |  6 
+ modules/gui/qt4/dialogs/messages.cpp   |  2 ++
+ modules/gui/qt4/dialogs/vlm.cpp|  4 ---
+ modules/gui/qt4/dialogs/vlm.hpp|  4 ++-
+ modules/gui/qt4/input_manager.cpp  |  2 ++
+ modules/gui/qt4/input_manager.hpp  |  3 +-
+ modules/gui/qt4/menus.cpp  |  2 ++
+ modules/gui/qt4/qt4.hpp| 32 ++
+ modules/gui/qt4/util/pictureflow.cpp   |  2 ++
+ modules/visualization/projectm.cpp |  4 +++
+ 15 files changed, 56 insertions(+), 21 deletions(-)
+
+diff --git a/modules/gui/qt4/actions_manager.cpp 
b/modules/gui/qt4/actions_manager.cpp
+index eff40d9..b7ca967 100644
+--- a/modules/gui/qt4/actions_manager.cpp
 b/modules/gui/qt4/actions_manager.cpp
+@@ -25,6 +25,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include 
+ #include 
+ 
+diff --git a/modules/gui/qt4/adapters/seekpoints.cpp 
b/modules/gui/qt4/adapters/seekpoints.cpp
+index fbf2957..a3564bb 100644
+--- a/modules/gui/qt4/adapters/seekpoints.cpp
 b/modules/gui/qt4/adapters/seekpoints.cpp
+@@ -19,14 +19,12 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, 
USA.
+  
*/
+ 
++#include "seekpoints.hpp"
+ 
+ #include "recents.hpp"
+ #include "dialogs_provider.hpp"
+ #include "menus.hpp"
+ 
+-#include "seekpoints.hpp"
+-
+-#include "qt4.hpp"
+ #include "input_manager.hpp"
+ 
+ SeekPoints::SeekPoints( QObject *parent, intf_thread_t *p_intf_ ) :
+diff --git a/modules/gui/qt4/adapters/seekpoints.hpp 
b/modules/gui/qt4/adapters/seekpoints.hpp
+index 0083989..bbb9214 100644
+--- a/modules/gui/qt4/adapters/seekpoints.hpp
 b/modules/gui/qt4/adapters/seekpoints.hpp
+@@ -22,9 +22,7 @@
+ #ifndef SEEKPOINTS_HPP
+ #define SEEKPOINTS_HPP
+ 
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#endif
++#include "qt4.hpp"
+ 
+ #include 
+ #include 
+diff --git a/modules/gui/qt4/components/controller.cpp 
b/modules/gui/qt4/components/controller.cpp
+index d93e0db..c43d929 100644
+--- a/modules/gui/qt4/components/controller.cpp
 b/modules/gui/qt4/components/controller.cpp
+@@ -26,6 +26,8 @@
+ # include "config.h"
+ #endif
+ 
++#include "qt4.hpp"
++
+ #include/* vout_thread_t for FSC */
+ 
+ /* Widgets */
+diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp 
b/modules/gui/qt4/components/playlist/playlist_model.hpp
+index f9d1d0c..1f71ac9 100644
+--- a/modules/gui/qt4/components/playlist/playlist_model.hpp

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2016-02-08 Thread Lars Wendler 
commit: 76316f1b39de5f0923a62c5e8c0e83cb1efa69a8
Author: Lars Wendler  gentoo  org>
AuthorDate: Tue Feb  9 07:41:18 2016 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Tue Feb  9 07:41:41 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76316f1b

media-video/vlc: Removed old.

Package-Manager: portage-2.2.27
Signed-off-by: Lars Wendler  gentoo.org>

 media-video/vlc/Manifest   |   1 -
 .../files/vlc-2.1-mem_undefined_functions.patch|  14 -
 media-video/vlc/files/vlc-2.1.0-newer-rdp.patch|  47 --
 media-video/vlc/files/vlc-2.2.0-fix-xcb.patch  |  16 -
 media-video/vlc/metadata.xml   |   6 -
 media-video/vlc/vlc-2.1.5-r1.ebuild| 478 -
 media-video/vlc/vlc-2.1..ebuild| 472 
 7 files changed, 1034 deletions(-)

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 62c067f..5d01377 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,3 +1,2 @@
-DIST vlc-2.1.5.tar.xz 19574208 SHA256 
6f6566ab6cd90d381395b7f0e401060b044cd3843e50ceb252b558a88e5d1f72 SHA512 
37c6b82b4e89f4a14ed391cc677d9325a032e04bcc51a3e0d7d2ccf9e17a7a0deb90d9129e9dc3baf05a1ea9dae9c05e3177ab17a31098aafa6a2cb23388fa32
 WHIRLPOOL 
c13098f922c7b24f3c718e88807a7dcb656af21bcf2be63d2ec7401583680658bd371e3935ba22537857861e0b1b0c4f0e693c87ed20999c679b4a04cddf7008
 DIST vlc-2.2.1.tar.xz 20940288 SHA256 
543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb SHA512 
91cd33ac61ebe376c24b3cc0d1dc52d7765fdccbd17e75af38f52b400e0269dc48f34ed558bff7ec1dd52c4f27098012709a3eb9fe7e8aad1069516de5de
 WHIRLPOOL 
5c889fc5c0137f022b0b3408a5252668a1a946ed45677bb97bbbf0ec14c9411c24e8d1587e987391596774aaf7f1e4592c55b0c0f76742e84296bbfffb08e885
 DIST vlc-2.2.2.tar.xz 22253152 SHA256 
9ad23128be16f9b40ed772961272cb0748ed8e4aa1bc79c129e589feebea5fb5 SHA512 
14f26f380925cdf68495ef0b7fba96fbc7a6bfb8ad16e624c2e50773bc8f5b17fb928de27d4052b79553e1a160c952ef8be3fbb1d2f11865f68f3ffb82a35ce8
 WHIRLPOOL 
1521d53287051c3d252c0ef6f782ca8728be2ec26858aceccb83791fdf34a53754aa4a1c27e1b906eb39ce2a4e4c8f3e1b90e9cb1a64b4e5dde705ba6e88e127

diff --git a/media-video/vlc/files/vlc-2.1-mem_undefined_functions.patch 
b/media-video/vlc/files/vlc-2.1-mem_undefined_functions.patch
deleted file mode 100644
index 7289c07..000
--- a/media-video/vlc/files/vlc-2.1-mem_undefined_functions.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-# Fixes gentoo bug 541654
-# https://bugs.gentoo.org/show_bug.cgi?id=541654
-# Committed on behalf of Luca Barbato 
-
 modules/codec/avcodec/avcommon.h.orig  2015-02-28 15:19:33.449761287 
+
-+++ modules/codec/avcodec/avcommon.h   2015-02-28 15:20:10.469537179 +
-@@ -81,6 +81,7 @@
- #ifdef HAVE_LIBAVUTIL_AVUTIL_H
- # include 
- # include 
-+# include 
- 
- #define AV_OPTIONS_TEXT "Advanced options."
- #define AV_OPTIONS_LONGTEXT "Advanced options, in the form 
{opt=val,opt2=val2} ."

diff --git a/media-video/vlc/files/vlc-2.1.0-newer-rdp.patch 
b/media-video/vlc/files/vlc-2.1.0-newer-rdp.patch
deleted file mode 100644
index aa1957a..000
--- a/media-video/vlc/files/vlc-2.1.0-newer-rdp.patch
+++ /dev/null
@@ -1,47 +0,0 @@
 a/modules/access/rdp.c
-+++ b/modules/access/rdp.c
-@@ -198,15 +198,15 @@
- 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 +217,9 @@
- vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) 
p_instance->context;
- 
- msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)",
-- p_instance->settings->width,
-- p_instance->settings->height,
-- p_instance->settings->color_depth );
-+ p_instance->settings->DesktopWidth,
-+ p_instance->settings->DesktopHeight,
-+ p_instance->settings->ColorDepth );
- 
- p_instance->update->DesktopResize = desktopResizeHandler;
-

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/, media-video/vlc/files/

2015-10-27 Thread Ian Delaney 
commit: 512cacd39f22b2bfde6725f09d0f08ff37e8bbd6
Author: Ian Delaney  gentoo  org>
AuthorDate: Wed Oct 28 01:40:00 2015 +
Commit: Ian Delaney  gentoo  org>
CommitDate: Wed Oct 28 01:43:01 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=512cacd3

media-video/vlc: revbump -> -2.2.1-r1, sec patch CVE-2015-5949

patch submitted by proxy maintainer via the gentoo bug, also
runtested by Amynka, removed initial vlc-2.2.1.ebuild

Gentoo bug: #558418

Package-Manager: portage-2.2.23

 media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch   | 15 +++
 media-video/vlc/{vlc-2.2.1.ebuild => vlc-2.2.1-r1.ebuild} |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch 
b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch
new file mode 100644
index 000..83a5258
--- /dev/null
+++ b/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch
@@ -0,0 +1,15 @@
+https://git.videolan.org/?p=vlc/vlc-2.2.git;a=commitdiff;h=ce91452460a75d7424b165c4dc8db98114c3cbd9;hp=9e12195d3e4316278af1fa4bcb6a705ff27456fd
+--- a/modules/demux/mp4/libmp4.c
 b/modules/demux/mp4/libmp4.c
+@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
+ {
+ for( i_index = 0; ; i_index++ )
+ {
++if ( MP4_Box_Function[i_index].i_parent &&
++ p_box->p_father &&
++ p_box->p_father->i_type != 
MP4_Box_Function[i_index].i_parent )
++continue;
++
+ if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
+ ( MP4_Box_Function[i_index].i_type == 0 ) )
+ {

diff --git a/media-video/vlc/vlc-2.2.1.ebuild 
b/media-video/vlc/vlc-2.2.1-r1.ebuild
similarity index 99%
rename from media-video/vlc/vlc-2.2.1.ebuild
rename to media-video/vlc/vlc-2.2.1-r1.ebuild
index 73ab21a..be3ece4 100644
--- a/media-video/vlc/vlc-2.2.1.ebuild
+++ b/media-video/vlc/vlc-2.2.1-r1.ebuild
@@ -250,6 +250,7 @@ src_prepare() {
# We are not in a real git checkout due to the absence of a .git 
directory.
touch src/revision.txt || die
 
+   # PATCHES
# Fix build system mistake.
epatch "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch
 
@@ -271,6 +272,8 @@ src_prepare() {
# Add missed header imgproc_c.h, imgproc.hpp, bug #554562
epatch "${FILESDIR}"/opencv-3.0.0.patch
 
+   epatch "${FILESDIR}"//${P}-CVE-2015-5949.patch
+
# Don't use --started-from-file when not using dbus.
if ! use dbus ; then
sed -i 's/ --started-from-file//' share/vlc.desktop.in || die