[vlc-commits] [Git][videolan/vlc][3.0.x] contrib: sidplay: Do not overwrite CXXFLAGS in configure.in
David pushed to branch 3.0.x at VideoLAN / VLC Commits: 86a582c9 by David Fuhrmann at 2024-06-06T09:43:50+02:00 contrib: sidplay: Do not overwrite CXXFLAGS in configure.in resid configure has a bug which overwrites CXXFLAGS unconditionally, causing build failures when preset CXXFLAGS are needed. Reason: In newer autoconf, ac_test_CXXFLAGS does not use "set" anymore, but "y". - - - - - 2 changed files: - contrib/src/sidplay2/rules.mak - + contrib/src/sidplay2/sidplay2-cxxtest.patch Changes: = contrib/src/sidplay2/rules.mak = @@ -24,10 +24,12 @@ sidplay-libs: sidplay-libs-$(SID_VERSION).tar.gz .sum-sidplay2 $(APPLY) $(SRC)/sidplay2/sidplay2-noutils.patch $(APPLY) $(SRC)/sidplay2/sidplay2-string.patch $(APPLY) $(SRC)/sidplay2/sidplay2-fix-overflow.patch + $(APPLY) $(SRC)/sidplay2/sidplay2-cxxtest.patch $(MOVE) .sidplay2: sidplay-libs $(REQUIRE_GPL) + #export ac_cv_sizeof_int=4 for d in . libsidplay builders resid builders/resid-builder \ builders/hardsid-builder libsidutils ; \ do \ = contrib/src/sidplay2/sidplay2-cxxtest.patch = @@ -0,0 +1,11 @@ +--- sidplay-libs/resid/configure.in.old2024-06-06 09:31:47.0 +0200 sidplay-libs/resid/configure.in2024-06-06 09:32:10.0 +0200 +@@ -28,7 +28,7 @@ + + dnl Set CXXFLAGS for g++. Use -fno-exceptions if supported. + if test "$GXX" = yes; then +- if test "$ac_test_CXXFLAGS" != set; then ++ if test "$ac_test_CXXFLAGS" != set -a "$ac_test_CXXFLAGS" != y; then + CXXFLAGS="-g -Wall -O2 -funroll-loops -fomit-frame-pointer -fno-exceptions" + AC_MSG_CHECKING([whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works]) + AC_TRY_COMPILE([], View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/86a582c93eb1a442bd1d8641853bebf752225dbd -- This project does not include diff previews in email notifications. View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/86a582c93eb1a442bd1d8641853bebf752225dbd You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] macosx: fix possible SPMediaKeyTap crash
David pushed to branch 3.0.x at VideoLAN / VLC
Commits:
b64b9c22 by Marvin Scholz at 2022-11-27T20:54:08+00:00
macosx: fix possible SPMediaKeyTap crash
Adding nil to an NSArray would make it raise an
NSInvalidArgumentException which in turn leads to an abort in
dispatch_once:
https://github.com/apple-oss-distributions/libdispatch/blob/55c3a68e9ec47f1c1d5bb9909404ce5f0351edef/src/object.m#L557
Fix #27487
(cherry picked from commit 41ec80a1282ba01d82e7954530e1d9ab8e14e415)
Signed-off-by: Marvin Scholz <epira...@gmail.com>
- - - - -
1 changed file:
- modules/gui/macosx/SPMediaKeyTap.m
Changes:
=
modules/gui/macosx/SPMediaKeyTap.m
=
@@ -157,8 +157,13 @@ static CGEventRef tapEventCallback(CGEventTapProxy proxy,
CGEventType type, CGEv
static NSArray *bundleIdentifiers;
static dispatch_once_t onceToken;
dispatch_once(&onceToken, ^{
+NSString *ourIdentifier = [[NSBundle mainBundle] bundleIdentifier];
+if (ourIdentifier == nil) {
+NSLog(@"SPMediaKeyTap: Bundle identifier unexpectedly nil, falling
back to org.videolan.vlc");
+ourIdentifier = @"org.videolan.vlc";
+}
bundleIdentifiers = @[
-[[NSBundle mainBundle] bundleIdentifier], // your app
+ourIdentifier, // your app
@"com.spotify.client",
@"com.apple.iTunes",
@"com.apple.Music",
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/b64b9c224bc69e5a2803c7cdbe8d83a65303cf15
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/b64b9c224bc69e5a2803c7cdbe8d83a65303cf15
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc] Pushed new tag 3.0.18
David pushed new tag 3.0.18 at VideoLAN / VLC -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/tree/3.0.18 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] Update NEWS
David pushed to branch 3.0.x at VideoLAN / VLC Commits: e9eceaed by David Fuhrmann at 2022-10-13T18:26:02+02:00 Update NEWS - - - - - 1 changed file: - NEWS Changes: = NEWS = @@ -5,6 +5,12 @@ macOS: * Fix audio device listing with non-latin names * Update some translations +Misc: +* Fix rendering and performance issue with older GPUs + +Contribs: +* Update aom + Changes between 3.0.18-rc and 3.0.18-rc2: - View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/e9eceaed4d838dbd84638bfb2e4bdd08294163b1 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/e9eceaed4d838dbd84638bfb2e4bdd08294163b1 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc] Pushed new tag 3.0.18-rc2
David pushed new tag 3.0.18-rc2 at VideoLAN / VLC -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/tree/3.0.18-rc2 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc] Deleted tag 3.0.18-rc2
David deleted tag 3.0.18-rc2 at VideoLAN / VLC -- You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] configure.ac: Correctly set version to 3.0.18-rc2
David pushed to branch 3.0.x at VideoLAN / VLC Commits: ed93768c by David Fuhrmann at 2022-09-30T10:36:07+02:00 configure.ac: Correctly set version to 3.0.18-rc2 - - - - - 1 changed file: - configure.ac Changes: = configure.ac = @@ -2,7 +2,7 @@ dnl Autoconf settings for vlc AC_COPYRIGHT([Copyright 1999-2022 VLC authors and VideoLAN]) -AC_INIT(vlc, 3.0.18) +AC_INIT(vlc, 3.0.18-rc2) VERSION_MAJOR=3 VERSION_MINOR=0 VERSION_REVISION=18 View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ed93768cedee7dae31a5b44d57a38d59da4dd1cf -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ed93768cedee7dae31a5b44d57a38d59da4dd1cf You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc] Pushed new tag 3.0.18-rc2
David pushed new tag 3.0.18-rc2 at VideoLAN / VLC -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/tree/3.0.18-rc2 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] 3 commits: demux: mp4: fix qtff v1 divbyzero
David pushed to branch 3.0.x at VideoLAN / VLC
Commits:
2154ab15 by Francois Cartegnie at 2022-09-28T20:54:22+02:00
demux: mp4: fix qtff v1 divbyzero
- - - - -
38bc5514 by Francois Cartegnie at 2022-09-29T21:03:47+02:00
demux: ogg: check ogg_sync_buffer allocs
(cherry picked from commit 03100bbd06a1aeaf0cb580cff8204df3e05cb9eb)
- - - - -
4fcace61 by Romain Vimont at 2022-09-29T21:04:07+02:00
vnc: fix possible buffer overflow
Thanks to 0xMitsurugi [1] from Synacktiv [2] for the bug report and fix.
[1] https://twitter.com/0xMitsurugi
[2] https://www.synacktiv.com/
Fixes #27335
(cherry picked from commit 5eb783fd44ed6298db3e38f7765f21c42e4405f9)
- - - - -
4 changed files:
- modules/access/vnc.c
- modules/demux/mp4/essetup.c
- modules/demux/ogg.c
- modules/demux/oggseek.c
Changes:
=
modules/access/vnc.c
=
@@ -33,6 +33,7 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include
#include
#include
@@ -115,7 +116,7 @@ struct demux_sys_t
int i_cancel_state;
rfbClient* p_client;
-int i_framebuffersize;
+size_t i_framebuffersize;
block_t *p_block;
float f_fps;
@@ -143,11 +144,16 @@ static rfbBool mallocFrameBufferHandler( rfbClient*
p_client )
p_sys->es = NULL;
}
-int i_width = p_client->width;
-int i_height = p_client->height;
-int i_depth = p_client->format.bitsPerPixel;
+assert(!(p_client->width & ~0x)); // fits in 16 bits
+uint16_t i_width = p_client->width;
-switch( i_depth )
+assert(!(p_client->height & ~0x)); // fits in 16 bits
+uint16_t i_height = p_client->height;
+
+uint8_t i_bits_per_pixel = p_client->format.bitsPerPixel;
+assert((i_bits_per_pixel & 0x7) == 0); // multiple of 8
+
+switch( i_bits_per_pixel )
{
case 8:
i_chroma = VLC_CODEC_RGB8;
@@ -180,7 +186,10 @@ static rfbBool mallocFrameBufferHandler( rfbClient*
p_client )
}
/* Set up framebuffer */
-p_sys->i_framebuffersize = i_width * i_height * i_depth / 8;
+if (mul_overflow(i_width, i_height * (i_bits_per_pixel / 8),
&p_sys->i_framebuffersize)) {
+msg_Err(p_demux, "VNC framebuffersize overflow");
+return FALSE;
+}
/* Reuse unsent block */
if ( p_sys->p_block )
@@ -211,7 +220,7 @@ static rfbBool mallocFrameBufferHandler( rfbClient*
p_client )
fmt.video.i_frame_rate_base = 1000;
fmt.video.i_frame_rate = 1000 * p_sys->f_fps;
-fmt.video.i_bits_per_pixel = i_depth;
+fmt.video.i_bits_per_pixel = i_bits_per_pixel;
fmt.video.i_rmask = p_client->format.redMax << p_client->format.redShift;
fmt.video.i_gmask = p_client->format.greenMax <<
p_client->format.greenShift;
fmt.video.i_bmask = p_client->format.blueMax << p_client->format.blueShift;
=
modules/demux/mp4/essetup.c
=
@@ -807,11 +807,6 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track,
MP4_Box_t *p_sample )
p_track->fmt.i_codec = p_sample->i_type;
break;
}
-
-}
-else if( p_soun->i_qt_version == 1 && p_soun->i_sample_per_packet <= 0
)
-{
-p_soun->i_qt_version = 0;
}
}
else if( p_sample->data.p_sample_soun->i_qt_version == 1 )
@@ -838,7 +833,8 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track,
MP4_Box_t *p_sample )
{
/* redefined sample tables for vbr audio */
}
-else if ( p_track->i_sample_size != 0 && p_soun->i_sample_per_packet
== 0 )
+else if ( p_track->i_sample_size != 0 &&
+ ( p_soun->i_sample_per_packet == 0 ||
p_soun->i_bytes_per_frame == 0 ) )
{
msg_Err( p_demux, "Invalid sample per packet value for qt_version
1. Broken muxer! %u %u",
p_track->i_sample_size, p_soun->i_sample_per_packet );
@@ -846,6 +842,15 @@ int SetupAudioES( demux_t *p_demux, mp4_track_t *p_track,
MP4_Box_t *p_sample )
}
}
+if( p_sample->data.p_sample_soun->i_qt_version == 1 &&
+( p_soun->i_sample_per_packet == 0 || /* >0, 1 for uncompressed
formats */
+ p_soun->i_bytes_per_frame == 0 /* bytes_per_packet * channels */ ) )
+{
+msg_Warn( p_demux, "Invalid sample values for qtff v1. Broken muxer!
sz %u spp %u bpf %u",
+ p_track->i_sample_size, p_soun->i_sample_per_packet,
p_soun->i_bytes_per_frame );
+p_soun->i_qt_version = 0;
+}
+
/* Endianness atom */
const MP4_Box_t *p_enda = MP4_BoxGet( p_sample, "wave/enda" );
if( !p_enda )
=
mo
[vlc-commits] [Git][videolan/vlc][master] 3 commits: decoder: update i_bitspersample
David pushed to branch master at VideoLAN / VLC
Commits:
2c2df214 by Romain Vimont at 2022-09-29T21:02:13+02:00
decoder: update i_bitspersample
The field i_bytes_per_frame was updated, but not i_bitspersample,
causing an inconsistency leading to a buffer overflow.
Fixes #26930
- - - - -
03100bbd by Francois Cartegnie at 2022-09-29T21:02:14+02:00
demux: ogg: check ogg_sync_buffer allocs
- - - - -
5eb783fd by Romain Vimont at 2022-09-29T21:02:14+02:00
vnc: fix possible buffer overflow
Thanks to 0xMitsurugi [1] from Synacktiv [2] for the bug report and fix.
[1] https://twitter.com/0xMitsurugi
[2] https://www.synacktiv.com/
Fixes #27335
- - - - -
4 changed files:
- modules/access/vnc.c
- modules/demux/ogg.c
- modules/demux/oggseek.c
- src/input/decoder.c
Changes:
=
modules/access/vnc.c
=
@@ -33,6 +33,7 @@
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
+#include
#include
#include
@@ -116,7 +117,7 @@ typedef struct
vlc_sem_t closing;
rfbClient* p_client;
-int i_framebuffersize;
+size_t i_framebuffersize;
block_t *p_block;
float f_fps;
@@ -144,11 +145,16 @@ static rfbBool mallocFrameBufferHandler( rfbClient*
p_client )
p_sys->es = NULL;
}
-int i_width = p_client->width;
-int i_height = p_client->height;
-int i_depth = p_client->format.bitsPerPixel;
+assert(!(p_client->width & ~0x)); // fits in 16 bits
+uint16_t i_width = p_client->width;
-switch( i_depth )
+assert(!(p_client->height & ~0x)); // fits in 16 bits
+uint16_t i_height = p_client->height;
+
+uint8_t i_bits_per_pixel = p_client->format.bitsPerPixel;
+assert((i_bits_per_pixel & 0x7) == 0); // multiple of 8
+
+switch( i_bits_per_pixel )
{
case 8:
i_chroma = VLC_CODEC_RGB8;
@@ -187,7 +193,10 @@ static rfbBool mallocFrameBufferHandler( rfbClient*
p_client )
}
/* Set up framebuffer */
-p_sys->i_framebuffersize = i_width * i_height * i_depth / 8;
+if (mul_overflow(i_width, i_height * (i_bits_per_pixel / 8),
&p_sys->i_framebuffersize)) {
+msg_Err(p_demux, "VNC framebuffersize overflow");
+return FALSE;
+}
/* Reuse unsent block */
if ( p_sys->p_block )
@@ -218,7 +227,7 @@ static rfbBool mallocFrameBufferHandler( rfbClient*
p_client )
fmt.video.i_frame_rate_base = 1000;
fmt.video.i_frame_rate = 1000 * p_sys->f_fps;
-fmt.video.i_bits_per_pixel = i_depth;
+fmt.video.i_bits_per_pixel = i_bits_per_pixel;
fmt.video.i_rmask = p_client->format.redMax << p_client->format.redShift;
fmt.video.i_gmask = p_client->format.greenMax <<
p_client->format.greenShift;
fmt.video.i_bmask = p_client->format.blueMax << p_client->format.blueShift;
=
modules/demux/ogg.c
=
@@ -920,6 +920,8 @@ static int Ogg_ReadPage( demux_t *p_demux, ogg_page
*p_oggpage )
while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
{
p_buffer = ogg_sync_buffer( &p_ogg->oy, OGGSEEK_BYTES_TO_READ );
+if( !p_buffer )
+return VLC_EGENERIC;
i_read = vlc_stream_Read( p_demux->s, p_buffer, OGGSEEK_BYTES_TO_READ
);
if( i_read <= 0 )
=
modules/demux/oggseek.c
=
@@ -197,6 +197,8 @@ static int64_t get_data( demux_t *p_demux, int64_t
i_bytes_to_read )
seek_byte ( p_demux, p_sys->i_input_position );
buf = ogg_sync_buffer( &p_sys->oy, i_bytes_to_read );
+if( !buf )
+return 0;
i_result = vlc_stream_Read( p_demux->s, buf, i_bytes_to_read );
@@ -968,6 +970,8 @@ int64_t oggseek_read_page( demux_t *p_demux )
ogg_sync_reset( &p_ogg->oy );
buf = ogg_sync_buffer( &p_ogg->oy, i_page_size );
+if( !buf )
+return 0;
memcpy( buf, header, PAGE_HEADER_BYTES + i_nsegs );
=
src/input/decoder.c
=
@@ -475,6 +475,8 @@ static int ModuleThread_UpdateAudioFormat( decoder_t *p_dec
)
p_dec->fmt_out.audio.i_bytes_per_frame =
p_owner->fmt.audio.i_bytes_per_frame;
+p_dec->fmt_out.audio.i_bitspersample =
+p_owner->fmt.audio.i_bitspersample;
p_dec->fmt_out.audio.i_frame_length =
p_owner->fmt.audio.i_frame_length;
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/bd9ba4a8e67e83af9acc824b739e1e7fdddbfb41...5eb783fd44ed6298db3e38f7765f21c42e4405f9
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/bd9ba4a8e67e83af9acc824b739e1e7fdddbfb41...5eb783fd44ed6298db3e38f7765f21c42e4405f9
You're receiving this ema
[vlc-commits] [Git][videolan/vlc][3.0.x] Update NEWS for 3.0.18-rc2
David pushed to branch 3.0.x at VideoLAN / VLC Commits: 13426fb3 by David Fuhrmann at 2022-09-28T20:23:52+02:00 Update NEWS for 3.0.18-rc2 Update news, and bump version to 3.0.18-rc2. - - - - - 2 changed files: - NEWS - configure.ac Changes: = NEWS = @@ -1,12 +1,27 @@ -Changes between 3.0.18-rc and 3.0.18: +Changes between 3.0.18-rc and 3.0.18-rc2: - -Demux: +Codec/Demux: + * Add support for Y16 chroma * Fix build of gme plugin +Lua: + * Fix script for vocaroo + * Fix script for youtube to allow throttled playback + (Note: Restrictions on youtube still prevent unthrottled playback) + +Service Discovery: + * Fix UPnP regression on Windows + Video Output: * Fix video placement with caopengllayer +Misc: + * Fix password search in kwallet module + +Contribs: + * Update FFmpeg + Changes between 3.0.17.4 and 3.0.18-rc: -- = configure.ac = @@ -7,7 +7,7 @@ VERSION_MAJOR=3 VERSION_MINOR=0 VERSION_REVISION=18 VERSION_EXTRA=0 -VERSION_DEV= +VERSION_DEV=rc2 PKGDIR="vlc" AC_SUBST(PKGDIR) View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/13426fb3eb33a64a4c03696a51101e3694806176 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/13426fb3eb33a64a4c03696a51101e3694806176 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] araw: fix overflows in 24-bit decoder
David pushed to branch 3.0.x at VideoLAN / VLC
Commits:
50d44064 by Rémi Denis-Courmont at 2022-09-03T14:51:33+00:00
araw: fix overflows in 24-bit decoder
The high-order byte is promoted to 'int'. If the high-order bit is set,
this results in an overflow (into the sign bit) when shifted by 24 bits
to the left. This was flagged by the UB sanitiser. To fix that, promote
all bytes to 32-bit unsigned first, to perform overflow-proof unsigned
arithmetic.
Then to avoid aliasing errors, make sure the output is written as signed
32-bit values, since the decoder outputs S32N.
(cherry picked from commit 9260acab6a7ecfd5118d3da2b885aeff39cf21da)
- - - - -
1 changed file:
- modules/codec/araw.c
Changes:
=
modules/codec/araw.c
=
@@ -436,36 +436,45 @@ static void S20BDecode( void *outp, const uint8_t *in,
unsigned samples )
static void U24BDecode( void *outp, const uint8_t *in, unsigned samples )
{
-uint32_t *out = outp;
+int32_t *out = outp;
+union { int32_t s; uint32_t u; } u;
for( size_t i = 0; i < samples; i++ )
{
-uint32_t s = ((in[0] << 24) | (in[1] << 16) | (in[2] << 8)) -
0x8000;
-*(out++) = s;
+uint_fast32_t hi = in[0], mid = in[1], lo = in[2];
+
+u.u = ((hi << 24) | (mid << 16) | (lo << 8)) - UINT32_C(0x8000);
+*(out++) = u.s;
in += 3;
}
}
static void U24LDecode( void *outp, const uint8_t *in, unsigned samples )
{
-uint32_t *out = outp;
+int32_t *out = outp;
+union { int32_t s; uint32_t u; } u;
for( size_t i = 0; i < samples; i++ )
{
-uint32_t s = ((in[2] << 24) | (in[1] << 16) | (in[0] << 8)) -
0x8000;
-*(out++) = s;
+uint_fast32_t hi = in[2], mid = in[1], lo = in[0];
+
+u.u = ((hi << 24) | (mid << 16) | (lo << 8)) - UINT32_C(0x8000);
+*(out++) = u.s;
in += 3;
}
}
static void S24BDecode( void *outp, const uint8_t *in, unsigned samples )
{
-uint32_t *out = outp;
+int32_t *out = outp;
+union { int32_t s; uint32_t u; } u;
for( size_t i = 0; i < samples; i++ )
{
-uint32_t s = ((in[0] << 24) | (in[1] << 16) | (in[2] << 8));
-*(out++) = s;
+uint_fast32_t hi = in[0], mid = in[1], lo = in[2];
+
+u.u = (hi << 24) | (mid << 16) | (lo << 8);
+*(out++) = u.s;
in += 3;
}
}
@@ -473,11 +482,14 @@ static void S24BDecode( void *outp, const uint8_t *in,
unsigned samples )
static void S24LDecode( void *outp, const uint8_t *in, unsigned samples )
{
uint32_t *out = outp;
+union { int32_t s; uint32_t u; } u;
for( size_t i = 0; i < samples; i++ )
{
-uint32_t s = ((in[2] << 24) | (in[1] << 16) | (in[0] << 8));
-*(out++) = s;
+uint_fast32_t hi = in[2], mid = in[1], lo = in[0];
+
+u.u = (hi << 24) | (mid << 16) | (lo << 8);
+*(out++) = u.s;
in += 3;
}
}
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/50d440647bd5a4c5828316c8a13e79ad91bf0fa3
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/50d440647bd5a4c5828316c8a13e79ad91bf0fa3
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 3 commits: youtube.lua: fix crash on unexpected "n" descrambling transformation code
David pushed to branch master at VideoLAN / VLC
Commits:
14944410 by Pierre Ynard at 2022-09-01T20:09:08+00:00
youtube.lua: fix crash on unexpected "n" descrambling transformation
code
It was possible, when encountering different code from what was expected
for some known transformations, to void the code parsing pointer instead
of advancing it, resulting in a subsequent crash of the script and total
playback failure. Add a fallback and check, to prevent and gracefully
deal with this, and still allow playback, even if throttled, in case of
descrambling failure.
- - - - -
b735ef2c by Pierre Ynard at 2022-09-01T20:09:08+00:00
youtube.lua: don't silently fail on "n" descrambling script
parsing
The descrambling script section was updated from a simple and linear
chain of calls, to a complex execution tree with conditional branches.
Failure to recognize and parse this call structure (or lack thereof)
resulted in a silent no-op. Add a check to properly report an error.
Ref #27227
- - - - -
90dcfa0e by Pierre Ynard at 2022-09-01T20:09:08+00:00
youtube.lua: bump up severity of "n" parameter throttling warning
Due to the severely increased complexity of "n" descrambling code, a
quick fix is unfortunately not foreseeable. For now, let users know more
clearly what's going on and what's to expect or not.
Ref #27227
- - - - -
1 changed file:
- share/lua/playlist/youtube.lua
Changes:
=
share/lua/playlist/youtube.lua
=
@@ -370,7 +370,7 @@ function n_descramble( nparam, js )
-- as such into a table.
local data = {}
datac = datac..","
-while datac ~= "" do
+while datac and datac ~= "" do
local el = nil
-- Transformation functions
if string.match( datac, "^function%(" ) then
@@ -396,6 +396,7 @@ function n_descramble( nparam, js )
el == trans.compound1.func or
el == trans.compound2.func then
datac = string.match( datac, '^.-},e%.split%(""%)%)},(.*)$' )
+or string.match( datac, "^.-},(.*)$" )
else
datac = string.match( datac, "^.-},(.*)$" )
end
@@ -459,6 +460,10 @@ function n_descramble( nparam, js )
-- as a second argument. We parse and emulate those calls to follow
-- the descrambling script.
-- c[40](c[14],c[2]),c[25](c[48]),c[14](c[1],c[24],c[42]()), [...]
+if not string.match( script, "c%[(%d+)%]%(c%[(%d+)%]([^)]-)%)" ) then
+vlc.msg.dbg( "Couldn't parse and execute YouTube video throttling
parameter descrambling rules" )
+return nil
+end
for ifunc, itab, args in string.gmatch( script,
"c%[(%d+)%]%(c%[(%d+)%]([^)]-)%)" ) do
local iarg1 = string.match( args, "^,c%[(%d+)%]" )
local iarg2 = string.match( args, "^,[^,]-,c%[(%d+)%]" )
@@ -703,8 +708,8 @@ function pick_stream( stream_map, js_url )
if dn then
url = string.gsub( url, "([?&])n=[^&]+",
"%1n="..vlc.strings.encode_uri_component( dn ), 1 )
else
-vlc.msg.dbg( "Couldn't descramble YouTube throttling URL
parameter: data transfer will get throttled" )
-vlc.msg.err( "Couldn't process youtube video URL, please check for
updates to this script" )
+vlc.msg.err( "Couldn't descramble YouTube throttling URL
parameter: data transfer will get throttled" )
+--vlc.msg.err( "Couldn't process youtube video URL, please check
for updates to this script" )
end
end
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/49ff728d48005aac6d87ecfb8f8114fe07dedd51...90dcfa0e78081770ecbd0a072b96a277aea4a214
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/49ff728d48005aac6d87ecfb8f8114fe07dedd51...90dcfa0e78081770ecbd0a072b96a277aea4a214
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 4 commits: contrib: gme: Depend on zlib
David pushed to branch master at VideoLAN / VLC
Commits:
adf27a00 by David Fuhrmann at 2022-08-27T15:27:19+00:00
contrib: gme: Depend on zlib
The latest version of game-music-emu links against zlib if it is
available.
Refs #27262
- - - - -
e5831665 by David Fuhrmann at 2022-08-27T15:27:19+00:00
contrib: gme: Add libm to pkg-config file
This library links against libm, so it should be added into its
pkg-config file for static builds.
Refs #27262
- - - - -
9946913f by David Fuhrmann at 2022-08-27T15:27:19+00:00
contrib: gme: Prepare pkgconfig file and list lc++ on mac
On mac, we use libc++ instead of libstdc++. While the library is
actually build against libc++ already, the pkgconfig file still
hardcoded libstdc++ instead.
Refs #27262
- - - - -
3a08825c by David Fuhrmann at 2022-08-27T15:27:19+00:00
configure.ac: Use pkg-config to detect presence of libgme
Use the existing pkg-config file to detect presence of libgme. This file
is already shipped on all known libgme versions (checked back until
0.6.0, which is from 2015).
This fixes build with recent libgme versions, which added even more
dependencies which were missing in the old check.
Fixes #27262
- - - - -
4 changed files:
- configure.ac
- + contrib/src/gme/add-libm.patch
- + contrib/src/gme/mac-use-c-stdlib.patch
- contrib/src/gme/rules.mak
Changes:
=
configure.ac
=
@@ -2203,26 +2203,7 @@ AM_CONDITIONAL([HAVE_DVBPSI], [test "${have_dvbpsi}" =
"yes"])
dnl
dnl GME demux plugin
dnl
-AC_ARG_ENABLE([gme],
- AS_HELP_STRING([--enable-gme],
-[use Game Music Emu (default auto)]))
-AS_IF([test "${enable_gme}" != "no"], [
- AC_CHECK_HEADER([gme/gme.h], [
-AC_CHECK_LIB([gme], [gme_identify_header], [
- VLC_ADD_PLUGIN([gme])
-], [
- AC_CHECK_LIB([gme], [gme_identify_extension], [
- VLC_ADD_LIBS([gme], [-lstdc++ $LIBM])
- VLC_ADD_PLUGIN([gme])
- ],, [-lstdc++ $LIBM])
-])
-VLC_ADD_LIBS([gme], [-lgme])
- ], [
-AS_IF([test "x${enable_gme}" != "x"], [
- AC_MSG_ERROR([GME cannot be found. Please install the development
files.])
-])
- ])
-])
+PKG_ENABLE_MODULES_VLC([GME], [], [libgme], [Game Music Emu support (default
auto)], [auto])
dnl
=
contrib/src/gme/add-libm.patch
=
@@ -0,0 +1,8 @@
+--- game-music-emu-0.6.3/gme/libgme.pc.in.old 2022-08-26 08:35:03.0
+0200
game-music-emu-0.6.3/gme/libgme.pc.in 2022-08-26 08:35:18.0
+0200
+@@ -13,4 +13,4 @@
+ Version: @GME_VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lgme
+-Libs.private: -lstdc++ @PKG_CONFIG_ZLIB@
++Libs.private: -lstdc++ -lm @PKG_CONFIG_ZLIB@
=
contrib/src/gme/mac-use-c-stdlib.patch
=
@@ -0,0 +1,8 @@
+--- game-music-emu/gme/libgme.pc.in.old2022-08-25 21:46:36.0
+0200
game-music-emu/gme/libgme.pc.in2022-08-25 21:46:57.0 +0200
+@@ -13,4 +13,4 @@
+ Version: @GME_VERSION@
+ Cflags: -I${includedir}
+ Libs: -L${libdir} -lgme
+-Libs.private: -lstdc++ -lm @PKG_CONFIG_ZLIB@
++Libs.private: -lc++ -lm @PKG_CONFIG_ZLIB@
=
contrib/src/gme/rules.mak
=
@@ -8,11 +8,18 @@ PKGS += gme
$(TARBALLS)/game-music-emu-$(GME_VERSION).tar.xz:
$(call download_pkg,$(GME_URL),gme)
+DEPS_gme = zlib $(DEPS_zlib)
+
.sum-gme: game-music-emu-$(GME_VERSION).tar.xz
game-music-emu: game-music-emu-$(GME_VERSION).tar.xz .sum-gme
$(UNPACK)
$(APPLY) $(SRC)/gme/skip-underrun.patch
+ $(APPLY) $(SRC)/gme/add-libm.patch
+ifdef HAVE_MACOSX
+ $(APPLY) $(SRC)/gme/mac-use-c-stdlib.patch
+endif
+ $(call pkg_static,"gme/libgme.pc.in")
$(MOVE)
.gme: game-music-emu toolchain.cmake
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/45de32bea8cba85880a8ede25678bddd2f89b451...3a08825c8aea3148b4d51db85dd14d42c105987d
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/compare/45de32bea8cba85880a8ede25678bddd2f89b451...3a08825c8aea3148b4d51db85dd14d42c105987d
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc] Pushed new tag 3.0.18-rc
David pushed new tag 3.0.18-rc at VideoLAN / VLC -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/tree/3.0.18-rc You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: decoder: update i_bitspersample
David pushed to branch 3.0.x at VideoLAN / VLC Commits: d7d0bbf8 by Romain Vimont at 2022-08-24T19:51:40+02:00 decoder: update i_bitspersample The field i_bytes_per_frame was updated, but not i_bitspersample, causing an inconsistency leading to a buffer overflow. Fixes #26930 - - - - - 675232e5 by David Fuhrmann at 2022-08-24T19:52:36+02:00 Update NEWS - - - - - 2 changed files: - NEWS - src/input/decoder.c Changes: = NEWS = @@ -33,7 +33,7 @@ Misc: Contribs: * update FFmpeg, bluray, upnp, pthread, x265, freetype, libsmb2, aom, dav1d, libass, libxml2 (contains CVE), dvdread, harfbuzz, zlib, gme, nettle, GnuTLS, - mpg123, speex, bluray + mpg123, speex, bluray, libvpx Changes between 3.0.17.3 and 3.0.17.4: = src/input/decoder.c = @@ -405,6 +405,8 @@ static int aout_update_format( decoder_t *p_dec ) p_dec->fmt_out.audio.i_bytes_per_frame = p_owner->fmt.audio.i_bytes_per_frame; +p_dec->fmt_out.audio.i_bitspersample = +p_owner->fmt.audio.i_bitspersample; p_dec->fmt_out.audio.i_frame_length = p_owner->fmt.audio.i_frame_length; } View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/04b535561db7a11e3ca2684d31f09758957e2eb4...675232e5932e5f205f03a485f1b56c7ae4f1ca6d -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/04b535561db7a11e3ca2684d31f09758957e2eb4...675232e5932e5f205f03a485f1b56c7ae4f1ca6d You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] 7 commits: contrib: update libvpx to 1.9.0
David pushed to branch 3.0.x at VideoLAN / VLC
Commits:
abf2379a by Tristan Matthews at 2022-08-24T16:41:18+00:00
contrib: update libvpx to 1.9.0
(cherry picked from commit 5a88236177425c275cd9d18059db690467b187ae) (edited)
edited:
* header of the 3.0 pacth was different
- - - - -
bf49fd9a by Tristan Matthews at 2022-08-24T16:41:18+00:00
contrib: vpx: update to 1.10.0
(cherry picked from commit 3d128f5b7eb4c0c4a3418e23a08369ad90eced6a)
Signed-off-by: Steve Lhomme <rob...@ycbcr.xyz>
- - - - -
a5bdd659 by Tristan Matthews at 2022-08-24T16:41:18+00:00
contrib: update libvpx to 1.11.0
(cherry picked from commit 668ef74e5971e1d90666194964c8af046e7fe442)
Signed-off-by: Steve Lhomme <rob...@ycbcr.xyz>
- - - - -
1ba3efcd by Felix Paul Kühne at 2022-08-24T16:41:18+00:00
contrib/vpx: fix compilation for aarch64 simulators on iOS/tvOS
(cherry picked from commit c32d801a882773c0f6b22999afcd3c3a297f76f8) (rebased)
rebased:
* no wasm support in 3.0
Signed-off-by: Steve Lhomme <rob...@ycbcr.xyz>
- - - - -
fdb1909e by Thomas Guillem at 2022-08-24T16:41:18+00:00
contrib: vpx: fix build with NDK25
Disable neon_asm since it rely on arm-linux-androideabi-as (removed in
NDK25).
Temporary commit.
(cherry picked from commit 7be5d4d844361de2461c557ef0114eed3cdc5aee)
Signed-off-by: Steve Lhomme <rob...@ycbcr.xyz>
- - - - -
75b8aa7a by Thomas Guillem at 2022-08-24T16:41:18+00:00
contrib: vpx: enable back i386/x86_64 asm on Android
Since relocation issues are now fixed.
(cherry picked from commit 4386bd5f3272f9e6dc410e9398071513c3187ade) (rebased)
rebased:
* no wasm on 3.0
Signed-off-by: Steve Lhomme <rob...@ycbcr.xyz>
- - - - -
04b53556 by Tristan Matthews at 2022-08-24T16:41:18+00:00
contrib: vpx: update to 1.12.0
Notable changes:
- This release adds optimizations for Loongarch, adds support for vp8 in the
real-time rate control library, upgrades GoogleTest to v1.11.0, updates
libwebm to libwebm-1.0.0.28-20-g206d268, and includes numerous bug fixes.
Bug fixes:
- Fix to a crash related to {vp8/vp9}_set_roi_map.
- Fix to compiling failure with -Wformat-nonliteral.
- Fix to integer overflow with vp9 with high resolution content.
- Fix to AddNoiseTest failure with ARMv7.
- Fix to libvpx Null-dereference READ in vp8.
(cherry picked from commit 1cc04dc41b047042fd5375e8313131176c85a2ff)
Signed-off-by: Steve Lhomme <rob...@ycbcr.xyz>
- - - - -
3 changed files:
- contrib/src/vpx/SHA512SUMS
- contrib/src/vpx/libvpx-ios.patch
- contrib/src/vpx/rules.mak
Changes:
=
contrib/src/vpx/SHA512SUMS
=
@@ -1 +1 @@
-8d544552b35000ea5712aec220b78bb5f7dc210704b2f609365214cb95a4f5a0e343b362723d829cb4a9ac203b10d5443700ba84b28fd6b2fefbabb40663e298
libvpx-1.9.0.tar.gz
+dc059bc3102b75524ae29989372334b3e0f2acf1520e5a4daa4073831bb55949d82897c498fb9d2d38b59f1a66bb0ad24407d0d086b1e3a8394a4933f04f2ed0
libvpx-1.12.0.tar.gz
=
contrib/src/vpx/libvpx-ios.patch
=
@@ -1,7 +1,8 @@
-diff -ru libvpx-1.9.0/build/make/configure.sh
libvpx-1.9.0/build/make/configure.sh
libvpx-1.9.0/build/make/configure.sh 2020-07-30 21:59:15.0
+0200
-+++ libvpx-1.9.0/build/make/configure.sh 2020-11-29 18:05:12.0
+0100
-@@ -832,96 +832,6 @@
+diff --git a/build/make/configure.sh b/build/make/configure.sh
+index 581042e38..5b282d666 100644
+--- a/build/make/configure.sh
b/build/make/configure.sh
+@@ -861,100 +861,6 @@ process_common_toolchain() {
# PIC is probably what we want when building shared libs
enabled shared && soft_enable pic
@@ -18,7 +19,7 @@ diff -ru libvpx-1.9.0/build/make/configure.sh
libvpx-1.9.0/build/make/configure.
- # Handle darwin variants. Newer SDKs allow targeting older
- # platforms, so use the newest one available.
- case ${toolchain} in
--arm*-darwin*)
+-arm*-darwin-*)
- add_cflags "-miphoneos-version-min=${IOS_VERSION_MIN}"
- iphoneos_sdk_dir="$(show_darwin_sdk_path iphoneos)"
- if [ -d "${iphoneos_sdk_dir}" ]; then
@@ -26,7 +27,7 @@ diff -ru libvpx-1.9.0/build/make/configure.sh
libvpx-1.9.0/build/make/configure.
-add_ldflags "-isysroot ${iphoneos_sdk_dir}"
- fi
- ;;
--x86*-darwin*)
+-*-darwin*)
- osx_sdk_dir="$(show_darwin_sdk_path macosx)"
- if [ -d "${osx_sdk_dir}" ]; then
-add_cflags "-isysroot ${osx_sdk_dir}"
@@ -84,6 +85,10 @@ diff -ru libvpx-1.9.0/build/make/configure.sh
libvpx-1.9.0/build/make/configure.
- add_cflags "-mmacosx-version-min=10.15"
- add_ldflags "-mmacosx-version-min=10.15"
- ;;
+-*-darwin2[0-1]-*)
+- add_cflags "-arch ${toolchain%%-*}"
+- add_ldflags "-arch ${toolchain%%-*}"
+- ;;
-*-iphonesimulator-*)
- add_cflags
[vlc-commits] [Git][videolan/vlc][3.0.x] demux: dash: include cstdint, needed for uint64_t
David pushed to branch 3.0.x at VideoLAN / VLC Commits: 58d30c8b by Johannes Kauffmann at 2022-08-24T16:20:11+00:00 demux: dash: include cstdint, needed for uint64_t Fixes #27077. (cherry picked from commit 6fca76ebd76bf8fce9b111e31bda64015cdc770f) - - - - - 1 changed file: - modules/demux/dash/mpd/TemplatedUri.hpp Changes: = modules/demux/dash/mpd/TemplatedUri.hpp = @@ -21,6 +21,7 @@ #ifndef TEMPLATEDURI_HPP #define TEMPLATEDURI_HPP +#include #include namespace dash View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/58d30c8b6432b8ba12f37f20900c9976670bab2e -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/58d30c8b6432b8ba12f37f20900c9976670bab2e You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] OpenMAX IL: add more missing extern qualifiers
David pushed to branch 3.0.x at VideoLAN / VLC Commits: 7a1446e3 by Johannes Kauffmann at 2022-08-24T15:59:10+00:00 OpenMAX IL: add more missing extern qualifiers Amends 8e50cc985ed1e6e42387af0383c37cfb5ffbf1d7. This should fix #24617, which is still an issue on 3.0.x (cf. #27256). - - - - - 1 changed file: - modules/codec/omxil/omxil_core.h Changes: = modules/codec/omxil/omxil_core.h = @@ -34,9 +34,9 @@ extern OMX_ERRORTYPE (*pf_component_enum)(OMX_STRING, OMX_U32, OMX_U32); extern OMX_ERRORTYPE (*pf_get_roles_of_component)(OMX_STRING, OMX_U32 *, OMX_U8 **); /* Extra IOMX android functions. Can be NULL if we don't link with libiomx */ -OMX_ERRORTYPE (*pf_enable_graphic_buffers)(OMX_HANDLETYPE, OMX_U32, OMX_BOOL); -OMX_ERRORTYPE (*pf_get_graphic_buffer_usage)(OMX_HANDLETYPE, OMX_U32, OMX_U32*); -OMX_ERRORTYPE (*pf_get_hal_format) (const char *, int *); +extern OMX_ERRORTYPE (*pf_enable_graphic_buffers)(OMX_HANDLETYPE, OMX_U32, OMX_BOOL); +extern OMX_ERRORTYPE (*pf_get_graphic_buffer_usage)(OMX_HANDLETYPE, OMX_U32, OMX_U32*); +extern OMX_ERRORTYPE (*pf_get_hal_format) (const char *, int *); int InitOmxCore(vlc_object_t *p_this); void DeinitOmxCore(void); View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/7a1446e3852faaa22012b541332bef226e721843 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/7a1446e3852faaa22012b541332bef226e721843 You're receiving this email because of your account on code.videolan.org. VideoLAN code repository instance___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] 9 commits: contrib: gnutls: Backport a patch to avoid -Wint-conversion errors
David pushed to branch 3.0.x at VideoLAN / VLC
Commits:
f22fc52d by Martin Storsjö at 2022-08-19T15:18:45+03:00
contrib: gnutls: Backport a patch to avoid -Wint-conversion errors
Clang 15 made "incompatible pointer to integer conversion" an error
instead of a plain warning. This fixes errors like these:
system/keys-win.c:257:13: error: incompatible pointer to integer conversion
initializing 'HCRYPTHASH' (aka 'unsigned long') with an
expression of type 'void *' [-Wint-conversion]
HCRYPTHASH hHash = NULL;
^
This backports
https://gitlab.com/gnutls/gnutls/-/commit/88d79b964d88730e316919d6ccd17ca0fe9b3244.
(cherry picked from commit ef1d4f3d22abacb6b5333e5c1a3ff943255f9101)
Signed-off-by: Martin Storsjö <mar...@martin.st>
- - - - -
1d4bcca1 by Steve Lhomme at 2022-08-19T15:47:46+03:00
contrib: crystalhd: fix forward declaration of a struct
Clang doesn't like it and warns about setting the callback using this
signature.
(cherry picked from commit aee808c442476604846a8a33c48e51a0110957f7)
Signed-off-by: Martin Storsjö <mar...@martin.st>
- - - - -
ab3617c2 by Martin Storsjö at 2022-08-19T15:47:46+03:00
contrib: qt: Backport patches to Qt 5.6 to fix compilation with latest Clang
Clang 16 errors out on ill-formed constant expressions when setting an
enum value to an out of range value for a non-fixed type enum.
These are all fixes that have been made in newer versions of Qt, but
which are backported to the version carried in vlc contribs.
- - - - -
57df8aee by Steve Lhomme at 2022-08-19T15:47:46+03:00
winvlc: fix warnings
(cherry picked from commit 260ee399c517721806076a6ffd6dec7875afa1a4)
Signed-off-by: Martin Storsjö <mar...@martin.st>
- - - - -
b184d1fd by Rémi Denis-Courmont at 2022-08-19T15:47:46+03:00
yadif: fix invalid function pointer conversion
(cherry picked from commit 87724691c899a02d94fb64a3ef16868d65f3551b)
Signed-off-by: Martin Storsjö <mar...@martin.st>
- - - - -
957906af by Rémi Denis-Courmont at 2022-08-19T15:47:46+03:00
ts: fix invalid casts
(cherry picked from commit 779c87eaff8399a3c7f65fe51fcf107c727fc227)
Signed-off-by: Martin Storsjö <mar...@martin.st>
- - - - -
71707c2f by Steve Lhomme at 2022-08-19T15:47:46+03:00
ntservice: fix warning on losing const attribute
(cherry picked from commit 6add3c05520f0a81f9fe61d27eb31f1e1a1a8919)
Signed-off-by: Martin Storsjö <mar...@martin.st>
- - - - -
9e4d83f3 by Martin Storsjö at 2022-08-19T15:47:46+03:00
d3d11: Avoid -Wint-conversion errors
Clang 15 made "incompatible pointer to integer conversion" an error
instead of a plain warning. This fixes errors like these:
d3d11va.c:426:29: error: incompatible integer to pointer conversion assigning
to 'ID3D11DeviceContext *' (aka 'struct ID3D11DeviceContext *')
from 'int64_t' (aka 'long long') [-Wint-conversion]
sys->d3d_dev.d3dcontext = var_InheritInteger(va,
"winrt-d3dcontext");
- - - - -
d2cad92d by Martin Storsjö at 2022-08-19T15:47:46+03:00
spudec: Fix function pointer incompatibilities
This is an error in Clang 16.
- - - - -
18 changed files:
- bin/winvlc.c
- + contrib/src/crystalhd/callback_proto.patch
- contrib/src/crystalhd/rules.mak
- + contrib/src/gnutls/0001-windows-Avoid-Wint-conversion-errors.patch
- contrib/src/gnutls/rules.mak
- + contrib/src/qt/0015-foreach-remove-implementations-not-using-decltype.patch
- + contrib/src/qt/0016-Replace-custom-type-traits-with-std-one-s.patch
- +
contrib/src/qt/0017-Rename-QtPrivate-is_-un-signed-to-QtPrivate-Is-Un-si.patch
- + contrib/src/qt/0018-Remove-qtypetraits.h-s-contents-altogether.patch
- contrib/src/qt/rules.mak
- modules/codec/avcodec/d3d11va.c
- modules/codec/crystalhd.c
- modules/codec/spudec/parse.c
- modules/codec/spudec/spudec.h
- modules/control/ntservice.c
- modules/demux/mpeg/ts_pid.c
- modules/video_filter/deinterlace/yadif.h
- modules/video_output/win32/direct3d11.c
Changes:
=
bin/winvlc.c
=
@@ -70,8 +70,8 @@ static BOOL SetDefaultDllDirectories_(DWORD flags)
BOOL (WINAPI * SetDefaultDllDirectoriesReal)(DWORD);
-SetDefaultDllDirectoriesReal = GetProcAddress(h,
- "SetDefaultDllDirectories");
+SetDefaultDllDirectoriesReal = (BOOL (WINAPI *)(DWORD))
+GetProcAddress(h,
"SetDefaultDllDirectories");
if (SetDefaultDllDirectoriesReal == NULL)
return FALSE;
@@ -149,7 +149,9 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE
hPrevInstance,
if (h_Kernel32 != NULL)
{
/* Enable DEP */
+#ifndef PROCESS_DEP_ENABLE
# define PROCESS_DEP_ENABLE 1
+#endif /* PROCESS_DEP_ENABLE */
BOOL (WINAPI * mySetProcessDEPPolicy)( DWORD dwFlags);
mySetProcessDEPPolicy = (BOOL (WINAPI *)(DWORD)
[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: contrib: upnp: Remove unneeded patch
David pushed to branch 3.0.x at VideoLAN / VLC Commits: f6bd67bb by Hugo Beauzée-Luyssen at 2022-08-17T15:50:07+02:00 contrib: upnp: Remove unneeded patch If libupnp is built without --enable-debug, debug is entirely deactivated. When debug is enabled, users are required to call UpnpInitLog to enable logging, otherwise logs are dropped (cherry picked from commit be9bc069b0599d8b33c3023855c91abcecbfaa5a) - - - - - 5c8512df by Hugo Beauzée-Luyssen at 2022-08-17T15:50:51+02:00 contrib: upnp: Bump to 1.14.13 (cherry picked from commit bf2819fd0bb212f200821ed33b8e041332b5a4ae) - - - - - 8 changed files: - + contrib/src/upnp/0001-ThreadPool-Fix-non-UCRT-builds.patch - contrib/src/upnp/SHA512SUMS - contrib/src/upnp/libupnp-win32.patch - − contrib/src/upnp/libupnp-win64.patch - contrib/src/upnp/rules.mak - − contrib/src/upnp/upnp-no-debugfile.patch - − contrib/src/upnp/win32-gettimeofday.patch - contrib/src/upnp/windows-version-inet.patch Changes: = contrib/src/upnp/0001-ThreadPool-Fix-non-UCRT-builds.patch = @@ -0,0 +1,32 @@ +From 3560d8d3f1a5b7e88b9d6282c09b2caf37beedc8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= +Date: Thu, 4 Aug 2022 15:55:55 +0200 +Subject: [PATCH] ThreadPool: Fix non UCRT builds + +--- + upnp/src/threadutil/ThreadPool.c | 5 + + 1 file changed, 5 insertions(+) + +diff --git a/upnp/src/threadutil/ThreadPool.c b/upnp/src/threadutil/ThreadPool.c +index 49fa8486..e5883d31 100644 +--- a/upnp/src/threadutil/ThreadPool.c b/upnp/src/threadutil/ThreadPool.c +@@ -1297,10 +1297,15 @@ int gettimeofday(struct timeval *tv, struct timezone *tz) + _tzset(); + tzflag++; + } ++#ifdef _UCRT + long itz = 0; + _get_timezone(&itz); + tz->tz_minuteswest = (int)(itz / 60); + _get_daylight(&tz->tz_dsttime); ++#else ++ tz->tz_minuteswest = _timezone / 60; ++ tz->tz_dsttime = _daylight; ++#endif + } + + return 0; +-- +2.35.1 + = contrib/src/upnp/SHA512SUMS = @@ -1 +1 @@ -deb971c6ebaa6a159072cb4153f7ada40400d88faee896366a694d0f15cf1aeea4de1199186122a2968c9e6a92fb7687019601cdbe1f7e08d2962496469a55ea pupnp-release-1.14.11.tar.gz +ae6ae72a5e784a0f9508af94c4070627e791660fa37966e9825643fd0f88b171826bda9a2ec872d4961bf3454e5a9cd716127f0bdf6e63c789c4e22aab0b7e71 pupnp-release-1.14.13.tar.gz = contrib/src/upnp/libupnp-win32.patch = @@ -1,11 +1,13 @@ libupnp/upnp/src/inc/upnputil.h2010-12-23 21:24:06.0 +0100 -+++ libupnp.new/upnp/src/inc/upnputil.h2011-02-13 08:24:24.0 +0100 -@@ -125,7 +125,7 @@ - #define strncasecmp strnicmp - #define sleep(a)Sleep((a)*1000) - #define usleep(a) Sleep((a)/1000) -- #define strerror_r(a,b,c) (strerror_s((b),(c),(a))) -+ #define strerror_r(a,b,c) strncpy( b, strerror(a), c) +diff --git a/upnp/src/inc/upnputil.h b/upnp/src/inc/upnputil.h +index 2f18422b..ffc79254 100644 +--- a/upnp/src/inc/upnputil.h b/upnp/src/inc/upnputil.h +@@ -106,7 +106,7 @@ void linecopylen( + #endif + #define sleep(a) Sleep((a)*1000) + #define usleep(a) Sleep((a) / 1000) +- #define strerror_r(a, b, c) (strerror_s((b), (c), (a))) ++ #define strerror_r(a, b, c) strncpy(b, strerror(a), c) #else - #define max(a, b) (((a)>(b))? (a):(b)) - #define min(a, b) (((a)<(b))? (a):(b)) + #define max(a, b) (((a) > (b)) ? (a) : (b)) + #define min(a, b) (((a) < (b)) ? (a) : (b)) = contrib/src/upnp/libupnp-win64.patch deleted = @@ -1,36 +0,0 @@ -From 9ec9967c55e51c387f7d517e72adb6ed278d153f Mon Sep 17 00:00:00 2001 -From: Alaric Senat -Date: Wed, 10 Mar 2021 15:25:20 +0100 -Subject: win64 - - upnp/inc/upnp.h | 13 + - 1 file changed, 13 insertions(+) - -diff --git a/upnp/inc/upnp.h b/upnp/inc/upnp.h -index 0a51b34..4711e11 100644 a/upnp/inc/upnp.h -+++ b/upnp/inc/upnp.h -@@ -61,6 +61,19 @@ - /* Other systems ??? */ - #endif - -+#if defined(__MINGW32__) -+ #if !defined(_OFF_T_) -+ typedef long long _off_t; -+ typedef _off_t off_t; -+ #define _OFF_T_ -+ #else -+ #ifdef off_t -+ #undef off_t -+ #endif -+ #define off_t long long -+ #endif -+#endif -+ - #ifdef UPNP_ENABLE_OPEN_SSL - #include - #endif --- -2.29.2 - = contrib/src/upnp/rules.mak ==
[vlc-commits] [Git][videolan/vlc][3.0.x] bin: Add Frameworks directory to vlc-osx RPATH
David pushed to branch 3.0.x at VideoLAN / VLC Commits: 0b72ae60 by David Fuhrmann at 2022-01-08T10:42:03+00:00 bin: Add Frameworks directory to vlc-osx RPATH vlc-osx is used to generate the final VLC executable, and therefore the RPATH to the Frameworks directory is needed as well, in order to find the Sparkle framework. Followup fix for !1155. - - - - - 1 changed file: - bin/Makefile.am Changes: = bin/Makefile.am = @@ -49,6 +49,7 @@ vlc_osx_SOURCES = darwinvlc.m vlc_osx_LDFLAGS = $(LDFLAGS_vlc) -Wl,-framework,CoreFoundation,-framework,Cocoa vlc_osx_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/lib/" vlc_osx_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/plugins/" +vlc_osx_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../Frameworks/" if HAVE_BREAKPAD vlc_osx_LDFLAGS += -Wl,-framework,Breakpad vlc_osx_OBJCFLAGS = -F$(CONTRIB_DIR)/Frameworks View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/0b72ae60d25e40a960fa4ecd54ac30a66ef60e0b -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/0b72ae60d25e40a960fa4ecd54ac30a66ef60e0b You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] 2 commits: macosx: add rpath for Frameworks
David pushed to branch 3.0.x at VideoLAN / VLC Commits: 939b0470 by Marvin Scholz at 2022-01-04T15:36:29+01:00 macosx: add rpath for Frameworks The Frameworks folder was missing in the rpath, leading to Frameworks like Sparkle requiring change of the install_name after it was built instead of just using rpath properly. - - - - - 0b23c96a by Marvin Scholz at 2022-01-04T15:36:29+01:00 contrib: sparkle: do not change install_name Changing the install name is no longer necessary since 0831e42ecb6878bec2b3a0e07d56123a730d6a98 and doing so breaks the ad-hoc code signing leading to a broken bundle and pseudo-bundle on arm64 which requires ad-hoc signing. Fix #26127 - - - - - 2 changed files: - bin/Makefile.am - contrib/src/sparkle/rules.mak Changes: = bin/Makefile.am = @@ -64,6 +64,7 @@ vlc_osx_static_OBJCFLAGS = $(AM_OBJCFLAGS) \ vlc_osx_static_LDFLAGS = $(vlc_osx_LDFLAGS) -static vlc_osx_static_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../lib/.libs/" vlc_osx_static_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../src/.libs/" +vlc_osx_static_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../Frameworks/" vlc_osx_static_LDADD = $(vlc_osx_LDADD) if HAVE_BREAKPAD vlc_osx_static_LDFLAGS += -Wl,-framework,Breakpad = contrib/src/sparkle/rules.mak = @@ -19,7 +19,6 @@ sparkle: Sparkle-$(SPARKLE_VERSION).zip .sum-sparkle .sparkle: sparkle # Build Sparkle and change the @rpath cd $< && xcodebuild $(XCODE_FLAGS) - cd $< && install_name_tool -id @executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle build/Release/Sparkle.framework/Versions/A/Sparkle # Install cd $< && mkdir -p "$(PREFIX)/Frameworks" && \ rm -Rf "$(PREFIX)/Frameworks/Sparkle.framework" && \ View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/307931a3d3282bb88bb7be5d7c7520de00a7a21f...0b23c96a037cb9572223778b6e08ee8345bd8a34 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/307931a3d3282bb88bb7be5d7c7520de00a7a21f...0b23c96a037cb9572223778b6e08ee8345bd8a34 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] 2 commits: macosx: add rpath for Frameworks
David pushed to branch master at VideoLAN / VLC Commits: ffaadb57 by Marvin Scholz at 2022-01-04T19:40:24+00:00 macosx: add rpath for Frameworks The Frameworks folder was missing in the rpath, leading to Frameworks like Sparkle requiring change of the install_name after it was built instead of just using rpath properly. - - - - - b97c1377 by Marvin Scholz at 2022-01-04T19:40:24+00:00 contrib: sparkle: do not change install_name Changing the install name is no longer necessary since 0831e42ecb6878bec2b3a0e07d56123a730d6a98 and doing so breaks the ad-hoc code signing leading to a broken bundle and pseudo-bundle on arm64 which requires ad-hoc signing. Fix #26127 - - - - - 2 changed files: - bin/Makefile.am - contrib/src/sparkle/rules.mak Changes: = bin/Makefile.am = @@ -63,6 +63,7 @@ vlc_osx_static_OBJCFLAGS = $(AM_OBJCFLAGS) \ vlc_osx_static_LDFLAGS = $(vlc_osx_LDFLAGS) -static vlc_osx_static_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../lib/.libs/" vlc_osx_static_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../src/.libs/" +vlc_osx_static_LDFLAGS += -Xlinker -rpath -Xlinker "@executable_path/../Frameworks/" vlc_osx_static_LDADD = $(vlc_osx_LDADD) if HAVE_BREAKPAD vlc_osx_static_LDFLAGS += -Wl,-framework,Breakpad = contrib/src/sparkle/rules.mak = @@ -19,7 +19,6 @@ sparkle: Sparkle-$(SPARKLE_VERSION).zip .sum-sparkle .sparkle: sparkle # Build Sparkle and change the @rpath cd $< && xcodebuild $(XCODE_FLAGS) - cd $< && install_name_tool -id @executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle build/Release/Sparkle.framework/Versions/A/Sparkle # Install cd $< && mkdir -p "$(PREFIX)/Frameworks" && \ rm -Rf "$(PREFIX)/Frameworks/Sparkle.framework" && \ View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/52ef980fb2ad9ca45f2db7d114a3e957457612bb...b97c1377fd5d68d3c268e5461813400a9bd9c9b9 -- View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/52ef980fb2ad9ca45f2db7d114a3e957457612bb...b97c1377fd5d68d3c268e5461813400a9bd9c9b9 You're receiving this email because of your account on code.videolan.org. ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][3.0.x] 9 commits: avcapture: setup framerate correctly
David pushed to branch 3.0.x at VideoLAN / VLC
Commits:
c593d59c by Alexandre Janniaux at 2021-10-11T14:09:06+00:00
avcapture: setup framerate correctly
Set the framerate to 1 / framerate_base, avoiding the following warning
for a 30fps capture stream:
rawvideo decoder warning: invalid frame rate 0/3, using 25 fps
instead
Cherry-picked from commit 84a5179345c9ec0b2bb687db0d3ad7b0eb61664c.
Signed-off-by: Alexandre Janniaux <aja...@videolabs.io>
- - - - -
92188660 by Alexandre Janniaux at 2021-10-11T14:09:06+00:00
avcapture: fix typo
Cherry-picked from commit 34111f324433e93d250c17129fc2d52bb6955b8e.
Signed-off-by: Alexandre Janniaux <aja...@videolabs.io>
- - - - -
8eee92c3 by Alexandre Janniaux at 2021-10-11T14:09:06+00:00
avcapture: remove trailing characters
Cherry-picked from commit de1339120dbef5ff9eb1afd6df964424f4bbff43.
Signed-off-by: Alexandre Janniaux <aja...@videolabs.io>
- - - - -
8f60dd97 by Alexandre Janniaux at 2021-10-11T14:09:06+00:00
avcapture: improve the es_format_t exposed
Cherry-picked from commit d105cfe42dda31d5403c01e71a44eae63b8b04a3.
Signed-off-by: Alexandre Janniaux <aja...@videolabs.io>
- - - - -
8f07b5cd by Alexandre Janniaux at 2021-10-11T14:09:06+00:00
avcapture: fix locking for pts
Cherry-picked from commit 27489f99ccd8e56884d79359d30e7d499c415f03.
Signed-off-by: Alexandre Janniaux <aja...@videolabs.io>
- - - - -
a71f62e7 by Alexandre Janniaux at 2021-10-11T14:09:06+00:00
avcapture: use video_format_Print
...instead of using custom debug strings
Cherry-picked from commit 3e9507cd6b48f1d6a26e1710f56e6a6a856dbf80.
Signed-off-by: Alexandre Janniaux <aja...@videolabs.io>
- - - - -
d9eb0075 by Alexandre Janniaux at 2021-10-11T14:09:06+00:00
avcapture: use a separate class for ARC
ARC is not supported when storing NSObject in a structure. But it is
well-supported when storing a NSObject as (__bridge_retained void*) into
the p_sys until (__bridge_tranfer) releases it.
It highly simplify the whole handling of ARC objects and avoid using
CFRelease/CFRetain in the code, unifying with other Objective-C modules
like VLCVideoUIView or VLCOpenGLES2VideoView.
Cherry-picked from commit 3571e7ed3ad7df8aa62a3f360bed07bedb56bdda.
Signed-off-by: Alexandre Janniaux <aja...@videolabs.io>
- - - - -
a4e07fb9 by Alexandre Janniaux at 2021-10-11T14:09:06+00:00
avcapture: signal missing protocol implemented
AVCaptureVideoDataOutputSampleBufferDelegate is implemented by
VLCAVDecompressedVideoOutput but wasn't signalled, leading to warnings
when compiling.
Cherry-picked from commit 2a3074cc36f708c0048e11347c9f337f017e1e47.
Signed-off-by: Alexandre Janniaux <aja...@videolabs.io>
- - - - -
aa517507 by Alexandre Janniaux at 2021-10-11T14:09:06+00:00
avcapture: fix PTS conversion and usage
CMTime is **not** equivalent to vlc_tick_t. In particular, the timescale
doesn't match. So it should be converted before usage.
In addition, GET_TIME is supposed to return where the access is
currently reading, which should also match the timestamps of the output
frames from the access.
Fixes #26101
Cherry-picked from commit ca04b74fa6724c6d770cf277d97b1bfb4d18fe20.
Signed-off-by: Alexandre Janniaux <aja...@videolabs.io>
- - - - -
1 changed file:
- modules/access/avcapture.m
Changes:
=
modules/access/avcapture.m
=
@@ -72,11 +72,20 @@ vlc_module_begin ()
set_callbacks(Open, Close)
vlc_module_end ()
+static mtime_t vlc_CMTime_to_mtime(CMTime timestamp)
+{
+CMTime scaled = CMTimeConvertScale(
+timestamp, CLOCK_FREQ,
+kCMTimeRoundingMethod_Default);
+
+return 1 + scaled.value;
+}
/*
* AVFoundation Bridge
*/
-@interface VLCAVDecompressedVideoOutput : AVCaptureVideoDataOutput
+@interface VLCAVDecompressedVideoOutput :
+AVCaptureVideoDataOutput
{
demux_t *p_avcapture;
@@ -157,7 +166,7 @@ vlc_module_end ()
self.videoDimensions =
CMVideoFormatDescriptionGetDimensions(formatDescription);
bytesPerRow =
CVPixelBufferGetBytesPerRow(CMSampleBufferGetImageBuffer(sampleBuffer));
videoDimensionsReady = YES;
-msg_Dbg(p_avcapture, "Dimensionns obtained height:%i width:%i
bytesPerRow:%lu", [self height], [self width], bytesPerRow);
+msg_Dbg(p_avcapture, "Dimensions obtained height:%i width:%i
bytesPerRow:%lu", [self height], [self width], bytesPerRow);
}
}
@@ -165,15 +174,14 @@ vlc_module_end ()
{
mtime_t pts;
-if ( !currentImageBuffer || currentPts == previousPts )
-return 0;
-
@synchronized (self)
{
+ if ( !currentImageBuffer || currentPts == previousPts )
+ return 0;
pts = previousPts = curre
[vlc-commits] [Git][videolan/vlc][master] macosx: Fix a bug preventing VLC from launching
David pushed to branch master at VideoLAN / VLC
Commits:
8cb3f814 by Samuel Bassaly at 2021-09-18T10:38:53+00:00
macosx: Fix a bug preventing VLC from launching
When the defaults key VideoEffectApplyProfileOnStartup is set to true,
the VLCVideoEffectsWindowController was initialized in a way that caused
the VLCMain's sharedInstance method to be called recursively on launch.
This caused the app to crash, in the VLCMain's init.
The method [VLCVideoEffectsWindowController resetValues] was the source.
In this fix, call this method with dispatch async, to get the
sharedInstance after it is fully intitalized.
This is similar to what is done in VLCAudioEffectsWindowController.
Closes #24746.
- - - - -
1 changed file:
- modules/gui/macosx/panels/VLCVideoEffectsWindowController.m
Changes:
=
modules/gui/macosx/panels/VLCVideoEffectsWindowController.m
=
@@ -79,26 +79,27 @@ NSString *VLCVideoEffectsProfileNamesKey =
@"VideoEffectProfileNames";
{
self = [super initWithWindowNibName:@"VideoEffects"];
if (self) {
-NSNotificationCenter *notificationCenter = [NSNotificationCenter
defaultCenter];
-[notificationCenter addObserver:self
- selector:@selector(updateCocoaWindowLevel:)
- name:VLCWindowShouldUpdateLevel
- object:nil];
-[notificationCenter addObserver:self
-
selector:@selector(saveCurrentProfileAtTerminate:)
- name:NSApplicationWillTerminateNotification
- object:nil];
-
-NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-if ([defaults boolForKey:@"VideoEffectApplyProfileOnStartup"]) {
-// This does not reset the UI (which does not exist yet), but it
initalizes needed playlist vars
-[self resetValues];
-
-[self loadProfile];
-} else {
-[self saveCurrentProfileIndex:0];
-}
-
+dispatch_async(dispatch_get_main_queue(), ^{
+NSNotificationCenter *notificationCenter = [NSNotificationCenter
defaultCenter];
+[notificationCenter addObserver:self
+ selector:@selector(updateCocoaWindowLevel:)
+ name:VLCWindowShouldUpdateLevel
+ object:nil];
+[notificationCenter addObserver:self
+
selector:@selector(saveCurrentProfileAtTerminate:)
+
name:NSApplicationWillTerminateNotification
+ object:nil];
+
+NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
+if ([defaults boolForKey:@"VideoEffectApplyProfileOnStartup"]) {
+// This does not reset the UI (which does not exist yet), but
it initalizes needed playlist vars
+[self resetValues];
+
+[self loadProfile];
+} else {
+[self saveCurrentProfileIndex:0];
+}
+});
}
return self;
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/8cb3f81422c566ea738200f26d2c0c70bde8f9ed
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/8cb3f81422c566ea738200f26d2c0c70bde8f9ed
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] macosx: Add stereo_pan filter
David pushed to branch master at VideoLAN / VLC Commits: 6f47656d by Samuel Bassaly at 2021-08-29T13:28:07+00:00 macosx: Add stereo_pan filter Add stereo pan filter to Advanced Audio Effects panel. Add enable button for each filter, as pan audio effect has effect over the whole spectrum (always noticeable), thus, if always enabled, it makes pitch adjustment unusable. Additionally, for pitch adjustment: - Update the step of the scale to 0.25 - Fix the default value to 0.0 (was previously 0.25) Closes issue #25872 - - - - - 3 changed files: - modules/gui/macosx/UI/AudioEffects.xib - modules/gui/macosx/panels/VLCAudioEffectsWindowController.h - modules/gui/macosx/panels/VLCAudioEffectsWindowController.m Changes: = modules/gui/macosx/UI/AudioEffects.xib = @@ -8,11 +8,13 @@ - - + + + + @@ -101,7 +103,7 @@ - + @@ -1136,18 +1138,8 @@ - - - - - - - - - - - + @@ -1157,57 +1149,85
[vlc-commits] [Git][videolan/vlc][master] macosx: Add pitch adjustment to Audio Effects
David pushed to branch master at VideoLAN / VLC Commits: f6275d44 by Samuel Bassaly at 2021-06-30T19:20:54+00:00 macosx: Add pitch adjustment to Audio Effects Add the Advanced Tab to the Audio Effects panel, and include the Adjust pitch slider. Update the profile string to include the pitch value, so that the user doesn't need to set it each time. Closes: #25543 - - - - - 3 changed files: - modules/gui/macosx/UI/AudioEffects.xib - modules/gui/macosx/panels/VLCAudioEffectsWindowController.h - modules/gui/macosx/panels/VLCAudioEffectsWindowController.m Changes: = modules/gui/macosx/UI/AudioEffects.xib = @@ -1,13 +1,19 @@ - + - + + + + + + + @@ -95,13 +101,13 @@ - + - + - - + + @@ -109,6 +115,7 @@ + @@ -116,18 +123,18 @@ - + - + - + @@ -151,7 +158,7 @@ - + @@ -219,7 +226,7 @@ - + @@ -498,7 +505,7 @@ - + @@ -512,7 +519,7 @@ - + @@ -522,7 +529,7 @@ - + @@ -785,7 +792,7 @@ - + @@ -799,7 +806,7 @@ - + @@ -809,7 +
[vlc-commits] [Git][videolan/vlc][3.0.x] macosx/prefs: always show media key control as enabled
David pushed to branch 3.0.x at VideoLAN / VLC
Commits:
08db536c by Felix Paul Kühne at 2021-06-16T13:53:41+02:00
macosx/prefs: always show media key control as enabled
On macOS Sierra and higher, we will use the official API to enable
control of VLC, which will always be enabled as potential conflicts are
mitigated by the OS and it is possible to control more than one
application at the same time, so the option is ignored. On earlier
releases of macOS, SPMediaKeyTap can still be optionally disabled.
- - - - -
1 changed file:
- modules/gui/macosx/VLCSimplePrefsController.m
Changes:
=
modules/gui/macosx/VLCSimplePrefsController.m
=
@@ -565,7 +565,12 @@ static inline const char * __config_GetLabel(vlc_object_t
*p_this, const char *p
[self setupButton:_intf_appleremoteCheckbox forBoolValue:
"macosx-appleremote"];
[self setupButton:_intf_appleremote_sysvolCheckbox forBoolValue:
"macosx-appleremote-sysvol"];
[self setupButton:_intf_statusIconCheckbox forBoolValue:
"macosx-statusicon"];
-[self setupButton:_intf_mediakeysCheckbox forBoolValue:
"macosx-mediakeys"];
+if (OSX_SIERRA_AND_HIGHER) {
+_intf_mediakeysCheckbox.enabled = NO;
+_intf_mediakeysCheckbox.intValue = YES;
+} else {
+[self setupButton:_intf_mediakeysCheckbox forBoolValue:
"macosx-mediakeys"];
+}
[self setupButton:_video_nativeFullscreenCheckbox forBoolValue:
"macosx-nativefullscreenmode"];
[self setupButton:_video_embeddedCheckbox forBoolValue: "embedded-video"];
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/08db536c9921b0b5654bc954e335051efa1130c1
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/08db536c9921b0b5654bc954e335051efa1130c1
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Workaround crash in PXSourceList dealloc
vlc/vlc-3.0 | branch: master | David Fuhrmann | Tue
Jun 1 17:54:45 2021 +0200| [bb7022aed9b88cd519848de19d1cb6ba3795d1b2] |
committer: David Fuhrmann
macosx: Workaround crash in PXSourceList dealloc
[super setDataSource] crashes on macOS 10.11 until 10.13.
The code in question should not be needed (the recieving
properties are weak in new macOS frameworks).
Also whole deallocation of this object is not consistent.
Therefore remove the code in question.
Closes videolan/vlc#21267
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=bb7022aed9b88cd519848de19d1cb6ba3795d1b2
---
modules/gui/macosx/PXSourceList/PXSourceList.m | 8
1 file changed, 8 deletions(-)
diff --git a/modules/gui/macosx/PXSourceList/PXSourceList.m
b/modules/gui/macosx/PXSourceList/PXSourceList.m
index fd7f74b419..ec43c6aa48 100755
--- a/modules/gui/macosx/PXSourceList/PXSourceList.m
+++ b/modules/gui/macosx/PXSourceList/PXSourceList.m
@@ -67,14 +67,6 @@ NSString * const PXSLDeleteKeyPressedOnRowsNotification =
@"PXSourceListDeleteKe
_delegateDataSourceProxy = [[PXSourceListDelegateDataSourceProxy alloc]
initWithSourceList:self];
}
-- (void)dealloc
-{
-_delegateDataSourceProxy = nil;
-//Remove ourselves as the delegate and data source to be safe
-[super setDataSource:nil];
-[super setDelegate:nil];
-}
-
#pragma mark -
#pragma mark Custom Accessors
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS package: Increase image size for dmg package
vlc/vlc-3.0 | branch: master | David Fuhrmann | Mon
May 3 21:39:32 2021 +0200| [9f1a68226ba337bdf673f95caef95a10ef2920b4] |
committer: David Fuhrmann
macOS package: Increase image size for dmg package
Increase to 300M to allow to build universal releases.
This is the maximum size of the release image, the final
file will be only at the usual compressed size.
(cherry picked from commit 6a8dcbee0f3925af7ace8afb0b1a5b58c69f354f)
Signed-off-by: David Fuhrmann
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=9f1a68226ba337bdf673f95caef95a10ef2920b4
---
extras/package/macosx/dmg/dmg_settings.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/macosx/dmg/dmg_settings.py
b/extras/package/macosx/dmg/dmg_settings.py
index 2b0984c521..c380893907 100644
--- a/extras/package/macosx/dmg/dmg_settings.py
+++ b/extras/package/macosx/dmg/dmg_settings.py
@@ -27,7 +27,7 @@ appname = os.path.basename(application)
format = defines.get('format', 'UDBZ')
# Volume size (must be large enough for your files)
-size = defines.get('size', '150M')
+size = defines.get('size', '300M')
# Files to include
files = [ application ]
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] [Git][videolan/vlc][master] macOS package: Increase image size for dmg package
David pushed to branch master at VideoLAN / VLC
Commits:
6a8dcbee by David Fuhrmann at 2021-05-05T08:06:43+02:00
macOS package: Increase image size for dmg package
Increase to 300M to allow to build universal releases.
This is the maximum size of the release image, the final
file will be only at the usual compressed size.
- - - - -
1 changed file:
- extras/package/macosx/dmg/dmg_settings.py
Changes:
=
extras/package/macosx/dmg/dmg_settings.py
=
@@ -27,7 +27,7 @@ appname = os.path.basename(application)
format = defines.get('format', 'UDBZ')
# Volume size (must be large enough for your files)
-size = defines.get('size', '150M')
+size = defines.get('size', '300M')
# Files to include
files = [ application ]
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/6a8dcbee0f3925af7ace8afb0b1a5b58c69f354f
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/6a8dcbee0f3925af7ace8afb0b1a5b58c69f354f
You're receiving this email because of your account on code.videolan.org.
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] POTFILES.in: Update for macosx UI files
vlc/vlc-3.0 | branch: master | David Fuhrmann | Tue Apr 13 12:58:33 2021 +0200| [832a58631ca235d2a5bc558a55f8c0172fb86ac9] | committer: David Fuhrmann POTFILES.in: Update for macosx UI files Add all files in directory. Fixes missing VLCSidebarSource and VLCLogWindowController, notably. > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=832a58631ca235d2a5bc558a55f8c0172fb86ac9 --- po/POTFILES.in | 65 ++ 1 file changed, 61 insertions(+), 4 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index 0d03d2ba9e..ffeb3db566 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -459,6 +459,19 @@ modules/demux/xa.c modules/demux/xiph.h modules/demux/xiph_metadata.c modules/demux/xiph_metadata.h +modules/gui/macosx/AppleRemote.h +modules/gui/macosx/AppleRemote.m +modules/gui/macosx/CompatibilityFixes.h +modules/gui/macosx/CompatibilityFixes.m +modules/gui/macosx/NSGradient+VLCAdditions.h +modules/gui/macosx/NSGradient+VLCAdditions.m +modules/gui/macosx/NSScreen+VLCAdditions.h +modules/gui/macosx/NSScreen+VLCAdditions.m +modules/gui/macosx/NSSound+VLCAdditions.h +modules/gui/macosx/NSSound+VLCAdditions.m +modules/gui/macosx/SPMediaKeyTap.h +modules/gui/macosx/SPMediaKeyTap.m +modules/gui/macosx/Spotify.h modules/gui/macosx/VLCAboutWindowController.h modules/gui/macosx/VLCAboutWindowController.m modules/gui/macosx/VLCAddonListItem.h @@ -495,10 +508,46 @@ modules/gui/macosx/VLCExtensionsManager.h modules/gui/macosx/VLCExtensionsManager.m modules/gui/macosx/VLCFSPanelController.h modules/gui/macosx/VLCFSPanelController.m -modules/gui/macosx/helpers.h -modules/gui/macosx/macosx.m -modules/gui/macosx/VLCMain.h -modules/gui/macosx/VLCMain.m +modules/gui/macosx/VLCFSPanelDraggableView.h +modules/gui/macosx/VLCFSPanelDraggableView.m +modules/gui/macosx/VLCHUDButtonCell.h +modules/gui/macosx/VLCHUDButtonCell.m +modules/gui/macosx/VLCHUDCheckboxCell.h +modules/gui/macosx/VLCHUDCheckboxCell.m +modules/gui/macosx/VLCHUDOutlineView.h +modules/gui/macosx/VLCHUDOutlineView.m +modules/gui/macosx/VLCHUDPopUpButtonCell.h +modules/gui/macosx/VLCHUDPopUpButtonCell.m +modules/gui/macosx/VLCHUDScroller.h +modules/gui/macosx/VLCHUDScroller.m +modules/gui/macosx/VLCHUDSegmentedCell.h +modules/gui/macosx/VLCHUDSegmentedCell.m +modules/gui/macosx/VLCHUDSliderCell.h +modules/gui/macosx/VLCHUDSliderCell.m +modules/gui/macosx/VLCHUDStepperCell.h +modules/gui/macosx/VLCHUDStepperCell.m +modules/gui/macosx/VLCHUDTableCornerView.h +modules/gui/macosx/VLCHUDTableCornerView.m +modules/gui/macosx/VLCHUDTableView.h +modules/gui/macosx/VLCHUDTableView.m +modules/gui/macosx/VLCHUDTextFieldCell.h +modules/gui/macosx/VLCHUDTextFieldCell.m +modules/gui/macosx/VLCHelpWindowController.h +modules/gui/macosx/VLCHelpWindowController.m +modules/gui/macosx/VLCHexNumberFormatter.h +modules/gui/macosx/VLCHexNumberFormatter.m +modules/gui/macosx/VLCHotkeyChangeWindow.h +modules/gui/macosx/VLCHotkeyChangeWindow.m +modules/gui/macosx/VLCImageButton.h +modules/gui/macosx/VLCImageButton.m +modules/gui/macosx/VLCInputManager.h +modules/gui/macosx/VLCInputManager.m +modules/gui/macosx/VLCKeyboardBacklightControl.h +modules/gui/macosx/VLCKeyboardBacklightControl.m +modules/gui/macosx/VLCLogMessage.h +modules/gui/macosx/VLCLogMessage.m +modules/gui/macosx/VLCLogWindowController.h +modules/gui/macosx/VLCLogWindowController.m modules/gui/macosx/VLCMain+OldPrefs.h modules/gui/macosx/VLCMain+OldPrefs.m modules/gui/macosx/VLCMain.h @@ -537,6 +586,8 @@ modules/gui/macosx/VLCResumeDialogController.h modules/gui/macosx/VLCResumeDialogController.m modules/gui/macosx/VLCScrollingClipView.h modules/gui/macosx/VLCScrollingClipView.m +modules/gui/macosx/VLCSidebarDataSource.h +modules/gui/macosx/VLCSidebarDataSource.m modules/gui/macosx/VLCSimplePrefsController.h modules/gui/macosx/VLCSimplePrefsController.m modules/gui/macosx/VLCSimplePrefsWindow.h @@ -545,6 +596,12 @@ modules/gui/macosx/VLCSlider.h modules/gui/macosx/VLCSlider.m modules/gui/macosx/VLCSliderCell.h modules/gui/macosx/VLCSliderCell.m +modules/gui/macosx/VLCSourceListBadgeButton.h +modules/gui/macosx/VLCSourceListBadgeButton.m +modules/gui/macosx/VLCSourceListItem.h +modules/gui/macosx/VLCSourceListItem.m +modules/gui/macosx/VLCSourceListTableCellView.h +modules/gui/macosx/VLCSourceListTableCellView.m modules/gui/macosx/VLCStatusBarIcon.h modules/gui/macosx/VLCStatusBarIcon.m modules/gui/macosx/VLCStringUtility.h ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Fix compilation of sidebar source with old SDKs
vlc/vlc-3.0 | branch: master | David Fuhrmann | Tue Apr 6 13:38:49 2021 +0200| [58d8dd6c7d31a15519dc69dcd5f6ad4b88e1b4f1] | committer: David Fuhrmann macosx: Fix compilation of sidebar source with old SDKs > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=58d8dd6c7d31a15519dc69dcd5f6ad4b88e1b4f1 --- modules/gui/macosx/VLCSidebarDataSource.m | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/gui/macosx/VLCSidebarDataSource.m b/modules/gui/macosx/VLCSidebarDataSource.m index ee39ca5f49..136c3064a7 100644 --- a/modules/gui/macosx/VLCSidebarDataSource.m +++ b/modules/gui/macosx/VLCSidebarDataSource.m @@ -32,6 +32,8 @@ #import "PXSourceList/PXSourceList.h" #import "PXSourceList/PXSourceListDataSource.h" +#import "CompatibilityFixes.h" + #import "VLCMain.h" #import "VLCPlaylist.h" #import "VLCMainWindow.h" ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Modernize code style for VLCTimeField
vlc/vlc-3.0 | branch: master | David Fuhrmann | Tue
Apr 6 11:31:05 2021 +0200| [84847c28514a802585094338d2622be4bcdd0c89] |
committer: David Fuhrmann
macosx: Modernize code style for VLCTimeField
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=84847c28514a802585094338d2622be4bcdd0c89
---
modules/gui/macosx/VLCTimeField.h | 2 +-
modules/gui/macosx/VLCTimeField.m | 26 +-
2 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/modules/gui/macosx/VLCTimeField.h
b/modules/gui/macosx/VLCTimeField.h
index 56a16c3645..ebb64ae62b 100644
--- a/modules/gui/macosx/VLCTimeField.h
+++ b/modules/gui/macosx/VLCTimeField.h
@@ -33,7 +33,7 @@
@interface VLCTimeField : NSTextField
-- (void)setRemainingIdentifier:(NSString *)o_string;
+- (void)setRemainingIdentifier:(NSString *)identifier;
- (void)setTime:(NSString *)time withRemainingTime:(NSString *)remainingTime;
@end
diff --git a/modules/gui/macosx/VLCTimeField.m
b/modules/gui/macosx/VLCTimeField.m
index 14dbad548d..ed482d7ab0 100644
--- a/modules/gui/macosx/VLCTimeField.m
+++ b/modules/gui/macosx/VLCTimeField.m
@@ -30,8 +30,8 @@
@interface VLCTimeField ()
{
-NSString *o_remaining_identifier;
-BOOL b_time_remaining;
+NSString *_identifier;
+BOOL _isTimeRemaining;
NSString *_cachedTime;
NSString *_remainingTime;
@@ -51,10 +51,10 @@
}
-- (void)setRemainingIdentifier:(NSString *)o_string
+- (void)setRemainingIdentifier:(NSString *)identifier
{
-o_remaining_identifier = o_string;
-b_time_remaining = [[NSUserDefaults standardUserDefaults]
boolForKey:o_remaining_identifier];
+_identifier = identifier;
+_isTimeRemaining = [[NSUserDefaults standardUserDefaults]
boolForKey:_identifier];
}
- (void)mouseDown: (NSEvent *)ourEvent
@@ -63,12 +63,12 @@
[[[VLCMain sharedInstance] mainMenu] goToSpecificTime: nil];
else
{
-if (o_remaining_identifier) {
-b_time_remaining = [[NSUserDefaults standardUserDefaults]
boolForKey:o_remaining_identifier];
-b_time_remaining = !b_time_remaining;
-[[NSUserDefaults standardUserDefaults] setObject:(b_time_remaining
? @"YES" : @"NO") forKey:o_remaining_identifier];
+if (_identifier) {
+_isTimeRemaining = [[NSUserDefaults standardUserDefaults]
boolForKey:_identifier];
+_isTimeRemaining = !_isTimeRemaining;
+[[NSUserDefaults standardUserDefaults] setObject:(_isTimeRemaining
? @"YES" : @"NO") forKey:_identifier];
} else {
-b_time_remaining = !b_time_remaining;
+_isTimeRemaining = !_isTimeRemaining;
}
[self updateTimeValue];
@@ -107,10 +107,10 @@
- (BOOL)timeRemaining
{
-if (o_remaining_identifier)
-return [[NSUserDefaults standardUserDefaults]
boolForKey:o_remaining_identifier];
+if (_identifier)
+return [[NSUserDefaults standardUserDefaults] boolForKey:_identifier];
else
-return b_time_remaining;
+return _isTimeRemaining;
}
@end
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Fix format specifier
vlc/vlc-3.0 | branch: master | David Fuhrmann | Tue
Apr 6 11:11:46 2021 +0200| [701ae51e3f841fb760cf3707682ae491f71c61f1] |
committer: David Fuhrmann
macosx: Fix format specifier
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=701ae51e3f841fb760cf3707682ae491f71c61f1
---
modules/gui/macosx/prefs.m | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/modules/gui/macosx/prefs.m b/modules/gui/macosx/prefs.m
index ddb91f6966..3dc232bc91 100644
--- a/modules/gui/macosx/prefs.m
+++ b/modules/gui/macosx/prefs.m
@@ -317,7 +317,7 @@
- (NSString *)description
{
-return [NSString stringWithFormat:@"%@: name: %@, number of children %li",
NSStringFromClass([self class]), [self name], [self numberOfChildren]];
+return [NSString stringWithFormat:@"%@: name: %@, number of children %i",
NSStringFromClass([self class]), [self name], [self numberOfChildren]];
}
- (VLCTreeItem *)childAtIndex:(NSInteger)i_index
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: time fields: Cache alternative time representation
vlc/vlc-3.0 | branch: master | David Fuhrmann | Tue
Apr 6 11:12:06 2021 +0200| [30ce9f876c9d56122e94450a4c988e45fea7b6cc] |
committer: David Fuhrmann
macosx: time fields: Cache alternative time representation
This allows to toggle between remaining and elapsed
time at any time, also while the media is paused.
Close #25433
(backport of 497fc4216d776fc81d241578eaf9abd17dbeedcb)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=30ce9f876c9d56122e94450a4c988e45fea7b6cc
---
modules/gui/macosx/VLCControlsBarCommon.m | 12 +--
modules/gui/macosx/VLCFSPanelController.m | 18 +++--
modules/gui/macosx/VLCTimeField.h | 3 +--
modules/gui/macosx/VLCTimeField.m | 33 +++
4 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/modules/gui/macosx/VLCControlsBarCommon.m
b/modules/gui/macosx/VLCControlsBarCommon.m
index 46f7026244..046824322f 100644
--- a/modules/gui/macosx/VLCControlsBarCommon.m
+++ b/modules/gui/macosx/VLCControlsBarCommon.m
@@ -319,14 +319,14 @@
p_input = pl_CurrentInput(getIntf());
if (p_input != NULL) {
vlc_value_t pos;
-NSString * o_time;
pos.f_float = f_updated / 1.;
var_Set(p_input, "position", pos);
[self.timeSlider setFloatValue: f_updated];
-o_time = [[VLCStringUtility sharedInstance] getCurrentTimeAsString:
p_input negative:[self.timeField timeRemaining]];
-[self.timeField setStringValue: o_time];
+NSString *time = [[VLCStringUtility sharedInstance]
getCurrentTimeAsString:p_input negative:NO];
+NSString *remainingTime = [[VLCStringUtility sharedInstance]
getCurrentTimeAsString:p_input negative:YES];
+[self.timeField setTime:time withRemainingTime:remainingTime];
vlc_object_release(p_input);
}
}
@@ -372,9 +372,9 @@
[self.timeSlider setIndefinite:buffering];
}
-NSString *time = [[VLCStringUtility sharedInstance]
getCurrentTimeAsString:p_input
-
negative:[self.timeField timeRemaining]];
-[self.timeField setStringValue:time];
+NSString *time = [[VLCStringUtility sharedInstance]
getCurrentTimeAsString:p_input negative:NO];
+NSString *remainingTime = [[VLCStringUtility sharedInstance]
getCurrentTimeAsString:p_input negative:YES];
+[self.timeField setTime:time withRemainingTime:remainingTime];
[self.timeField setNeedsDisplay:YES];
vlc_object_release(p_input);
diff --git a/modules/gui/macosx/VLCFSPanelController.m
b/modules/gui/macosx/VLCFSPanelController.m
index 86294bcb96..036853db1a 100644
--- a/modules/gui/macosx/VLCFSPanelController.m
+++ b/modules/gui/macosx/VLCFSPanelController.m
@@ -285,17 +285,13 @@ static NSString *kAssociatedFullscreenRect =
@"VLCFullscreenAssociatedWindowRect
} else {
[_remainingOrTotalTime setHidden:NO];
-NSString *totalTime;
-
-if ([_remainingOrTotalTime timeRemaining]) {
-mtime_t remaining = 0;
-if (dur > t)
-remaining = dur - t;
-totalTime = [NSString stringWithFormat:@"-%s",
secstotimestr(psz_time, (remaining / 100))];
-} else {
-totalTime = toNSStr(secstotimestr(psz_time, (dur / 100)));
-}
-[_remainingOrTotalTime setStringValue:totalTime];
+mtime_t remaining = 0;
+if (dur > t)
+remaining = dur - t;
+NSString *remainingTime = [NSString stringWithFormat:@"-%s",
secstotimestr(psz_time, (remaining / 100))];
+NSString *totalTime = toNSStr(secstotimestr(psz_time, (dur /
100)));
+
+[_remainingOrTotalTime setTime:totalTime
withRemainingTime:remainingTime];
}
/* Update current position (left field) */
diff --git a/modules/gui/macosx/VLCTimeField.h
b/modules/gui/macosx/VLCTimeField.h
index c6d81e6d6a..56a16c3645 100644
--- a/modules/gui/macosx/VLCTimeField.h
+++ b/modules/gui/macosx/VLCTimeField.h
@@ -33,8 +33,7 @@
@interface VLCTimeField : NSTextField
-@property (readonly) BOOL timeRemaining;
-
- (void)setRemainingIdentifier:(NSString *)o_string;
+- (void)setTime:(NSString *)time withRemainingTime:(NSString *)remainingTime;
@end
diff --git a/modules/gui/macosx/VLCTimeField.m
b/modules/gui/macosx/VLCTimeField.m
index 91d515a3c6..14dbad548d 100644
--- a/modules/gui/macosx/VLCTimeField.m
+++ b/modules/gui/macosx/VLCTimeField.m
@@ -32,6 +32,9 @@
{
NSString *o_remaining_identifier;
BOOL b_time_remaining;
+
+NSString *_cachedTime;
+NSString *_remainingTime;
}
@end
@@ -67,11 +70,41 @@
} else {
b_time_remaining = !b_time_remaining;
}
+
+[self updateTimeValue];
}
[[self nextResponder] mouseDown:ourEvent];
}
+- (void)setTime:(NSString *)time withRemainingTime:(NSString *)remainingTime
+{
+_cachedTime = time;
+
[vlc-commits] macosx: Fix translation of "general settings box"
vlc/vlc-3.0 | branch: master | David Fuhrmann | Mon Apr 5 18:18:12 2021 +0200| [b17069595772d64888aa388cfbe0d5a163e32edd] | committer: David Fuhrmann macosx: Fix translation of "general settings box" refs #25558 > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=b17069595772d64888aa388cfbe0d5a163e32edd --- modules/gui/macosx/UI/SimplePreferences.xib | 125 ++-- 1 file changed, 63 insertions(+), 62 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commitdiff;h=b17069595772d64888aa388cfbe0d5a163e32edd ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Fix autolayout issues for simple prefs
vlc/vlc-3.0 | branch: master | David Fuhrmann | Mon Apr 5 19:09:15 2021 +0200| [198fb6c0e60cbe6e4836761814b9d263a38ddc54] | committer: David Fuhrmann macosx: Fix autolayout issues for simple prefs For all views shown in simple preferences, all UI elements with intrinsic sizes (e.g. labels / checkboxes) need a vertical content hugging priority of 750 (bigger than 500) because those views should adapt its height based on the content. > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=198fb6c0e60cbe6e4836761814b9d263a38ddc54 --- modules/gui/macosx/UI/SimplePreferences.xib | 516 ++-- 1 file changed, 258 insertions(+), 258 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commitdiff;h=198fb6c0e60cbe6e4836761814b9d263a38ddc54 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Initialize sidebar in main window
vlc/vlc-3.0 | branch: master | David Fuhrmann | Fri Apr 2 12:18:00 2021 +0200| [edd5319c1a95210edac9d9544d77998747605419] | committer: David Fuhrmann macosx: Initialize sidebar in main window > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=edd5319c1a95210edac9d9544d77998747605419 --- modules/gui/macosx/VLCMainWindow.m| 3 +++ modules/gui/macosx/VLCSidebarDataSource.m | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/gui/macosx/VLCMainWindow.m b/modules/gui/macosx/VLCMainWindow.m index a484369bcd..36f0748516 100644 --- a/modules/gui/macosx/VLCMainWindow.m +++ b/modules/gui/macosx/VLCMainWindow.m @@ -177,6 +177,9 @@ static const float f_min_window_height = 307.; self.sidebarDataSource.sidebarView = self.sidebarView; [self.sidebarDataSource reloadSidebar]; +[_sidebarView setAutosaveName:@"mainwindow-sidebar"]; +[_sidebarView setAutosaveExpandedItems:YES]; + [_sidebarView selectRowIndexes:[NSIndexSet indexSetWithIndex:1] byExtendingSelection:NO]; /* diff --git a/modules/gui/macosx/VLCSidebarDataSource.m b/modules/gui/macosx/VLCSidebarDataSource.m index 4ab75d3e85..ee39ca5f49 100644 --- a/modules/gui/macosx/VLCSidebarDataSource.m +++ b/modules/gui/macosx/VLCSidebarDataSource.m @@ -146,10 +146,8 @@ [_sidebarView setDropItem:playlistItem dropChildIndex:NSOutlineViewDropOnItemIndex]; [_sidebarView registerForDraggedTypes:[NSArray arrayWithObjects:NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]]; -[_sidebarView setAutosaveName:@"mainwindow-sidebar"]; [_sidebarView setDataSource:self]; [_sidebarView setDelegate:self]; -[_sidebarView setAutosaveExpandedItems:YES]; [_sidebarView expandItem:libraryItem expandChildren:YES]; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Move out sidebar handling in own data source object
vlc/vlc-3.0 | branch: master | David Fuhrmann | Fri Apr 2 11:50:11 2021 +0200| [abbc95861f12992a773e67867851801fb1ea9858] | committer: David Fuhrmann macosx: Move out sidebar handling in own data source object Move delegate and datasource handling of sidebar into own object. This decouples and cleans up the VLCMainWindow class. Additionally, delegate and dataSource object cannot inherit from an NSWindow class, as it is not allowed to contruct weak references for such objects on old OS versions (Mac OS 10.7). close vlc#25403 > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=abbc95861f12992a773e67867851801fb1ea9858 --- .../package/macosx/vlc.xcodeproj/project.pbxproj | 6 + modules/gui/macosx/Makefile.am | 1 + modules/gui/macosx/VLCAddonsWindowController.m | 4 +- modules/gui/macosx/VLCMainWindow.h | 7 +- modules/gui/macosx/VLCMainWindow.m | 323 +- modules/gui/macosx/VLCSidebarDataSource.h | 42 +++ modules/gui/macosx/VLCSidebarDataSource.m | 359 + 7 files changed, 427 insertions(+), 315 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commitdiff;h=abbc95861f12992a773e67867851801fb1ea9858 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: time fields: Cache alternative time representation
vlc | branch: master | David Fuhrmann | Tue Apr 6
11:46:12 2021 +0200| [497fc4216d776fc81d241578eaf9abd17dbeedcb] | committer:
David Fuhrmann
macosx: time fields: Cache alternative time representation
This allows to toggle between remaining and elapsed
time at any time, also while the media is paused.
Close #25433
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=497fc4216d776fc81d241578eaf9abd17dbeedcb
---
modules/gui/macosx/views/VLCTimeField.h| 6 +--
modules/gui/macosx/views/VLCTimeField.m| 60 +-
.../windows/mainwindow/VLCControlsBarCommon.m | 11 ++--
.../macosx/windows/video/VLCFSPanelController.m| 7 ++-
4 files changed, 62 insertions(+), 22 deletions(-)
diff --git a/modules/gui/macosx/views/VLCTimeField.h
b/modules/gui/macosx/views/VLCTimeField.h
index 7b4b37464b..6236197ab7 100644
--- a/modules/gui/macosx/views/VLCTimeField.h
+++ b/modules/gui/macosx/views/VLCTimeField.h
@@ -2,6 +2,7 @@
* VLCTimeField.h: NSTextField subclass for playback time fields
*
* Copyright (C) 2003-2017 VLC authors and VideoLAN
+ * $Id$
*
* Authors: Jon Lech Johansen
* Felix Paul Kühne
@@ -34,8 +35,7 @@ extern NSString *VLCTimeFieldDisplayTimeAsRemaining;
@interface VLCTimeField : NSTextField
-@property (readonly) BOOL timeRemaining;
-
-- (void)setRemainingIdentifier:(NSString *)o_string;
+- (void)setRemainingIdentifier:(NSString *)identifier;
+- (void)setTime:(NSString *)time withRemainingTime:(NSString *)remainingTime;
@end
diff --git a/modules/gui/macosx/views/VLCTimeField.m
b/modules/gui/macosx/views/VLCTimeField.m
index 578cb9b6f7..fccd62ddcc 100644
--- a/modules/gui/macosx/views/VLCTimeField.m
+++ b/modules/gui/macosx/views/VLCTimeField.m
@@ -2,6 +2,7 @@
* VLCTimeField.m: NSTextField subclass for playback time fields
*
* Copyright (C) 2003-2017 VLC authors and VideoLAN
+ * $Id$
*
* Authors: Jon Lech Johansen
* Felix Paul Kühne
@@ -31,8 +32,11 @@ NSString *VLCTimeFieldDisplayTimeAsRemaining =
@"DisplayTimeAsTimeRemaining";
@interface VLCTimeField ()
{
-NSString *o_remaining_identifier;
-BOOL b_time_remaining;
+NSString *_identifier;
+BOOL _isTimeRemaining;
+
+NSString *_cachedTime;
+NSString *_remainingTime;
}
@end
@@ -48,10 +52,10 @@ NSString *VLCTimeFieldDisplayTimeAsRemaining =
@"DisplayTimeAsTimeRemaining";
}
-- (void)setRemainingIdentifier:(NSString *)o_string
+- (void)setRemainingIdentifier:(NSString *)identifier
{
-o_remaining_identifier = o_string;
-b_time_remaining = [[NSUserDefaults standardUserDefaults]
boolForKey:o_remaining_identifier];
+_identifier = identifier;
+_isTimeRemaining = [[NSUserDefaults standardUserDefaults]
boolForKey:_identifier];
}
- (void)mouseDown: (NSEvent *)ourEvent
@@ -60,24 +64,54 @@ NSString *VLCTimeFieldDisplayTimeAsRemaining =
@"DisplayTimeAsTimeRemaining";
[[[VLCMain sharedInstance] mainMenu] goToSpecificTime: nil];
else
{
-if (o_remaining_identifier) {
-b_time_remaining = [[NSUserDefaults standardUserDefaults]
boolForKey:o_remaining_identifier];
-b_time_remaining = !b_time_remaining;
-[[NSUserDefaults standardUserDefaults] setObject:(b_time_remaining
? @"YES" : @"NO") forKey:o_remaining_identifier];
+if (_identifier) {
+_isTimeRemaining = [[NSUserDefaults standardUserDefaults]
boolForKey:_identifier];
+_isTimeRemaining = !_isTimeRemaining;
+[[NSUserDefaults standardUserDefaults] setObject:(_isTimeRemaining
? @"YES" : @"NO") forKey:_identifier];
} else {
-b_time_remaining = !b_time_remaining;
+_isTimeRemaining = !_isTimeRemaining;
}
+
+[self updateTimeValue];
}
[[self nextResponder] mouseDown:ourEvent];
}
+- (void)setTime:(NSString *)time withRemainingTime:(NSString *)remainingTime
+{
+_cachedTime = time;
+_remainingTime = remainingTime;
+
+[self updateTimeValue];
+}
+
+- (void)updateTimeValue
+{
+if (!_cachedTime || !_remainingTime)
+return;
+
+if ([self timeRemaining]) {
+[super setStringValue:_remainingTime];
+} else {
+[super setStringValue:_cachedTime];
+}
+}
+
+- (void)setStringValue:(NSString *)stringValue
+{
+[super setStringValue:stringValue];
+
+_cachedTime = nil;
+_remainingTime = nil;
+}
+
- (BOOL)timeRemaining
{
-if (o_remaining_identifier)
-return [[NSUserDefaults standardUserDefaults]
boolForKey:o_remaining_identifier];
+if (_identifier)
+return [[NSUserDefaults standardUserDefaults] boolForKey:_identifier];
else
-return b_time_remaining;
+return _isTim
[vlc-commits] macosx: Fix autolayout issues for simple prefs
vlc | branch: master | David Fuhrmann | Mon Apr 5 19:33:45 2021 +0200| [f3c7ba5bb3a5bda29ad18e28b566b79c91d89355] | committer: David Fuhrmann macosx: Fix autolayout issues for simple prefs For all views shown in simple preferences, all UI elements with intrinsic sizes (e.g. labels / checkboxes) need a vertical content hugging priority of 750 (bigger than 500) because those views should adapt its height based on the content. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f3c7ba5bb3a5bda29ad18e28b566b79c91d89355 --- modules/gui/macosx/UI/SimplePreferences.xib | 200 +++- 1 file changed, 105 insertions(+), 95 deletions(-) diff --git a/modules/gui/macosx/UI/SimplePreferences.xib b/modules/gui/macosx/UI/SimplePreferences.xib index 90fd85b8bb..0bb10a6ca6 100644 --- a/modules/gui/macosx/UI/SimplePreferences.xib +++ b/modules/gui/macosx/UI/SimplePreferences.xib @@ -1,8 +1,8 @@ - + - + @@ -166,7 +166,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -285,10 +285,10 @@ Gw - + - + @@ -302,20 +302,20 @@ Gw - + - + - + @@ -325,7 +325,7 @@ Gw - + @@ -351,13 +351,13 @@ Gw - + - + - + @@ -368,7 +368,7 @@ Gw - + @@ -387,13 +387,13 @@ Gw - + - + - - + + @@ -403,7 +403,7 @@ Gw - + @@ -414,7 +414,7 @@ Gw - + @@ -438,12 +438,12 @@
[vlc-commits] macosx: Add two size configurations for fullscreen panel
vlc | branch: master | David Fuhrmann | Fri Apr 2 12:26:12 2021 +0200| [9ad0a1de606b52ad7b98ec4e2a7b1674d21f1105] | committer: David Fuhrmann macosx: Add two size configurations for fullscreen panel Freely choosing an increased size for fullscreen panel control buttons has been an error prone drag and drop operation which was hard to perform right. Compiled with the latest macOS SDKs, this method does not work at all anymore. As an alternative, this patch implements two size configurations (large and normal), which additionally increased font size. close #20720 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9ad0a1de606b52ad7b98ec4e2a7b1674d21f1105 --- modules/gui/macosx/UI/VLCFullScreenPanel.xib | 123 ++--- .../macosx/windows/video/VLCFSPanelController.m| 11 ++ 2 files changed, 70 insertions(+), 64 deletions(-) diff --git a/modules/gui/macosx/UI/VLCFullScreenPanel.xib b/modules/gui/macosx/UI/VLCFullScreenPanel.xib index 832d56d93b..87f9c87286 100644 --- a/modules/gui/macosx/UI/VLCFullScreenPanel.xib +++ b/modules/gui/macosx/UI/VLCFullScreenPanel.xib @@ -1,8 +1,8 @@ - + - - + + @@ -29,16 +29,56 @@ - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -62,10 +102,10 @@ - + - + @@ -78,7 +118,7 @@ - + @@ -91,7 +131,7 @@ - + @@ -107,7 +147,7 @@ - + @@ -120,7 +160,7 @@ - + @@ -153,7 +193,7 @@ - + @@ -170,7 +21
[vlc-commits] macosx: Add two size configurations for fullscreen panel
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed Mar 31 22:27:39 2021 +0200| [659f569c3a0a77256bbca8a0745d35da7aab3ada] | committer: David Fuhrmann macosx: Add two size configurations for fullscreen panel Freely choosing an increased size for fullscreen panel control buttons has been an error prone drag and drop operation which was hard to perform right. Compiled with the latest macOS SDKs, this method does not work at all anymore. As an alternative, this patch implements two size configurations (large and normal), which additionally increased font size. close vlc#20720 > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=659f569c3a0a77256bbca8a0745d35da7aab3ada --- modules/gui/macosx/UI/VLCFullScreenPanel.xib | 126 +-- modules/gui/macosx/VLCFSPanelController.m| 19 +++- 2 files changed, 75 insertions(+), 70 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commitdiff;h=659f569c3a0a77256bbca8a0745d35da7aab3ada ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: open panel: fix MRL generation for multiple input devices
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed
Mar 31 22:51:17 2021 +0200| [f2e872c78dfdadf8dbbbc4db0a2aa6a3cfb353db] |
committer: David Fuhrmann
macosx: open panel: fix MRL generation for multiple input devices
Fix issue in MRL generation for multiple audio / video input devices.
Now updates the correct MRL in case the device selection changed.
(manual bp of c21bf10646a6c432a0d1fb695256778a84c83a13)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=f2e872c78dfdadf8dbbbc4db0a2aa6a3cfb353db
---
modules/gui/macosx/VLCOpenWindowController.m | 27 ---
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/modules/gui/macosx/VLCOpenWindowController.m
b/modules/gui/macosx/VLCOpenWindowController.m
index 57920bc09d..b93faeb5c4 100644
--- a/modules/gui/macosx/VLCOpenWindowController.m
+++ b/modules/gui/macosx/VLCOpenWindowController.m
@@ -1156,15 +1156,8 @@ static NSString *kCaptureTabViewId = @"capture";
else if ([[[_captureModePopup selectedItem] title] isEqualToString:
_NS("Input Devices")]) {
[_captureTabView selectTabViewItemAtIndex:0];
-[self qtkChanged:nil];
-[self qtkAudioChanged:nil];
-
[self setMRL: @""];
-
-if ([_qtkVideoCheckbox state] && _avCurrentDeviceUID)
-[self setMRL:[NSString stringWithFormat:@"avcapture://%@",
_avCurrentDeviceUID]];
-else if ([_qtkAudioCheckbox state] && _avCurrentAudioDeviceUID)
-[self setMRL:[NSString stringWithFormat:@"avaudiocapture://%@",
_avCurrentAudioDeviceUID]];
+[self qtkToggleUIElements: nil];
}
}
@@ -1199,6 +1192,17 @@ static NSString *kCaptureTabViewId = @"capture";
}
// QTKit Recording actions
+
+- (void)updateInputDevicesUrl
+{
+if ([_qtkVideoCheckbox state] && _avCurrentDeviceUID)
+[self setMRL:[NSString stringWithFormat:@"avcapture://%@",
_avCurrentDeviceUID]];
+else if ([_qtkAudioCheckbox state] && _avCurrentAudioDeviceUID)
+[self setMRL:[NSString stringWithFormat:@"avaudiocapture://%@",
_avCurrentAudioDeviceUID]];
+else
+[self setMRL:@""];
+}
+
- (IBAction)qtkChanged:(id)sender
{
NSInteger selectedDevice = [_qtkVideoDevicePopup indexOfSelectedItem];
@@ -1206,6 +1210,7 @@ static NSString *kCaptureTabViewId = @"capture";
return;
_avCurrentDeviceUID = [[(AVCaptureDevice *)[_avvideoDevices
objectAtIndex:selectedDevice] uniqueID]
stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+[self updateInputDevicesUrl];
}
- (IBAction)qtkAudioChanged:(id)sender
@@ -1215,16 +1220,16 @@ static NSString *kCaptureTabViewId = @"capture";
return;
_avCurrentAudioDeviceUID = [[(AVCaptureDevice *)[_avaudioDevices
objectAtIndex:selectedDevice] uniqueID]
stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+[self updateInputDevicesUrl];
}
- (IBAction)qtkToggleUIElements:(id)sender
{
[_qtkAudioDevicePopup setEnabled:[_qtkAudioCheckbox state]];
-BOOL b_state = [_qtkVideoCheckbox state];
-[_qtkVideoDevicePopup setEnabled:b_state];
+[_qtkVideoDevicePopup setEnabled:[_qtkVideoCheckbox state]];
+
[self qtkAudioChanged:sender];
[self qtkChanged:sender];
-[self openCaptureModeChanged:sender];
}
#pragma mark -
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: open panel: fix MRL generation for multiple input devices
vlc | branch: master | David Fuhrmann | Wed Mar 31
22:58:57 2021 +0200| [c21bf10646a6c432a0d1fb695256778a84c83a13] | committer:
David Fuhrmann
macosx: open panel: fix MRL generation for multiple input devices
Fix issue in MRL generation for multiple audio / video input devices.
Now updates the correct MRL in case the device selection changed.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c21bf10646a6c432a0d1fb695256778a84c83a13
---
.../gui/macosx/windows/VLCOpenWindowController.m | 27 +-
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/modules/gui/macosx/windows/VLCOpenWindowController.m
b/modules/gui/macosx/windows/VLCOpenWindowController.m
index 2bddc39345..0ca7298b22 100644
--- a/modules/gui/macosx/windows/VLCOpenWindowController.m
+++ b/modules/gui/macosx/windows/VLCOpenWindowController.m
@@ -1122,15 +1122,8 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
else if ([[[_captureModePopup selectedItem] title] isEqualToString:
_NS("Input Devices")]) {
[_captureTabView selectTabViewItemAtIndex:0];
-[self qtkChanged:nil];
-[self qtkAudioChanged:nil];
-
[self setMRL: @""];
-
-if ([_qtkVideoCheckbox state] && _avCurrentDeviceUID)
-[self setMRL:[NSString stringWithFormat:@"avcapture://%@",
_avCurrentDeviceUID]];
-else if ([_qtkAudioCheckbox state] && _avCurrentAudioDeviceUID)
-[self setMRL:[NSString stringWithFormat:@"avaudiocapture://%@",
_avCurrentAudioDeviceUID]];
+[self qtkToggleUIElements: nil];
}
}
@@ -1166,6 +1159,17 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
}
// QTKit Recording actions
+
+- (void)updateInputDevicesUrl
+{
+if ([_qtkVideoCheckbox state] && _avCurrentDeviceUID)
+[self setMRL:[NSString stringWithFormat:@"avcapture://%@",
_avCurrentDeviceUID]];
+else if ([_qtkAudioCheckbox state] && _avCurrentAudioDeviceUID)
+[self setMRL:[NSString stringWithFormat:@"avaudiocapture://%@",
_avCurrentAudioDeviceUID]];
+else
+[self setMRL:@""];
+}
+
- (IBAction)qtkChanged:(id)sender
{
NSInteger selectedDevice = [_qtkVideoDevicePopup indexOfSelectedItem];
@@ -1173,6 +1177,7 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
return;
_avCurrentDeviceUID = [[(AVCaptureDevice *)[_avvideoDevices
objectAtIndex:selectedDevice] uniqueID]
stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+[self updateInputDevicesUrl];
}
- (IBAction)qtkAudioChanged:(id)sender
@@ -1182,16 +1187,16 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
return;
_avCurrentAudioDeviceUID = [[(AVCaptureDevice *)[_avaudioDevices
objectAtIndex:selectedDevice] uniqueID]
stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]];
+[self updateInputDevicesUrl];
}
- (IBAction)qtkToggleUIElements:(id)sender
{
[_qtkAudioDevicePopup setEnabled:[_qtkAudioCheckbox state]];
-BOOL b_state = [_qtkVideoCheckbox state];
-[_qtkVideoDevicePopup setEnabled:b_state];
+[_qtkVideoDevicePopup setEnabled:[_qtkVideoCheckbox state]];
+
[self qtkAudioChanged:sender];
[self qtkChanged:sender];
-[self openCaptureModeChanged:sender];
}
#pragma mark -
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Fix crash on exit related to PXSourceList
vlc/vlc-3.0 | branch: master | David Fuhrmann | Mon
Mar 29 10:54:19 2021 +0200| [53359e6f9bbcc101f84935d272b4be5b6bd1fb3b] |
committer: David Fuhrmann
macosx: Fix crash on exit related to PXSourceList
The delegate object (aka VLCMainWindow) is sometimes not valid
anymore when the destructor of PXSourceListDelegateDataSourceProxy
is called. Also, VLCMainWindow removes all observers from the
notification center in its own dealloc method already.
This should fix the majority of current on-exit related crashes
on macOS.
close #25403
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=53359e6f9bbcc101f84935d272b4be5b6bd1fb3b
---
.../PXSourceList/Internal/PXSourceListDelegateDataSourceProxy.h | 4 ++--
.../PXSourceList/Internal/PXSourceListDelegateDataSourceProxy.m | 6 --
modules/gui/macosx/VLCMainWindow.m | 2 ++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git
a/modules/gui/macosx/PXSourceList/Internal/PXSourceListDelegateDataSourceProxy.h
b/modules/gui/macosx/PXSourceList/Internal/PXSourceListDelegateDataSourceProxy.h
index 3ea5605058..2bf8930597 100755
---
a/modules/gui/macosx/PXSourceList/Internal/PXSourceListDelegateDataSourceProxy.h
+++
b/modules/gui/macosx/PXSourceList/Internal/PXSourceListDelegateDataSourceProxy.h
@@ -13,8 +13,8 @@
@interface PXSourceListDelegateDataSourceProxy : NSProxy
@property (weak, nonatomic) PXSourceList *sourceList;
-@property (unsafe_unretained, nonatomic) id delegate;
-@property (unsafe_unretained, nonatomic) id
dataSource;
+@property (weak, nonatomic) id delegate;
+@property (weak, nonatomic) id dataSource;
- (id)initWithSourceList:(PXSourceList *)sourceList;
diff --git
a/modules/gui/macosx/PXSourceList/Internal/PXSourceListDelegateDataSourceProxy.m
b/modules/gui/macosx/PXSourceList/Internal/PXSourceListDelegateDataSourceProxy.m
index c5e2e8e286..182de2c8bd 100755
---
a/modules/gui/macosx/PXSourceList/Internal/PXSourceListDelegateDataSourceProxy.m
+++
b/modules/gui/macosx/PXSourceList/Internal/PXSourceListDelegateDataSourceProxy.m
@@ -61,8 +61,10 @@ static NSArray * __fastPathForwardingDataSourceMethods = nil;
- (void)dealloc
{
-//Unregister the delegate from receiving notifications
- [[NSNotificationCenter defaultCenter] removeObserver:self.delegate
name:nil object:self.sourceList];
+// Unregister the delegate from receiving notifications
+if (self.delegate) {
+[[NSNotificationCenter defaultCenter] removeObserver:self.delegate
name:nil object:self.sourceList];
+}
}
#pragma mark - Accessors
diff --git a/modules/gui/macosx/VLCMainWindow.m
b/modules/gui/macosx/VLCMainWindow.m
index 84d33a5ed4..2515ee132e 100644
--- a/modules/gui/macosx/VLCMainWindow.m
+++ b/modules/gui/macosx/VLCMainWindow.m
@@ -136,6 +136,8 @@ static const float f_min_window_height = 307.;
- (void)dealloc
{
+msg_Dbg(getIntf(), "Deinitializing VLCMainWindow object");
+
[[NSNotificationCenter defaultCenter] removeObserver: self];
if (@available(macOS 10_14, *)) {
[[NSApplication sharedApplication] removeObserver:self
forKeyPath:@"effectiveAppearance"];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx proj: Add Internal directory for PXSourceList
vlc/vlc-3.0 | branch: master | David Fuhrmann | Mon
Mar 29 10:53:59 2021 +0200| [adf964a472568981393ad407143c54abbbd4c9ed] |
committer: David Fuhrmann
macosx proj: Add Internal directory for PXSourceList
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=adf964a472568981393ad407143c54abbbd4c9ed
---
extras/package/macosx/vlc.xcodeproj/project.pbxproj | 2 ++
1 file changed, 2 insertions(+)
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 3f95d0b165..90e45aebe3 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -142,6 +142,7 @@
1CD040462554A13A00CFF59C /* PXSourceListItem.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name
= PXSourceListItem.m; path = PXSourceList/PXSourceListItem.m; sourceTree =
""; };
1CD366791B7A242E0054E39F /* VLCTimeSelectionPanelController.h
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; path = VLCTimeSelectionPanelController.h; sourceTree =
""; };
1CD3667A1B7A242E0054E39F /* VLCTimeSelectionPanelController.m
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = VLCTimeSelectionPanelController.m; sourceTree =
""; };
+ 1CDFF2AB2610E019002FFE04 /* Internal */ = {isa =
PBXFileReference; lastKnownFileType = folder; name = Internal; path =
PXSourceList/Internal; sourceTree = ""; };
1CF50B08255490D000A3C298 /* VLCSourceListBadgeButton.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = VLCSourceListBadgeButton.h; sourceTree = ""; };
1CF50B09255490D000A3C298 /* VLCSourceListBadgeButton.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = VLCSourceListBadgeButton.m; sourceTree = ""; };
1CF50B0A255490D100A3C298 /* VLCSourceListTableCellView.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = VLCSourceListTableCellView.m; sourceTree = "";
};
@@ -1587,6 +1588,7 @@
CC0CD0E413DE0EB500B0D90D /* PXSourceList */ = {
isa = PBXGroup;
children = (
+ 1CDFF2AB2610E019002FFE04 /* Internal */,
1CD040402554A13900CFF59C /* PXSourceList.h */,
1CD040422554A13900CFF59C /* PXSourceList.m */,
1CD0403C2554A13800CFF59C /*
PXSourceListBadgeCell.h */,
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Fix make dist after l10n update
vlc/vlc-3.0 | branch: master | David Fuhrmann | Mon Mar 1 19:08:59 2021 +0100| [5a02fe693e96ca4f37c3eb5f103824dd7dd4f743] | committer: David Fuhrmann macosx: Fix make dist after l10n update > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=5a02fe693e96ca4f37c3eb5f103824dd7dd4f743 --- modules/gui/macosx/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am index 6b6de9f3c1..ac19b3c37e 100644 --- a/modules/gui/macosx/Makefile.am +++ b/modules/gui/macosx/Makefile.am @@ -770,12 +770,14 @@ EXTRA_DIST += \ gui/macosx/Resources/gl.lproj/InfoPlist.strings \ gui/macosx/Resources/gu-IN.lproj/InfoPlist.strings \ gui/macosx/Resources/he.lproj/InfoPlist.strings \ + gui/macosx/Resources/hi.lproj/InfoPlist.strings \ gui/macosx/Resources/hr.lproj/InfoPlist.strings \ gui/macosx/Resources/hu.lproj/InfoPlist.strings \ gui/macosx/Resources/id.lproj/InfoPlist.strings \ gui/macosx/Resources/is.lproj/InfoPlist.strings \ gui/macosx/Resources/it.lproj/InfoPlist.strings \ gui/macosx/Resources/ja.lproj/InfoPlist.strings \ + gui/macosx/Resources/ka.lproj/InfoPlist.strings \ gui/macosx/Resources/kab.lproj/InfoPlist.strings \ gui/macosx/Resources/kk.lproj/InfoPlist.strings \ gui/macosx/Resources/km.lproj/InfoPlist.strings \ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Update PO files after vlc.pot update
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed Feb 24 18:59:26 2021 +0100| [17f64a4dae93e22505fe58577cd38dd8146ab236] | committer: David Fuhrmann Update PO files after vlc.pot update > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=17f64a4dae93e22505fe58577cd38dd8146ab236 --- po/ach.po | 1667 ++- po/af.po | 1673 ++- po/am.po | 1676 +-- po/am_ET.po | 1663 ++- po/an.po | 1677 ++- po/ar.po | 1678 +-- po/as_IN.po | 1677 ++- po/ast.po | 1676 ++- po/be.po | 1677 ++- po/bg.po | 1675 ++- po/bn.po | 1676 +-- po/bn_IN.po | 1676 ++- po/br.po | 1668 ++- po/brx.po | 1677 ++- po/bs.po | 1666 ++- po/ca.po | 1689 ++-- po/c...@valencia.po | 1679 ++- po/cgg.po | 1673 ++- po/co.po | 1665 ++- po/cs.po | 1675 ++- po/cy.po | 1680 +-- po/da.po | 1679 ++- po/de.po | 1685 ++-- po/el.po | 1679 ++- po/en_GB.po | 1668 ++- po/es.po | 1689 ++-- po/es_MX.po | 1679 ++- po/et.po | 1683 ++-- po/eu.po | 1685 ++-- po/fa.po | 1673 ++- po/ff.po | 1667 ++- po/fi.po | 1679 ++- po/fr.po | 1685 ++-- po/fur.po | 1678 +-- po/fy.po | 1679 ++- po/ga.po | 1671 ++- po/gd.po | 1670 ++- po/gl.po | 1681 +-- po/gu.po | 1677 ++- po/he.po | 1678 ++- po/hi.po | 1668 ++- po/hr.po | 1679 ++- po/hu.po | 1685 ++-- po/hy.po | 1683 ++-- po/id.po | 1679 ++- po/is.po | 1676 ++- po/it.po | 1689 ++-- po/ja.po | 1689 ++-- po/ka.po | 1683 ++-- po/kab.po | 1673 ++- po/kk.po | 1672 ++- po/km.po | 1681 +-- po/kn.po | 1679 ++- po/ko.po | 1683 ++-- po/ks_IN.po | 1677 ++- po/ku_IQ.po | 1663 ++- po/ky.po | 1663 ++- po/lg.po | 1676 +-- po/lt.po | 1682 +-- po/lv.po | 1
[vlc-commits] macosx: Fix make dist after l10n update
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed Feb 24 18:46:06 2021 +0100| [81968a757aec852858e92c3d94e944d614773d9e] | committer: David Fuhrmann macosx: Fix make dist after l10n update > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=81968a757aec852858e92c3d94e944d614773d9e --- modules/gui/macosx/Makefile.am | 5 + 1 file changed, 5 insertions(+) diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am index 958e3d581a..6b6de9f3c1 100644 --- a/modules/gui/macosx/Makefile.am +++ b/modules/gui/macosx/Makefile.am @@ -748,6 +748,7 @@ EXTRA_DIST += \ gui/macosx/Resources/be.lproj/InfoPlist.strings \ gui/macosx/Resources/bg.lproj/InfoPlist.strings \ gui/macosx/Resources/bn-IN.lproj/InfoPlist.strings \ + gui/macosx/Resources/br.lproj/InfoPlist.strings \ gui/macosx/Resources/brx.lproj/InfoPlist.strings \ gui/macosx/Resources/ca.lproj/InfoPlist.strings \ gui/macosx/Resources/co.lproj/InfoPlist.strings \ @@ -780,11 +781,13 @@ EXTRA_DIST += \ gui/macosx/Resources/km.lproj/InfoPlist.strings \ gui/macosx/Resources/kn.lproj/InfoPlist.strings \ gui/macosx/Resources/ko.lproj/InfoPlist.strings \ + gui/macosx/Resources/ku.lproj/InfoPlist.strings \ gui/macosx/Resources/lt.lproj/InfoPlist.strings \ gui/macosx/Resources/lv.lproj/InfoPlist.strings \ gui/macosx/Resources/ml.lproj/InfoPlist.strings \ gui/macosx/Resources/mr.lproj/InfoPlist.strings \ gui/macosx/Resources/ms.lproj/InfoPlist.strings \ + gui/macosx/Resources/my.lproj/InfoPlist.strings \ gui/macosx/Resources/nb.lproj/InfoPlist.strings \ gui/macosx/Resources/ne.lproj/InfoPlist.strings \ gui/macosx/Resources/nl.lproj/InfoPlist.strings \ @@ -796,10 +799,12 @@ EXTRA_DIST += \ gui/macosx/Resources/pt-PT.lproj/InfoPlist.strings \ gui/macosx/Resources/ro.lproj/InfoPlist.strings \ gui/macosx/Resources/ru.lproj/InfoPlist.strings \ + gui/macosx/Resources/sat.lproj/InfoPlist.strings \ gui/macosx/Resources/sc.lproj/InfoPlist.strings \ gui/macosx/Resources/si.lproj/InfoPlist.strings \ gui/macosx/Resources/sk.lproj/InfoPlist.strings \ gui/macosx/Resources/sl.lproj/InfoPlist.strings \ + gui/macosx/Resources/sq.lproj/InfoPlist.strings \ gui/macosx/Resources/sr.lproj/InfoPlist.strings \ gui/macosx/Resources/sv.lproj/InfoPlist.strings \ gui/macosx/Resources/th.lproj/InfoPlist.strings \ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] gitlab-ci: Add builders for macOS ARM
vlc | branch: master | David Fuhrmann | Thu Jan 21
22:12:32 2021 +0100| [449168207808b00e5cb1231c2ec8d476fbc751b5] | committer:
David Fuhrmann
gitlab-ci: Add builders for macOS ARM
Restructure scripts into common builders for mac and mac nightly.
Add dedicated jobs to build for macos-arm64, and rename the
old macos jobs to macos-x86_64.
All builds are running on the catalina machines.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=449168207808b00e5cb1231c2ec8d476fbc751b5
---
extras/ci/gitlab-ci.yml | 39 +++
1 file changed, 31 insertions(+), 8 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index f82e362937..9598ea27e0 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -48,12 +48,20 @@ variables:
HOST_ARCH: aarch64
TRIPLET: $HOST_ARCH-w64-mingw32
-.variables-macos: &variables-macos
+.variables-macos-x86_64: &variables-macos-x86_64
VLC_PATH: /Users/videolanci/sandbox/bin
VLC_FORCE_KERNELVERSION: 19
+SHORTARCH: intel64
HOST_ARCH: x86_64
TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
+.variables-macos-arm64: &variables-macos-arm64
+VLC_PATH: /Users/videolanci/sandbox/bin
+VLC_FORCE_KERNELVERSION: 19
+SHORTARCH: arm64
+HOST_ARCH: aarch64
+TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
+
.variables-ios-arm64: &variables-ios-arm64
VLC_PATH: /Users/videolanci/sandbox/bin
HOST_ARCH: arm64
@@ -304,7 +312,7 @@ raspbian-arm:
#
# macOS
#
-macos:
+.macos-common:
extends: .base-template
tags:
- amd64
@@ -319,23 +327,38 @@ macos:
EXTRA_BUILD_FLAGS="-c -p"
fi
mkdir build && cd build
-../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS
$NIGHTLY_EXTRA_BUILD_FLAGS
-variables: *variables-macos
+../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS
$NIGHTLY_EXTRA_BUILD_FLAGS -a $HOST_ARCH
+
+macos-x86_64:
+extends: .macos-common
+variables: *variables-macos-x86_64
+
+macos-arm64:
+extends: .macos-common
+variables: *variables-macos-arm64
-nightly-macos:
-extends: macos
+.nightly-macos-common:
+extends: .macos-common
only:
- schedules
except:
after_script:
- mkdir nightlies
-- mv build/vlc-*.dmg nightlies/$(basename build/vlc-*.dmg | sed
"s/\.dmg/-${CI_COMMIT_SHORT_SHA}\.dmg/")
-- mv build/vlc-*.tar.gz nightlies/$(basename build/vlc-*.tar.gz | sed
"s/\.tar\.gz/-${CI_COMMIT_SHORT_SHA}\.tar\.gz/")
+- mv build/vlc-*.dmg nightlies/$(basename build/vlc-*.dmg | sed
"s/\.dmg/-${SHORTARCH}-${CI_COMMIT_SHORT_SHA}\.dmg/")
+- mv build/vlc-*.tar.gz nightlies/$(basename build/vlc-*.tar.gz | sed
"s/\.tar\.gz/-${SHORTARCH}-${CI_COMMIT_SHORT_SHA}\.tar\.gz/")
- cd nightlies && find . -maxdepth 1 -type f -not -name SHA512SUM |
xargs shasum -a 512 | tee SHA512SUM
artifacts:
paths:
- nightlies/*
+nightly-macos-x86_64:
+extends: .nightly-macos-common
+variables: *variables-macos-x86_64
+
+nightly-macos-arm64:
+extends: .nightly-macos-common
+variables: *variables-macos-arm64
+
#
# iOS
#
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS build.sh: Respect VLC_PREBUILT_CONTRIBS_URL, rebuild luac
vlc | branch: master | David Fuhrmann | Tue Jan 26 10:56:49 2021 +0100| [8e29a54120c85cdee65df25e83ec0b4c7a9a9dcb] | committer: David Fuhrmann macOS build.sh: Respect VLC_PREBUILT_CONTRIBS_URL, rebuild luac luac is a native tool not being bundled in the prebuilt contribs so far. Therefore this needs to be rebuilt. Also respect VLC_PREBUILT_CONTRIBS_URL, analog to the windows build scripts. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8e29a54120c85cdee65df25e83ec0b4c7a9a9dcb --- extras/package/macosx/build.sh | 10 -- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh index 18cde8bc4f..5d796dafe9 100755 --- a/extras/package/macosx/build.sh +++ b/extras/package/macosx/build.sh @@ -177,8 +177,14 @@ if [ "$CONTRIBFROMSOURCE" = "yes" ]; then fi else -if [ ! -e "../$TRIPLET" ]; then -make prebuilt > $out +if [ ! -e "../$HOST_TRIPLET" ]; then +if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then +make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL" +make .luac +else +make prebuilt +make .luac +fi fi fi spopd ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] gitlab-ci: Let the build scripts fetch the prebuilt contribs
vlc | branch: master | David Fuhrmann | Sun Jan 24
12:28:17 2021 +0100| [dac0501e1d92d6ae0f56bbe5f2e4da4f5e19e003] | committer:
David Fuhrmann
gitlab-ci: Let the build scripts fetch the prebuilt contribs
Like it is done for the other platforms.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dac0501e1d92d6ae0f56bbe5f2e4da4f5e19e003
---
extras/ci/gitlab-ci.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index cb88819d57..f82e362937 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -315,9 +315,6 @@ macos:
fi
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
echo "Building using prebuilt contribs at
$VLC_PREBUILT_CONTRIBS_URL"
-mkdir -p contrib/contrib-$TRIPLET && cd contrib/contrib-$TRIPLET
-curl -f -L ${VLC_PREBUILT_CONTRIBS_URL} -o
vlc-contrib-$TRIPLET-latest.tar.bz2
-cd ../../
else
EXTRA_BUILD_FLAGS="-c -p"
fi
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] gitlab-ci: Let the build scripts fetch the prebuilt contribs
vlc/vlc-3.0 | branch: master | David Fuhrmann | Sun
Jan 24 12:28:17 2021 +0100| [7d5552d6bb0462543c1f5530529be79f6d5c707b] |
committer: David Fuhrmann
gitlab-ci: Let the build scripts fetch the prebuilt contribs
Like it is done for the other platforms.
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=7d5552d6bb0462543c1f5530529be79f6d5c707b
---
extras/ci/gitlab-ci.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index a2e13a32c6..32a330c095 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -246,9 +246,6 @@ nightly-snap:
fi
if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
echo "Building using prebuilt contribs at
$VLC_PREBUILT_CONTRIBS_URL"
-mkdir -p contrib/contrib-$TRIPLET && cd contrib/contrib-$TRIPLET
-curl -f -L ${VLC_PREBUILT_CONTRIBS_URL} -o
vlc-contrib-$TRIPLET-latest.tar.bz2
-cd ../../
else
EXTRA_BUILD_FLAGS="-c -p"
fi
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS build.sh: Respect VLC_PREBUILT_CONTRIBS_URL, rebuild luac
vlc/vlc-3.0 | branch: master | David Fuhrmann | Sun Jan 24 12:18:08 2021 +0100| [5dd2501b3ebdab86ad8f9238aceb403d0e7ffa7c] | committer: David Fuhrmann macOS build.sh: Respect VLC_PREBUILT_CONTRIBS_URL, rebuild luac luac is a native tool not being bundled in the prebuilt contribs so far. Therefore this needs to be rebuilt. Also respect VLC_PREBUILT_CONTRIBS_URL, analog to the windows build scripts. > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=5dd2501b3ebdab86ad8f9238aceb403d0e7ffa7c --- extras/package/macosx/build.sh | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh index bbfa66f444..8c16fb711f 100755 --- a/extras/package/macosx/build.sh +++ b/extras/package/macosx/build.sh @@ -263,7 +263,13 @@ if [ "$CONTRIBFROMSOURCE" = "yes" ]; then else if [ ! -e "../$HOST_TRIPLET" ]; then -make prebuilt > $out +if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then +make prebuilt PREBUILT_URL="$VLC_PREBUILT_CONTRIBS_URL" +make .luac +else +make prebuilt +make .luac +fi fi fi spopd ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] gitlab-ci: Add builders for macOS ARM
vlc/vlc-3.0 | branch: master | David Fuhrmann | Thu
Jan 21 22:12:32 2021 +0100| [47c1832816393900975fa5c1eb2606cbc7733361] |
committer: David Fuhrmann
gitlab-ci: Add builders for macOS ARM
Restructure scripts into common builders for mac and mac nightly.
Add dedicated jobs to build for macos-arm64, and rename the
old macos jobs to macos-x86_64.
The arm builds are running on the catalina machine, the old builds
stay on old-macmini.
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=47c1832816393900975fa5c1eb2606cbc7733361
---
extras/ci/gitlab-ci.yml | 50 -
1 file changed, 41 insertions(+), 9 deletions(-)
diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index a5f942af1e..a2e13a32c6 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -37,11 +37,20 @@ variables:
HOST_ARCH: x86_64
TRIPLET: $HOST_ARCH-w64-mingw32
-.variables-macos: &variables-macos
+.variables-macos-x86_64: &variables-macos-x86_64
VLC_PATH: /Users/videolanci/sandbox/bin
VLC_FORCE_KERNELVERSION: 18
VLC_SDK_PATH:
/Applications/Xcode9.2.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk
HOST_ARCH: x86_64
+SHORTARCH: intel64
+TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
+
+.variables-macos-arm64: &variables-macos-arm64
+VLC_PATH: /Users/videolanci/sandbox/bin
+VLC_FORCE_KERNELVERSION: 19
+VLC_SDK_PATH:
/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
+HOST_ARCH: aarch64
+SHORTARCH: arm64
TRIPLET: $HOST_ARCH-apple-darwin$VLC_FORCE_KERNELVERSION
.variables-android-arm: &variables-android-arm
@@ -229,10 +238,8 @@ nightly-snap:
#
# macOS
#
-macos:
+.macos-common:
extends: .base-template
-tags:
-- old-macmini
script: |
if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
NIGHTLY_EXTRA_BUILD_FLAGS="-i n"
@@ -246,22 +253,47 @@ macos:
EXTRA_BUILD_FLAGS="-c -p"
fi
mkdir build && cd build
-../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS -k $VLC_SDK_PATH
$NIGHTLY_EXTRA_BUILD_FLAGS
-variables: *variables-macos
+../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS -a $HOST_ARCH -k
$VLC_SDK_PATH $NIGHTLY_EXTRA_BUILD_FLAGS
-nightly-macos:
-extends: macos
+macos-x86_64:
+extends: .macos-common
+tags:
+- old-macmini
+variables: *variables-macos-x86_64
+
+macos-arm64:
+extends: .macos-common
+tags:
+- amd64
+- catalina
+variables: *variables-macos-arm64
+
+.nightly-macos-common:
+extends: .macos-common
only:
- schedules
except:
after_script:
- mkdir nightlies
-- mv build/vlc-*.dmg nightlies/$(basename build/vlc-*.dmg | sed
"s/\.dmg/-${CI_COMMIT_SHORT_SHA}\.dmg/")
+- mv build/vlc-*.dmg nightlies/$(basename build/vlc-*.dmg | sed
"s/\.dmg/-${SHORTARCH}-${CI_COMMIT_SHORT_SHA}\.dmg/")
- cd nightlies && find . -maxdepth 1 -type f -not -name SHA512SUM |
xargs shasum -a 512 | tee SHA512SUM
artifacts:
paths:
- nightlies/*
+nightly-macos-x86_64:
+extends: .nightly-macos-common
+tags:
+- old-macmini
+variables: *variables-macos-x86_64
+
+nightly-macos-arm64:
+extends: .nightly-macos-common
+tags:
+- amd64
+- catalina
+variables: *variables-macos-arm64
+
#
# Android
#
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Fixed Santa hat not showing on cone after playback ends or is stopped even if it should
vlc/vlc-3.0 | branch: master | David Berdik | Tue Dec 29 21:57:41 2020 -0500| [ce327db9c472e15606c7736980f0a512aaa4ab1e] | committer: Pierre Lamot Fixed Santa hat not showing on cone after playback ends or is stopped even if it should Signed-off-by: Pierre Lamot > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=ce327db9c472e15606c7736980f0a512aaa4ab1e --- modules/gui/qt/components/interface_widgets.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp index 78dbc2f9c3..ced7d9f8c7 100644 --- a/modules/gui/qt/components/interface_widgets.cpp +++ b/modules/gui/qt/components/interface_widgets.cpp @@ -35,6 +35,7 @@ #include "menus.hpp" /* Popup menu on bgWidget */ +#include #include #include #include @@ -445,6 +446,8 @@ void BackgroundWidget::titleUpdated( const QString& title ) i_pos + 5 == title.indexOf( "Bi" /* directional */ "ll", i_pos, Qt::CaseInsensitive ) ) updateDefaultArt( ":/logo/vlc128-kb.png" ); +else if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY ) +updateDefaultArt( ":/logo/vlc128-xmas.png" ); else updateDefaultArt( ":/logo/vlc128.png" ); } ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Fix make dist after l10n update
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed Dec 30 14:51:38 2020 +0100| [8e19ecd054978352abc01bc33ee91ab4573c491d] | committer: David Fuhrmann macosx: Fix make dist after l10n update > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=8e19ecd054978352abc01bc33ee91ab4573c491d --- modules/gui/macosx/Makefile.am | 45 +- 1 file changed, 44 insertions(+), 1 deletion(-) diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am index 87d8bcb97e..958e3d581a 100644 --- a/modules/gui/macosx/Makefile.am +++ b/modules/gui/macosx/Makefile.am @@ -741,31 +741,74 @@ libmacosx_plugin_la_RES += \ EXTRA_DIST += \ gui/macosx/Resources/English.lproj/InfoPlist.strings \ + gui/macosx/Resources/an.lproj/InfoPlist.strings \ gui/macosx/Resources/ar.lproj/InfoPlist.strings \ + gui/macosx/Resources/as-IN.lproj/InfoPlist.strings \ + gui/macosx/Resources/ast.lproj/InfoPlist.strings \ + gui/macosx/Resources/be.lproj/InfoPlist.strings \ gui/macosx/Resources/bg.lproj/InfoPlist.strings \ + gui/macosx/Resources/bn-IN.lproj/InfoPlist.strings \ + gui/macosx/Resources/brx.lproj/InfoPlist.strings \ gui/macosx/Resources/ca.lproj/InfoPlist.strings \ + gui/macosx/Resources/co.lproj/InfoPlist.strings \ gui/macosx/Resources/cs.lproj/InfoPlist.strings \ + gui/macosx/Resources/cy.lproj/InfoPlist.strings \ + gui/macosx/Resources/da.lproj/InfoPlist.strings \ gui/macosx/Resources/de.lproj/InfoPlist.strings \ gui/macosx/Resources/el.lproj/InfoPlist.strings \ + gui/macosx/Resources/en-GB.lproj/InfoPlist.strings \ + gui/macosx/Resources/es-MX.lproj/InfoPlist.strings \ gui/macosx/Resources/es.lproj/InfoPlist.strings \ + gui/macosx/Resources/et.lproj/InfoPlist.strings \ + gui/macosx/Resources/eu.lproj/InfoPlist.strings \ + gui/macosx/Resources/fa.lproj/InfoPlist.strings \ + gui/macosx/Resources/fi.lproj/InfoPlist.strings \ gui/macosx/Resources/fr.lproj/InfoPlist.strings \ + gui/macosx/Resources/ga.lproj/InfoPlist.strings \ + gui/macosx/Resources/gd.lproj/InfoPlist.strings \ gui/macosx/Resources/gl.lproj/InfoPlist.strings \ + gui/macosx/Resources/gu-IN.lproj/InfoPlist.strings \ gui/macosx/Resources/he.lproj/InfoPlist.strings \ + gui/macosx/Resources/hr.lproj/InfoPlist.strings \ gui/macosx/Resources/hu.lproj/InfoPlist.strings \ + gui/macosx/Resources/id.lproj/InfoPlist.strings \ + gui/macosx/Resources/is.lproj/InfoPlist.strings \ gui/macosx/Resources/it.lproj/InfoPlist.strings \ gui/macosx/Resources/ja.lproj/InfoPlist.strings \ + gui/macosx/Resources/kab.lproj/InfoPlist.strings \ + gui/macosx/Resources/kk.lproj/InfoPlist.strings \ + gui/macosx/Resources/km.lproj/InfoPlist.strings \ + gui/macosx/Resources/kn.lproj/InfoPlist.strings \ + gui/macosx/Resources/ko.lproj/InfoPlist.strings \ + gui/macosx/Resources/lt.lproj/InfoPlist.strings \ gui/macosx/Resources/lv.lproj/InfoPlist.strings \ + gui/macosx/Resources/ml.lproj/InfoPlist.strings \ + gui/macosx/Resources/mr.lproj/InfoPlist.strings \ + gui/macosx/Resources/ms.lproj/InfoPlist.strings \ + gui/macosx/Resources/nb.lproj/InfoPlist.strings \ + gui/macosx/Resources/ne.lproj/InfoPlist.strings \ gui/macosx/Resources/nl.lproj/InfoPlist.strings \ + gui/macosx/Resources/nn.lproj/InfoPlist.strings \ + gui/macosx/Resources/oc.lproj/InfoPlist.strings \ + gui/macosx/Resources/pa.lproj/InfoPlist.strings \ gui/macosx/Resources/pl.lproj/InfoPlist.strings \ gui/macosx/Resources/pt-BR.lproj/InfoPlist.strings \ gui/macosx/Resources/pt-PT.lproj/InfoPlist.strings \ gui/macosx/Resources/ro.lproj/InfoPlist.strings \ + gui/macosx/Resources/ru.lproj/InfoPlist.strings \ + gui/macosx/Resources/sc.lproj/InfoPlist.strings \ + gui/macosx/Resources/si.lproj/InfoPlist.strings \ gui/macosx/Resources/sk.lproj/InfoPlist.strings \ gui/macosx/Resources/sl.lproj/InfoPlist.strings \ + gui/macosx/Resources/sr.lproj/InfoPlist.strings \ gui/macosx/Resources/sv.lproj/InfoPlist.strings \ + gui/macosx/Resources/th.lproj/InfoPlist.strings \ gui/macosx/Resources/tr.lproj/InfoPlist.strings \ gui/macosx/Resources/uk.lproj/InfoPlist.strings \ - gui/macosx/Resources/zh-Hans.lproj/InfoPlist.strings + gui/macosx/Resources/vi.lproj/InfoPlist.strings \ + gui/macosx/Resources/wa.lproj/InfoPlist.strings \ + gui/macosx/Resources/zh-Hans.lproj/InfoPlist.strings \ + gui/macosx/Resources/zh-Hant.lproj/InfoPlist.strings if ENABLE_MACOSX_UI dist_libmacosx_plugin_la_DATA = $(libmacosx_plugin_la_RES) ___ vlc-commits mailing list vlc-commits@videolan.org ht
[vlc-commits] macosx: Fix animations in open panel
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed
Dec 16 08:23:12 2020 +0100| [d147bb5e7e8bfda63cbfbed310d0bbcf3f110614] |
committer: David Fuhrmann
macosx: Fix animations in open panel
Open panel was showing only half of the tab view, because
the animation was interrupted right in the middle.
(manual bp of 12c8eb0c7f02b3bac3bd08ce07292183bf20d327)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=d147bb5e7e8bfda63cbfbed310d0bbcf3f110614
---
modules/gui/macosx/VLCOpenWindowController.m | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/gui/macosx/VLCOpenWindowController.m
b/modules/gui/macosx/VLCOpenWindowController.m
index 994953a8b0..57920bc09d 100644
--- a/modules/gui/macosx/VLCOpenWindowController.m
+++ b/modules/gui/macosx/VLCOpenWindowController.m
@@ -414,8 +414,11 @@ static NSString *kCaptureTabViewId = @"capture";
// load window
[self window];
-[_tabView selectTabViewItemWithIdentifier:identifier];
-[_fileSubCheckbox setState: NSOffState];
+// Delay this to allow the full animation to run inside the modal event
loop
+dispatch_async(dispatch_get_main_queue(), ^{
+[_tabView selectTabViewItemWithIdentifier:identifier];
+[_fileSubCheckbox setState: NSOffState];
+});
int i_result = [NSApp runModalForWindow: self.window];
[self.window close];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Move Base.lproj back to English.lproj
vlc/vlc-3.0 | branch: master | David Fuhrmann | Tue
Dec 15 22:29:29 2020 +0100| [a1d577518d6665ba0567f9f5b0b2176e111da37f] |
committer: David Fuhrmann
macosx: Move Base.lproj back to English.lproj
Base.lproj is not recognised yet as a known directory on 10.7.
This seems to be supported only for 10.8 and later.
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a1d577518d6665ba0567f9f5b0b2176e111da37f
---
extras/package/macosx/package.mak | 2 +-
modules/gui/macosx/Makefile.am | 2 +-
.../macosx/Resources/{Base.lproj => English.lproj}/InfoPlist.strings| 0
3 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 3e95760be6..21ab36cf71 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -18,7 +18,7 @@ VLC.app: install
cp -R $(prefix)/share/macosx/ $@
## Copy .strings file and .nib files
cp -R "$(srcdir)/modules/gui/macosx/Resources/"*.lproj
$@/Contents/Resources/
- cp -R "$(top_builddir)/modules/gui/macosx/UI/."
$@/Contents/Resources/Base.lproj/
+ cp -R "$(top_builddir)/modules/gui/macosx/UI/."
$@/Contents/Resources/English.lproj/
## Copy Info.plist and convert to binary
cp -R $(top_builddir)/share/macosx/Info.plist $@/Contents/
xcrun plutil -convert binary1 $@/Contents/Info.plist
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 99bb7df691..87d8bcb97e 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -740,7 +740,7 @@ libmacosx_plugin_la_RES += \
gui/macosx/Resources/vlc.scriptTerminology
EXTRA_DIST += \
- gui/macosx/Resources/Base.lproj/InfoPlist.strings \
+ gui/macosx/Resources/English.lproj/InfoPlist.strings \
gui/macosx/Resources/ar.lproj/InfoPlist.strings \
gui/macosx/Resources/bg.lproj/InfoPlist.strings \
gui/macosx/Resources/ca.lproj/InfoPlist.strings \
diff --git a/modules/gui/macosx/Resources/Base.lproj/InfoPlist.strings
b/modules/gui/macosx/Resources/English.lproj/InfoPlist.strings
similarity index 100%
rename from modules/gui/macosx/Resources/Base.lproj/InfoPlist.strings
rename to modules/gui/macosx/Resources/English.lproj/InfoPlist.strings
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Fix animations in open panel
vlc | branch: master | David Fuhrmann | Wed Dec 16
12:10:39 2020 +0100| [12c8eb0c7f02b3bac3bd08ce07292183bf20d327] | committer:
David Fuhrmann
macosx: Fix animations in open panel
Open panel was showing only half of the tab view, because
the animation was interrupted right in the middle.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=12c8eb0c7f02b3bac3bd08ce07292183bf20d327
---
modules/gui/macosx/windows/VLCOpenWindowController.m | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/gui/macosx/windows/VLCOpenWindowController.m
b/modules/gui/macosx/windows/VLCOpenWindowController.m
index 6d93043fbc..2bddc39345 100644
--- a/modules/gui/macosx/windows/VLCOpenWindowController.m
+++ b/modules/gui/macosx/windows/VLCOpenWindowController.m
@@ -371,8 +371,11 @@ NSString *const VLCOpenTextFieldWasClicked =
@"VLCOpenTextFieldWasClicked";
// load window
[self window];
-[_tabView selectTabViewItemWithIdentifier:identifier];
-[_fileSubCheckbox setState: NSOffState];
+// Delay this to allow the full animation to run inside the modal event
loop
+dispatch_async(dispatch_get_main_queue(), ^{
+[_tabView selectTabViewItemWithIdentifier:identifier];
+[_fileSubCheckbox setState: NSOffState];
+});
NSModalResponse i_result = [NSApp runModalForWindow: self.window];
[self.window close];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix make dist
vlc/vlc-3.0 | branch: master | David Fuhrmann | Mon Dec 14 20:45:14 2020 +0100| [96fc54755d18b1091673043a965eafc71bf2af99] | committer: David Fuhrmann macosx: fix make dist > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=96fc54755d18b1091673043a965eafc71bf2af99 --- modules/gui/macosx/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am index cb1962ad94..99bb7df691 100644 --- a/modules/gui/macosx/Makefile.am +++ b/modules/gui/macosx/Makefile.am @@ -1,6 +1,6 @@ SUFFIXES += .xib -libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions -fobjc-arc +libmacosx_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-exceptions -fobjc-arc libmacosx_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(guidir)' \ -Wl,-framework,Cocoa -Wl,-framework,CoreServices \ -Wl,-framework,AVFoundation -Wl,-framework,CoreMedia -Wl,-framework,IOKit \ @@ -759,6 +759,7 @@ EXTRA_DIST += \ gui/macosx/Resources/pl.lproj/InfoPlist.strings \ gui/macosx/Resources/pt-BR.lproj/InfoPlist.strings \ gui/macosx/Resources/pt-PT.lproj/InfoPlist.strings \ + gui/macosx/Resources/ro.lproj/InfoPlist.strings \ gui/macosx/Resources/sk.lproj/InfoPlist.strings \ gui/macosx/Resources/sl.lproj/InfoPlist.strings \ gui/macosx/Resources/sv.lproj/InfoPlist.strings \ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: codesign: Check whether vlc-cache-gen can be executed
vlc/vlc-3.0 | branch: master | David Fuhrmann | Mon
Dec 14 20:27:04 2020 +0100| [c8ab476aa089c71799db5624c809b5c83ceab825] |
committer: David Fuhrmann
macosx: codesign: Check whether vlc-cache-gen can be executed
Check whether vlc-cache-gen can actually be executed, to
detect whether it is available for the right architecture.
If it is not available, support the possibility to not
sign the plugins.dat cache file. Also support the case
the cache file is not there from the beginning.
(manual bp of 18271e16182312cc2d0a80848d562e52efc2ebf8)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c8ab476aa089c71799db5624c809b5c83ceab825
---
extras/package/macosx/codesign.sh | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/extras/package/macosx/codesign.sh
b/extras/package/macosx/codesign.sh
index 36e7213157..76711bae4a 100755
--- a/extras/package/macosx/codesign.sh
+++ b/extras/package/macosx/codesign.sh
@@ -79,13 +79,19 @@ if [ -e "./vlc-cache-gen" ]; then
VLCCACHEGEN="./vlc-cache-gen"
fi
+$VLCCACHEGEN --help 1>/dev/null 2>&1 && returncode=$? || returncode=$?
+if [ $returncode -ne 0 ]; then
+info "WARN: Cannot execute vlc-cache-gen with path '$VLCCACHEGEN' (wrong
arch?)"
+VLCCACHEGEN=""
+fi
+
if [ -z "$VLCCACHEGEN" ]; then
-info "WARN: Cannot find vlc-cache-gen, cache will be corrupt after signing"
+info "WARN: Cannot find vlc-cache-gen, cache will be removed for signing"
fi
SCRIPTDIR=$(dirname "$0")
if [ ! -z "$RUNTIME" ]; then
-RUNTIME_FLAGS="--options runtime --entitlements
$SCRIPTDIR/vlc-hardening.entitlements"
+RUNTIME_FLAGS="--options runtime --entitlements
$SCRIPTDIR/vlc-hardening.entitlements"
fi
# Call with $1 = file or folder
@@ -156,10 +162,11 @@ done
if [ ! -z "$VLCCACHEGEN" ]; then
$VLCCACHEGEN VLC.app/Contents/MacOS/plugins
+sign "VLC.app/Contents/MacOS/plugins/plugins.dat"
+else
+rm "VLC.app/Contents/MacOS/plugins/plugins.dat" || true
fi
-sign "VLC.app/Contents/MacOS/plugins/plugins.dat"
-
info "Signing the libraries"
for i in $(find VLC.app/Contents/MacOS/lib -type f -exec echo {} \;)
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: sparkle: call install_name_tool on actual file
vlc/vlc-3.0 | branch: master | David Fuhrmann | Mon Dec 14 20:13:25 2020 +0100| [81087465d4cb1abfc3f1a9f7abac44cb8767d55e] | committer: David Fuhrmann contrib: sparkle: call install_name_tool on actual file Calling on the symlink replaces that symlink with the real file with latest versions of that tool. This invalidated the framework structure of the Sparkle.framework. (cherry picked from commit 80d4dd9157fc410c1541973ae2ad2a4767fea65f) Signed-off-by: David Fuhrmann > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=81087465d4cb1abfc3f1a9f7abac44cb8767d55e --- contrib/src/sparkle/rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/sparkle/rules.mak b/contrib/src/sparkle/rules.mak index da34dc8af4..0a79e1a9a7 100644 --- a/contrib/src/sparkle/rules.mak +++ b/contrib/src/sparkle/rules.mak @@ -19,7 +19,7 @@ sparkle: Sparkle-$(SPARKLE_VERSION).zip .sum-sparkle .sparkle: sparkle # Build Sparkle and change the @rpath cd $< && xcodebuild $(XCODE_FLAGS) - cd $< && install_name_tool -id @executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle build/Release/Sparkle.framework/Sparkle + cd $< && install_name_tool -id @executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle build/Release/Sparkle.framework/Versions/A/Sparkle # Install cd $< && mkdir -p "$(PREFIX)/Frameworks" && \ rm -Rf "$(PREFIX)/Frameworks/Sparkle.framework" && \ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: sparkle: call install_name_tool on actual file
vlc | branch: master | David Fuhrmann | Mon Dec 14 20:13:25 2020 +0100| [80d4dd9157fc410c1541973ae2ad2a4767fea65f] | committer: David Fuhrmann contrib: sparkle: call install_name_tool on actual file Calling on the symlink replaces that symlink with the real file with latest versions of that tool. This invalidated the framework structure of the Sparkle.framework. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=80d4dd9157fc410c1541973ae2ad2a4767fea65f --- contrib/src/sparkle/rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/sparkle/rules.mak b/contrib/src/sparkle/rules.mak index da34dc8af4..0a79e1a9a7 100644 --- a/contrib/src/sparkle/rules.mak +++ b/contrib/src/sparkle/rules.mak @@ -19,7 +19,7 @@ sparkle: Sparkle-$(SPARKLE_VERSION).zip .sum-sparkle .sparkle: sparkle # Build Sparkle and change the @rpath cd $< && xcodebuild $(XCODE_FLAGS) - cd $< && install_name_tool -id @executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle build/Release/Sparkle.framework/Sparkle + cd $< && install_name_tool -id @executable_path/../Frameworks/Sparkle.framework/Versions/A/Sparkle build/Release/Sparkle.framework/Versions/A/Sparkle # Install cd $< && mkdir -p "$(PREFIX)/Frameworks" && \ rm -Rf "$(PREFIX)/Frameworks/Sparkle.framework" && \ ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: codesign: Check whether vlc-cache-gen can be executed
vlc | branch: master | David Fuhrmann | Mon Dec 14
20:22:24 2020 +0100| [18271e16182312cc2d0a80848d562e52efc2ebf8] | committer:
David Fuhrmann
macosx: codesign: Check whether vlc-cache-gen can be executed
Check whether vlc-cache-gen can actually be executed, to
detect whether it is available for the right architecture.
If it is not available, support the possibility to not
sign the plugins.dat cache file. Also support the case
the cache file is not there from the beginning.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=18271e16182312cc2d0a80848d562e52efc2ebf8
---
extras/package/macosx/codesign.sh | 15 +++
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/extras/package/macosx/codesign.sh
b/extras/package/macosx/codesign.sh
index 22f6cbb61a..3d6e796aad 100755
--- a/extras/package/macosx/codesign.sh
+++ b/extras/package/macosx/codesign.sh
@@ -79,13 +79,19 @@ if [ -e "./vlc-cache-gen" ]; then
VLCCACHEGEN="./vlc-cache-gen"
fi
+$VLCCACHEGEN --help 1>/dev/null 2>&1 && returncode=$? || returncode=$?
+if [ $returncode -ne 0 ]; then
+info "WARN: Cannot execute vlc-cache-gen with path '$VLCCACHEGEN' (wrong
arch?)"
+VLCCACHEGEN=""
+fi
+
if [ -z "$VLCCACHEGEN" ]; then
-info "WARN: Cannot find vlc-cache-gen, cache will be corrupt after signing"
+info "WARN: Cannot find vlc-cache-gen, cache will be removed for signing"
fi
SCRIPTDIR=$(dirname "$0")
if [ ! -z "$RUNTIME" ]; then
-RUNTIME_FLAGS="--options runtime --entitlements
$SCRIPTDIR/vlc-hardening.entitlements"
+RUNTIME_FLAGS="--options runtime --entitlements
$SCRIPTDIR/vlc-hardening.entitlements"
fi
# Call with $1 = file or folder
@@ -124,10 +130,11 @@ done
if [ ! -z "$VLCCACHEGEN" ]; then
$VLCCACHEGEN VLC.app/Contents/Frameworks/plugins
+sign "VLC.app/Contents/Frameworks/plugins/plugins.dat"
+else
+rm "VLC.app/Contents/Frameworks/plugins/plugins.dat" || true
fi
-sign "VLC.app/Contents/Frameworks/plugins/plugins.dat"
-
info "Signing the libraries"
for i in $(find VLC.app/Contents/Frameworks -type f -name "*.dylib" -d 1 -exec
echo {} \;)
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: nettle: fix build with CC_FOR_BUILD set to recent clang
vlc | branch: master | David Fuhrmann | Mon Nov 30 09:21:33 2020 +0100| [c8abac44747cfe6bbf0b8399373f78ea6125367c] | committer: Felix Paul Kühne contrib: nettle: fix build with CC_FOR_BUILD set to recent clang See upstream https://git.lysator.liu.se/nettle/nettle/-/merge_requests/9/diffs Signed-off-by: Felix Paul Kühne > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c8abac44747cfe6bbf0b8399373f78ea6125367c --- contrib/src/nettle/fix-cc-for-build.patch | 34 +++ contrib/src/nettle/rules.mak | 3 ++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/contrib/src/nettle/fix-cc-for-build.patch b/contrib/src/nettle/fix-cc-for-build.patch new file mode 100644 index 00..37826f7820 --- /dev/null +++ b/contrib/src/nettle/fix-cc-for-build.patch @@ -0,0 +1,34 @@ +From 91df68136ad1562cf9217599254706d8cfa970ea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adrien=20B=C3=A9raud?= +Date: Sun, 20 Sep 2020 19:35:54 +0200 +Subject: [PATCH] m4: follow GMP changes for GMP_PROG_CC_FOR_BUILD + +--- + aclocal.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 513b2df4..e81e0351 100644 +--- a/aclocal.m4 b/aclocal.m4 +@@ -369,7 +369,7 @@ cat >conftest.c <https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS build: fix pseudo package
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed
Dec 2 20:17:27 2020 +0100| [599688cedd73688512edaff8c2ce616c6a2869b3] |
committer: David Fuhrmann
macOS build: fix pseudo package
No need to link InfoPlist.strings files here.
(cherry picked from commit 4f34f66f5eaddf3d88fa8a7f5dc839bb2c012103)
(edited)
Signed-off-by: David Fuhrmann
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=599688cedd73688512edaff8c2ce616c6a2869b3
---
extras/package/macosx/package.mak | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 0aca811b67..3e95760be6 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -5,10 +5,10 @@ endif
# Symlink a pseudo-bundle
pseudo-bundle:
$(MKDIR_P) $(top_builddir)/bin/Contents/Resources/
- $(LN_S) -hf $(abs_top_builddir)/modules/gui/macosx/UI
$(top_builddir)/bin/Contents/Resources/Base.lproj
- $(LN_S) -hf $(abs_top_builddir)/share/macosx/Info.plist
$(top_builddir)/bin/Contents/Info.plist
- $(LN_S) -hf $(CONTRIB_DIR)/Frameworks
- cd $(top_builddir)/bin/Contents/Resources/ && find
$(abs_top_srcdir)/modules/gui/macosx/Resources/ -type f -exec $(LN_S) -f {} \;
+ $(LN_S) -nf $(abs_top_builddir)/modules/gui/macosx/UI
$(top_builddir)/bin/Contents/Resources/Base.lproj
+ $(LN_S) -nf $(abs_top_builddir)/share/macosx/Info.plist
$(top_builddir)/bin/Contents/Info.plist
+ $(LN_S) -nf $(CONTRIB_DIR)/Frameworks
+ cd $(top_builddir)/bin/Contents/Resources/ && find
$(abs_top_srcdir)/modules/gui/macosx/Resources/ -type f -not -path "*.lproj/*"
-exec $(LN_S) -f {} \;
# VLC.app for packaging and giving it to your friends
# use package-macosx to get a nice dmg
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix make dist after language update
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed Dec 2 20:16:50 2020 +0100| [2630b360927a5656c4987a86ba1499211955fd98] | committer: David Fuhrmann macosx: fix make dist after language update (cherry picked from commit 21e9016865f72f517ca7f0c5ec49f64a60223fa4) Signed-off-by: David Fuhrmann > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2630b360927a5656c4987a86ba1499211955fd98 --- modules/gui/macosx/Makefile.am | 28 ++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am index 06f52d7e10..cb1962ad94 100644 --- a/modules/gui/macosx/Makefile.am +++ b/modules/gui/macosx/Makefile.am @@ -739,8 +739,32 @@ libmacosx_plugin_la_RES += \ gui/macosx/Resources/vlc.scriptSuite \ gui/macosx/Resources/vlc.scriptTerminology -libmacosx_plugin_la_RES += \ - gui/macosx/Resources/Base.lproj/InfoPlist.strings +EXTRA_DIST += \ + gui/macosx/Resources/Base.lproj/InfoPlist.strings \ + gui/macosx/Resources/ar.lproj/InfoPlist.strings \ + gui/macosx/Resources/bg.lproj/InfoPlist.strings \ + gui/macosx/Resources/ca.lproj/InfoPlist.strings \ + gui/macosx/Resources/cs.lproj/InfoPlist.strings \ + gui/macosx/Resources/de.lproj/InfoPlist.strings \ + gui/macosx/Resources/el.lproj/InfoPlist.strings \ + gui/macosx/Resources/es.lproj/InfoPlist.strings \ + gui/macosx/Resources/fr.lproj/InfoPlist.strings \ + gui/macosx/Resources/gl.lproj/InfoPlist.strings \ + gui/macosx/Resources/he.lproj/InfoPlist.strings \ + gui/macosx/Resources/hu.lproj/InfoPlist.strings \ + gui/macosx/Resources/it.lproj/InfoPlist.strings \ + gui/macosx/Resources/ja.lproj/InfoPlist.strings \ + gui/macosx/Resources/lv.lproj/InfoPlist.strings \ + gui/macosx/Resources/nl.lproj/InfoPlist.strings \ + gui/macosx/Resources/pl.lproj/InfoPlist.strings \ + gui/macosx/Resources/pt-BR.lproj/InfoPlist.strings \ + gui/macosx/Resources/pt-PT.lproj/InfoPlist.strings \ + gui/macosx/Resources/sk.lproj/InfoPlist.strings \ + gui/macosx/Resources/sl.lproj/InfoPlist.strings \ + gui/macosx/Resources/sv.lproj/InfoPlist.strings \ + gui/macosx/Resources/tr.lproj/InfoPlist.strings \ + gui/macosx/Resources/uk.lproj/InfoPlist.strings \ + gui/macosx/Resources/zh-Hans.lproj/InfoPlist.strings if ENABLE_MACOSX_UI dist_libmacosx_plugin_la_DATA = $(libmacosx_plugin_la_RES) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS package: Install InfoPlist.strings for different langs
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed
Dec 2 19:53:31 2020 +0100| [bc51dbbcda9e4c7960d4bc659e69a5c1aebab4e2] |
committer: David Fuhrmann
macOS package: Install InfoPlist.strings for different langs
Also, move the template file, InfoPlist.strings, into Base.lproj
to simplify the install rules.
(cherry picked from commit 5b6d90bada44fc99ca0adf029d5ba5df5a496ae4)
Signed-off-by: David Fuhrmann
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=bc51dbbcda9e4c7960d4bc659e69a5c1aebab4e2
---
extras/package/macosx/package.mak | 4 ++--
modules/gui/macosx/Makefile.am | 2 +-
modules/gui/macosx/Resources/{ => Base.lproj}/InfoPlist.strings | 0
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index db3fb18e5a..0aca811b67 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -17,8 +17,8 @@ VLC.app: install
## Copy Contents
cp -R $(prefix)/share/macosx/ $@
## Copy .strings file and .nib files
- cp -R "$(top_builddir)/modules/gui/macosx/UI"
$@/Contents/Resources/Base.lproj
- cp "$(srcdir)/modules/gui/macosx/Resources/InfoPlist.strings"
$@/Contents/Resources/Base.lproj/
+ cp -R "$(srcdir)/modules/gui/macosx/Resources/"*.lproj
$@/Contents/Resources/
+ cp -R "$(top_builddir)/modules/gui/macosx/UI/."
$@/Contents/Resources/Base.lproj/
## Copy Info.plist and convert to binary
cp -R $(top_builddir)/share/macosx/Info.plist $@/Contents/
xcrun plutil -convert binary1 $@/Contents/Info.plist
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 70b1985dcc..06f52d7e10 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -740,7 +740,7 @@ libmacosx_plugin_la_RES += \
gui/macosx/Resources/vlc.scriptTerminology
libmacosx_plugin_la_RES += \
- gui/macosx/Resources/InfoPlist.strings
+ gui/macosx/Resources/Base.lproj/InfoPlist.strings
if ENABLE_MACOSX_UI
dist_libmacosx_plugin_la_DATA = $(libmacosx_plugin_la_RES)
diff --git a/modules/gui/macosx/Resources/InfoPlist.strings
b/modules/gui/macosx/Resources/Base.lproj/InfoPlist.strings
similarity index 100%
rename from modules/gui/macosx/Resources/InfoPlist.strings
rename to modules/gui/macosx/Resources/Base.lproj/InfoPlist.strings
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Add explanatory strings for access to restricted resources
vlc/vlc-3.0 | branch: master | David Fuhrmann | Sat Oct 17 13:15:10 2020 +0200| [f121a648c1e74844027427be28f5a567ebef0525] | committer: David Fuhrmann macosx: Add explanatory strings for access to restricted resources Those strings are read directly by the mac OS to show some reason in ressource request dialogs. The strings for NSAppleEventsUsageDescription, NSCameraUsageDescription and NSMicrophoneUsageDescription are mandatory, otherwise the application will crash. InfoPlist.strings needs to be translated to show localized variants of those strings. refs #21378 (cherry picked from commit f1534626c69952d3b24de51c6468ad56337c3c14) (edited) Signed-off-by: David Fuhrmann > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=f121a648c1e74844027427be28f5a567ebef0525 --- modules/gui/macosx/Resources/InfoPlist.strings | 11 --- share/Info.plist.in| 16 +--- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/modules/gui/macosx/Resources/InfoPlist.strings b/modules/gui/macosx/Resources/InfoPlist.strings index 2f109b7715..ba5bf4a29f 100644 --- a/modules/gui/macosx/Resources/InfoPlist.strings +++ b/modules/gui/macosx/Resources/InfoPlist.strings @@ -1,5 +1,10 @@ /* Localized versions of Info.plist keys */ -"NSCameraUsageDescription" = "VLC uses the camera to record some video."; -"NSMicrophoneUsageDescription" = "VLC uses the microphone to record some audio."; -"NSAppleEventsUsageDescription" = "VLC uses apple events to control external media players."; +"NSCameraUsageDescription" = "VLC wants to access the camera as requested by the user."; +"NSMicrophoneUsageDescription" = "VLC wants to access the microphone as requested by the user."; +"NSAppleEventsUsageDescription" = "VLC wants to pause and resume external media players."; +"NSDesktopFolderUsageDescription" = "VLC wants to access the desktop folder as requested by the user."; +"NSDocumentsFolderUsageDescription" = "VLC wants to access the documents folder as requested by the user."; +"NSDownloadsFolderUsageDescription" = "VLC wants to access the downloads folder as requested by the user."; +"NSNetworkVolumesUsageDescription" = "VLC wants to access a network volume as requested by the user."; +"NSRemovableVolumesUsageDescription" = "VLC wants to access a removable volume as requested by the user."; diff --git a/share/Info.plist.in b/share/Info.plist.in index 378c0fd70b..0de4224369 100644 --- a/share/Info.plist.in +++ b/share/Info.plist.in @@ -1402,11 +1402,21 @@ NSHumanReadableCopyright Copyright (c) @COPYRIGHT_YEARS@ VLC authors and VideoLAN NSCameraUsageDescription - VLC uses the camera to record some video. + VLC wants to access the camera as requested by the user. NSMicrophoneUsageDescription - VLC uses the microphone to record some audio. + VLC wants to access the microphone as requested by the user. NSAppleEventsUsageDescription - VLC uses apple events to control external media players. + VLC wants to pause and resume external media players. + NSDesktopFolderUsageDescription + VLC wants to access the desktop folder as requested by the user. + NSDocumentsFolderUsageDescription + VLC wants to access the documents folder as requested by the user. + NSDownloadsFolderUsageDescription + VLC wants to access the downloads folder as requested by the user. + NSNetworkVolumesUsageDescription + VLC wants to access a network volume as requested by the user. + NSRemovableVolumesUsageDescription + VLC wants to access a removable volume as requested by the user. CFBundleURLTypes ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Do not generate InfoPlist.strings anymore
vlc/vlc-3.0 | branch: master | David Fuhrmann | Sat
Oct 17 12:46:52 2020 +0200| [f233f85df706b7648946c6ef28a41cd92e40173a] |
committer: David Fuhrmann
macosx: Do not generate InfoPlist.strings anymore
(cherry picked from commit 468e864fb929bc849d71d99e6cbd6a09e436bd3a)
(edited)
Signed-off-by: David Fuhrmann
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=f233f85df706b7648946c6ef28a41cd92e40173a
---
configure.ac | 1 -
extras/package/macosx/package.mak | 3 ++-
modules/gui/macosx/Makefile.am | 3 +++
.../gui/macosx/Resources/{InfoPlist.strings.in => InfoPlist.strings} | 0
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 1f74566008..376f5200e7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4373,7 +4373,6 @@ AM_COND_IF([HAVE_WIN32], [
AM_COND_IF([HAVE_DARWIN], [
AC_CONFIG_FILES([
-
modules/gui/macosx/UI/InfoPlist.strings:modules/gui/macosx/Resources/InfoPlist.strings.in
share/macosx/Info.plist:share/Info.plist.in
])
])
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 2d6b3ff962..db3fb18e5a 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -17,7 +17,8 @@ VLC.app: install
## Copy Contents
cp -R $(prefix)/share/macosx/ $@
## Copy .strings file and .nib files
- cp -R $(top_builddir)/modules/gui/macosx/UI
$@/Contents/Resources/Base.lproj
+ cp -R "$(top_builddir)/modules/gui/macosx/UI"
$@/Contents/Resources/Base.lproj
+ cp "$(srcdir)/modules/gui/macosx/Resources/InfoPlist.strings"
$@/Contents/Resources/Base.lproj/
## Copy Info.plist and convert to binary
cp -R $(top_builddir)/share/macosx/Info.plist $@/Contents/
xcrun plutil -convert binary1 $@/Contents/Info.plist
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index eed481e31a..70b1985dcc 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -739,6 +739,9 @@ libmacosx_plugin_la_RES += \
gui/macosx/Resources/vlc.scriptSuite \
gui/macosx/Resources/vlc.scriptTerminology
+libmacosx_plugin_la_RES += \
+ gui/macosx/Resources/InfoPlist.strings
+
if ENABLE_MACOSX_UI
dist_libmacosx_plugin_la_DATA = $(libmacosx_plugin_la_RES)
endif
diff --git a/modules/gui/macosx/Resources/InfoPlist.strings.in
b/modules/gui/macosx/Resources/InfoPlist.strings
similarity index 100%
rename from modules/gui/macosx/Resources/InfoPlist.strings.in
rename to modules/gui/macosx/Resources/InfoPlist.strings
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS package: Simplify installation of locales
vlc/vlc-3.0 | branch: master | David Fuhrmann | Sat
Feb 3 17:51:45 2018 +0100| [be20a6e399738a2575bb6ccd8b7cc5a32439563a] |
committer: David Fuhrmann
macOS package: Simplify installation of locales
The prefix already contains the correct directory structure for
locale, just copy this one over. Also, remove lots of xx.lproj
folders inside Resources, and install the untranslated xibs into
Base.lproj, as it is recommended by apple.
Instead, set a key in Info.plist, which fixes translation of system
dialogs, behaviour is the same as before.
(cherry picked from commit 4a410a2a255f8bcce0e86f1b3e253f91c613c0cd)
(edited)
Signed-off-by: David Fuhrmann
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=be20a6e399738a2575bb6ccd8b7cc5a32439563a
---
extras/package/macosx/package.mak | 14 --
share/Info.plist.in | 2 ++
2 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index b56d68b372..2d6b3ff962 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -5,7 +5,7 @@ endif
# Symlink a pseudo-bundle
pseudo-bundle:
$(MKDIR_P) $(top_builddir)/bin/Contents/Resources/
- $(LN_S) -hf $(abs_top_builddir)/modules/gui/macosx/UI
$(top_builddir)/bin/Contents/Resources/English.lproj
+ $(LN_S) -hf $(abs_top_builddir)/modules/gui/macosx/UI
$(top_builddir)/bin/Contents/Resources/Base.lproj
$(LN_S) -hf $(abs_top_builddir)/share/macosx/Info.plist
$(top_builddir)/bin/Contents/Info.plist
$(LN_S) -hf $(CONTRIB_DIR)/Frameworks
cd $(top_builddir)/bin/Contents/Resources/ && find
$(abs_top_srcdir)/modules/gui/macosx/Resources/ -type f -exec $(LN_S) -f {} \;
@@ -17,7 +17,7 @@ VLC.app: install
## Copy Contents
cp -R $(prefix)/share/macosx/ $@
## Copy .strings file and .nib files
- cp -R $(top_builddir)/modules/gui/macosx/UI
$@/Contents/Resources/English.lproj
+ cp -R $(top_builddir)/modules/gui/macosx/UI
$@/Contents/Resources/Base.lproj
## Copy Info.plist and convert to binary
cp -R $(top_builddir)/share/macosx/Info.plist $@/Contents/
xcrun plutil -convert binary1 $@/Contents/Info.plist
@@ -30,7 +30,7 @@ endif
if HAVE_BREAKPAD
cp -R $(CONTRIB_DIR)/Frameworks/Breakpad.framework
$@/Contents/Frameworks
endif
- mkdir -p $@/Contents/MacOS/share/locale/
+ mkdir -p $@/Contents/MacOS/share/
if BUILD_LUA
## Copy lua scripts
cp -r "$(prefix)/share/vlc/lua" $@/Contents/MacOS/share/
@@ -42,13 +42,7 @@ endif
mkdir -p $@/Contents/MacOS/include/
(cd "$(prefix)/include" && $(AMTAR) -c --exclude "plugins" vlc) |
$(AMTAR) -x -C $@/Contents/MacOS/include/
## Copy translations
- cat $(top_srcdir)/po/LINGUAS | while read i; do \
- $(INSTALL) -d $@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES ; \
- $(INSTALL) $(srcdir)/po/$${i}.gmo
$@/Contents/MacOS/share/locale/$${i}/LC_MESSAGES/vlc.mo; \
- mkdir -p $@/Contents/Resources/$${i}.lproj/ ; \
- $(LN_S) -f ../English.lproj/InfoPlist.strings
../English.lproj/MainMenu.nib \
- $@/Contents/Resources/$${i}.lproj/ ; \
- done
+ cp -r "$(prefix)/share/locale" $@/Contents/MacOS/share/
printf "APPLVLC#" >| $@/Contents/PkgInfo
## Copy libs
mkdir -p $@/Contents/MacOS/lib
diff --git a/share/Info.plist.in b/share/Info.plist.in
index 68fd5e71e1..378c0fd70b 100644
--- a/share/Info.plist.in
+++ b/share/Info.plist.in
@@ -6,6 +6,8 @@
English
NSRequiresAquaSystemAppearance
+ CFBundleAllowMixedLocalizations
+
CFBundleDocumentTypes
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Remove HumanReadableCopyright from InfoPlist.strings
vlc/vlc-3.0 | branch: master | David Fuhrmann | Sat Oct 17 12:26:31 2020 +0200| [94df25b30867601a530993efce43199265f2e750] | committer: David Fuhrmann macosx: Remove HumanReadableCopyright from InfoPlist.strings The translation file should not need to be generated by the build system to allow more simple translation. In this case the string cannot be reconstructed during runtime (its read out by the OS), thus drop the translation. (cherry picked from commit 971705e799e978338e60bf6b3b1d130991e1ab3f) Signed-off-by: David Fuhrmann > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=94df25b30867601a530993efce43199265f2e750 --- modules/gui/macosx/Resources/InfoPlist.strings.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/gui/macosx/Resources/InfoPlist.strings.in b/modules/gui/macosx/Resources/InfoPlist.strings.in index 6c2ca0db83..2f109b7715 100644 --- a/modules/gui/macosx/Resources/InfoPlist.strings.in +++ b/modules/gui/macosx/Resources/InfoPlist.strings.in @@ -1,7 +1,5 @@ /* Localized versions of Info.plist keys */ -"NSHumanReadableCopyright" = "Copyright (c) @COPYRIGHT_YEARS@ VLC authors and VideoLAN"; - "NSCameraUsageDescription" = "VLC uses the camera to record some video."; "NSMicrophoneUsageDescription" = "VLC uses the microphone to record some audio."; "NSAppleEventsUsageDescription" = "VLC uses apple events to control external media players."; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macos info.plist strings: Factorize translatable strings
vlc/vlc-3.0 | branch: master | David Fuhrmann | Sun May 19 11:53:24 2019 +0200| [19287f00d3b76a8e949094a088599e2b54b9ce92] | committer: David Fuhrmann macos info.plist strings: Factorize translatable strings Some strings do not need to be translated here. CFBundleGetInfoString is replaced by NSHumanReadableCopyright, therefore not needed anymore. The usage strings always need to be in Info.plist as a fallback, otherwise the app might crash if a translated version is not found. (cherry picked from commit 17ff486e0c3b42cb15840fbaebe648c85993c969) Signed-off-by: David Fuhrmann > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=19287f00d3b76a8e949094a088599e2b54b9ce92 --- modules/gui/macosx/Resources/InfoPlist.strings.in | 4 share/Info.plist.in | 14 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/modules/gui/macosx/Resources/InfoPlist.strings.in b/modules/gui/macosx/Resources/InfoPlist.strings.in index 67121a26aa..6c2ca0db83 100644 --- a/modules/gui/macosx/Resources/InfoPlist.strings.in +++ b/modules/gui/macosx/Resources/InfoPlist.strings.in @@ -1,9 +1,5 @@ /* Localized versions of Info.plist keys */ -"CFBundleName" = "VLC"; -"CFBundleDisplayName" = "VLC"; -"CFBundleShortVersionString" = "@VERSION@"; -"CFBundleGetInfoString" = "@COPYRIGHT_MESSAGE@"; "NSHumanReadableCopyright" = "Copyright (c) @COPYRIGHT_YEARS@ VLC authors and VideoLAN"; "NSCameraUsageDescription" = "VLC uses the camera to record some video."; diff --git a/share/Info.plist.in b/share/Info.plist.in index 711721fdee..68fd5e71e1 100644 --- a/share/Info.plist.in +++ b/share/Info.plist.in @@ -1373,8 +1373,6 @@ CFBundleExecutable VLC - CFBundleGetInfoString - @COPYRIGHT_MESSAGE@ CFBundleIconFile VLC.icns CFBundleIdentifier @@ -1385,10 +1383,10 @@ VLC media player CFBundleDisplayName VLC - CFBundlePackageType - APPL CFBundleShortVersionString @VERSION@ + CFBundlePackageType + APPL CFBundleSignature VLC# BreakpadProduct @@ -1399,6 +1397,14 @@ 1 BreakpadURL @BREAKPAD_URL@/reports + NSHumanReadableCopyright + Copyright (c) @COPYRIGHT_YEARS@ VLC authors and VideoLAN + NSCameraUsageDescription + VLC uses the camera to record some video. + NSMicrophoneUsageDescription + VLC uses the microphone to record some audio. + NSAppleEventsUsageDescription + VLC uses apple events to control external media players. CFBundleURLTypes ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: InfoPlist: Add strings for ressource usages
vlc/vlc-3.0 | branch: master | David Fuhrmann | Sat Feb 2 11:25:28 2019 +0100| [7d8be8d23c0256d3fb7e258aad3251881c9964a5] | committer: David Fuhrmann macosx: InfoPlist: Add strings for ressource usages Those strings must be provided once VLC is compiled with 10.14 sdk, otherwise VLC crashes. One todo is to translate those strings, see #21871. (cherry picked from commit 33c51004531a10f5daa895f74690376ac2deb67c) Signed-off-by: David Fuhrmann > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=7d8be8d23c0256d3fb7e258aad3251881c9964a5 --- modules/gui/macosx/Resources/InfoPlist.strings.in | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/gui/macosx/Resources/InfoPlist.strings.in b/modules/gui/macosx/Resources/InfoPlist.strings.in index 1bb41d7924..67121a26aa 100644 --- a/modules/gui/macosx/Resources/InfoPlist.strings.in +++ b/modules/gui/macosx/Resources/InfoPlist.strings.in @@ -1,7 +1,11 @@ /* Localized versions of Info.plist keys */ -CFBundleName = "VLC"; -CFBundleDisplayName = "VLC"; -CFBundleShortVersionString = "@VERSION@"; -CFBundleGetInfoString = "@COPYRIGHT_MESSAGE@"; -NSHumanReadableCopyright = "Copyright (c) @COPYRIGHT_YEARS@ VLC authors and VideoLAN"; +"CFBundleName" = "VLC"; +"CFBundleDisplayName" = "VLC"; +"CFBundleShortVersionString" = "@VERSION@"; +"CFBundleGetInfoString" = "@COPYRIGHT_MESSAGE@"; +"NSHumanReadableCopyright" = "Copyright (c) @COPYRIGHT_YEARS@ VLC authors and VideoLAN"; + +"NSCameraUsageDescription" = "VLC uses the camera to record some video."; +"NSMicrophoneUsageDescription" = "VLC uses the microphone to record some audio."; +"NSAppleEventsUsageDescription" = "VLC uses apple events to control external media players."; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Fix display of copyright message
vlc/vlc-3.0 | branch: master | David Fuhrmann | Thu
Dec 3 06:28:36 2020 +0100| [b16d96ddd3680add14468412b7df9c3ca76da9fe] |
committer: David Fuhrmann
macosx: Fix display of copyright message
This string is not in the localized info.plist anymore.
(manual bp of 9f81ba8e3ece2903796886e3229202fafe86)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=b16d96ddd3680add14468412b7df9c3ca76da9fe
---
modules/gui/macosx/VLCAboutWindowController.m | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/modules/gui/macosx/VLCAboutWindowController.m
b/modules/gui/macosx/VLCAboutWindowController.m
index bd0f6783f6..f11e7fe191 100644
--- a/modules/gui/macosx/VLCAboutWindowController.m
+++ b/modules/gui/macosx/VLCAboutWindowController.m
@@ -87,11 +87,8 @@
{
[[self window] setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
-/* Get the localized info dictionary (InfoPlist.strings) */
-NSDictionary *localizedInfoDict = [[NSBundle mainBundle]
localizedInfoDictionary];
-
-/* Setup the copyright field */
-[o_copyright_field setStringValue: [localizedInfoDict
objectForKey:@"NSHumanReadableCopyright"]];
+NSString *copyrightText = [[[NSBundle mainBundle] infoDictionary]
objectForKey:@"NSHumanReadableCopyright"];
+[o_copyright_field setStringValue: copyrightText];
/* l10n */
[[self window] setTitle: _NS("About VLC media player")];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: nettle: fix build with CC_FOR_BUILD set to recent clang
vlc/vlc-3.0 | branch: master | David Fuhrmann | Mon Nov 30 09:21:33 2020 +0100| [bf0b8c691d251f0a77dec378a2bc8dc0d7a408de] | committer: Felix Paul Kühne contrib: nettle: fix build with CC_FOR_BUILD set to recent clang See upstream https://git.lysator.liu.se/nettle/nettle/-/merge_requests/9/diffs Signed-off-by: Felix Paul Kühne > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=bf0b8c691d251f0a77dec378a2bc8dc0d7a408de --- contrib/src/nettle/fix-cc-for-build.patch | 34 +++ contrib/src/nettle/rules.mak | 3 ++- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/contrib/src/nettle/fix-cc-for-build.patch b/contrib/src/nettle/fix-cc-for-build.patch new file mode 100644 index 00..37826f7820 --- /dev/null +++ b/contrib/src/nettle/fix-cc-for-build.patch @@ -0,0 +1,34 @@ +From 91df68136ad1562cf9217599254706d8cfa970ea Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Adrien=20B=C3=A9raud?= +Date: Sun, 20 Sep 2020 19:35:54 +0200 +Subject: [PATCH] m4: follow GMP changes for GMP_PROG_CC_FOR_BUILD + +--- + aclocal.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/aclocal.m4 b/aclocal.m4 +index 513b2df4..e81e0351 100644 +--- a/aclocal.m4 b/aclocal.m4 +@@ -369,7 +369,7 @@ cat >conftest.c <https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Revert "l10n: Czech update"
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed Dec 2 22:48:52 2020 +0100| [e68ee71c385c706f3215a5feffb5fc8422d63d9c] | committer: David Fuhrmann Revert "l10n: Czech update" Breaks build: cs.po:1289: Formatspezifikation in »msgid« und »msgstr« für Argument 1 sind nicht identisch This reverts commit 17144fd9bff0982b86e3b6df0298da366f6df0be. > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e68ee71c385c706f3215a5feffb5fc8422d63d9c --- po/cs.po | 90 ++-- 1 file changed, 36 insertions(+), 54 deletions(-) diff --git a/po/cs.po b/po/cs.po index 8aa71285b0..8fc7783e1e 100644 --- a/po/cs.po +++ b/po/cs.po @@ -6,30 +6,32 @@ # Daniel Pastera , 2016 # Jiri Sedlak , 2017 # Kamil Páral , 2009 -# Lukáš Spurný , 2018 # Martin Zicha , 2012 # Michal Vašíček , 2017 # Miroslav Oujeský , 2006 -# Pavel Řehák , 2018 +# Sofartin , 2013 +# dreddux , 2012 # Petr Dolejší , 2019 # Petr Nekvinda , 2015 # Petr Šimáček , 2012 -# Roman Horník , 2016,2020 +# Roman Horník , 2016 # Roman Ondráček , 2014-2015 # Tadeáš Valenta , 2019 -# Tomáš Chvátal , 2014-2020 +# Tomáš Chvátal , 2014-2018 # Tomáš Souček , 2014 # Václav Pavlíček , 2012 # Vít Pelčák , 2012,2015,2016,2018 # Vojtěch Smejkal , 2009 # Zuzana Wolfová , 2014 +# Lukáš Spurný , 2018 +# Pavel Řehák , 2018 msgid "" msgstr "" "Project-Id-Version: vlc 3.0.9\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2020-03-24 21:54+0100\n" -"PO-Revision-Date: 2020-11-08 15:49+0100\n" -"Last-Translator: Fourdee Foureight , 2020\n" +"PO-Revision-Date: 2019-06-30 19:28+0200\n" +"Last-Translator: Petr Dolejší , 2019\n" "Language-Team: Czech (https://www.transifex.com/yaron/teams/16553/cs/)\n" "Language: cs\n" "MIME-Version: 1.0\n" @@ -1238,17 +1240,17 @@ msgstr "Projekce" #: src/input/es_out.c:3293 msgctxt "ViewPoint" msgid "Yaw" -msgstr "Natočení" +msgstr "" #: src/input/es_out.c:3295 msgctxt "ViewPoint" msgid "Pitch" -msgstr "Klopení" +msgstr "" #: src/input/es_out.c:3297 msgctxt "ViewPoint" msgid "Roll" -msgstr "Náklon" +msgstr "" #: src/input/es_out.c:3300 msgctxt "ViewPoint" @@ -1286,7 +1288,7 @@ msgstr "Titulky" #: src/input/input.c:1821 modules/control/hotkeys.c:1512 #, c-format msgid "Volume %ld%%" -msgstr "Hlasitost %Id%%" +msgstr "" #: src/input/input.c:2725 msgid "Your input can't be opened" @@ -1851,7 +1853,7 @@ msgstr "Výchozí zesílení přehrávání" #: src/libvlc-module.c:223 msgid "This is the gain used for stream without replay gain information" -msgstr "Zisk použitý pro stream bez informací o získání přehrávání" +msgstr "Toto je zisk použitý pro stream bez informací o získání přehrávání" #: src/libvlc-module.c:225 msgid "Peak protection" @@ -4185,7 +4187,7 @@ msgstr "Vyberte předchozí DVD titul" #: src/libvlc-module.c:1308 msgid "Select the key to choose the previous title from the DVD" -msgstr "Vyberte klávesu pro výběr předchozího titulu na DVD" +msgstr "" #: src/libvlc-module.c:1309 msgid "Select next DVD title" @@ -4201,7 +4203,7 @@ msgstr "Vyberte předchozí kapitolu DVD" #: src/libvlc-module.c:1312 msgid "Select the key to choose the previous chapter from the DVD" -msgstr "Vyberte klávesu pro výběr předchozí kapitoly na DVD" +msgstr "" #: src/libvlc-module.c:1313 msgid "Select next DVD chapter" @@ -4268,7 +4270,7 @@ msgstr "Zmenšit text titulků" #: src/libvlc-module.c:1328 msgid "Select the key to change subtitles text scaling" -msgstr "Vyberte klávesu pro změnu velikosti textu titulků." +msgstr "" #: src/libvlc-module.c:1329 msgid "Subtitle sync / bookmark audio timestamp" @@ -4477,7 +4479,7 @@ msgstr "10. záložka seznamu skladeb" #: src/libvlc-module.c:1387 msgid "This allows you to define playlist bookmarks." -msgstr "Toto umožňuje definovat záložky v playlistech." +msgstr "" #: src/libvlc-module.c:1389 msgid "Cycle audio track" @@ -4489,11 +4491,11 @@ msgstr "Procházet dostupnými zvukovými stopami (jazyky)." #: src/libvlc-module.c:1391 msgid "Cycle subtitle track in reverse order" -msgstr "Procházet stopami titulků pozpátku" +msgstr "" #: src/libvlc-module.c:1392 msgid "Cycle through the available subtitle tracks in reverse order." -msgstr "Procházet dostupnými stopami titulků pozpátku." +msgstr "" #: src/libvlc-module.c:1393 ms
[vlc-commits] Revert "l10n: Romanian update"
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed Dec 2 22:53:36 2020 +0100| [0edbf097df010f04e1d0b70ab938385b58430fc7] | committer: David Fuhrmann Revert "l10n: Romanian update" Breaks build: ro.po:1187: die Anzahl der Formatspezifikationen in »msgid« und »msgstr« stimmt nicht überein This reverts commit c96c8e991afc6227b3c793d4ac98572002675d46. > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0edbf097df010f04e1d0b70ab938385b58430fc7 --- po/ro.po | 36 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/po/ro.po b/po/ro.po index a708f0cf83..b25ded9f89 100644 --- a/po/ro.po +++ b/po/ro.po @@ -20,8 +20,8 @@ msgstr "" "Project-Id-Version: vlc 3.0.9\n" "Report-Msgid-Bugs-To: vlc-de...@videolan.org\n" "POT-Creation-Date: 2020-03-24 21:54+0100\n" -"PO-Revision-Date: 2020-09-22 11:29+0200\n" -"Last-Translator: Chirita Edward , 2020\n" +"PO-Revision-Date: 2019-05-20 11:46+0200\n" +"Last-Translator: Eduard Pintilie , 2019\n" "Language-Team: Romanian (https://www.transifex.com/yaron/teams/16553/ro/)\n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -672,7 +672,7 @@ msgstr "Spectru" #: src/audio_output/output.c:275 msgid "VU meter" -msgstr "VU metru" +msgstr "" #: src/audio_output/output.c:314 src/libvlc-module.c:201 msgid "Audio filters" @@ -1002,7 +1002,7 @@ msgstr "Da" #: src/input/es_out.c:2141 #, c-format msgid "DTVCC Closed captions %u" -msgstr "Subtitrări DTVCC %u" +msgstr "" #: src/input/es_out.c:2143 #, c-format @@ -1179,12 +1179,12 @@ msgstr "Funcția de transfer de culoare" #: src/input/es_out.c:3253 msgid "Color space" -msgstr "Spațiu culori" +msgstr "" #: src/input/es_out.c:3253 #, c-format msgid "%s Range" -msgstr "Gamă" +msgstr "" #: src/input/es_out.c:3255 msgid "Full" @@ -1219,7 +1219,7 @@ msgstr "Centru jos" #: src/input/es_out.c:3270 msgid "Chroma location" -msgstr "Locație chroma" +msgstr "" #: src/input/es_out.c:3279 msgid "Rectangular" @@ -1227,11 +1227,11 @@ msgstr "Dreptunghiular" #: src/input/es_out.c:3282 msgid "Equirectangular" -msgstr "Equirectangular" +msgstr "" #: src/input/es_out.c:3285 msgid "Cubemap" -msgstr "Cubemap" +msgstr "" #: src/input/es_out.c:3291 msgid "Projection" @@ -1245,7 +1245,7 @@ msgstr "Girație" #: src/input/es_out.c:3295 msgctxt "ViewPoint" msgid "Pitch" -msgstr "Ton" +msgstr "" #: src/input/es_out.c:3297 msgctxt "ViewPoint" @@ -1255,7 +1255,7 @@ msgstr "" #: src/input/es_out.c:3300 msgctxt "ViewPoint" msgid "Field of view" -msgstr "Câmp de vizualizare" +msgstr "" #: src/input/es_out.c:3305 msgid "Max. luminance" @@ -1279,7 +1279,7 @@ msgstr "" #: src/input/es_out.c:3339 msgid "White point" -msgstr "Punctul alb" +msgstr "" #: src/input/es_out.c:3354 modules/access/imem.c:64 msgid "Subtitle" @@ -1654,11 +1654,11 @@ msgstr "" #: src/libvlc-module.c:129 msgid "Media role" -msgstr "Rolul media" +msgstr "" #: src/libvlc-module.c:130 msgid "Media (player) role for operating system policy." -msgstr "Rolul media (player) pentru politica sistemului de operare." +msgstr "" #: src/libvlc-module.c:132 modules/gui/macosx/VLCSimplePrefsController.m:273 #: modules/stream_out/display.c:40 modules/gui/qt/ui/sprefs_audio.h:407 @@ -1758,7 +1758,7 @@ msgstr "" #: src/libvlc-module.c:174 msgid "Force S/PDIF support" -msgstr "Forțează suportul S/PDIF" +msgstr "" #: src/libvlc-module.c:176 msgid "" @@ -6216,6 +6216,10 @@ msgstr "Captură audio" msgid "AVFoundation audio capture module." msgstr "Modul de ieșire audio" +#: modules/access/avcapture.m:66 +msgid "AVFoundation Video Capture" +msgstr "" + #: modules/access/avcapture.m:67 msgid "AVFoundation video capture module." msgstr "" @@ -8320,7 +8324,7 @@ msgstr "" #: modules/access/satip.c:64 msgid "Request server to send stream as multicast" -msgstr "Cere serverului să trimită fluxul ca și multicast" +msgstr "" #: modules/access/satip.c:66 modules/lua/vlc.c:62 #: share/lua/http/dialogs/stream_config_window.html:28 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: fix make dist after language update
vlc | branch: master | David Fuhrmann | Wed Dec 2 20:16:50 2020 +0100| [21e9016865f72f517ca7f0c5ec49f64a60223fa4] | committer: David Fuhrmann macosx: fix make dist after language update > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=21e9016865f72f517ca7f0c5ec49f64a60223fa4 --- modules/gui/macosx/Makefile.am | 28 ++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am index 90a629aa85..04258c3122 100644 --- a/modules/gui/macosx/Makefile.am +++ b/modules/gui/macosx/Makefile.am @@ -489,8 +489,32 @@ libmacosx_plugin_la_RES += \ gui/macosx/Resources/vlc.scriptSuite \ gui/macosx/Resources/vlc.scriptTerminology -libmacosx_plugin_la_RES += \ - gui/macosx/Resources/Base.lproj/InfoPlist.strings +EXTRA_DIST += \ + gui/macosx/Resources/Base.lproj/InfoPlist.strings \ + gui/macosx/Resources/ar.lproj/InfoPlist.strings \ + gui/macosx/Resources/bg.lproj/InfoPlist.strings \ + gui/macosx/Resources/ca.lproj/InfoPlist.strings \ + gui/macosx/Resources/cs.lproj/InfoPlist.strings \ + gui/macosx/Resources/de.lproj/InfoPlist.strings \ + gui/macosx/Resources/el.lproj/InfoPlist.strings \ + gui/macosx/Resources/es.lproj/InfoPlist.strings \ + gui/macosx/Resources/fr.lproj/InfoPlist.strings \ + gui/macosx/Resources/gl.lproj/InfoPlist.strings \ + gui/macosx/Resources/he.lproj/InfoPlist.strings \ + gui/macosx/Resources/hu.lproj/InfoPlist.strings \ + gui/macosx/Resources/it.lproj/InfoPlist.strings \ + gui/macosx/Resources/ja.lproj/InfoPlist.strings \ + gui/macosx/Resources/lv.lproj/InfoPlist.strings \ + gui/macosx/Resources/nl.lproj/InfoPlist.strings \ + gui/macosx/Resources/pl.lproj/InfoPlist.strings \ + gui/macosx/Resources/pt-BR.lproj/InfoPlist.strings \ + gui/macosx/Resources/pt-PT.lproj/InfoPlist.strings \ + gui/macosx/Resources/sk.lproj/InfoPlist.strings \ + gui/macosx/Resources/sl.lproj/InfoPlist.strings \ + gui/macosx/Resources/sv.lproj/InfoPlist.strings \ + gui/macosx/Resources/tr.lproj/InfoPlist.strings \ + gui/macosx/Resources/uk.lproj/InfoPlist.strings \ + gui/macosx/Resources/zh-Hans.lproj/InfoPlist.strings if ENABLE_MACOSX_UI dist_libmacosx_plugin_la_DATA = $(libmacosx_plugin_la_RES) ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS package: Install InfoPlist.strings for different langs
vlc | branch: master | David Fuhrmann | Wed Dec 2
19:53:31 2020 +0100| [5b6d90bada44fc99ca0adf029d5ba5df5a496ae4] | committer:
David Fuhrmann
macOS package: Install InfoPlist.strings for different langs
Also, move the template file, InfoPlist.strings, into Base.lproj
to simplify the install rules.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5b6d90bada44fc99ca0adf029d5ba5df5a496ae4
---
extras/package/macosx/package.mak | 4 ++--
modules/gui/macosx/Makefile.am | 2 +-
modules/gui/macosx/Resources/{ => Base.lproj}/InfoPlist.strings | 0
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index af41f0fbae..21d5c4292b 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -26,8 +26,8 @@ VLC.app: macos-install
## Copy Contents
cp -R "$(macos_destdir)$(datadir)/macosx/" $@
## Copy .strings file and .nib files
- cp -R "$(top_builddir)/modules/gui/macosx/UI"
$@/Contents/Resources/Base.lproj
- cp "$(srcdir)/modules/gui/macosx/Resources/InfoPlist.strings"
$@/Contents/Resources/Base.lproj/
+ cp -R "$(srcdir)/modules/gui/macosx/Resources/"*.lproj
$@/Contents/Resources/
+ cp -R "$(top_builddir)/modules/gui/macosx/UI/."
$@/Contents/Resources/Base.lproj/
## Copy Info.plist and convert to binary
cp -R "$(top_builddir)/share/macosx/Info.plist" $@/Contents/
xcrun plutil -convert binary1 $@/Contents/Info.plist
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 9540ae5bd7..90a629aa85 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -490,7 +490,7 @@ libmacosx_plugin_la_RES += \
gui/macosx/Resources/vlc.scriptTerminology
libmacosx_plugin_la_RES += \
- gui/macosx/Resources/InfoPlist.strings
+ gui/macosx/Resources/Base.lproj/InfoPlist.strings
if ENABLE_MACOSX_UI
dist_libmacosx_plugin_la_DATA = $(libmacosx_plugin_la_RES)
diff --git a/modules/gui/macosx/Resources/InfoPlist.strings
b/modules/gui/macosx/Resources/Base.lproj/InfoPlist.strings
similarity index 100%
rename from modules/gui/macosx/Resources/InfoPlist.strings
rename to modules/gui/macosx/Resources/Base.lproj/InfoPlist.strings
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS build: fix pseudo package
vlc | branch: master | David Fuhrmann | Wed Dec 2
20:17:27 2020 +0100| [4f34f66f5eaddf3d88fa8a7f5dc839bb2c012103] | committer:
David Fuhrmann
macOS build: fix pseudo package
No need to link InfoPlist.strings files here.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=4f34f66f5eaddf3d88fa8a7f5dc839bb2c012103
---
extras/package/macosx/package.mak | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 21d5c4292b..c71879def2 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -11,7 +11,7 @@ pseudo-bundle:
$(LN_S) -nf $(abs_top_builddir)/modules/gui/macosx/UI
$(top_builddir)/bin/Contents/Resources/Base.lproj
$(LN_S) -nf $(abs_top_builddir)/share/macosx/Info.plist
$(top_builddir)/bin/Contents/Info.plist
$(LN_S) -nf $(CONTRIB_DIR)/Frameworks
- cd $(top_builddir)/bin/Contents/Resources/ && find
$(abs_top_srcdir)/modules/gui/macosx/Resources/ -type f -exec $(LN_S) -f {} \;
+ cd $(top_builddir)/bin/Contents/Resources/ && find
$(abs_top_srcdir)/modules/gui/macosx/Resources/ -type f -not -path "*.lproj/*"
-exec $(LN_S) -f {} \;
macos-install:
rm -Rf "$(macos_destdir)"
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Fix display of copyright message
vlc | branch: master | David Fuhrmann | Wed Dec 2
00:15:33 2020 +0100| [9f81ba8e3ece2903796886e3229202fafe86] | committer:
David Fuhrmann
macosx: Fix display of copyright message
This string is not in the localized info.plist anymore.
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9f81ba8e3ece2903796886e3229202fafe86
---
modules/gui/macosx/windows/VLCAboutWindowController.m | 7 ++-
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/modules/gui/macosx/windows/VLCAboutWindowController.m
b/modules/gui/macosx/windows/VLCAboutWindowController.m
index 94daa7740e..411eac8f44 100644
--- a/modules/gui/macosx/windows/VLCAboutWindowController.m
+++ b/modules/gui/macosx/windows/VLCAboutWindowController.m
@@ -88,11 +88,8 @@
{
[[self window] setCollectionBehavior:
NSWindowCollectionBehaviorFullScreenAuxiliary];
-/* Get the localized info dictionary (InfoPlist.strings) */
-NSDictionary *localizedInfoDict = [[NSBundle mainBundle]
localizedInfoDictionary];
-
-/* Setup the copyright field */
-[o_copyright_field setStringValue: [localizedInfoDict
objectForKey:@"NSHumanReadableCopyright"]];
+NSString *copyrightText = [[[NSBundle mainBundle] infoDictionary]
objectForKey:@"NSHumanReadableCopyright"];
+[o_copyright_field setStringValue: copyrightText];
/* l10n */
[[self window] setTitle: _NS("About VLC media player")];
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS build.sh: Use default macosx SDK for xcodebuild targets
vlc/vlc-3.0 | branch: master | David Fuhrmann | Mon
Nov 16 20:22:20 2020 +0100| [35601c58e182dc18601dfd3f8bc00d861d025878] |
committer: David Fuhrmann
macOS build.sh: Use default macosx SDK for xcodebuild targets
xcodebuild only allows to use an SDK which is bundled inside the
corresponding Xcode.app package. If you pass a different SDK
stored in another location, it bails out with:
xcodebuild: error: SDK "..." cannot be located.
Therefore, do not set an external SDK for contribs, but use
the default one.
This restores the behaviour we had previously for the 3.x branch.
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=35601c58e182dc18601dfd3f8bc00d861d025878
---
extras/package/macosx/build.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index d663cb4bfe..87a3129bb5 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -218,7 +218,8 @@ export OBJCFLAGS="-Werror=partial-availability"
export EXTRA_CFLAGS="-isysroot $SDKROOT
-mmacosx-version-min=$MINIMAL_OSX_VERSION
-DMACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION"
export EXTRA_LDFLAGS="-Wl,-syslibroot,$SDKROOT
-mmacosx-version-min=$MINIMAL_OSX_VERSION -isysroot $SDKROOT
-DMACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION"
-export XCODE_FLAGS="MACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION -sdk
$SDKROOT WARNING_CFLAGS=-Werror=partial-availability"
+# xcodebuild only allows to set a build-in sdk, not a custom one. Therefore
use the default included SDK here
+export XCODE_FLAGS="MACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION -sdk macosx
WARNING_CFLAGS=-Werror=partial-availability"
info "Building contribs"
spushd "${vlcroot}/contrib"
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS build.sh: Drop OSX_VERSION
vlc/vlc-3.0 | branch: master | David Fuhrmann | Thu
Nov 12 20:37:42 2020 +0100| [399b29adb151bb1cdaa007b4e76189a30e171c08] |
committer: David Fuhrmann
macOS build.sh: Drop OSX_VERSION
This is not needed anymore.
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=399b29adb151bb1cdaa007b4e76189a30e171c08
---
extras/package/macosx/build.sh | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 88d57aa4a2..d663cb4bfe 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -10,7 +10,6 @@ info()
ARCH="x86_64"
MINIMAL_OSX_VERSION="10.7"
-OSX_VERSION=$(xcrun --show-sdk-version)
OSX_KERNELVERSION=`uname -r | cut -d. -f1`
SDKROOT=$(xcrun --show-sdk-path)
VLCBUILDDIR=""
@@ -135,7 +134,6 @@ fi
export CC="`xcrun --find clang`"
export CXX="`xcrun --find clang++`"
export OBJC="`xcrun --find clang`"
-export OSX_VERSION
export SDKROOT
export
PATH="${vlcroot}/extras/tools/build/bin:${vlcroot}/contrib/${TRIPLET}/bin:$python3Path:${VLC_PATH}:/bin:/sbin:/usr/bin:/usr/sbin"
@@ -220,7 +218,7 @@ export OBJCFLAGS="-Werror=partial-availability"
export EXTRA_CFLAGS="-isysroot $SDKROOT
-mmacosx-version-min=$MINIMAL_OSX_VERSION
-DMACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION"
export EXTRA_LDFLAGS="-Wl,-syslibroot,$SDKROOT
-mmacosx-version-min=$MINIMAL_OSX_VERSION -isysroot $SDKROOT
-DMACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION"
-export XCODE_FLAGS="MACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION -sdk
macosx$OSX_VERSION WARNING_CFLAGS=-Werror=partial-availability"
+export XCODE_FLAGS="MACOSX_DEPLOYMENT_TARGET=$MINIMAL_OSX_VERSION -sdk
$SDKROOT WARNING_CFLAGS=-Werror=partial-availability"
info "Building contribs"
spushd "${vlcroot}/contrib"
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: caca: Disable build on darwin OS
vlc/vlc-3.0 | branch: master | David Fuhrmann | Sun Nov 15 13:04:20 2020 +0100| [42e03c51b4455f6a921ce07ebef1c96f0ce6c1d4] | committer: David Fuhrmann contrib: caca: Disable build on darwin OS This does not build anymore with recent ncurses, and the caca vlc module is also disabled by default. Thus disable the contrib as well. (manual backport of 2a988cc4624dd388f9c1af1d8f0fc78ca89939ef) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=42e03c51b4455f6a921ce07ebef1c96f0ce6c1d4 --- contrib/src/caca/rules.mak | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/src/caca/rules.mak b/contrib/src/caca/rules.mak index f1f2a31ef7..4f5f300261 100644 --- a/contrib/src/caca/rules.mak +++ b/contrib/src/caca/rules.mak @@ -2,9 +2,12 @@ CACA_VERSION := 0.99.beta17 CACA_URL := http://caca.zoy.org/files/libcaca/libcaca-$(CACA_VERSION).tar.gz +ifndef HAVE_DARWIN_OS ifndef HAVE_LINUX # see VLC Trac 17251 PKGS += caca endif +endif + ifeq ($(call need_pkg,"caca >= 0.99.beta14"),) PKGS_FOUND += caca endif ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: bootstrap: Simplify macOS sdk detection
vlc/vlc-3.0 | branch: master | David Fuhrmann | Thu
May 31 01:12:22 2018 +0200| [d2326c1163882dd4ed92ef24ae2390cddd753ce4] |
committer: David Fuhrmann
contrib: bootstrap: Simplify macOS sdk detection
Just use xcrun --show-sdk-path to get the default SDK patch.
This also finds all other variants checked by the other tests.
(cherry picked from commit cddeb563f53168ac859d1b32e08e8212dc93a50c)
Signed-off-by: David Fuhrmann
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=d2326c1163882dd4ed92ef24ae2390cddd753ce4
---
contrib/bootstrap | 23 ---
1 file changed, 4 insertions(+), 19 deletions(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index 980b1f9e49..a847306c6b 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -223,28 +223,13 @@ check_macosx_sdk()
OSX_VERSION=`xcrun --show-sdk-version`
echo "OSX_VERSION not specified, assuming $OSX_VERSION"
fi
- if test -z "$SDKROOT"
- then
- SDKROOT=`xcode-select
-print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk
+ if [ -z "$SDKROOT" ]; then
+ SDKROOT=$(xcrun --show-sdk-path)
echo "SDKROOT not specified, assuming $SDKROOT"
fi
- if [ ! -d "${SDKROOT}" ]
- then
- SDKROOT_NOT_FOUND=`xcode-select
-print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk
- SDKROOT=`xcode-select -print-path`/SDKs/MacOSX$OSX_VERSION.sdk
- echo "SDKROOT not found at $SDKROOT_NOT_FOUND, trying $SDKROOT"
- fi
- if [ ! -d "${SDKROOT}" ]
- then
- SDKROOT_NOT_FOUND="$SDKROOT"
- SDKROOT=`xcrun --show-sdk-path`
- echo "SDKROOT not found at $SDKROOT_NOT_FOUND, trying $SDKROOT"
- fi
-
- if [ ! -d "${SDKROOT}" ]
- then
- echo "*** ${SDKROOT} does not exist, please install required SDK, or set
SDKROOT manually. ***"
+ if [ ! -d "$SDKROOT" ]; then
+ echo "*** $SDKROOT does not exist, please install required SDK, or set
SDKROOT manually. ***"
exit 1
fi
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS build.sh: Simplify detection of default SDKROOT
vlc/vlc-3.0 | branch: master | David Fuhrmann | Wed May 30 23:25:48 2018 +0200| [258aeb918a484022bbd21173359b2c28224819be] | committer: David Fuhrmann macOS build.sh: Simplify detection of default SDKROOT This fixes the build on macOS Catalina. (cherry picked from commit 48a31f50641027dd5c9c341b0de084630a7023c8) Signed-off-by: David Fuhrmann > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=258aeb918a484022bbd21173359b2c28224819be --- extras/package/macosx/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh index 4508354a9f..88d57aa4a2 100755 --- a/extras/package/macosx/build.sh +++ b/extras/package/macosx/build.sh @@ -10,9 +10,9 @@ info() ARCH="x86_64" MINIMAL_OSX_VERSION="10.7" -OSX_VERSION=`xcrun --show-sdk-version` +OSX_VERSION=$(xcrun --show-sdk-version) OSX_KERNELVERSION=`uname -r | cut -d. -f1` -SDKROOT=`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX$OSX_VERSION.sdk +SDKROOT=$(xcrun --show-sdk-path) VLCBUILDDIR="" CORE_COUNT=`getconf NPROCESSORS_ONLN 2>&1` ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: bootstrap: Remove OSX_VERSION from contrib system
vlc/vlc-3.0 | branch: master | David Fuhrmann | Thu
May 31 01:15:13 2018 +0200| [a47f8a5ba10f3829dee9ffaa6b7a9ae0c0848c9d] |
committer: David Fuhrmann
contrib: bootstrap: Remove OSX_VERSION from contrib system
This is not needed anymore.
(cherry picked from commit 9c0f44c40f88ea963a2a9495e41544bd0b8aa3bb)
Signed-off-by: David Fuhrmann
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a47f8a5ba10f3829dee9ffaa6b7a9ae0c0848c9d
---
contrib/bootstrap | 6 --
1 file changed, 6 deletions(-)
diff --git a/contrib/bootstrap b/contrib/bootstrap
index a847306c6b..5a33182722 100755
--- a/contrib/bootstrap
+++ b/contrib/bootstrap
@@ -218,11 +218,6 @@ check_ios_sdk()
check_macosx_sdk()
{
- if [ -z "${OSX_VERSION}" ]
- then
- OSX_VERSION=`xcrun --show-sdk-version`
- echo "OSX_VERSION not specified, assuming $OSX_VERSION"
- fi
if [ -z "$SDKROOT" ]; then
SDKROOT=$(xcrun --show-sdk-path)
echo "SDKROOT not specified, assuming $SDKROOT"
@@ -234,7 +229,6 @@ check_macosx_sdk()
fi
add_make "MACOSX_SDK=${SDKROOT}"
- add_make "OSX_VERSION ?= ${OSX_VERSION}"
}
check_android_sdk()
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] contrib: caca: Disable build on darwin OS
vlc | branch: master | David Fuhrmann | Sun Nov 15 18:20:54 2020 +0100| [2a988cc4624dd388f9c1af1d8f0fc78ca89939ef] | committer: David Fuhrmann contrib: caca: Disable build on darwin OS This does not build anymore with recent ncurses, and the caca vlc module is also disabled by default. Thus disable the contrib as well. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2a988cc4624dd388f9c1af1d8f0fc78ca89939ef --- contrib/src/caca/rules.mak | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/src/caca/rules.mak b/contrib/src/caca/rules.mak index 81f6fcda26..8b4c11a491 100644 --- a/contrib/src/caca/rules.mak +++ b/contrib/src/caca/rules.mak @@ -2,11 +2,14 @@ CACA_VERSION := 0.99.beta17 CACA_URL := http://caca.zoy.org/files/libcaca/libcaca-$(CACA_VERSION).tar.gz +ifndef HAVE_DARWIN_OS ifndef HAVE_LINUX # see VLC Trac 17251 ifndef HAVE_WINSTORE PKGS += caca endif endif +endif + ifeq ($(call need_pkg,"caca >= 0.99.beta14"),) PKGS_FOUND += caca endif ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Fix width of sidebar panel
vlc/vlc-3.0 | branch: master | David Fuhrmann | Sun Nov 8 19:14:49 2020 +0100| [c5d5da7b231ed9c3c7d7a4a28e219c7e29ff0013] | committer: David Fuhrmann macosx: Fix width of sidebar panel > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c5d5da7b231ed9c3c7d7a4a28e219c7e29ff0013 --- modules/gui/macosx/UI/MainWindow.xib | 113 ++- 1 file changed, 57 insertions(+), 56 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commitdiff;h=c5d5da7b231ed9c3c7d7a4a28e219c7e29ff0013 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Fix visual appearance of side bar icon
vlc/vlc-3.0 | branch: master | David Fuhrmann | Fri Nov 6 07:52:31 2020 +0100| [6d697b9e7b0a58332bde577a51854f4cd65c29e3] | committer: David Fuhrmann macosx: Fix visual appearance of side bar icon Fix padding of sidebar icons on macOS 11. > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=6d697b9e7b0a58332bde577a51854f4cd65c29e3 --- modules/gui/macosx/UI/MainWindow.xib| 141 modules/gui/macosx/VLCSourceListTableCellView.h | 4 + modules/gui/macosx/VLCSourceListTableCellView.m | 12 ++ 3 files changed, 86 insertions(+), 71 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commitdiff;h=6d697b9e7b0a58332bde577a51854f4cd65c29e3 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Improve creation of sidebar items
vlc/vlc-3.0 | branch: master | David Fuhrmann | Fri
Nov 6 07:52:54 2020 +0100| [57a0ec167dc9097faa5439d428f531c829c65579] |
committer: David Fuhrmann
macosx: Improve creation of sidebar items
Respect that the header and cell are two different classes.
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=57a0ec167dc9097faa5439d428f531c829c65579
---
modules/gui/macosx/VLCMainWindow.m | 25 +++--
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/modules/gui/macosx/VLCMainWindow.m
b/modules/gui/macosx/VLCMainWindow.m
index d4c18b561c..84d33a5ed4 100644
--- a/modules/gui/macosx/VLCMainWindow.m
+++ b/modules/gui/macosx/VLCMainWindow.m
@@ -1100,19 +1100,24 @@ static const float f_min_window_height = 307.;
- (NSView *)sourceList:(PXSourceList *)aSourceList viewForItem:(id)item
{
-VLCSourceListTableCellView *cellView = nil;
-if ([aSourceList levelForItem:item] == 0)
-cellView = [aSourceList makeViewWithIdentifier:@"HeaderCell"
owner:nil];
-else
-cellView = [aSourceList makeViewWithIdentifier:@"DataCell" owner:nil];
-
PXSourceListItem *sourceListItem = item;
+if ([aSourceList levelForItem:item] == 0) {
+PXSourceListTableCellView *cellView = [aSourceList
makeViewWithIdentifier:@"HeaderCell" owner:nil];
+
+cellView.textField.editable = NO;
+cellView.textField.selectable = NO;
+cellView.textField.stringValue = sourceListItem.title ?
sourceListItem.title : @"";
+
+return cellView;
+}
+
+VLCSourceListTableCellView * cellView = [aSourceList
makeViewWithIdentifier:@"DataCell" owner:nil];
+
cellView.textField.editable = NO;
cellView.textField.selectable = NO;
-
cellView.textField.stringValue = sourceListItem.title ?
sourceListItem.title : @"";
-cellView.imageView.image = [item icon];
+cellView.imageView.image = [sourceListItem icon];
// Badge count
{
@@ -1120,9 +1125,9 @@ static const float f_min_window_height = 307.;
playlist_item_t *p_pl_item = NULL;
NSInteger i_playlist_size = 0;
-if ([[item identifier] isEqualToString: @"playlist"]) {
+if ([[sourceListItem identifier] isEqualToString: @"playlist"]) {
p_pl_item = p_playlist->p_playing;
-} else if ([[item identifier] isEqualToString: @"medialibrary"]) {
+} else if ([[sourceListItem identifier] isEqualToString:
@"medialibrary"]) {
p_pl_item = p_playlist->p_media_library;
}
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macOS project: Add new files to project, reorder
vlc/vlc-3.0 | branch: master | David Fuhrmann | Fri Nov 6 07:58:52 2020 +0100| [978af5edd4d3bd6714967369cb83017a76a93467] | committer: David Fuhrmann macOS project: Add new files to project, reorder > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=978af5edd4d3bd6714967369cb83017a76a93467 --- .../package/macosx/vlc.xcodeproj/project.pbxproj | 230 - 1 file changed, 133 insertions(+), 97 deletions(-) Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commitdiff;h=978af5edd4d3bd6714967369cb83017a76a93467 ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] Update NEWS
vlc/vlc-3.0 | branch: master | David Fuhrmann | Fri Nov 6 07:59:22 2020 +0100| [d5443bc70213b2821d21aaf251eb0bc154eb490d] | committer: David Fuhrmann Update NEWS > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=d5443bc70213b2821d21aaf251eb0bc154eb490d --- NEWS | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 218eb9dc7e..3b6114056c 100644 --- a/NEWS +++ b/NEWS @@ -1,12 +1,17 @@ Changes between 3.0.11.1 and 3.0.12: -- +Audio output: + * Fix audio distortion on macOS during start of playback + Video Output: * Direct3D11: Fix some potential crashes when using video filters macOS: - * Fixed displaying EQ bands in the UI depending on which frequency + * Visual UI adaptations for macOS Big Sur + * Fix displaying EQ bands in the UI depending on which frequency presets are set for the EQ in advanced preferences + * Fix UI issues in bookmarks window Misc: * Several fixes in the web interface, including privacy and security ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Remove HumanReadableCopyright from InfoPlist.strings
vlc | branch: master | David Fuhrmann | Sat Oct 17 12:26:31 2020 +0200| [971705e799e978338e60bf6b3b1d130991e1ab3f] | committer: David Fuhrmann macosx: Remove HumanReadableCopyright from InfoPlist.strings The translation file should not need to be generated by the build system to allow more simple translation. In this case the string cannot be reconstructed during runtime (its read out by the OS), thus drop the translation. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=971705e799e978338e60bf6b3b1d130991e1ab3f --- modules/gui/macosx/Resources/InfoPlist.strings.in | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/gui/macosx/Resources/InfoPlist.strings.in b/modules/gui/macosx/Resources/InfoPlist.strings.in index 6c2ca0db83..2f109b7715 100644 --- a/modules/gui/macosx/Resources/InfoPlist.strings.in +++ b/modules/gui/macosx/Resources/InfoPlist.strings.in @@ -1,7 +1,5 @@ /* Localized versions of Info.plist keys */ -"NSHumanReadableCopyright" = "Copyright (c) @COPYRIGHT_YEARS@ VLC authors and VideoLAN"; - "NSCameraUsageDescription" = "VLC uses the camera to record some video."; "NSMicrophoneUsageDescription" = "VLC uses the microphone to record some audio."; "NSAppleEventsUsageDescription" = "VLC uses apple events to control external media players."; ___ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
[vlc-commits] macosx: Do not generate InfoPlist.strings anymore
vlc | branch: master | David Fuhrmann | Sat Oct 17
12:46:52 2020 +0200| [468e864fb929bc849d71d99e6cbd6a09e436bd3a] | committer:
David Fuhrmann
macosx: Do not generate InfoPlist.strings anymore
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=468e864fb929bc849d71d99e6cbd6a09e436bd3a
---
configure.ac | 1 -
extras/package/macosx/package.mak | 1 +
modules/gui/macosx/Makefile.am | 3 +++
.../gui/macosx/Resources/{InfoPlist.strings.in => InfoPlist.strings} | 0
4 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a09a3ef5b7..28a09d2b2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4644,7 +4644,6 @@ AM_COND_IF([HAVE_WIN32], [
AM_COND_IF([HAVE_DARWIN], [
AC_CONFIG_FILES([
-
modules/gui/macosx/UI/InfoPlist.strings:modules/gui/macosx/Resources/InfoPlist.strings.in
share/macosx/Info.plist:share/Info.plist.in
])
])
diff --git a/extras/package/macosx/package.mak
b/extras/package/macosx/package.mak
index 49ea3d7b96..af41f0fbae 100644
--- a/extras/package/macosx/package.mak
+++ b/extras/package/macosx/package.mak
@@ -27,6 +27,7 @@ VLC.app: macos-install
cp -R "$(macos_destdir)$(datadir)/macosx/" $@
## Copy .strings file and .nib files
cp -R "$(top_builddir)/modules/gui/macosx/UI"
$@/Contents/Resources/Base.lproj
+ cp "$(srcdir)/modules/gui/macosx/Resources/InfoPlist.strings"
$@/Contents/Resources/Base.lproj/
## Copy Info.plist and convert to binary
cp -R "$(top_builddir)/share/macosx/Info.plist" $@/Contents/
xcrun plutil -convert binary1 $@/Contents/Info.plist
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 900f09a1ec..9540ae5bd7 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -489,6 +489,9 @@ libmacosx_plugin_la_RES += \
gui/macosx/Resources/vlc.scriptSuite \
gui/macosx/Resources/vlc.scriptTerminology
+libmacosx_plugin_la_RES += \
+ gui/macosx/Resources/InfoPlist.strings
+
if ENABLE_MACOSX_UI
dist_libmacosx_plugin_la_DATA = $(libmacosx_plugin_la_RES)
endif
diff --git a/modules/gui/macosx/Resources/InfoPlist.strings.in
b/modules/gui/macosx/Resources/InfoPlist.strings
similarity index 100%
rename from modules/gui/macosx/Resources/InfoPlist.strings.in
rename to modules/gui/macosx/Resources/InfoPlist.strings
___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
