[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/
commit: 2d1c1da2fc83c41d0760766e77cd8cec1343c593 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Tue Mar 19 19:20:10 2024 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Mar 23 06:05:05 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1c1da2 media-video/vlc: remove unused patch Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Arthur Zamarin gentoo.org> media-video/vlc/files/vlc-3.0.18-flac-crc.patch | 90 - 1 file changed, 90 deletions(-) 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 deleted file mode 100644 index 5e4d896bc7e7.. --- a/media-video/vlc/files/vlc-3.0.18-flac-crc.patch +++ /dev/null @@ -1,90 +0,0 @@ -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( &p_sys->bytestream, FLAC_HEADER_SIZE_MAX + 2 ); - block_BytestreamFlush( &p_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( &p_sys->bytestream, 0, p_sys->p_buf, p_sys->i_offset ); -+block_PeekOffsetBytes( &p_sys->bytestream, p_sys->i_buf_offset, -+ &p_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(&p_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( &p_sys->bytestream ); - p_sys->i_offset = 0; - p_sys->crc = 0; -+p_sys->i_buf_offset = 0; - - if( block_BytestreamRemaining(&p_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; --- -G
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 03edc44ac03874e3a5f3a86658a8bb8cd25a8acd Author: Sam James gentoo org> AuthorDate: Tue Dec 5 13:40:45 2023 + Commit: Sam James gentoo org> CommitDate: Tue Dec 5 13:40:56 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03edc44a media-video/vlc: backport modern c fixes Closes: https://bugs.gentoo.org/919068 Signed-off-by: Sam James gentoo.org> media-video/vlc/files/vlc-3.0.20-c99.patch | 150 + media-video/vlc/vlc-3.0.20-r2.ebuild | 518 + 2 files changed, 668 insertions(+) diff --git a/media-video/vlc/files/vlc-3.0.20-c99.patch b/media-video/vlc/files/vlc-3.0.20-c99.patch new file mode 100644 index ..135e1e6b9e5b --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.20-c99.patch @@ -0,0 +1,150 @@ +https://bugs.gentoo.org/919068 +https://code.videolan.org/videolan/vlc/-/issues/28441 +https://code.videolan.org/videolan/vlc/-/merge_requests/4645 + +From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001 +From: Thomas Guillem +Date: Tue, 5 Dec 2023 09:23:35 +0100 +Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment + +Fixes #28441 +--- a/src/input/input_internal.h b/src/input/input_internal.h +@@ -117,7 +117,7 @@ typedef struct input_thread_private_t + + /* Title infos FIXME multi-input (not easy) ? */ + int i_title; +-const input_title_t **title; ++input_title_t * const *title; + + int i_title_offset; + int i_seekpoint_offset; +-- +GitLab + + +From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001 +From: Zhao Zhili +Date: Thu, 1 Mar 2018 14:25:59 +0800 +Subject: [PATCH 2/5] yadif: fix variable type + +Signed-off-by: Thomas Guillem +(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60) +Signed-off-by: Thomas Guillem +--- a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h +@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8 + } + + static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) { +-uint8_t *dst = (uint8_t *)dst8; +-uint8_t *prev = (uint8_t *)prev8; +-uint8_t *cur = (uint8_t *)cur8; +-uint8_t *next = (uint8_t *)next8; ++uint16_t *dst = (uint16_t *)dst8; ++uint16_t *prev = (uint16_t *)prev8; ++uint16_t *cur = (uint16_t *)cur8; ++uint16_t *next = (uint16_t *)next8; + int x; + uint16_t *prev2= parity ? prev : cur ; + uint16_t *next2= parity ? cur : next; +-- +GitLab + + +From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 3 Mar 2019 09:59:10 +0200 +Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion + +(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058) +Signed-off-by: Thomas Guillem +--- a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c +@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, + { + filter_sys_t *p_sys = p_filter->p_sys; + uint8_t palette[AVPALETTE_SIZE]; +-uint8_t *src[4]; int src_stride[4]; +-uint8_t *dst[4]; int dst_stride[4]; ++uint8_t *src[4], *dst[4]; ++const uint8_t *csrc[4]; ++int src_stride[4], dst_stride[4]; + + GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video, +p_src, i_plane_count, b_swap_uvi ); +@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, + GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video, +p_dst, i_plane_count, b_swap_uvo ); + ++for (size_t i = 0; i < ARRAY_SIZE(src); i++) ++csrc[i] = src[i]; ++ + #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) +-sws_scale( ctx, src, src_stride, 0, i_height, ++sws_scale( ctx, csrc, src_stride, 0, i_height, +dst, dst_stride ); + #else +-sws_scale_ordered( ctx, src, src_stride, 0, i_height, ++sws_scale_ordered( ctx, csrc, src_stride, 0, i_height, +dst, dst_stride ); + #endif + } +-- +GitLab + + +From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= +Date: Sun, 3 Mar 2019 17:20:04 +0200 +Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing + +(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35) +Signed-off-by: Thomas Guillem +--- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c +@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] = + void RegisterCommand( filter_t *p_filter ) + { + filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; +-size_t i_index = 0; + + p_sys->i_commands = ARRAY_SIZE(p_commands); + p_sys->pp_commands = (commandd
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 3403638a3e4c2d6527a3e92da2b616afb831c16e Author: Sam James gentoo org> AuthorDate: Sat Jun 3 21:00:52 2023 + Commit: Sam James gentoo org> CommitDate: Sat Jun 3 21:00:52 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3403638a media-video/vlc: drop stale minizip dep Reported on IRC by nbgen. The configure check was dropped finally in d22de99eb8c46786ca2feb4abca2e4f25ceeb0a8 upstream but the usage was dropped a while before that. Signed-off-by: Sam James gentoo.org> .../vlc/files/vlc-3.0.18-drop-minizip-dep.patch| 38 ++ .../{vlc-3.0.18-r2.ebuild => vlc-3.0.18-r3.ebuild} | 3 +- media-video/vlc/vlc-3.0..ebuild| 3 +- media-video/vlc/vlc-.ebuild| 2 +- 4 files changed, 43 insertions(+), 3 deletions(-) diff --git a/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch b/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch new file mode 100644 index ..6cd7019f6ed0 --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.18-drop-minizip-dep.patch @@ -0,0 +1,38 @@ +Nothing uses this. + +From 6cd8ac42e8c296eb1c9e154b3e99dab8bffcad0a Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Thu, 12 Apr 2018 13:24:38 +0200 +Subject: [PATCH] configure: remove minizip check not referenced anywhere + +(cherry picked from commit d22de99eb8c46786ca2feb4abca2e4f25ceeb0a8) +--- a/configure.ac b/configure.ac +@@ -890,23 +890,14 @@ AS_IF([test -n "${PKG_CONFIG}" ],[ + + + dnl +-dnl Check for zlib.h and -lz along with system -lminizip if available ++dnl Check for zlib.h and -lz if available + dnl + AC_CHECK_HEADERS(zlib.h, [ have_zlib=yes ], [ have_zlib=no ]) + AM_CONDITIONAL(HAVE_ZLIB, [ test "${have_zlib}" = "yes" ]) + if test "${have_zlib}" = "yes" + then + VLC_ADD_LIBS([sap],[-lz]) +- PKG_CHECK_MODULES([MINIZIP], [minizip] , [ have_minizip=yes ], [ +-AC_CHECK_HEADERS([unzip.h], [ +- have_minizip=yes +- MINIZIP_LIBS="-lminizip -lz" +-], [ +- have_minizip=no +-]) +- ]) + fi +-AM_CONDITIONAL(HAVE_MINIZIP, [ test "${have_minizip}" = "yes" ]) + + + dnl +-- +2.41.0 + diff --git a/media-video/vlc/vlc-3.0.18-r2.ebuild b/media-video/vlc/vlc-3.0.18-r3.ebuild similarity index 99% rename from media-video/vlc/vlc-3.0.18-r2.ebuild rename to media-video/vlc/vlc-3.0.18-r3.ebuild index fda17b56a01a..8090dd85c579 100644 --- a/media-video/vlc/vlc-3.0.18-r2.ebuild +++ b/media-video/vlc/vlc-3.0.18-r3.ebuild @@ -64,7 +64,7 @@ BDEPEND=" RDEPEND=" media-libs/libvorbis net-dns/libidn:= - sys-libs/zlib[minizip] + sys-libs/zlib virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) @@ -234,6 +234,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 "${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.18-drop-minizip-dep.patch "${FILESDIR}"/${P}-flac-crc.patch ) diff --git a/media-video/vlc/vlc-3.0..ebuild b/media-video/vlc/vlc-3.0..ebuild index 1ada73f5cf53..345109f70eab 100644 --- a/media-video/vlc/vlc-3.0..ebuild +++ b/media-video/vlc/vlc-3.0..ebuild @@ -64,7 +64,7 @@ BDEPEND=" RDEPEND=" media-libs/libvorbis net-dns/libidn:= - sys-libs/zlib[minizip] + sys-libs/zlib virtual/libintl virtual/opengl a52? ( media-libs/a52dec ) @@ -234,6 +234,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 "${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.18-drop-minizip-dep.patch ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) diff --git a/media-video/vlc/vlc-.ebuild b/media-video/vlc/vlc-.ebuild index d3a241d4baf7..712516931946 100644 --- a/media-video/vlc/vlc-.ebuild +++ b/media-video/vlc/vlc-.ebuild @@ -63,7 +63,7 @@ BDEPEND=" RDEPEND=" media-libs/libvorbis net-dns/libidn:= - sys-libs/zlib[minizip] + sys-libs/zlib virtual/libintl virtual/opengl a52? ( media-libs/a52dec )
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/
commit: 59d26c40982765c7a36e7da8c21dec5e3a8b43ef Author: Sam James gentoo org> AuthorDate: Sat May 27 02:47:15 2023 + Commit: Sam James gentoo org> CommitDate: Sat May 27 02:47:19 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d26c40 media-video/vlc: scrub patches Accidentally left in dummy commit msg, oops. Bug: https://bugs.gentoo.org/901995 Signed-off-by: Sam James gentoo.org> media-video/vlc/files/vlc--configure-lua-version.patch | 9 - media-video/vlc/files/vlc--fix-libtremor-libs.patch| 9 - 2 files changed, 18 deletions(-) diff --git a/media-video/vlc/files/vlc--configure-lua-version.patch b/media-video/vlc/files/vlc--configure-lua-version.patch index d0ac9493a0fd..223841de8a3c 100644 --- a/media-video/vlc/files/vlc--configure-lua-version.patch +++ b/media-video/vlc/files/vlc--configure-lua-version.patch @@ -1,9 +1,3 @@ -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 - -Signed-off-by: Sam James --- a/configure.ac +++ b/configure.ac @@ -1847,43 +1847,10 @@ AC_ARG_ENABLE([lua], @@ -54,6 +48,3 @@ Signed-off-by: Sam James 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.]) --- -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 index 690cb73acfc4..3703cea1f10d 100644 --- a/media-video/vlc/files/vlc--fix-libtremor-libs.patch +++ b/media-video/vlc/files/vlc--fix-libtremor-libs.patch @@ -1,9 +1,3 @@ -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) @@ -15,6 +9,3 @@ Signed-off-by: Sam James EXTRA_LTLIBRARIES += libtremor_plugin.la codec_LTLIBRARIES += $(LTLIBtremor) --- -2.40.1 -
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/
commit: c79b32b61b3faab133ff22da56b55f7ae6e089bd Author: Michael Mair-Keimberger levelnine at> AuthorDate: Fri Feb 10 18:46:58 2023 + Commit: Sam James gentoo org> CommitDate: Fri Feb 17 05:21:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c79b32b6 media-video/vlc: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29537 Signed-off-by: Sam James gentoo.org> .../files/vlc-3.0.14-fix-live-address-api.patch| 53 --- .../vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch | 78 -- media-video/vlc/files/vlc-3.0.17.4-gcc13.patch | 20 -- 3 files changed, 151 deletions(-) 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 deleted file mode 100644 index 2d6f86f0aba6.. --- a/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch +++ /dev/null @@ -1,53 +0,0 @@ -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/files/vlc-3.0.17.3-dav1d-1.0.0.patch b/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch deleted file mode 100644 index deb748cdba92.. --- a/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch +++ /dev/null @@ -1,78 +0,0 @@ -https://code.videolan.org/videolan/vlc/-/merge_requests/1618.patch -https://bugs.gentoo.org/835787 - -From 0efdfe8799b0100f41c5b8d6e1b43451001386cb Mon Sep 17 00:00:00 2001 -From: Steve Lhomme -Date: Fri, 18 Mar 2022 11:42:49 +0100 -Subject: [PATCH 1/2] dav1d: fix compilation with (upcoming) dav1d 1.0 - -(cherry picked from commit dbf45cea2a8abdfbef897b8a71f3eb782bb1b712) (edited) -edited: -- 3.0 has the 128 pixels padding elsewhere -- 3.0 has an extra parameter for add_integer_with_range() -- 3.0 was setting i_extra_picture_buffers further down in the code -- 3.0 uses 16 threads max - -Signed-off-by: Steve Lhomme a/modules/codec/dav1d.c -+++ b/modules/codec/dav1d.c -@@ -63,10 +63,16 @@ vlc_module_begin () - set_category(CAT_INPUT) - set_subcategory(SUBCAT_INPUT_VCODEC) - -+#if DAV1D_API_VERSION_MAJOR >= 6 -+add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS, -+THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) -+add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0 -+#else - add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS, - THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) - add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS, - THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false) -+#endif - vlc_module_end () - - /* -@@ -294,6 +300,11 @@ static int
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 541281ddd0bef7dcefe265cec675ea8710e5fb68 Author: Sam James gentoo org> AuthorDate: Fri Oct 28 15:56:04 2022 + Commit: Sam James gentoo org> CommitDate: Fri Oct 28 15:56:04 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=541281dd media-video/vlc: fix build w/ gcc 13 Closes: https://bugs.gentoo.org/875785 Signed-off-by: Sam James gentoo.org> media-video/vlc/files/vlc-3.0.17.4-gcc13.patch | 20 media-video/vlc/vlc-3.0.17.4-r2.ebuild | 1 + 2 files changed, 21 insertions(+) diff --git a/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch b/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch new file mode 100644 index ..374cd5ada0ac --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch @@ -0,0 +1,20 @@ +https://code.videolan.org/robUx4/vlc/-/commit/6fca76ebd76bf8fce9b111e31bda64015cdc770f +https://bugs.gentoo.org/875785 + +From 6fca76ebd76bf8fce9b111e31bda64015cdc770f Mon Sep 17 00:00:00 2001 +From: Johannes Kauffmann +Date: Mon, 11 Jul 2022 19:35:57 + +Subject: [PATCH] demux: dash: include cstdint, needed for uint64_t + +Fixes #27077. +--- a/modules/demux/dash/mpd/TemplatedUri.hpp b/modules/demux/dash/mpd/TemplatedUri.hpp +@@ -21,6 +21,7 @@ + #ifndef TEMPLATEDURI_HPP + #define TEMPLATEDURI_HPP + ++#include + #include + + namespace dash +GitLab diff --git a/media-video/vlc/vlc-3.0.17.4-r2.ebuild b/media-video/vlc/vlc-3.0.17.4-r2.ebuild index 2d22452092cf..824a5c251898 100644 --- a/media-video/vlc/vlc-3.0.17.4-r2.ebuild +++ b/media-video/vlc/vlc-3.0.17.4-r2.ebuild @@ -232,6 +232,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch "${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 835072 "${FILESDIR}"/${PN}-3.0.17.3-dav1d-1.0.0.patch # bug 835787 + "${FILESDIR}"/${PN}-3.0.17.4-gcc13.patch # bug 875785 ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/
commit: 6c5218213a469e90cdb76c48ff5ff028f59f094d Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Oct 15 07:59:51 2022 + Commit: Conrad Kostecki gentoo org> CommitDate: Sat Oct 15 19:33:44 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c521821 media-video/vlc: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/27789 Signed-off-by: Conrad Kostecki gentoo.org> media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch | 25 -- media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch | 11 -- 2 files changed, 36 deletions(-) diff --git a/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch b/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch deleted file mode 100644 index d617a8357ff7.. --- a/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch +++ /dev/null @@ -1,25 +0,0 @@ -net-libs/srt renamed the SRTO_TSBPDDELAY constant to SRTRO_LATENCY. -https://github.com/Haivision/srt/pull/1364 -https://bugs.gentoo.org/758062 b/modules/access/srt.c -+++ a/modules/access/srt.c -@@ -165,7 +165,7 @@ static bool srt_schedule_reconnect(strea - - /* Set latency */ - i_latency = var_InheritInteger( p_stream, "latency" ); --srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, -+srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, - &i_latency, sizeof( int ) ); - - psz_passphrase = var_InheritString( p_stream, "passphrase" ); a/modules/access_output/srt.c -+++ b/modules/access_output/srt.c -@@ -162,7 +162,7 @@ static bool srt_schedule_reconnect(sout_ - - /* Set latency */ - i_latency = var_InheritInteger( p_access, "latency" ); --srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, -+srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, - &i_latency, sizeof( int ) ); - - if ( psz_passphrase != NULL && psz_passphrase[0] != '\0') diff --git a/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch b/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch deleted file mode 100644 index c255689c1ca0.. --- a/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch +++ /dev/null @@ -1,11 +0,0 @@ a/configure.ac -+++ b/configure.ac -@@ -4016,7 +4016,7 @@ - dnl - dnl SRT plugin - dnl --PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2 srt < 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) -+PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) - - EXTEND_HELP_STRING([Visualisations and Video filter plugins:]) - dnl
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 57322daae014d657b2b063abff4af216f1d90151 Author: Sam James gentoo org> AuthorDate: Thu Apr 7 22:32:43 2022 + Commit: Sam James gentoo org> CommitDate: Thu Apr 7 22:33:17 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57322daa media-video/vlc: add dav1d-1.0.0 patch It's unmerged (pending upstream) but nobody's complained of runtime issues and the patch itself wasn't disputed; just whether there's another separate runtime bug which people noticed during review of the patch. Closes: https://bugs.gentoo.org/835787 Signed-off-by: Sam James gentoo.org> .../vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch | 78 media-video/vlc/vlc-3.0.17.3-r2.ebuild | 515 + 2 files changed, 593 insertions(+) diff --git a/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch b/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch new file mode 100644 index ..deb748cdba92 --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch @@ -0,0 +1,78 @@ +https://code.videolan.org/videolan/vlc/-/merge_requests/1618.patch +https://bugs.gentoo.org/835787 + +From 0efdfe8799b0100f41c5b8d6e1b43451001386cb Mon Sep 17 00:00:00 2001 +From: Steve Lhomme +Date: Fri, 18 Mar 2022 11:42:49 +0100 +Subject: [PATCH 1/2] dav1d: fix compilation with (upcoming) dav1d 1.0 + +(cherry picked from commit dbf45cea2a8abdfbef897b8a71f3eb782bb1b712) (edited) +edited: +- 3.0 has the 128 pixels padding elsewhere +- 3.0 has an extra parameter for add_integer_with_range() +- 3.0 was setting i_extra_picture_buffers further down in the code +- 3.0 uses 16 threads max + +Signed-off-by: Steve Lhomme +--- a/modules/codec/dav1d.c b/modules/codec/dav1d.c +@@ -63,10 +63,16 @@ vlc_module_begin () + set_category(CAT_INPUT) + set_subcategory(SUBCAT_INPUT_VCODEC) + ++#if DAV1D_API_VERSION_MAJOR >= 6 ++add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS, ++THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) ++add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0 ++#else + add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS, + THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false) + add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS, + THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false) ++#endif + vlc_module_end () + + /* +@@ -294,6 +300,11 @@ static int OpenDecoder(vlc_object_t *p_this) + return VLC_ENOMEM; + + dav1d_default_settings(&p_sys->s); ++#if DAV1D_API_VERSION_MAJOR >= 6 ++p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); ++if (p_sys->s.n_threads == 0) ++p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16; ++#else + p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles"); + if (p_sys->s.n_tile_threads == 0) + p_sys->s.n_tile_threads = +@@ -303,6 +314,7 @@ static int OpenDecoder(vlc_object_t *p_this) + p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames"); + if (p_sys->s.n_frame_threads == 0) + p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16; ++#endif + p_sys->s.allocator.cookie = dec; + p_sys->s.allocator.alloc_picture_callback = NewPicture; + p_sys->s.allocator.release_picture_callback = FreePicture; +@@ -313,12 +325,20 @@ static int OpenDecoder(vlc_object_t *p_this) + return VLC_EGENERIC; + } + ++#if DAV1D_API_VERSION_MAJOR >= 6 ++msg_Dbg(p_this, "Using dav1d version %s with %d threads", ++dav1d_version(), p_sys->s.n_threads); ++ ++dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1); ++#else + msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads", + dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads); + ++dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); ++#endif ++ + dec->pf_decode = Decode; + dec->pf_flush = FlushDecoder; +-dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1); + + dec->fmt_out.video.i_width = dec->fmt_in.video.i_width; + dec->fmt_out.video.i_height = dec->fmt_in.video.i_height; +GitLab diff --git a/media-video/vlc/vlc-3.0.17.3-r2.ebuild b/media-video/vlc/vlc-3.0.17.3-r2.ebuild new file mode 100644 index ..33d9f2b17a26 --- /dev/null +++ b/media-video/vlc/vlc-3.0.17.3-r2.ebuild @@ -0,0 +1,515 @@ +# Copyright 2000-2022 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_BRANCH="3.0.x" + fi + EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 3c66c764661b65e66ebe69ef6d4cce3a544b6a85 Author: Sam James gentoo org> AuthorDate: Tue May 4 22:46:13 2021 + Commit: Sam James gentoo org> CommitDate: Tue May 4 22:46:13 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c66c764 media-video/vlc: allow building against newer net-libs/srt Bug: https://bugs.gentoo.org/788226 Thanks-to: Lars Wendler gentoo.org> Signed-off-by: Sam James gentoo.org> media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch | 11 +++ media-video/vlc/vlc-3.0.13.ebuild| 1 + 2 files changed, 12 insertions(+) diff --git a/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch b/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch new file mode 100644 index 000..c255689c1ca --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch @@ -0,0 +1,11 @@ +--- a/configure.ac b/configure.ac +@@ -4016,7 +4016,7 @@ + dnl + dnl SRT plugin + dnl +-PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2 srt < 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) ++PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) + + EXTEND_HELP_STRING([Visualisations and Video filter plugins:]) + dnl diff --git a/media-video/vlc/vlc-3.0.13.ebuild b/media-video/vlc/vlc-3.0.13.ebuild index d9b5ab264cc..a706bd9e653 100644 --- a/media-video/vlc/vlc-3.0.13.ebuild +++ b/media-video/vlc/vlc-3.0.13.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.13-srt-1.3.0.patch ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/
commit: f4cc9af8940ec5d328a6d2bfbf52fcc803cb31f8 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Mon Feb 15 17:03:51 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Mon Feb 15 20:11:25 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4cc9af8 media-video/vlc: remove unused patch Closes: https://github.com/gentoo/gentoo/pull/19480 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> media-video/vlc/files/vlc-3.0.8-qt-5.15.patch | 30 --- 1 file changed, 30 deletions(-) diff --git a/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch b/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch deleted file mode 100644 index 7bdc24de4af..000 --- a/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch +++ /dev/null @@ -1,30 +0,0 @@ a/modules/gui/qt/util/timetooltip.hpp 2018-05-03 14:03:21.0 +0200 -+++ b/modules/gui/qt/util/timetooltip.hpp 2020-04-21 00:57:48.570508113 +0200 -@@ -24,6 +24,7 @@ - - #include "qt.hpp" - -+#include - #include - - class TimeTooltip : public QWidget a/modules/gui/qt/dialogs/plugins.cpp 2017-11-24 16:29:17.0 +0100 -+++ b/modules/gui/qt/dialogs/plugins.cpp 2020-04-21 01:10:14.916737405 +0200 -@@ -53,6 +53,7 @@ - #include - #include - #include -+#include - #include - #include - #include a/modules/gui/qt/components/playlist/views.cpp 2017-11-24 16:29:17.0 +0100 -+++ b/modules/gui/qt/components/playlist/views.cpp 2020-04-21 01:12:28.002665729 +0200 -@@ -27,6 +27,7 @@ - #include "input_manager.hpp" /* THEMIM */ - - #include -+#include - #include - #include - #include
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: e014d41451b0d3fc3f9037d37703a20de1d197e3 Author: Sam James gentoo org> AuthorDate: Fri Dec 25 02:26:13 2020 + Commit: Sam James gentoo org> CommitDate: Fri Dec 25 02:35:51 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e014d414 media-video/vlc: fix USE=srt with >=net-libs/srt-1.4.2 Thanks-to: Attila Tóth atoth.sote.hu> Closes: https://bugs.gentoo.org/758062 Package-Manager: Portage-3.0.9, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch | 25 ++ ...3.0.11.1-r100.ebuild => vlc-3.0.11.1-r1.ebuild} | 18 ...0.11.1-r100.ebuild => vlc-3.0.11.1-r101.ebuild} | 3 ++- 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch b/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch new file mode 100644 index 000..d617a8357ff --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch @@ -0,0 +1,25 @@ +net-libs/srt renamed the SRTO_TSBPDDELAY constant to SRTRO_LATENCY. +https://github.com/Haivision/srt/pull/1364 +https://bugs.gentoo.org/758062 +--- b/modules/access/srt.c a/modules/access/srt.c +@@ -165,7 +165,7 @@ static bool srt_schedule_reconnect(strea + + /* Set latency */ + i_latency = var_InheritInteger( p_stream, "latency" ); +-srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, ++srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, + &i_latency, sizeof( int ) ); + + psz_passphrase = var_InheritString( p_stream, "passphrase" ); +--- a/modules/access_output/srt.c b/modules/access_output/srt.c +@@ -162,7 +162,7 @@ static bool srt_schedule_reconnect(sout_ + + /* Set latency */ + i_latency = var_InheritInteger( p_access, "latency" ); +-srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY, ++srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY, + &i_latency, sizeof( int ) ); + + if ( psz_passphrase != NULL && psz_passphrase[0] != '\0') diff --git a/media-video/vlc/vlc-3.0.11.1-r100.ebuild b/media-video/vlc/vlc-3.0.11.1-r1.ebuild similarity index 97% copy from media-video/vlc/vlc-3.0.11.1-r100.ebuild copy to media-video/vlc/vlc-3.0.11.1-r1.ebuild index 1c18dbda43a..5191f531572 100644 --- a/media-video/vlc/vlc-3.0.11.1-r100.ebuild +++ b/media-video/vlc/vlc-3.0.11.1-r1.ebuild @@ -3,8 +3,6 @@ EAPI=7 -LUA_COMPAT=( lua5-{1..2} ) - MY_PV="${PV/_/-}" MY_PV="${MY_PV/-beta/-test}" MY_P="${PN}-${MY_PV}" @@ -23,7 +21,7 @@ else fi KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -sparc ~x86" fi -inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg +inherit autotools flag-o-matic toolchain-funcs virtualx xdg DESCRIPTION="Media player and framework with support for most multimedia files and streaming" HOMEPAGE="https://www.videolan.org/vlc/"; @@ -49,7 +47,6 @@ REQUIRED_USE=" libcaca? ( X ) libtar? ( skins ) libtiger? ( kate ) - lua? ( ${LUA_REQUIRED_USE} ) skins? ( qt5 truetype X xml ) ssl? ( gcrypt ) vaapi? ( ffmpeg X ) @@ -58,7 +55,6 @@ REQUIRED_USE=" BDEPEND=" >=sys-devel/gettext-0.19.8 virtual/pkgconfig - lua? ( ${LUA_DEPS} ) amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) " @@ -137,7 +133,7 @@ RDEPEND=" linsys? ( media-libs/zvbi ) lirc? ( app-misc/lirc ) live? ( media-plugins/live:= ) - lua? ( ${LUA_DEPS} ) + lua? ( >=dev-lang/lua-5.1:0= ) mad? ( media-libs/libmad ) matroska? ( >=dev-libs/libebml-1.3.6:= @@ -184,7 +180,7 @@ RDEPEND=" >=media-libs/speex-1.2.0 media-libs/speexdsp ) - srt? ( net-libs/srt ) + srt? ( >=net-libs/srt-1.4.2 ) ssl? ( net-libs/gnutls:= ) svg? ( gnome-base/librsvg:2 @@ -232,19 +228,13 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 "${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream - "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch + "${FILESDIR}"/${PN}-3.0.11.1-srt-1.4.2.patch # bug 758062 ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) S="${WORKDIR}/${MY_P}" -pkg_setup() { - if use lua; then - lua-single_pkg_setup - fi -} - src_prepare() { xdg_src_prepare # bug 608256 diff --git a/media-video/vlc/vlc-3.0.11.1-r100.ebuild b/media-video/vlc/vlc-3.0.11.1-r101.ebuild similarity index 99% rename from media-video/vlc/vlc-3.0.11.1-r100.ebuild rename to media-video/vlc/vlc-3.0.11.1-r101.ebuild index 1c18dbda43a..f07316c9278 100644 --- a/media-video/vlc/vlc-3.0.11.1-r100.ebuild +++ b/media-video/vlc/vlc-3.0.11.1-r101.ebuild @@ -184,7 +184,7 @@ RDEPEND=" >=media-libs/speex-1.2.0 media-libs/speexdsp ) - srt? ( net-libs/srt ) +
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: f9ed1719f97b18dc04892cc08b5d0324c152a150 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 21 08:31:42 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 21 09:22:15 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9ed1719 media-video/vlc: Fix build with Qt 5.15 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> media-video/vlc/files/vlc-3.0.8-qt-5.15.patch | 30 +++ media-video/vlc/vlc-3.0.8.ebuild | 1 + media-video/vlc/vlc-3.0..ebuild | 1 + 3 files changed, 32 insertions(+) diff --git a/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch b/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch new file mode 100644 index 000..7bdc24de4af --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch @@ -0,0 +1,30 @@ +--- a/modules/gui/qt/util/timetooltip.hpp 2018-05-03 14:03:21.0 +0200 b/modules/gui/qt/util/timetooltip.hpp 2020-04-21 00:57:48.570508113 +0200 +@@ -24,6 +24,7 @@ + + #include "qt.hpp" + ++#include + #include + + class TimeTooltip : public QWidget +--- a/modules/gui/qt/dialogs/plugins.cpp 2017-11-24 16:29:17.0 +0100 b/modules/gui/qt/dialogs/plugins.cpp 2020-04-21 01:10:14.916737405 +0200 +@@ -53,6 +53,7 @@ + #include + #include + #include ++#include + #include + #include + #include +--- a/modules/gui/qt/components/playlist/views.cpp 2017-11-24 16:29:17.0 +0100 b/modules/gui/qt/components/playlist/views.cpp 2020-04-21 01:12:28.002665729 +0200 +@@ -27,6 +27,7 @@ + #include "input_manager.hpp" /* THEMIM */ + + #include ++#include + #include + #include + #include diff --git a/media-video/vlc/vlc-3.0.8.ebuild b/media-video/vlc/vlc-3.0.8.ebuild index ff05a37e121..090c04ddbb2 100644 --- a/media-video/vlc/vlc-3.0.8.ebuild +++ b/media-video/vlc/vlc-3.0.8.ebuild @@ -231,6 +231,7 @@ 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.6-fdk-aac-2.0.0.patch # bug 672290 + "${FILESDIR}"/${P}-qt-5.15.patch ) 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 46be52b9fc5..8af1fe6e259 100644 --- a/media-video/vlc/vlc-3.0..ebuild +++ b/media-video/vlc/vlc-3.0..ebuild @@ -232,6 +232,7 @@ 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.6-fdk-aac-2.0.0.patch # bug 672290 + "${FILESDIR}"/${PN}-3.0.8-qt-5.15.patch # TODO: upstream ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 6bc2447d478ecb43164615fc52b6248cf60d3671 Author: Conrad Kostecki kostecki com> AuthorDate: Fri Apr 5 08:46:32 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Apr 6 20:28:57 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bc2447d media-video/vlc: fix build with sftp Closes: https://bugs.gentoo.org/681764 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Conrad Kostecki kostecki.com> Closes: https://github.com/gentoo/gentoo/pull/11597 Signed-off-by: Andreas Sturmlechner gentoo.org> media-video/vlc/files/vlc-3.0.6-sftp.patch | 24 media-video/vlc/vlc-3.0.6-r1.ebuild| 1 + 2 files changed, 25 insertions(+) diff --git a/media-video/vlc/files/vlc-3.0.6-sftp.patch b/media-video/vlc/files/vlc-3.0.6-sftp.patch new file mode 100644 index 000..3092bf5a47c --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.6-sftp.patch @@ -0,0 +1,24 @@ +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 LIBSSH2_HOSTKEY_TYPE_ECDSA_256: + knownhost_fingerprint_algo = LIBSSH2_KNOWNHOST_KEY_ECDSA_256; + break; diff --git a/media-video/vlc/vlc-3.0.6-r1.ebuild b/media-video/vlc/vlc-3.0.6-r1.ebuild index e53ae722722..42b4075acb2 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}"/${P}-libvpx-1.8.0.patch # bug 677606 "${FILESDIR}"/${P}-fdk-aac-2.0.0.patch # bug 672290 "${FILESDIR}"/${P}-libav.patch + "${FILESDIR}"/${P}-sftp.patch ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 3a1d816d9bd8cc13bf203fd4076ec8059596e8ca Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jul 10 20:28:32 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 15 12:35:58 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a1d816d media-video/vlc: Drop 2.2.8-r1 Closes: https://bugs.gentoo.org/647606 Package-Manager: Portage-2.3.41, Repoman-2.3.9 media-video/vlc/Manifest | 1 - media-video/vlc/files/qt4-select.patch | 51 --- media-video/vlc/files/vlc-2.2.2-qt5widgets.patch | 13 - .../vlc/files/vlc-2.2.4-alsa-large-buffers.patch | 47 -- media-video/vlc/files/vlc-2.2.4-cxx0x.patch| 11 - media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch | 160 --- media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch | 45 -- .../vlc/files/vlc-2.2.6-decoder-lock-scope.patch | 34 -- .../vlc/files/vlc-2.2.8-libupnp-compat.patch | 28 -- media-video/vlc/metadata.xml | 15 - media-video/vlc/vlc-2.2.8-r1.ebuild| 480 - 11 files changed, 885 deletions(-) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 82d849bd006..06f4d1b15d5 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,2 +1 @@ -DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b5df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab diff --git a/media-video/vlc/files/qt4-select.patch b/media-video/vlc/files/qt4-select.patch deleted file mode 100644 index fb1526a30a7..000 --- a/media-video/vlc/files/qt4-select.patch +++ /dev/null @@ -1,51 +0,0 @@ -https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54 -For use until upstream ever accepts this patch or fixes it themsleves a/configure.ac -+++ b/configure.ac -@@ -3709,7 +3709,8 @@ - ]) - ]) - AS_IF([test "${enable_qt}" != "no"], [ -- PKG_CHECK_MODULES([QT], [Qt5Core >= 5.1.0 Qt5Widgets Qt5Gui], [ -+ AS_IF([test "${enable_qt}" != "4"], [ -+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]) -@@ -3721,20 +3722,23 @@ - AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) - AC_PATH_PROGS(RCC, [rcc-qt5 rcc], rcc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) - AC_PATH_PROGS(UIC, [uic-qt5 uic], uic, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) -+ enable_qt="5" --], [ -- PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [ --AS_IF([test -n "${enable_qt}"],[ -- AC_MSG_ERROR([${QT_PKG_ERRORS}.]) --],[ -- AC_MSG_WARN([${QT_PKG_ERRORS}.]) --]) --enable_qt="no" -+]) -+ ]) -+ AS_IF([test "${enable_qt}" != "5"], [ -+PKG_CHECK_MODULES([QT], [QtCore QtGui >= 4.6.0],, [ -+ AS_IF([test -n "${enable_qt}"],[ -+AC_MSG_ERROR([${QT_PKG_ERRORS}.]) -+ ],[ -+AC_MSG_WARN([${QT_PKG_ERRORS}.]) - ]) -- QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" -- AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) -- AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) -- AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) -+ enable_qt="no" - ]) -+QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix QtCore)" -+AC_PATH_PROGS(MOC, [moc-qt4 moc], moc, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) -+AC_PATH_PROG(RCC, rcc, rcc, [${QT_PATH}/bin ${CONTRIB_DIR}/bin]) -+AC_PATH_PROGS(UIC, [uic-qt4 uic], uic, ["${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) -+ ]) - ]) - AS_IF([test "${enable_qt}" != "no"], [ - VLC_ADD_PLUGIN([qt4]) - diff --git a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch deleted file mode 100644 index a024d0032b6..000 --- a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch +++ /dev/null @@ -1,13 +0,0 @@ vlc-2.2.2/configure.ac -+++ vlc-2.2.2/configure.ac -@@ -3754,10 +3754,6 @@ - AC_MSG_WARN([Not building Qt Interface with X11 helpers.]) - ]) - -- PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [ --AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/
commit: 17ee272a57feea1f9f530c89987d8cd4a60f1749 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 11 14:34:34 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 11 16:43:55 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ee272a media-video/vlc: Update vlc--libupnp-slot-1.8.patch Package-Manager: Portage-2.3.45, Repoman-2.3.10 media-video/vlc/files/vlc--libupnp-slot-1.8.patch | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/media-video/vlc/files/vlc--libupnp-slot-1.8.patch b/media-video/vlc/files/vlc--libupnp-slot-1.8.patch index 893f936b729..15ffc6af6fa 100644 --- a/media-video/vlc/files/vlc--libupnp-slot-1.8.patch +++ b/media-video/vlc/files/vlc--libupnp-slot-1.8.patch @@ -1,16 +1,16 @@ a/modules/services_discovery/upnp.hpp 2017-12-25 18:17:33.358015500 +0100 -+++ b/modules/services_discovery/upnp.hpp 2017-12-25 18:30:45.158167813 +0100 +--- a/modules/services_discovery/upnp-wrapper.hpp 2017-12-25 18:17:33.358015500 +0100 b/modules/services_discovery/upnp-wrapper.hpp 2017-12-25 18:30:45.158167813 +0100 @@ -35,8 +35,8 @@ - #include - #include - #endif --#include --#include + #include + #include + +-#include +-#include +#include +#include - #include - #include + #if UPNP_VERSION < 10800 + typedef void* UpnpEventPtr; --- a/configure.ac 2017-12-09 14:09:12.956370304 +0100 +++ b/configure.ac 2017-12-09 14:13:25.236710362 +0100
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: da6e5a8bc6d2a4598852471e692fefb94b71180a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 11 13:51:45 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Aug 11 16:43:53 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da6e5a8b media-video/vlc: Fix build with >=dev-libs/fribidi-1 Thanks-to: Greg Turner ameritech.net> Closes: https://bugs.gentoo.org/662662 Package-Manager: Portage-2.3.45, Repoman-2.3.10 media-video/vlc/files/vlc-3.0.3-fribidi-1.patch | 80 + media-video/vlc/vlc-3.0.3-r1.ebuild | 1 + 2 files changed, 81 insertions(+) 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 new file mode 100644 index 000..4431025a21e --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.3-fribidi-1.patch @@ -0,0 +1,80 @@ +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*p_levels; + FriBidiStrIndex *pi_reordered_indices; + FriBidiParType paragraph_type; +@@ -361,6 +364,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter, + #ifdef HAVE_FRIBIDI + p_paragraph->p_levels = vlc_alloc( i_size, sizeof( *p_paragraph->p_levels ) ); + p_paragraph->p_types = vlc_alloc( i_size, sizeof( *p_paragraph->p_types ) ); ++#if FRIBIDI_MAJOR_VERSION >= 1 ++p_paragraph->p_btypes = vlc_alloc( i_size, sizeof( *p_paragraph->p_btypes ) ); ++#endif + p_paragraph->pi_reordered_indices = + vlc_alloc( i_size, sizeof( *p_paragraph->pi_reordered_indices ) ); + +@@ -398,6 +404,9 @@ static paragraph_t *NewParagraph( filter_t *p_filter, + #ifdef HAVE_FRIBIDI + if( p_paragraph->p_levels ) free( p_paragraph->p_levels ); + if( p_paragraph->p_types ) free( p_paragraph->p_types ); ++#if FRIBIDI_MAJOR_VERSION >= 1 ++if( p_paragraph->p_btypes ) free( p_paragraph->p_btypes ); ++#endif + if( p_paragraph->pi_reordered_indices ) + free( p_paragraph->pi_reordered_indices ); + #endif +@@ -424,6 +433,9 @@ static void FreeParagraph( paragraph_t *p_paragraph ) + #ifdef HAVE_FRIBIDI + free( p_paragraph->pi_reordered_indices ); + free( p_paragraph->p_types ); ++#if FRIBIDI_MAJOR_VERSION >= 1 ++free( p_paragraph->p_btypes ); ++#endif + free( p_paragraph->p_levels ); + #endif + +@@ -436,10 +448,22 @@ static int AnalyzeParagraph( paragraph_t *p_paragraph ) + fribidi_get_bidi_types( p_paragraph->p_code_points, + p_paragraph->i_size, + p_paragraph->p_types ); ++#if FRIBIDI_MAJOR_VERSION >= 1 ++fribidi_get_bracket_types( p_paragraph->p_code_points, ++ p_paragraph->i_size, ++ p_paragraph->p_types, ++ p_paragraph->p_btypes ); ++fribidi_get_par_embedding_levels_ex( p_paragraph->p_types, ++ p_paragraph->p_btypes, ++ p_paragraph->i_size, ++ &p_paragraph->paragraph_type, ++ p_paragraph->p_levels ); ++#else + fribidi_get_par_embedding_levels( p_paragraph->p_types, + p_paragraph->i_size, + &p_paragraph->paragraph_type, + p_paragraph->p_levels ); ++#endif + + #ifdef HAVE_HARFBUZZ + hb_unicode_funcs_t *p_funcs = hb_unicode_funcs_get_default(); diff --git a/media-video/vlc/vlc-3.0.3-r1.ebuild b/media-video/vlc/vlc-3.0.3-r1.ebuild index 3a76f2f5cf9..f446a714430 100644 --- a/media-video/vlc/vlc-3.0.3-r1.ebuild +++ b/media-video/vlc/vlc-3.0.3-r1.ebuild @@ -230,6 +230,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 "${FILESDIR}"/${PN}-3.0.1-qt-5.11.patch # TODO upstream "${FILESDIR}"/${P}-fix-disable-vlm.patch # bug 649798 + "${FILESDIR}"/${P}-fribidi-1.patch # bug 662662 ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 87ea358ab733755cd330c5d5191d79bf1be121e5 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 31 21:04:35 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 31 21:16:17 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87ea358a media-video/vlc: 3.0.3 version bump Closes: https://bugs.gentoo.org/649798 Package-Manager: Portage-2.3.40, Repoman-2.3.9 media-video/vlc/Manifest | 1 + .../vlc/files/vlc-3.0.3-fix-disable-vlm.patch | 42 ++ media-video/vlc/vlc-3.0.3.ebuild | 499 + 3 files changed, 542 insertions(+) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index d3a85a7c167..86b22b14ecb 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.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c SHA512 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec20551758a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f +DIST vlc-3.0.3.tar.xz 24941592 BLAKE2B dd6e27b10064ecae1c6f64459d2ed172d09f8dc1414c4d96bf66e8b3104154154229bb5d638955c855b6cf471b8630196b170db94b61506c7e0dd42bec8fbb20 SHA512 1569cefa6623b2631a832679bc9a63ebeba222901e5221d254e896a68d2ee467054da8de9eda566924e80a11bb29a673a9f0c4243793845547d8027b58a238ab 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 new file mode 100644 index 000..fe4eecb8e76 --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.3-fix-disable-vlm.patch @@ -0,0 +1,42 @@ +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/vlc-3.0.3.ebuild b/media-video/vlc/vlc-3.0.3.ebuild new file mode 100644 index 000..e884279f947 --- /dev/null +++ b/media-video/vlc/vlc-3.0.3.ebuild @@ -0,0 +1,499 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +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 + SCM="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 ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd" +fi +inherit autotools flag-o-matic gnome2-utils toolchain-funcs versionator virtualx xdg-utils ${SCM} + +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 altivec aom archive bidi bluray cddb chromaprint chromecast dbus dc1394 + debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth fontconfig + +gcrypt gme gnome-keyring gstreamer i
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 693736686b836589030cd38562bacf7ea492d545 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue May 29 14:40:37 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue May 29 14:41:14 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69373668 media-video/vlc: Drop 3.0.1-r1 Package-Manager: Portage-2.3.40, Repoman-2.3.9 media-video/vlc/Manifest | 1 - media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch | 65 --- media-video/vlc/vlc-3.0.1-r1.ebuild| 498 - 3 files changed, 564 deletions(-) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index a5f18bc13c4..d3a85a7c167 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,3 +1,2 @@ DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b5df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a -DIST vlc-3.0.1.tar.xz 25174040 BLAKE2B 10121ef74f90ee7103d5958b49b7b187a3b8a1cd0bb36a9d97f409a7500285594d89721cb17add80d2a3d8d0f607ed4ec46986b9a9faa4a9d7c67c1eb7d60dca SHA512 f2ba7586e8fb8c04484e62809265ec998e875b1eff03262bbf463370277a318816cbb8d260901c774e59443393b16b040cb714019c80e051578008abbf91b13c DIST vlc-3.0.2.tar.xz 25175492 BLAKE2B c0f2bebd9df491ff511f6bbdf27dc21b5676c5fbcb992a2d8e231ad7c1d276c4e50e39784e4fc1445af44ecf8a1a23f7fbc4e1cef200b2365b25eeb604fd5e8c SHA512 907a999dfa00fbc378e46689b2c32a09ea324b47a92b2183f2a1ade2c2c1ec20551758a3c615d17b15d6885ee0ac51894944b90077968cb30ff58745497f diff --git a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch deleted file mode 100644 index 6ea45d5abf0..000 --- a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: Janne Grunau -Date: Mon, 19 Feb 2018 00:47:53 +0100 -Subject: arm: make the assembler functions compatible with non ELF/gas - platforms -MIME-Version: 1.0 -Content-Type: text/plain; charset="utf-8" -Content-Transfer-Encoding: 8bit - -Allow assembling arm neon functions for IOS and arm windows. - -Signed-off-by: Martin Storsjö -(cherry picked from commit ec4d9649d1c03fe8f578db38b41dccdf5e11b005) -Signed-off-by: Thomas Guillem - -[Add modules/arm_neon/asm.S missing from orig tarball.] - modules/arm_neon/asm.S | 39 +++ - 1 file changed, 39 insertions(+) - create mode 100644 modules/arm_neon/asm.S - -diff --git a/modules/arm_neon/asm.S b/modules/arm_neon/asm.S -new file mode 100644 -index 000..728391e /dev/null -+++ b/modules/arm_neon/asm.S -@@ -0,0 +1,39 @@ -+/* -+ * Copyright (c) 2018 Janne Grunau -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this program; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -+ */ -+ -+#ifdef __APPLE__ -+# define EXTERN_ASM _ -+#else -+# define EXTERN_ASM -+#endif -+ -+#if defined(__APPLE__) || defined(_WIN32) -+# define HAVE_AS_ARCH_DIRECTIVE 0 -+# define HAVE_AS_FPU_DIRECTIVE 0 -+#else -+# define HAVE_AS_ARCH_DIRECTIVE 1 -+# define HAVE_AS_FPU_DIRECTIVE 1 -+#endif -+ -+.macro function name -+ .globl EXTERN_ASM\name -+#ifdef __ELF__ -+ .type EXTERN_ASM\name, %function -+#endif -+EXTERN_ASM\name: -+.endm diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild b/media-video/vlc/vlc-3.0.1-r1.ebuild deleted file mode 100644 index 1ac9c9a5b14..000 --- a/media-video/vlc/vlc-3.0.1-r1.ebuild +++ /dev/null @@ -1,498 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -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 - SCM="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/p
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 8b1c79dc5982aa13d7fc4c6fce82e9febe4ed8f7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 10 21:39:20 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 10 21:45:22 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b1c79dc media-video/vlc: Fix build with arm Thanks-to: tt_1 yahoo.de> Tested-by: Alexey Korepanov yandex.ru> Closes: https://bugs.gentoo.org/649798 Package-Manager: Portage-2.3.28, Repoman-2.3.9 media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch | 65 ++ media-video/vlc/vlc-3.0.1-r1.ebuild| 1 + 2 files changed, 66 insertions(+) diff --git a/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch new file mode 100644 index 000..6ea45d5abf0 --- /dev/null +++ b/media-video/vlc/files/vlc-3.0.1-arm-neon-fix.patch @@ -0,0 +1,65 @@ +From: Janne Grunau +Date: Mon, 19 Feb 2018 00:47:53 +0100 +Subject: arm: make the assembler functions compatible with non ELF/gas + platforms +MIME-Version: 1.0 +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +Allow assembling arm neon functions for IOS and arm windows. + +Signed-off-by: Martin Storsjö +(cherry picked from commit ec4d9649d1c03fe8f578db38b41dccdf5e11b005) +Signed-off-by: Thomas Guillem + +[Add modules/arm_neon/asm.S missing from orig tarball.] +--- + modules/arm_neon/asm.S | 39 +++ + 1 file changed, 39 insertions(+) + create mode 100644 modules/arm_neon/asm.S + +diff --git a/modules/arm_neon/asm.S b/modules/arm_neon/asm.S +new file mode 100644 +index 000..728391e +--- /dev/null b/modules/arm_neon/asm.S +@@ -0,0 +1,39 @@ ++/* ++ * Copyright (c) 2018 Janne Grunau ++ * ++ * This program is free software; you can redistribute it and/or ++ * modify it under the terms of the GNU Lesser General Public ++ * License as published by the Free Software Foundation; either ++ * version 2.1 of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * Lesser General Public License for more details. ++ * ++ * You should have received a copy of the GNU Lesser General Public ++ * License along with this program; if not, write to the Free Software ++ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ++ */ ++ ++#ifdef __APPLE__ ++# define EXTERN_ASM _ ++#else ++# define EXTERN_ASM ++#endif ++ ++#if defined(__APPLE__) || defined(_WIN32) ++# define HAVE_AS_ARCH_DIRECTIVE 0 ++# define HAVE_AS_FPU_DIRECTIVE 0 ++#else ++# define HAVE_AS_ARCH_DIRECTIVE 1 ++# define HAVE_AS_FPU_DIRECTIVE 1 ++#endif ++ ++.macro function name ++ .globl EXTERN_ASM\name ++#ifdef __ELF__ ++ .type EXTERN_ASM\name, %function ++#endif ++EXTERN_ASM\name: ++.endm diff --git a/media-video/vlc/vlc-3.0.1-r1.ebuild b/media-video/vlc/vlc-3.0.1-r1.ebuild index bc0c2a189e6..f4d4543afd5 100644 --- a/media-video/vlc/vlc-3.0.1-r1.ebuild +++ b/media-video/vlc/vlc-3.0.1-r1.ebuild @@ -226,6 +226,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}-arm-neon-fix.patch # bug 649798 "${FILESDIR}"/${P}-qt-5.11.patch # TODO upstream )
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 01971664316881492a2982086b564112dc282ab2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 14 10:27:49 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Feb 27 22:50:41 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01971664 media-video/vlc: Cleanup vulnerable 2.2.6 arm security stabilisation timeout. Bug: https://bugs.gentoo.org/620176 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-video/vlc/Manifest | 1 - ...2.1.0-TomWij-bisected-PA-broken-underflow.patch | 23 - .../vlc/files/vlc-2.2.4-decoder-lock-scope.patch | 47 -- .../vlc/files/vlc--libva-1.2.1-compat.patch| 12 - media-video/vlc/vlc-2.2.6.ebuild | 511 - 5 files changed, 594 deletions(-) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 7de7a154668..b1a6a36d2b0 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,3 +1,2 @@ -DIST vlc-2.2.6.tar.xz 22198720 BLAKE2B a3d5d75551908a92c894ca18b36fd165ea0d6a99d1729c311f2051dfe1dd5eb7bf5045b08652e7a1d335212416a3e2d077f37157c7ae4773a5ecc2c49e39f5a6 SHA512 9aff5922eb8b3c6a24e6153c367b0170dbc67602ae3e9304f52d2da00c9081d66cc98abd722b7c95b6c7d2e6cc7c86f21f9cba42c7d4bf29ca97d0f2d3553f8d DIST vlc-2.2.8.tar.xz 22137276 BLAKE2B 10780f79a5c45c44b8fb76f229512da3932883da4a1b292745cabc8544ed251a080813ef233c9438766f3e635bee40ef64b929f3d43e0d457907093be1edd2f9 SHA512 adde16f4b4bd2d94f104bb3b5df6bf4603bc67333c7615cb8d1d31ca63440b6b0aa93de9ccf0dba717cf905577c7d0bca7baba63caf401790b82eac3e04a DIST vlc-3.0.0.tar.xz 25191148 BLAKE2B 8f0826f5586a304df4cc53acae768377a53bbd9a1c6578b4dcd39a4e1fb627d2e6f6f2f6ce3abacfb9ebc2a9fb1bae179938bbf88644aa9070f49675cc10fcf1 SHA512 9bdc64e16ddd2e8d2693179f2fcac8462d7defff186262a049ba325ef00882fbd75a9d323b506ba06876a8168fd5e90319837c8dcd136b206161e67748c2a9f7 diff --git a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch b/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch deleted file mode 100644 index 3163410353a..000 --- a/media-video/vlc/files/vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch +++ /dev/null @@ -1,23 +0,0 @@ -index 2debbcd..72e7fcf 100644 a/modules/audio_output/pulse.c -+++ b/modules/audio_output/pulse.c -@@ -472,8 +472,17 @@ static void stream_underflow_cb(pa_stream *s, void *userdata) - { -+uint32_t rate = pa_stream_get_sample_spec(s)->rate; - audio_output_t *aout = userdata; - --msg_Dbg(aout, "underflow"); --(void) s; -+msg_Warn(aout, "underflow"); -+stream_stop(s, aout); -+ -+aout_sys_t *sys = aout->sys; -+sys->first_pts = VLC_TS_INVALID; -+ -+pa_operation *op = pa_stream_update_sample_rate(s, rate, NULL, NULL); -+if (unlikely(op == NULL)) -+return; -+pa_operation_unref(op); - } - - static int stream_wait(pa_stream *stream, pa_threaded_mainloop *mainloop) 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 deleted file mode 100644 index 51a2cdcb16d..000 --- a/media-video/vlc/files/vlc-2.2.4-decoder-lock-scope.patch +++ /dev/null @@ -1,47 +0,0 @@ -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( &p_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( &p_owner->lock ); -+ - if( p_aout == NULL ) - b_reject = true; - -@@ -1199,7 +1205,6 @@ - - break; - } --vlc_mutex_unlock( &p_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( &p_owner->lock ); -- --aout_DecDelete( p_owner->p_aout ); - p_owner->p_aout = NULL; -- - vlc_mutex_unlock( &p_owner->lock ); -+aout_DecDelete( p_owner->p_aout ); -+ - input_resource_PutAout( p_owner->p_resource, p_aout ); - } - diff --git a/media-video/vlc/files/vlc--libva-1.2.1-compat.patch b/media-video/vlc/files/vlc--libva-1.2.1-compat.patch deleted file mode 100644 index adfdefec56a..000 --- a/media-video/vlc/files/vlc--libva-1.2.1-compat.patch +++ /dev/null @@ -1,12 +0,0 @@ a/modules/codec/avcodec/vaapi.c -+++ b/modules/codec/avcode
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: ec5725f193f7752eefab93df39609beb7788f529 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 25 17:36:53 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 25 17:42:07 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec5725f1 media-video/vlc: Fix libupnp-slot-1.8 patch for live Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../vlc/files/vlc--libupnp-slot-1.8.patch | 24 ++ media-video/vlc/vlc-.ebuild| 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/media-video/vlc/files/vlc--libupnp-slot-1.8.patch b/media-video/vlc/files/vlc--libupnp-slot-1.8.patch new file mode 100644 index 000..893f936b729 --- /dev/null +++ b/media-video/vlc/files/vlc--libupnp-slot-1.8.patch @@ -0,0 +1,24 @@ +--- a/modules/services_discovery/upnp.hpp 2017-12-25 18:17:33.358015500 +0100 b/modules/services_discovery/upnp.hpp 2017-12-25 18:30:45.158167813 +0100 +@@ -35,8 +35,8 @@ + #include + #include + #endif +-#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-.ebuild b/media-video/vlc/vlc-.ebuild index e235fc8b947..be6ba65a29e 100644 --- a/media-video/vlc/vlc-.ebuild +++ b/media-video/vlc/vlc-.ebuild @@ -249,7 +249,7 @@ 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 + has_version '>=net-libs/libupnp-1.8.0' && eapply "${FILESDIR}"/${P}-libupnp-slot-1.8.patch # Bootstrap when we are on a git checkout. if [[ ${PV} = * ]] ; then
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 0e8a96e9d650485f3323e689edfe371cc11688f6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 25 17:06:29 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Dec 25 17:42:07 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e8a96e9 media-video/vlc: Fix build with >=net-misc/freerdp-2.0.0 Bug: https://bugs.gentoo.org/590164 Package-Manager: Portage-2.3.19, Repoman-2.3.6 media-video/vlc/files/vlc-2.2.8-freerdp-2.patch| 131 + .../{vlc-2.2..ebuild => vlc-2.2.8-r1.ebuild} | 7 +- media-video/vlc/vlc-2.2..ebuild| 5 +- media-video/vlc/vlc-3.0..ebuild| 10 +- media-video/vlc/vlc-.ebuild| 10 +- 5 files changed, 148 insertions(+), 15 deletions(-) diff --git a/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch b/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch new file mode 100644 index 000..5cee1336505 --- /dev/null +++ b/media-video/vlc/files/vlc-2.2.8-freerdp-2.patch @@ -0,0 +1,131 @@ +--- a/configure.ac b/configure.ac +@@ -1957,7 +1957,7 @@ PKG_ENABLE_MODULES_VLC([VNC], [vnc], [li + + dnl RDP/Remote Desktop access module + dnl +-PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp >= 1.0.1], (RDP/Remote Desktop client support) ) ++PKG_ENABLE_MODULES_VLC([FREERDP], [rdp], [freerdp2 >= 1.0.1], (RDP/Remote Desktop client support) ) + + dnl + dnl Real RTSP plugin +--- a/modules/access/rdp.c 2017-12-25 17:45:32.964429170 +0100 b/modules/access/rdp.c 2017-12-25 17:53:15.114093670 +0100 +@@ -45,18 +45,6 @@ + # include + #endif + +-#if !defined(FREERDP_VERSION_MAJOR) || \ +-(defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))) +-# define SoftwareGdi sw_gdi +-# define Fullscreen fullscreen +-# define ServerHostname hostname +-# define Username username +-# define Password password +-# define ServerPort port +-# define EncryptionMethods encryption +-# define ContextSize context_size +-#endif +- + #include + #ifdef HAVE_POLL + # include +@@ -140,6 +128,7 @@ + vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_context; + demux_sys_t *p_sys = p_vlccontext->p_demux->p_sys; + rdpGdi *p_gdi = p_context->gdi; ++unsigned bytesPerPixel; + + if ( p_sys->es ) + { +@@ -149,19 +138,23 @@ + + /* Now init and fill es format */ + vlc_fourcc_t i_chroma; +-switch( p_gdi->bytesPerPixel ) ++switch( p_gdi->dstFormat ) + { + default: +-case 16: ++msg_Dbg( p_vlccontext->p_demux, "unhandled dstFormat %x bpp", p_gdi->dstFormat); ++case PIXEL_FORMAT_BGR16: + i_chroma = VLC_CODEC_RGB16; ++bytesPerPixel = 16; + break; +-case 24: ++case PIXEL_FORMAT_BGR24: + i_chroma = VLC_CODEC_RGB24; ++bytesPerPixel = 24; + break; +-case 32: ++case PIXEL_FORMAT_BGRA32: + i_chroma = VLC_CODEC_RGB32; ++bytesPerPixel = 32; + break; + } + es_format_t fmt; + es_format_Init( &fmt, VIDEO_ES, i_chroma ); + +@@ -172,7 +165,7 @@ + fmt.video.i_height = p_gdi->height; + fmt.video.i_frame_rate_base = 1000; + fmt.video.i_frame_rate = 1000 * p_sys->f_fps; +-p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * p_gdi->bytesPerPixel; ++p_sys->i_framebuffersize = p_gdi->width * p_gdi->height * bytesPerPixel; + + if ( p_sys->p_block ) + p_sys->p_block = block_Realloc( p_sys->p_block, 0, p_sys->i_framebuffersize ); +@@ -233,28 +226,19 @@ + vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; + + msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)", +-#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1)) + p_instance->settings->DesktopWidth, + p_instance->settings->DesktopHeight, + p_instance->settings->ColorDepth +-#else +- p_instance->settings->width, +- p_instance->settings->height, +- p_instance->settings->color_depth +-#endif + ); + + p_instance->update->DesktopResize = desktopResizeHandler; + p_instance->update->BeginPaint = beginPaintHandler; + p_instance->update->EndPaint = endPaintHandler; + +-gdi_init( p_instance, +-CLRBUF_16BPP | +-#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && \ +-!(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2)) +-CLRBUF_24BPP | +-#endif +-CLRBUF_32BPP, NULL ); ++if ( p_instance->settings->ColorDepth > 16 ) ++gdi_init( p_instance, PIXEL_FORMAT_XRGB32); ++else ++gdi_init( p_instance, PIXEL_FORMAT_RGB16); + + desktopResizeHand
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 34c95024aab1cfb361746997c55e1e44e5f037ab Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Dec 9 13:27:31 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 9 13:52:23 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=34c95024 media-video/vlc: Fix +Date: Wed, 29 Nov 2017 10:45:04 -0500 +Subject: [PATCH] upnp: don't clash with libupnp's own compat code + +Fixes build for upnp >= 1.6.23 and less than 1.8. + +Signed-off-by: Jean-Baptiste Kempf +--- + modules/services_discovery/upnp.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp +index bdd3c55ee5..82d43632f4 100644 +--- a/modules/services_discovery/upnp.cpp b/modules/services_discovery/upnp.cpp +@@ -38,7 +38,7 @@ + #include + #include + +-#if UPNP_VERSION < 10800 ++#if UPNP_VERSION < 10623 + /* + * Compat functions and typedefs for libupnp prior to 1.8 + */ +-- +2.11.0 + diff --git a/media-video/vlc/vlc-2.2..ebuild b/media-video/vlc/vlc-2.2..ebuild index 977724b1c27..40efb3e5ac1 100644 --- a/media-video/vlc/vlc-2.2..ebuild +++ b/media-video/vlc/vlc-2.2..ebuild @@ -213,6 +213,8 @@ PATCHES=( # Bug #593460 "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch + + "${FILESDIR}"/${P}-libupnp-compat.patch ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt )
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/
commit: 120721ea967521ee4093b6efa8f15eb0e248b1b9 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sat Dec 2 08:49:11 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Dec 3 23:49:14 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=120721ea media-video/vlc: remove unused patch media-video/vlc/files/vlc-2.2.4-qt57.patch | 284 - 1 file changed, 284 deletions(-) diff --git a/media-video/vlc/files/vlc-2.2.4-qt57.patch b/media-video/vlc/files/vlc-2.2.4-qt57.patch deleted file mode 100644 index 97472a64c39..000 --- a/media-video/vlc/files/vlc-2.2.4-qt57.patch +++ /dev/null @@ -1,284 +0,0 @@ -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 -+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp -@@ -25,9 +25,7 @@ - #ifndef _PLAYLIST_MODEL_H_ - #define _PLAYLIST_MODEL_H_ - --#ifdef HAVE_CONFIG_H --# include "config.h" --#endif -+#include "qt4.hpp" - - #include - #include -diff --git a/modules/gui/qt4/components/playlist/views.cpp b/modules/gui/qt4/components/playlist/views.cpp -index 59f6535..0066205 100644 a/modules/gui/qt4/components/playlist/views.cpp -+++ b/modules/gui/qt4/components/playlist/views.cpp -@@ -21,6 +21,12 @@ - * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "qt4.hpp" -+ - #include "components/playlist/views.hpp" - #include "components/playlist/vlc_model.hpp" /* VLCModel */ - #include "components/playlist/sorting.h" /* Columns List */ -diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp -index 30793a2..9c79c99 100644 a/modules/gui/
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 46f399ae97a59276acb995eda82e08654cc37536 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Jan 15 19:13:48 2017 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Jan 16 04:05:43 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46f399ae media-video/vlc: Security cleanup (bug #584510) Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/3493 media-video/vlc/Manifest | 1 - media-video/vlc/files/opencv-3.0.0.patch | 12 - media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch| 23 - media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch| 15 - .../vlc/files/vlc-2.2.1-CVE-2015-5949.patch| 15 - media-video/vlc/vlc-2.2.1-r1.ebuild| 506 - 6 files changed, 572 deletions(-) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 663e9d6..2d2aa09 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,2 +1 @@ -DIST vlc-2.2.1.tar.xz 20940288 SHA256 543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb SHA512 91cd33ac61ebe376c24b3cc0d1dc52d7765fdccbd17e75af38f52b400e0269dc48f34ed558bff7ec1dd52c4f27098012709a3eb9fe7e8aad1069516de5de WHIRLPOOL 5c889fc5c0137f022b0b3408a5252668a1a946ed45677bb97bbbf0ec14c9411c24e8d1587e987391596774aaf7f1e4592c55b0c0f76742e84296bbfffb08e885 DIST vlc-2.2.4.tar.xz 22199316 SHA256 1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be SHA512 2fc1fe957ba7903f2e0c9640884ed850cb10a60132d80658dee8da0b5abaf4a6ccdf95fa2b8c0a4a827be5e7e40341318bce44662a5248e04442f4779010f85c WHIRLPOOL 0d59d9c2a623f72a6c708f9face6f29b7c7e71a9b38faf3717b8f223641c6f599d1407a4976874226dbbd9e553ec528249dc4f301c5682bfb49f5745468934b2 diff --git a/media-video/vlc/files/opencv-3.0.0.patch b/media-video/vlc/files/opencv-3.0.0.patch deleted file mode 100644 index b09b651.. --- a/media-video/vlc/files/opencv-3.0.0.patch +++ /dev/null @@ -1,12 +0,0 @@ -http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b82416d7000a993b33e903095a590fe32212a85e -diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp -index ae3af05..998f286 100644 (file) a/modules/video_filter/opencv_example.cpp -+++ b/modules/video_filter/opencv_example.cpp -@@ -41,6 +41,8 @@ - - #include - #include -+#include -+#include - #include diff --git a/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch b/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch deleted file mode 100644 index 19fc70f.. --- a/media-video/vlc/files/vlc-2.2.0-rdp-1.2.0.patch +++ /dev/null @@ -1,23 +0,0 @@ a/modules/access/rdp.c 2014-11-22 01:40:52.044973648 -0800 -+++ b/modules/access/rdp.c 2014-11-22 01:36:44.291975380 -0800 -@@ -399,7 +404,9 @@ - if ( p_sys->f_fps <= 0 ) p_sys->f_fps = 1.0; - p_sys->i_frame_interval = 100 / p_sys->f_fps; - -+#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2)) - freerdp_channels_global_init(); -+#endif - - p_sys->p_instance = freerdp_new(); - if ( !p_sys->p_instance ) -@@ -475,7 +482,10 @@ - - freerdp_disconnect( p_sys->p_instance ); - freerdp_free( p_sys->p_instance ); -+ -+#if defined(FREERDP_VERSION_MAJOR) && defined(FREERDP_VERSION_MINOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 2)) - freerdp_channels_global_uninit(); -+#endif - - if ( p_sys->p_block ) - block_Release( p_sys->p_block ); diff --git a/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch b/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch deleted file mode 100644 index dec6c12.. --- a/media-video/vlc/files/vlc-2.2.0-xcb_vdpau.patch +++ /dev/null @@ -1,15 +0,0 @@ modules/hw/vdpau/Makefile.am.orig 2015-04-16 22:29:26.299342749 -0700 -+++ modules/hw/vdpau/Makefile.am 2015-04-16 22:31:40.886340950 -0700 -@@ -45,6 +45,7 @@ - libvdpau_chroma_plugin_la_LIBADD = libvlc_vdpau.la - vdpau_LTLIBRARIES += libvdpau_chroma_plugin.la - -+if HAVE_XCB - libvdpau_display_plugin_la_SOURCES = display.c - libvdpau_display_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(srcdir)/../../video_output/xcb - libvdpau_display_plugin_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) -@@ -52,3 +53,4 @@ - ../../video_output/libvlc_xcb_events.la \ - $(AM_LIBADD) $(X_LIBS) $(X_PRE_LIBS) -lX11 $(XCB_LIBS) - vdpau_LTLIBRARIES += libvdpau_display_plugin.la -+endif 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 deleted file mode 100644 index 83a5258.. --- a/media-video/vlc/files/vlc-2.2.1-CVE-2015-5949.patch +++ /dev/null @@ -1,15 +0,0 @@ -https://git.videolan.org/?p=vlc/vlc-2.2.git;a=commitdiff;h=ce91452460a75d7424b165c4dc8db98114c3cbd9;hp=9e12195d3e4316278af1fa4bcb6a705ff27456fd a/modules/demux/
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/
commit: f6b8f60690b35f4aa1be0448bb8f8529694dc057 Author: Michael Mair-Keimberger (asterix) gmail com> AuthorDate: Mon Dec 26 15:05:15 2016 + Commit: Göktürk Yüksek gentoo org> CommitDate: Tue Dec 27 19:30:08 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b8f606 media-video/vlc: remove unused patch media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch | 12 1 file changed, 12 deletions(-) diff --git a/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch deleted file mode 100644 index db73a4e.. --- a/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch +++ /dev/null @@ -1,12 +0,0 @@ a/modules/codec/avcodec/vaapi.c -+++ b/modules/codec/avcodec/vaapi.c -@@ -36,6 +36,9 @@ - #include - #include - #include -+#if VA_MINOR_VERSION >= 34 -+# include -+#endif - - #include "avcodec.h" - #include "va.h" \ No newline at end of file
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 5b56b99eeb7c29df23e317f9f3627ac7aa2eeb18 Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Dec 14 23:50:39 2016 + Commit: Lars Wendler gentoo org> CommitDate: Mon Dec 19 13:38:00 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b56b99e media-video/vlc: Fix build with libav-11.7 Gentoo-bug: 593460 Sync more changes from release -> live ebuilds Package-Manager: portage-2.3.0 Closes: https://github.com/gentoo/gentoo/pull/3122 media-video/vlc/files/vlc-2.2.4-libav-11.7.patch | 10 + media-video/vlc/vlc-2.2..ebuild | 28 ++-- media-video/vlc/vlc-.ebuild | 28 ++-- 3 files changed, 44 insertions(+), 22 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 new file mode 100644 index ..9322236 --- /dev/null +++ b/media-video/vlc/files/vlc-2.2.4-libav-11.7.patch @@ -0,0 +1,10 @@ +--- 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-2.2..ebuild b/media-video/vlc/vlc-2.2..ebuild index 8c5988f..fec5c52 100644 --- a/media-video/vlc/vlc-2.2..ebuild +++ b/media-video/vlc/vlc-2.2..ebuild @@ -5,7 +5,7 @@ EAPI=6 SCM="" -if [ "${PV%}" != "${PV}" ] ; then +if [[ ${PV} = * ]] ; then SCM="git-r3" if [ "${PV%.}" != "${PV}" ] ; then @@ -23,7 +23,7 @@ MY_P="${PN}-${MY_PV}" DESCRIPTION="VLC media player - Video player and streamer" HOMEPAGE="http://www.videolan.org/vlc/"; -if [ "${PV%}" != "${PV}" ] ; then # Live ebuild +if [[ ${PV} = * ]] ; then # Live ebuild SRC_URI="" elif [[ "${MY_P}" == "${P}" ]]; then SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"; @@ -47,10 +47,10 @@ IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit matroska cpu_flags_x86_mmx modplug mp3 mpeg mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus - png +postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba + png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau - vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zvbi zeroconf" + vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi" RDEPEND=" dev-libs/libgpg-error:0 @@ -123,8 +123,9 @@ RDEPEND=" pulseaudio? ( >=media-sound/pulseaudio-1:0 ) !qt5? ( qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 ) - rdp? ( >=net-misc/freerdp-1.0.1:0= ) - samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4:0[client] ) ) + rdp? ( =net-misc/freerdp-1*:0=[client] ) + samba? ( || ( ( >=net-fs/samba-3.4.6:0[smbclient] =net-fs/samba-4.0.0_alpha1:0[client] ) ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.10:0 sdl-image? ( >=media-libs/sdl-image-1.2.10:0 sys-libs/zlib:0 ) ) @@ -177,9 +178,10 @@ RDEPEND="${RDEPEND} DEPEND="${RDEPEND} !qt5? ( kde? ( kde-base/kdelibs:4 ) ) + amd64? ( dev-lang/yasm:* ) + x86? ( dev-lang/yasm:* ) xcb? ( x11-proto/xproto:0 ) app-arch/xz-utils:0 - dev-lang/yasm:* >=sys-devel/gettext-0.18.3:* virtual/pkgconfig:* " @@ -190,7 +192,7 @@ REQUIRED_USE=" cddb? ( cdda ) dvb? ( dvbpsi ) dxva2? ( avcodec ) - ffmpeg? ( avcodec avformat swscale postproc ) + ffmpeg? ( avcodec avformat swscale ) fontconfig? ( truetype ) gnutls? ( gcrypt ) httpd? ( lua ) @@ -200,8 +202,9 @@ REQUIRED_USE=" qt4? ( X ) qt5? ( X ) sdl? ( X ) - skins? ( truetype X || ( qt4 qt5 ) ) + skins? ( truetype X xml || ( qt4 qt5 ) ) vaapi? ( avcodec X ) + vdpau? ( xcb ) vlm? ( encode ) xv? ( xcb ) " @@ -228,6 +231,9 @@ PATCHES=( # Bug #594126 "${FILESDIR}"/${PN}-2.2.4-decoder-lock-scope.patch "${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch + + # Bug #593460 + "${FILESDIR}"/${PN}-2.2.4-libav-11.7.patch ) DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt doc/intf-vcd.txt ) @@ -243,7 +249,7 @@ pkg_setup() { } src_unpack() { - if [ "${PV%}" != "${PV}" ] ; then + if [[ ${PV} = * ]] ; then git-r3_src_unpack else unpack ${A} @@ -263,7 +269,7 @@ src_prepare
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: 1e7e5cf5b4395cb2ff0207ca4749d11b95a6d4d5 Author: Alexis Ballier gentoo org> AuthorDate: Fri Sep 2 09:18:37 2016 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Sep 2 09:18:58 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e7e5cf5 media-video/vlc: add patches to build with ffmpeg3, bug #574788 Package-Manager: portage-2.3.0 media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch | 160 + media-video/vlc/files/vlc-2.2.4-relax_ffmpeg.patch | 45 ++ media-video/vlc/vlc-2.2.4.ebuild | 15 +- 3 files changed, 213 insertions(+), 7 deletions(-) diff --git a/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch b/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch new file mode 100644 index ..3bc5954 --- /dev/null +++ b/media-video/vlc/files/vlc-2.2.4-ffmpeg3.patch @@ -0,0 +1,160 @@ +Index: vlc-2.2.4/configure.ac +=== +--- vlc-2.2.4.orig/configure.ac vlc-2.2.4/configure.ac +@@ -2323,8 +2323,8 @@ AC_ARG_ENABLE(avcodec, + [ --enable-avcodeclibavcodec codec (default enabled)]) + AS_IF([test "${enable_avcodec}" != "no"], [ + PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ +-PKG_CHECK_EXISTS([libavutil < 55],, [ +- AC_MSG_ERROR([libavutil versions 55 and later are not supported.]) ++PKG_CHECK_EXISTS([libavutil < 56],, [ ++ AC_MSG_ERROR([libavutil versions 56 and later are not supported.]) + ]) + VLC_SAVE_FLAGS + CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" +Index: vlc-2.2.4/modules/codec/avcodec/audio.c +=== +--- vlc-2.2.4.orig/modules/codec/avcodec/audio.c vlc-2.2.4/modules/codec/avcodec/audio.c +@@ -39,8 +39,6 @@ + #include + #include + +-#include +- + #include "avcodec.h" + + /* +Index: vlc-2.2.4/modules/codec/avcodec/encoder.c +=== +--- vlc-2.2.4.orig/modules/codec/avcodec/encoder.c vlc-2.2.4/modules/codec/avcodec/encoder.c +@@ -41,7 +41,6 @@ + #include + + #include +-#include + + #include "avcodec.h" + #include "avcommon.h" +@@ -311,7 +310,7 @@ int OpenEncoder( vlc_object_t *p_this ) + else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id, + &psz_namecodec ) ) + { +-if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE ) ++if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE ) + return VLC_EGENERIC; /* handed chroma output */ + + i_cat = VIDEO_ES; +@@ -555,7 +554,7 @@ int OpenEncoder( vlc_object_t *p_this ) + + if( p_codec->pix_fmts ) + { +-const enum PixelFormat *p = p_codec->pix_fmts; ++const enum AVPixelFormat *p = p_codec->pix_fmts; + for( ; *p != -1; p++ ) + { + if( *p == p_context->pix_fmt ) break; +@@ -1017,7 +1016,7 @@ errmsg: + } + } + +-p_sys->frame = avcodec_alloc_frame(); ++p_sys->frame = av_frame_alloc(); + if( !p_sys->frame ) + { + goto error; +@@ -1088,7 +1087,7 @@ static block_t *EncodeVideo( encoder_t * + AVFrame *frame = NULL; + if( likely(p_pict) ) { + frame = p_sys->frame; +-avcodec_get_frame_defaults( frame ); ++av_frame_unref( frame ); + for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ ) + { + p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels; +@@ -1329,7 +1328,7 @@ static block_t *handle_delay_buffer( enc + //How much we need to copy from new packet + const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes; + +-avcodec_get_frame_defaults( p_sys->frame ); ++av_frame_unref( p_sys->frame ); + p_sys->frame->format = p_sys->p_context->sample_fmt; + p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay; + +@@ -1451,7 +1450,7 @@ static block_t *EncodeAudio( encoder_t * + while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) || +( p_sys->b_variable && p_aout_buf->i_nb_samples ) ) + { +-avcodec_get_frame_defaults( p_sys->frame ); ++av_frame_unref( p_sys->frame ); + if( p_sys->b_variable ) + p_sys->frame->nb_samples = p_aout_buf->i_nb_samples; + else +Index: vlc-2.2.4/modules/codec/avcodec/vaapi.c +=== +--- vlc-2.2.4.orig/modules/codec/avcodec/vaapi.c vlc-2.2.4/modules/codec/avcodec/vaapi.c +@@ -598,7 +598,7 @@ static int Create( vlc_va_t *p_va, AVCod + return err; + + /* Only VLD supported */ +-p_va->pix_fmt = PIX_FMT_VAAPI_VLD; ++p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD; + p_va->setup = Setup; + p_va->get
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: fe5dc79e3f08966ed5dedeffbce7446995351b8f Author: Lars Wendler gentoo org> AuthorDate: Tue Feb 9 19:50:52 2016 + Commit: Lars Wendler gentoo org> CommitDate: Tue Feb 9 19:51:30 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe5dc79e media-video/vlc: Fixed compilation with qt5 (bug #574256). Patch provided by Nick Andrade in bug #574064 Package-Manager: portage-2.2.27 Signed-off-by: Lars Wendler gentoo.org> media-video/vlc/files/vlc-2.2.2-qt5widgets.patch | 13 + media-video/vlc/vlc-2.2.2.ebuild | 3 +++ 2 files changed, 16 insertions(+) diff --git a/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch new file mode 100644 index 000..a024d00 --- /dev/null +++ b/media-video/vlc/files/vlc-2.2.2-qt5widgets.patch @@ -0,0 +1,13 @@ +--- vlc-2.2.2/configure.ac vlc-2.2.2/configure.ac +@@ -3754,10 +3754,6 @@ + AC_MSG_WARN([Not building Qt Interface with X11 helpers.]) + ]) + +- PKG_CHECK_EXISTS([Qt5Core >= 5.5.0 Qt5Core < 5.6.0], [ +-AC_MSG_ERROR(["You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c"]) +- ]) +- + QT_PATH="$(eval $PKG_CONFIG --variable=exec_prefix Qt5Core)" + QT_HOST_PATH="$(eval $PKG_CONFIG --variable=host_bins Qt5Core)" + AC_PATH_PROGS(MOC, [moc-qt5 moc], moc, ["${QT_HOST_PATH}" "${QT_PATH}/bin" "${CONTRIB_DIR}/bin"]) diff --git a/media-video/vlc/vlc-2.2.2.ebuild b/media-video/vlc/vlc-2.2.2.ebuild index e930d06..b263cf5 100644 --- a/media-video/vlc/vlc-2.2.2.ebuild +++ b/media-video/vlc/vlc-2.2.2.ebuild @@ -222,6 +222,9 @@ PATCHES=( # Bug #541678 "${FILESDIR}"/qt4-select.patch + + # Allow QT5.5 since Gentoo has a patched QTwidgets + "${FILESDIR}"/${PN}-2.2.2-qt5widgets.patch ) S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/, media-video/vlc/
commit: fce413c87208a0690ad78d7289a02de313ddbca5 Author: Lars Wendler gentoo org> AuthorDate: Tue Feb 9 07:29:04 2016 + Commit: Lars Wendler gentoo org> CommitDate: Tue Feb 9 07:41:38 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fce413c8 media-video/vlc: Bump to version 2.2.2 Package-Manager: portage-2.2.27 Signed-off-by: Lars Wendler gentoo.org> media-video/vlc/Manifest | 1 + media-video/vlc/files/qt4-select.patch | 4 +- media-video/vlc/vlc-2.2.2.ebuild | 496 + 3 files changed, 499 insertions(+), 2 deletions(-) diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index d7f6c6a..62c067f 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -1,2 +1,3 @@ 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/qt4-select.patch b/media-video/vlc/files/qt4-select.patch index 5fcabae..fb1526a 100644 --- a/media-video/vlc/files/qt4-select.patch +++ b/media-video/vlc/files/qt4-select.patch @@ -1,7 +1,7 @@ https://gist.github.com/karolherbst/fb9e3d8f6ba05f1f5d54 For use until upstream ever accepts this patch or fixes it themsleves configure.ac.orig 2015-03-01 02:28:48.983932684 +0100 -+++ configure.ac 2015-03-01 02:41:29.641927072 +0100 +--- a/configure.ac b/configure.ac @@ -3709,7 +3709,8 @@ ]) ]) diff --git a/media-video/vlc/vlc-2.2.2.ebuild b/media-video/vlc/vlc-2.2.2.ebuild new file mode 100644 index 000..e930d06 --- /dev/null +++ b/media-video/vlc/vlc-2.2.2.ebuild @@ -0,0 +1,496 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +SCM="" +if [ "${PV%}" != "${PV}" ] ; then + SCM="git-r3" + + if [ "${PV%.}" != "${PV}" ] ; then + EGIT_REPO_URI="git://git.videolan.org/vlc/vlc-${PV%.}.git" + else + EGIT_REPO_URI="git://git.videolan.org/vlc.git" + fi +fi + +inherit eutils multilib autotools toolchain-funcs flag-o-matic virtualx ${SCM} + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-beta/-test}" +MY_P="${PN}-${MY_PV}" + +DESCRIPTION="VLC media player - Video player and streamer" +HOMEPAGE="http://www.videolan.org/vlc/"; +if [ "${PV%}" != "${PV}" ] ; then # Live ebuild + SRC_URI="" +elif [[ "${MY_P}" == "${P}" ]]; then + SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz"; +else + SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"; +fi + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5-8" # vlc - vlccore + +if [[ ${PV} != * ]] ; then + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86 ~x86-fbsd" +fi + +IUSE="a52 aalib alsa altivec atmo +audioqueue +avcodec + +avformat bidi bluray cdda cddb chromaprint dbus dc1394 debug + directfb directx dts dvb +dvbpsi dvd dxva2 elibc_glibc +encode faad fdk + fluidsynth +ffmpeg flac fontconfig +gcrypt gme gnome gnutls + growl httpd ieee1394 jack jpeg kate kde libass libav libcaca libnotify + +libsamplerate libtiger linsys libtar lirc live lua + macosx-dialog-provider macosx-eyetv macosx-quartztext macosx-qtkit + matroska media-library cpu_flags_x86_mmx modplug mp3 mpeg + mtp musepack ncurses neon ogg omxil opencv opengl optimisememory opus + png postproc projectm pulseaudio +qt4 qt5 rdp rtsp run-as-root samba + schroedinger sdl sdl-image sftp shout sid skins speex cpu_flags_x86_sse svg +swscale + taglib theora tremor truetype twolame udev upnp vaapi v4l vcdx vdpau + vlm vnc vorbis vpx wma-fixed +X x264 x265 +xcb xml xv zeroconf zvbi" + +RDEPEND=" + !=sys-libs/zlib-1.2.5.1-r2:0[minizip] + virtual/libintl:0 + a52? ( >=media-libs/a52dec-0.7.4-r3:0 ) + aalib? ( media-libs/aalib:0 ) + alsa? ( >=media