[vlc-commits] macosx: Workaround crash in PXSourceList dealloc

[David Fuhrmann]

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

[David Fuhrmann]

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] POTFILES.in: Update for macosx UI files

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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"

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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] macosx: Fix make dist after l10n update

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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"

[David Fuhrmann]

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"

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[David Fuhrmann]

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

[vlc-commits] macosx: Add explanatory strings for access to restricted resources

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Sat Oct 17 
13:15:10 2020 +0200| [f1534626c69952d3b24de51c6468ad56337c3c14] | 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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f1534626c69952d3b24de51c6468ad56337c3c14
---

 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 d106a87b6d..68f288aba2 100644
--- a/share/Info.plist.in
+++ b/share/Info.plist.in
@@ -62,11 +62,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.
CFBundleDocumentTypes



___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] cvpx: Fix build on macOS

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Mon Oct 12 
22:07:56 2020 +0200| [b7625aa0974602e11d4051a18015f5ca2fbeb6b3] | committer: 
David Fuhrmann

cvpx: Fix build on macOS

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b7625aa0974602e11d4051a18015f5ca2fbeb6b3
---

 modules/video_chroma/cvpx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/video_chroma/cvpx.c b/modules/video_chroma/cvpx.c
index f6a929df43..97bf253773 100644
--- a/modules/video_chroma/cvpx.c
+++ b/modules/video_chroma/cvpx.c
@@ -376,7 +376,7 @@ static int Open(vlc_object_t *obj)
 p_filter->fmt_out.i_codec = p_filter->fmt_out.video.i_chroma;
 return VLC_SUCCESS;
 error:
-Close(filter);
+Close(p_filter);
 p_filter->p_sys = NULL;
 
 assert(ret != VLC_SUCCESS);

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macOS: Fix missing vlc_object_release while getting vouts

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Sun 
Oct 11 19:31:13 2020 +0200| [029933322c5cec3f64b971c9fd3f9b0002508b65] | 
committer: David Fuhrmann

macOS: Fix missing vlc_object_release while getting vouts

VLC master branch is not affected by this issue anymore.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=029933322c5cec3f64b971c9fd3f9b0002508b65
---

 modules/gui/macosx/helpers.h | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/modules/gui/macosx/helpers.h b/modules/gui/macosx/helpers.h
index d58a761b52..3c6fc44d13 100644
--- a/modules/gui/macosx/helpers.h
+++ b/modules/gui/macosx/helpers.h
@@ -55,10 +55,16 @@ static inline NSArray *getVouts(void)
 vout_thread_t **pp_vouts;
 size_t i_num_vouts;
 
-if (!p_input
-|| input_Control(p_input, INPUT_GET_VOUTS, &pp_vouts, &i_num_vouts)
-|| !i_num_vouts)
+if (!p_input)
+return nil;
+
+if (input_Control(p_input, INPUT_GET_VOUTS, &pp_vouts, &i_num_vouts)
+|| !i_num_vouts) {
+vlc_object_release(p_input);
 return nil;
+}
+
+vlc_object_release(p_input);
 
 NSMutableArray *vouts =
 [NSMutableArray arrayWithCapacity:i_num_vouts];

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: bookmarks: fix logic for closing edit panel

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
Sep  9 14:37:30 2020 +0200| [e1aa5b526fe13ab4fc8db26449e2238befeb6149] | 
committer: David Fuhrmann

macosx: bookmarks: fix logic for closing edit panel

Always close panel, even in error cases. Make sure failure messages
are actually shown to the user.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=e1aa5b526fe13ab4fc8db26449e2238befeb6149
---

 modules/gui/macosx/VLCBookmarksWindowController.m | 21 ++---
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/modules/gui/macosx/VLCBookmarksWindowController.m 
b/modules/gui/macosx/VLCBookmarksWindowController.m
index 16ff42a5ea..e80f2dbf69 100644
--- a/modules/gui/macosx/VLCBookmarksWindowController.m
+++ b/modules/gui/macosx/VLCBookmarksWindowController.m
@@ -199,11 +199,12 @@
 
 - (IBAction)edit_ok:(id)sender
 {
-/* save field contents and close sheet */
- seekpoint_t **pp_bookmarks;
-int i_bookmarks, i;
 input_thread_t * p_input = pl_CurrentInput(getIntf());
 
+/* save field contents and close sheet */
+[NSApp endSheet: _editBookmarksWindow];
+[_editBookmarksWindow close];
+
 if (!p_input) {
 NSBeginCriticalAlertSheet(_NS("No input"), _NS("OK"), @"", @"", 
self.window, nil, nil, nil, nil, @"%@",_NS("No input found. A stream must be 
playing or paused for bookmarks to work."));
 return;
@@ -214,12 +215,15 @@
 return;
 }
 
+seekpoint_t **pp_bookmarks = NULL;
+int i_bookmarks = 0;
 if (input_Control(p_input, INPUT_GET_BOOKMARKS, &pp_bookmarks, 
&i_bookmarks) != VLC_SUCCESS) {
+msg_Warn(getIntf(), "Cannot get bookmarks");
 vlc_object_release(p_input);
 return;
 }
 
-i = [_dataTable selectedRow];
+int i = [_dataTable selectedRow];
 
 free(pp_bookmarks[i]->psz_name);
 
@@ -235,21 +239,16 @@
 pp_bookmarks[i]->i_time_offset = 100LL * ([[components 
firstObject] longLongValue] * 3600 + [[components objectAtIndex:1] 
longLongValue] * 60 + [[components objectAtIndex:2] floatValue]);
 else {
 msg_Err(getIntf(), "Invalid string format for time");
-goto clear;
 }
 
 if (input_Control(p_input, INPUT_CHANGE_BOOKMARK, pp_bookmarks[i], i) != 
VLC_SUCCESS) {
-msg_Warn(getIntf(), "Unable to change the bookmark");
-goto clear;
+msg_Err(getIntf(), "Unable to change the bookmark");
 }
 
 [_dataTable reloadData];
-vlc_object_release(p_input);
 
-[NSApp endSheet: _editBookmarksWindow];
-[_editBookmarksWindow close];
+vlc_object_release(p_input);
 
-clear:
 // Clear the bookmark list
 for (int i = 0; i < i_bookmarks; i++)
 vlc_seekpoint_Delete(pp_bookmarks[i]);

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: Avoid potential double release for input item

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
Sep  9 14:36:51 2020 +0200| [fc30a217187b690d9953f4d270fae888bc9ca918] | 
committer: David Fuhrmann

macosx: Avoid potential double release for input item

The item count is not retained for that variable

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=fc30a217187b690d9953f4d270fae888bc9ca918
---

 modules/gui/macosx/VLCBookmarksWindowController.m | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/gui/macosx/VLCBookmarksWindowController.m 
b/modules/gui/macosx/VLCBookmarksWindowController.m
index 55c9cb34aa..16ff42a5ea 100644
--- a/modules/gui/macosx/VLCBookmarksWindowController.m
+++ b/modules/gui/macosx/VLCBookmarksWindowController.m
@@ -58,9 +58,6 @@
 
 - (void)dealloc
 {
-if (p_old_input)
-vlc_object_release(p_old_input);
-
 [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] share: Add hrtf file to EXTRA_DIST

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Sat 
Aug  8 14:17:47 2020 +0200| [8f595793e5fad7245ec9b2bff221c06ef0e7c99a] | 
committer: David Fuhrmann

share: Add hrtf file to EXTRA_DIST

Both mac, as well as windows build scripts assume the hrtfs
directory to exist with hrtf file(s) in there. In order to allow
a full build from the release tarball, package that file as well.

(cherry picked from commit 50529ad91a3f12bbaec9bd66014c38d021456023)
Signed-off-by: David Fuhrmann 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=8f595793e5fad7245ec9b2bff221c06ef0e7c99a
---

 share/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/share/Makefile.am b/share/Makefile.am
index 2e58f014b8..803964a9f4 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -305,3 +305,6 @@ DIST_solid = \
solid/vlc-opencda.desktop \
solid/vlc-opendvd.desktop \
solid/vlc-openvcd.desktop
+
+EXTRA_DIST += \
+hrtfs/dodeca_and_7channel_3DSL_HRTF.sofa

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] share: Add hrtf file to EXTRA_DIST

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Sat Aug  8 
14:17:47 2020 +0200| [50529ad91a3f12bbaec9bd66014c38d021456023] | committer: 
David Fuhrmann

share: Add hrtf file to EXTRA_DIST

Both mac, as well as windows build scripts assume the hrtfs
directory to exist with hrtf file(s) in there. In order to allow
a full build from the release tarball, package that file as well.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=50529ad91a3f12bbaec9bd66014c38d021456023
---

 share/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/share/Makefile.am b/share/Makefile.am
index 0e6fd55dcb..b326f2e744 100644
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -306,3 +306,6 @@ DIST_solid = \
solid/vlc-opencda.desktop \
solid/vlc-opendvd.desktop \
solid/vlc-openvcd.desktop
+
+EXTRA_DIST += \
+hrtfs/dodeca_and_7channel_3DSL_HRTF.sofa

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] configure.ac: Bump to version 3.0.11.1

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Mon 
Jul 27 00:19:21 2020 +0200| [7491c17662f82ef960e2e4abab69ce28b8a41fef] | 
committer: David Fuhrmann

configure.ac: Bump to version 3.0.11.1

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=7491c17662f82ef960e2e4abab69ce28b8a41fef
---

 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 50f40e2d98..1f74566008 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@ dnl Autoconf settings for vlc
 
 AC_COPYRIGHT([Copyright 1999-2020 VLC authors and VideoLAN])
 
-AC_INIT(vlc, 3.0.11)
+AC_INIT(vlc, 3.0.11.1)
 VERSION_MAJOR=3
 VERSION_MINOR=0
 VERSION_REVISION=11
-VERSION_EXTRA=0
+VERSION_EXTRA=1
 VERSION_DEV=
 
 PKGDIR="vlc"

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] NEWS: Bump to version 3.0.11.1

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Mon 
Jul 27 00:19:38 2020 +0200| [f482863881ba52f1bd6a4b5ee96166cf24dfeb98] | 
committer: David Fuhrmann

NEWS: Bump to version 3.0.11.1

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=f482863881ba52f1bd6a4b5ee96166cf24dfeb98
---

 NEWS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 82571f4262..ced425d5e5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Changes between 3.0.11 and 3.0.12:
+Changes between 3.0.11 and 3.0.11.1:
 --
 
 Service Discovery:

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: gnutls: Drop getentropy patch for macOS

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Sat 
Feb 16 00:02:24 2019 +0100| [27e0d370a7aaec7a4e4c1873ef7feca5cde1e6fe] | 
committer: Steve Lhomme

contrib: gnutls: Drop getentropy patch for macOS

getentropy is correctly annotated since the macOS 10.13 SDK (at
least), and the gnutls check includes the correct header on macOS.
Therefore this patch is not needed anymore.

This also fixes current build failure as it avoids touching
configure.ac now.

(cherry picked from commit 58d4ea7d6274be17dd8189406f506bd7e76ef81a)

Signed-off-by: Steve Lhomme 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=27e0d370a7aaec7a4e4c1873ef7feca5cde1e6fe
---

 .../src/gnutls/gnutls-disable-getentropy-osx.patch   | 20 
 contrib/src/gnutls/rules.mak |  1 -
 2 files changed, 21 deletions(-)

diff --git a/contrib/src/gnutls/gnutls-disable-getentropy-osx.patch 
b/contrib/src/gnutls/gnutls-disable-getentropy-osx.patch
deleted file mode 100644
index fee755c034..00
--- a/contrib/src/gnutls/gnutls-disable-getentropy-osx.patch
+++ /dev/null
@@ -1,20 +0,0 @@
 gnutls/configure.ac2016-07-05 18:34:43.0 +0200
-+++ gnutls.new/configure.ac2017-08-09 21:57:44.0 +0200
-@@ -175,6 +175,9 @@
-  enable_getrandom=getrandom],
- [AC_MSG_RESULT(no)])
- 
-+if test "$have_macosx" = "yes"; then
-+AC_MSG_CHECKING([for getentropy disabled for OSX])
-+else
- AC_MSG_CHECKING([for getentropy])
- AC_LINK_IFELSE([AC_LANG_PROGRAM([
-  #include ],[
-@@ -184,6 +187,7 @@
-  AC_DEFINE([HAVE_GETENTROPY], 1, [Enable the OpenBSD 
getentropy function])
-  enable_getrandom=getentropy],
- [AC_MSG_RESULT(no)])
-+fi
- 
- dnl Try the hooks.m4
- LIBGNUTLS_HOOKS
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 5bfb40b3b0..92a298c78e 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -27,7 +27,6 @@ ifdef HAVE_ANDROID
$(APPLY) $(SRC)/gnutls/no-create-time-h.patch
 endif
 ifdef HAVE_MACOSX
-   $(APPLY) $(SRC)/gnutls/gnutls-disable-getentropy-osx.patch
$(APPLY) $(SRC)/gnutls/gnutls-disable-connectx-macos.patch
 endif
$(call pkg_static,"lib/gnutls.pc.in")

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: gnutls: Drop connectx patch

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Sat 
Feb 16 12:25:50 2019 +0100| [c2789408be5168d35bfc7872358cc3b189f31675] | 
committer: Steve Lhomme

contrib: gnutls: Drop connectx patch

connectx is available since macOS 10.11 and iOS 9, so this is not
needed anymore.

Note, this cannot be backported to 3.0 branch.

(cherry picked from commit dae2fff630562c5838098cb13cb6227a5ce05508) (edited)

edited:
- older gnutls patches were backported before

Signed-off-by: Steve Lhomme 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c2789408be5168d35bfc7872358cc3b189f31675
---

 contrib/src/gnutls/gnutls-disable-connectx-macos.patch | 12 
 contrib/src/gnutls/rules.mak   |  3 ---
 2 files changed, 15 deletions(-)

diff --git a/contrib/src/gnutls/gnutls-disable-connectx-macos.patch 
b/contrib/src/gnutls/gnutls-disable-connectx-macos.patch
deleted file mode 100644
index 47ca4226be..00
--- a/contrib/src/gnutls/gnutls-disable-connectx-macos.patch
+++ /dev/null
@@ -1,12 +0,0 @@
 gnutls/lib/system/fastopen.c   2017-12-26 18:00:54.041282870 +0100
-+++ gnutls/lib/system/fastopen.c.new   2017-12-26 18:00:09.209281540 +0100
-@@ -36,7 +36,8 @@
- #endif
- 
- /* TCP Fast Open on OSX behaves differently from Linux, so define these 
helpers */
--#if defined __APPLE__ && defined __MACH__ && defined CONNECT_DATA_IDEMPOTENT 
&& defined CONNECT_RESUME_ON_READ_WRITE
-+#if 0
-+// defined __APPLE__ && defined __MACH__ && defined CONNECT_DATA_IDEMPOTENT 
&& defined CONNECT_RESUME_ON_READ_WRITE
- # define TCP_FASTOPEN_OSX
- #elif defined TCP_FASTOPEN && defined MSG_FASTOPEN
- # define TCP_FASTOPEN_LINUX
diff --git a/contrib/src/gnutls/rules.mak b/contrib/src/gnutls/rules.mak
index 92a298c78e..03f4197010 100644
--- a/contrib/src/gnutls/rules.mak
+++ b/contrib/src/gnutls/rules.mak
@@ -25,9 +25,6 @@ ifdef HAVE_WIN32
 endif
 ifdef HAVE_ANDROID
$(APPLY) $(SRC)/gnutls/no-create-time-h.patch
-endif
-ifdef HAVE_MACOSX
-   $(APPLY) $(SRC)/gnutls/gnutls-disable-connectx-macos.patch
 endif
$(call pkg_static,"lib/gnutls.pc.in")
$(UPDATE_AUTOCONFIG)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] freetype: Append _LDFLAGS to _LINK for all platforms

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Sun 
May 27 12:33:36 2018 +0200| [5587d9a06f13b211232bc55b4f69b949c7d7ed31] | 
committer: Steve Lhomme

freetype: Append _LDFLAGS to _LINK for all platforms

AM_LDFLAGS needs to be removed as this is already added to the
standard LINK flags (and adding those flags twice is not allowed).

(cherry picked from commit ed600b3efd6b4642f0e0d364f5cbc0cc7b4b1d45)

Signed-off-by: Steve Lhomme 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=5587d9a06f13b211232bc55b4f69b949c7d7ed31
---

 modules/text_renderer/Makefile.am | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/text_renderer/Makefile.am 
b/modules/text_renderer/Makefile.am
index 41b370788d..62ea43d2fb 100644
--- a/modules/text_renderer/Makefile.am
+++ b/modules/text_renderer/Makefile.am
@@ -10,7 +10,7 @@ libfreetype_plugin_la_SOURCES = \
 
 libfreetype_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
 libfreetype_plugin_la_LIBADD = $(LIBM)
-libfreetype_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(FREETYPE_LDFLAGS) -rpath 
'$(textdir)'
+libfreetype_plugin_la_LDFLAGS = $(FREETYPE_LDFLAGS) -rpath '$(textdir)'
 
 if HAVE_WIN32
 libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/dwrite.cpp
@@ -34,7 +34,7 @@ libfreetype_plugin_la_SOURCES += 
text_renderer/freetype/fonts/android.c
 endif
 if HAVE_DARWIN
 libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/darwin.c
-libfreetype_plugin_la_LINK += -Wl,-framework,CoreFoundation 
-Wl,-framework,CoreText
+libfreetype_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation 
-Wl,-framework,CoreText
 endif
 if HAVE_FRIBIDI
 libfreetype_plugin_la_CPPFLAGS += $(FRIBIDI_CFLAGS) -DHAVE_FRIBIDI
@@ -44,6 +44,7 @@ if HAVE_HARFBUZZ
 libfreetype_plugin_la_CPPFLAGS += $(HARFBUZZ_CFLAGS) -DHAVE_HARFBUZZ
 libfreetype_plugin_la_LIBADD += $(HARFBUZZ_LIBS)
 endif
+libfreetype_plugin_la_LINK += $(libfreetype_plugin_la_LDFLAGS)
 libfreetype_plugin_la_LIBADD += $(FREETYPE_LIBS)
 if HAVE_FREETYPE
 text_LTLIBRARIES += libfreetype_plugin.la

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] macosx: Fix broken resume feature of the Music app

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
Jun 17 20:17:11 2020 +0200| [78a6405982163fa450a7901e02feddc2687426b3] | 
committer: David Fuhrmann

macosx: Fix broken resume feature of the Music app

Seems to be a copy paste error in the backport, the code in
vlc.git was right from the beginning

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=78a6405982163fa450a7901e02feddc2687426b3
---

 modules/gui/macosx/VLCInputManager.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/gui/macosx/VLCInputManager.m 
b/modules/gui/macosx/VLCInputManager.m
index 2b736dc2da..5938c3921e 100644
--- a/modules/gui/macosx/VLCInputManager.m
+++ b/modules/gui/macosx/VLCInputManager.m
@@ -376,7 +376,7 @@ static int InputEvent(vlc_object_t *p_this, const char 
*psz_var,
 if ([iTunesApp playerState] == iTunesEPlSPlaying) {
 msg_Dbg(p_intf, "pausing Apple Music");
 [iTunesApp pause];
-b_has_itunes_paused = YES;
+b_has_applemusic_paused = YES;
 }
 }
 }

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Update NEWS

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
Jun 17 20:22:37 2020 +0200| [2e637ca273ce8346332fa60ba79cc34e34e4dcb0] | 
committer: David Fuhrmann

Update NEWS

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=2e637ca273ce8346332fa60ba79cc34e34e4dcb0
---

 NEWS | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/NEWS b/NEWS
index 5a61ba26ce..960a99e3a5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+Changes between 3.0.11 and 3.0.12:
+--
+
+macOS:
+ * Fix automatic playback resume with "Music" app
+
 Changes between 3.0.10 and 3.0.11:
 --
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] make dist: Include libtool-2.4.6-clang-libs.patch

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
Jun 17 19:09:19 2020 +0200| [4b868c8d61e4ed5131664ddd56bb85aec49cf488] | 
committer: David Fuhrmann

make dist: Include libtool-2.4.6-clang-libs.patch

Fixes building from source tarball which was missing this file.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=4b868c8d61e4ed5131664ddd56bb85aec49cf488
---

 Makefile.am | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.am b/Makefile.am
index 3ac82623ad..ea37ccc0db 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -65,6 +65,7 @@ EXTRA_DIST += \
extras/tools/bison-macOS-c41f233c.patch \
extras/tools/libtool-2.4.2-bitcode.patch \
extras/tools/libtool-2.4.2-san.patch \
+   extras/tools/libtool-2.4.6-clang-libs.patch \
extras/tools/ragel-6.8-javacodegen.patch
 
 ###

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] keychain: Do not link against Cocoa

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Tue May 19 
22:29:14 2020 +0200| [c7b6983e6dd4641cc434a085342680e0ea30d396] | committer: 
David Fuhrmann

keychain: Do not link against Cocoa

This is a module used for both iOS as well as macOS, so it should
only use frameworks available on both platforms. And in fact,
linking against Cocoa is not necessary for macOS as well.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c7b6983e6dd4641cc434a085342680e0ea30d396
---

 modules/keystore/Makefile.am | 4 
 modules/keystore/keychain.m  | 7 +--
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/modules/keystore/Makefile.am b/modules/keystore/Makefile.am
index 57ae2273f6..318132881f 100644
--- a/modules/keystore/Makefile.am
+++ b/modules/keystore/Makefile.am
@@ -30,10 +30,6 @@ libkeychain_plugin_la_SOURCES = keystore/keychain.m 
keystore/list_util.c keystor
 libkeychain_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS) -fobjc-arc
 libkeychain_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(keystoredir)' 
-Wl,-framework,Foundation -Wl,-framework,Security
 
-if HAVE_OSX
-libkeychain_plugin_la_LDFLAGS += -Wl,-framework,Cocoa
-endif
-
 if HAVE_DARWIN
 keystore_LTLIBRARIES += libkeychain_plugin.la
 endif
diff --git a/modules/keystore/keychain.m b/modules/keystore/keychain.m
index f7fa1532bb..353f152c93 100644
--- a/modules/keystore/keychain.m
+++ b/modules/keystore/keychain.m
@@ -32,12 +32,7 @@
 
 #include 
 
-#if TARGET_OS_IPHONE
-  #import 
-#else
-  #import 
-#endif
-
+#import 
 #import 
 
 // Marker to recognize changed format in vlc 4: secret does not have \0 cut 
off anymore.

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: vpx: Fix linker check on mac build environment

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
May 13 21:20:09 2020 +0200| [9832addb1d0dec26b464db41bce11f1e058b3d63] | 
committer: David Fuhrmann

contrib: vpx: Fix linker check on mac build environment

Do not override the LD variable, as this fails the following
configure ld_check with the following error:
"ld: library not found for -lstdc++"

Also, this line seems to be not relevant for compiling the library
only.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=9832addb1d0dec26b464db41bce11f1e058b3d63
---

 contrib/src/vpx/darwin-do-not-overwrite-ld.patch | 11 +++
 contrib/src/vpx/rules.mak|  3 +++
 2 files changed, 14 insertions(+)

diff --git a/contrib/src/vpx/darwin-do-not-overwrite-ld.patch 
b/contrib/src/vpx/darwin-do-not-overwrite-ld.patch
new file mode 100644
index 00..c69709f7a4
--- /dev/null
+++ b/contrib/src/vpx/darwin-do-not-overwrite-ld.patch
@@ -0,0 +1,11 @@
+--- libvpx/configure.old   2020-05-13 21:15:06.0 +0200
 libvpx/configure   2020-05-13 21:15:28.0 +0200
+@@ -758,8 +758,6 @@
+ EOF
+ ;;
+ esac
+-# libwebm needs to be linked with C++ standard library
+-enabled webm_io && LD=${CXX}
+ 
+ # append any user defined extra cflags
+ if [ -n "${extra_cflags}" ] ; then
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index 7e899d898e..fe3dc1538c 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -20,6 +20,9 @@ ifdef HAVE_ANDROID
$(APPLY) $(SRC)/vpx/libvpx-android.patch
cp "${ANDROID_NDK}"/sources/android/cpufeatures/cpu-features.c 
$(UNPACK_DIR)/vpx_ports
cp "${ANDROID_NDK}"/sources/android/cpufeatures/cpu-features.h 
$(UNPACK_DIR)
+endif
+ifdef HAVE_MACOSX
+   $(APPLY) $(SRC)/vpx/darwin-do-not-overwrite-ld.patch
 endif
$(MOVE)
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] Update NEWS for macOS

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Sun 
May 17 00:17:08 2020 +0200| [0117fe32d98d75fa59e72b9782a54f3e23ce5b9a] | 
committer: David Fuhrmann

Update NEWS for macOS

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=0117fe32d98d75fa59e72b9782a54f3e23ce5b9a
---

 NEWS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 0ef240e6b8..49d05cf95d 100644
--- a/NEWS
+++ b/NEWS
@@ -21,8 +21,9 @@ Contribs:
 
 MacOS:
  * Fixed moving video window with mouse
- * Added optical devices insufficient permissions warning
+ * Fixed UI issue showing "permissions warning" unnecessarily often
  * Fixed stack buffer overflow listing bluray mount points
+ * Fixed potential crashes at startup
 
 
 Changes between 3.0.9.2 and 3.0.10:

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: modplug: Link against libc++ on macOS

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
May 13 19:42:15 2020 +0200| [594e7c8997afbc1a283fb9985298a31a45c24d62] | 
committer: David Fuhrmann

contrib: modplug: Link against libc++ on macOS

libstdc++ is not available anymore in modern sdks.

(cherry picked from commit a7dd702b66d6f3c211988e26a8534aba01c581de)
Signed-off-by: David Fuhrmann 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=594e7c8997afbc1a283fb9985298a31a45c24d62
---

 contrib/src/modplug/mac-use-c-stdlib.patch | 9 +
 contrib/src/modplug/rules.mak  | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/modplug/mac-use-c-stdlib.patch 
b/contrib/src/modplug/mac-use-c-stdlib.patch
new file mode 100644
index 00..c6a283a287
--- /dev/null
+++ b/contrib/src/modplug/mac-use-c-stdlib.patch
@@ -0,0 +1,9 @@
+--- libmodplug-0.8.9.0/libmodplug.pc.in.old2020-04-29 21:39:14.0 
+0200
 libmodplug-0.8.9.0/libmodplug.pc.in2020-04-29 21:40:06.0 
+0200
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ Requires: 
+ Libs: -L${libdir} -lmodplug 
+-Libs.private: -lstdc++ -lm
++Libs.private: -lc++ -lm
+ Cflags: -I${includedir} -DMODPLUG_STATIC
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index 6776bfbbe6..aa10fc41bb 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -18,6 +18,9 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
$(APPLY) $(SRC)/modplug/modplug-win32-static.patch
$(APPLY) $(SRC)/modplug/macosx-do-not-force-min-version.patch
$(APPLY) $(SRC)/modplug/fix-endianness-check.diff
+ifdef HAVE_MACOSX
+   $(APPLY) $(SRC)/modplug/mac-use-c-stdlib.patch
+endif
$(call pkg_static,"libmodplug.pc.in")
$(MOVE)
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contribs: live555: Set CXXFLAGS for macosx

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
Apr 29 21:53:41 2020 +0200| [f9701a24327fea50777fffe1f0450a7a8a48b90d] | 
committer: David Fuhrmann

contribs: live555: Set CXXFLAGS for macosx

CXXFLAGS are needed to set correct stdlib.

(cherry picked from commit c40a3d27b1d084172d9f59b482f4e06f4eaa3878)
Signed-off-by: David Fuhrmann 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=f9701a24327fea50777fffe1f0450a7a8a48b90d
---

 contrib/src/live555/rules.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 3bb8e78b3d..f5984577dc 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -55,6 +55,8 @@ live555: $(LIVE555_FILE) .sum-live555
cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
# Add Extra LDFLAGS for macOS
cd live && sed -i.orig -e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' 
config.macosx
+   # Add CXXFLAGS for macOS (force libc++)
+   cd live && sed -i.orig -e 's%^\(CPLUSPLUS_FLAGS.*\)$$%\1 
'"$(CXXFLAGS)%" config.macosx
# Add the Extra_CFLAGS to all config files
cd live && sed -i.orig \
-e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(LIVE_EXTRA_CFLAGS)%" config.*

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contrib: modplug: Link against libc++ on macOS

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Wed May 13 
19:42:15 2020 +0200| [a7dd702b66d6f3c211988e26a8534aba01c581de] | committer: 
David Fuhrmann

contrib: modplug: Link against libc++ on macOS

libstdc++ is not available anymore in modern sdks.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=a7dd702b66d6f3c211988e26a8534aba01c581de
---

 contrib/src/modplug/mac-use-c-stdlib.patch | 9 +
 contrib/src/modplug/rules.mak  | 3 +++
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/modplug/mac-use-c-stdlib.patch 
b/contrib/src/modplug/mac-use-c-stdlib.patch
new file mode 100644
index 00..c6a283a287
--- /dev/null
+++ b/contrib/src/modplug/mac-use-c-stdlib.patch
@@ -0,0 +1,9 @@
+--- libmodplug-0.8.9.0/libmodplug.pc.in.old2020-04-29 21:39:14.0 
+0200
 libmodplug-0.8.9.0/libmodplug.pc.in2020-04-29 21:40:06.0 
+0200
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ Requires: 
+ Libs: -L${libdir} -lmodplug 
+-Libs.private: -lstdc++ -lm
++Libs.private: -lc++ -lm
+ Cflags: -I${includedir} -DMODPLUG_STATIC
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index 6776bfbbe6..aa10fc41bb 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -18,6 +18,9 @@ libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
$(APPLY) $(SRC)/modplug/modplug-win32-static.patch
$(APPLY) $(SRC)/modplug/macosx-do-not-force-min-version.patch
$(APPLY) $(SRC)/modplug/fix-endianness-check.diff
+ifdef HAVE_MACOSX
+   $(APPLY) $(SRC)/modplug/mac-use-c-stdlib.patch
+endif
$(call pkg_static,"libmodplug.pc.in")
$(MOVE)
 

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] contribs: live555: Set CXXFLAGS for macosx

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Wed Apr 29 
21:53:41 2020 +0200| [c40a3d27b1d084172d9f59b482f4e06f4eaa3878] | committer: 
David Fuhrmann

contribs: live555: Set CXXFLAGS for macosx

CXXFLAGS are needed to set correct stdlib.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c40a3d27b1d084172d9f59b482f4e06f4eaa3878
---

 contrib/src/live555/rules.mak | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 6739f747a3..01aefacef8 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -55,6 +55,8 @@ live555: $(LIVE555_FILE) .sum-live555
cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
# Add Extra LDFLAGS for macOS
cd live && sed -i.orig -e 's%$(CXX)%$(CXX)\ $(EXTRA_LDFLAGS)%' 
config.macosx
+   # Add CXXFLAGS for macOS (force libc++)
+   cd live && sed -i.orig -e 's%^\(CPLUSPLUS_FLAGS.*\)$$%\1 
'"$(CXXFLAGS)%" config.macosx
# Add the Extra_CFLAGS to all config files
cd live && sed -i.orig \
-e 's%^\(COMPILE_OPTS.*\)$$%\1 '"$(LIVE_EXTRA_CFLAGS)%" config.*

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] dvdread: Implement analog access check as in dvdnav

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Mon 
May  4 20:07:41 2020 +0200| [efec119e80394421537c445a1459909ebe837157] | 
committer: David Fuhrmann

dvdread: Implement analog access check as in dvdnav

(cherry picked from commit 7555e75a779907791238a1f50e1fdaf25b7d23e5)
Signed-off-by: David Fuhrmann 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=efec119e80394421537c445a1459909ebe837157
---

 modules/access/Makefile.am |  2 +-
 modules/access/dvdread.c   | 15 ---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 7c9f10b055..21d88af5db 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -235,7 +235,7 @@ endif
 access_LTLIBRARIES += $(LTLIBdvdnav)
 EXTRA_LTLIBRARIES += libdvdnav_plugin.la
 
-libdvdread_plugin_la_SOURCES = access/dvdread.c demux/mpeg/ps.h 
demux/mpeg/pes.h \
+libdvdread_plugin_la_SOURCES = access/disc_helper.h access/dvdread.c 
demux/mpeg/ps.h demux/mpeg/pes.h \
demux/moving_avg.h demux/timestamps_filter.h
 libdvdread_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDREAD_CFLAGS)
 libdvdread_plugin_la_LIBADD = $(DVDREAD_LIBS)
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 6fab0d25e7..e75bef5986 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -68,6 +68,8 @@
 #include 
 #include 
 
+#include "disc_helper.h"
+
 /*
  * Module descriptor
  */
@@ -203,6 +205,12 @@ static int Open( vlc_object_t *p_this )
 if( unlikely(psz_file == NULL) )
 return VLC_EGENERIC;
 
+if( DiscProbeMacOSPermission( p_this, psz_file ) != VLC_SUCCESS )
+{
+free( psz_file );
+return VLC_EGENERIC;
+}
+
 /* Open dvdread */
 const char *psz_path = ToLocale( psz_file );
 #if DVDREAD_VERSION >= DVDREAD_VERSION_CODE(6, 1, 0)
@@ -216,15 +224,8 @@ static int Open( vlc_object_t *p_this )
 if( p_dvdread == NULL )
 {
 msg_Err( p_demux, "DVDRead cannot open source: %s", psz_file );
-#ifdef __APPLE__
-vlc_dialog_display_error( p_demux, _("Problem accessing a system 
resource"),
-_("Potentially, macOS blocks access to your disc. "
-  "Please open \"System Preferences\" -> \"Security & Privacy\" "
-  "and allow VLC to access your external media in \"Files and 
Folders\" section."));
-#else
 vlc_dialog_display_error( p_demux, _("Playback failure"),
   _("DVDRead could not open the disc \"%s\"."), psz_file );
-#endif
 
 free( psz_file );
 return VLC_EGENERIC;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] dvdnav: Improve user information about insufficient permissions

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Mon 
May  4 20:06:52 2020 +0200| [c454a09641eeb8f9d5699c1b622df7baa1dae1d3] | 
committer: David Fuhrmann

dvdnav: Improve user information about insufficient permissions

The mentioned security setting is relevant for accessing
external media like RAW block devices (/dev/xxx), which is one of
the main use cases for this module (modern Macs do not have internal
optical drives anymore).

Probe for this case explicitly to inform the user how to get
access.

This is only relevant starting with macOS Catalina.

(cherry picked from commit 18e5f17fb8c19ff84fba41db110ac575dfbccf59)
Signed-off-by: David Fuhrmann 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=c454a09641eeb8f9d5699c1b622df7baa1dae1d3
---

 modules/access/Makefile.am   |  2 +-
 modules/access/disc_helper.h | 70 
 modules/access/dvdnav.c  | 12 
 po/POTFILES.in   |  1 +
 4 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 3353faefa4..7c9f10b055 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -225,7 +225,7 @@ endif
 EXTRA_LTLIBRARIES += libvcd_plugin.la
 access_LTLIBRARIES += $(LTLIBvcd)
 
-libdvdnav_plugin_la_SOURCES = access/dvdnav.c demux/mpeg/ps.h demux/mpeg/pes.h
+libdvdnav_plugin_la_SOURCES = access/disc_helper.h access/dvdnav.c 
demux/mpeg/ps.h demux/mpeg/pes.h
 libdvdnav_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS)
 libdvdnav_plugin_la_LIBADD = $(DVDNAV_LIBS)
 libdvdnav_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
diff --git a/modules/access/disc_helper.h b/modules/access/disc_helper.h
new file mode 100644
index 00..8d5a4ef8b4
--- /dev/null
+++ b/modules/access/disc_helper.h
@@ -0,0 +1,70 @@
+/*
+ * disc_helper.h: disc helper functions
+ *
+ * Copyright (C) 2020 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+
+inline static int DiscProbeMacOSPermission( vlc_object_t *p_this, const char 
*psz_file )
+{
+#ifdef __APPLE__
+/* Check is only relevant starting macOS Catalina */
+if( __builtin_available( macOS 10.15, * ) )
+{
+/* Continue. The check above cannot be negated. */
+}
+else
+{
+return VLC_SUCCESS;
+}
+
+msg_Dbg( p_this, "Checking access permission for path %s", psz_file );
+
+struct stat stat_buf;
+if( vlc_stat( psz_file, &stat_buf ) != 0 )
+return VLC_SUCCESS; // Continue with probing to be on the safe side
+
+if( !S_ISBLK( stat_buf.st_mode ) && !S_ISCHR( stat_buf.st_mode ) )
+return VLC_SUCCESS;
+
+/* Check that device access in fact fails with EPERM error */
+int retVal = access( psz_file, R_OK );
+if( retVal == -1 && errno == EPERM )
+{
+msg_Err( p_this, "Path %s cannot be opened due to unsufficient 
permissions", psz_file );
+vlc_dialog_display_error( p_this, _("Problem accessing a system 
resource"),
+_("Potentially, macOS blocks access to your disc. "
+  "Please open \"System Preferences\" -> \"Security & Privacy\" "
+  "and allow VLC to access your external media in \"Files and 
Folders\" section."));
+
+return VLC_EGENERIC;
+}
+
+return VLC_SUCCESS;
+#else
+VLC_UNUSED( p_this );
+VLC_UNUSED( psz_file );
+return VLC_SUCCESS;
+#endif
+}
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 4c19de047e..89fb66f11e 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -65,6 +65,8 @@ dvdnav_status_t dvdnav_jump_to_sector_by_time(dvdnav_t *, 
uint64_t, int32_t);
 #include "../demux/mpeg/pes.h"
 #include "../demux/mpeg/ps.h"
 
+#include "disc_helper.h"
+
 /***

[vlc-commits] cdda: Add macOS permission check

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
May  6 20:33:10 2020 +0200| [21777d8dec1e7120e7ecb7b65b090d6658d08f14] | 
committer: David Fuhrmann

cdda: Add macOS permission check

Similar to dvdnav and dvdread.

(cherry picked from commit 1ae5ef9b045f483d1bd0d5ecc3df3f8b4fff5f9f)
Signed-off-by: David Fuhrmann 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=21777d8dec1e7120e7ecb7b65b090d6658d08f14
---

 modules/access/Makefile.am | 3 ++-
 modules/access/cdda.c  | 7 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 21d88af5db..5d2a5f915c 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -205,7 +205,8 @@ EXTRA_LTLIBRARIES += libvnc_plugin.la
 
 ### Optical media ###
 
-libcdda_plugin_la_SOURCES = access/cdda.c access/vcd/cdrom.c 
access/vcd/cdrom.h access/vcd/cdrom_internals.h
+libcdda_plugin_la_SOURCES = access/cdda.c access/disc_helper.h 
access/vcd/cdrom.c \
+access/vcd/cdrom.h access/vcd/cdrom_internals.h
 libcdda_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBCDDB_CFLAGS)
 libcdda_plugin_la_LIBADD = $(LIBCDDB_LIBS) $(LIBM)
 libcdda_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index e52594d30d..6f7ae19cc5 100644
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -50,8 +50,10 @@
 #include  /* ToLocaleDup */
 #include 
 
+#include "disc_helper.h"
 #include "vcd/cdrom.h"  /* For CDDA_DATA_SIZE */
 
+
 #ifdef HAVE_LIBCDDB
  #include 
  #include 
@@ -103,6 +105,11 @@ static vcddev_t *DiscOpen(vlc_object_t *obj, const char 
*location,
 devpath[2] = '\0';
 #endif
 
+if (DiscProbeMacOSPermission(obj, devpath) != VLC_SUCCESS) {
+free(devpath);
+return NULL;
+}
+
 /* Open CDDA */
 vcddev_t *dev = ioctl_Open(obj, devpath);
 if (dev == NULL)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] bluray: Fix potential buffer overflow when reading mount points

[David Fuhrmann]

vlc/vlc-3.0 | branch: master | David Fuhrmann  | Wed 
May  6 20:35:22 2020 +0200| [a9a75ea81d70d977dfc5e1ea68bf1efa56ca78ab] | 
committer: David Fuhrmann

bluray: Fix potential buffer overflow when reading mount points

Avoid overflow when more than 128 mount points exist on the system.

(cherry picked from commit 2b697ae12898316af895a0a1e2285a70a49ea085)
Signed-off-by: David Fuhrmann 

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=a9a75ea81d70d977dfc5e1ea68bf1efa56ca78ab
---

 modules/access/bluray.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index dff49e4a38..10be6cbf27 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -435,14 +435,18 @@ static void FindMountPoint(char **file)
 if (!stat (device, &st) && S_ISBLK (st.st_mode)) {
 int fs_count = getfsstat (NULL, 0, MNT_NOWAIT);
 if (fs_count > 0) {
-struct statfs mbuf[128];
-getfsstat (mbuf, fs_count * sizeof(mbuf[0]), MNT_NOWAIT);
+int bufSize = fs_count * sizeof (struct statfs);
+struct statfs* mbuf = malloc(bufSize);
+getfsstat (mbuf, bufSize, MNT_NOWAIT);
 for (int i = 0; i < fs_count; ++i)
 if (!strcmp (mbuf[i].f_mntfromname, device)) {
 free(device);
 *file = strdup(mbuf[i].f_mntonname);
+free(mbuf);
 return;
 }
+
+free(mbuf);
 }
 }
 #else

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] gitlab-ci: Package macOS sdk archive for nightly builds as well

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Thu May  7 
18:38:46 2020 +0200| [02a7b108f6aec2a266026c40be55ec3104d846a7] | committer: 
David Fuhrmann

gitlab-ci: Package macOS sdk archive for nightly builds as well

Restores the same behaviour we had with the old Jenkins for some
time now.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=02a7b108f6aec2a266026c40be55ec3104d846a7
---

 extras/ci/gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
index 7f796fd725..b9d29d162d 100644
--- a/extras/ci/gitlab-ci.yml
+++ b/extras/ci/gitlab-ci.yml
@@ -298,6 +298,7 @@ nightly-macos:
 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/")
 - cd nightlies && find . -maxdepth 1 -type f -not -name SHA512SUM | 
xargs shasum -a 512 | tee SHA512SUM
 artifacts:
 paths:

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] dvdread: Implement analog access check as in dvdnav

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Mon May  4 
20:07:41 2020 +0200| [7555e75a779907791238a1f50e1fdaf25b7d23e5] | committer: 
David Fuhrmann

dvdread: Implement analog access check as in dvdnav

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7555e75a779907791238a1f50e1fdaf25b7d23e5
---

 modules/access/Makefile.am |  2 +-
 modules/access/dvdread.c   | 15 ---
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index b6b3af2266..5fb23de555 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -252,7 +252,7 @@ endif
 access_LTLIBRARIES += $(LTLIBdvdnav)
 EXTRA_LTLIBRARIES += libdvdnav_plugin.la
 
-libdvdread_plugin_la_SOURCES = access/dvdread.c demux/mpeg/ps.h 
demux/mpeg/pes.h \
+libdvdread_plugin_la_SOURCES = access/disc_helper.h access/dvdread.c 
demux/mpeg/ps.h demux/mpeg/pes.h \
demux/moving_avg.h demux/timestamps_filter.h
 libdvdread_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDREAD_CFLAGS)
 libdvdread_plugin_la_LIBADD = $(DVDREAD_LIBS)
diff --git a/modules/access/dvdread.c b/modules/access/dvdread.c
index 657cdcacb2..ae0ed798cd 100644
--- a/modules/access/dvdread.c
+++ b/modules/access/dvdread.c
@@ -62,6 +62,8 @@
 #include 
 #include 
 
+#include "disc_helper.h"
+
 /*
  * Module descriptor
  */
@@ -194,6 +196,12 @@ static int Open( vlc_object_t *p_this )
 if( unlikely(psz_file == NULL) )
 return VLC_EGENERIC;
 
+if( DiscProbeMacOSPermission( p_this, psz_file ) != VLC_SUCCESS )
+{
+free( psz_file );
+return VLC_EGENERIC;
+}
+
 /* Open dvdread */
 const char *psz_path = ToLocale( psz_file );
 #if DVDREAD_VERSION >= DVDREAD_VERSION_CODE(6, 1, 0)
@@ -207,15 +215,8 @@ static int Open( vlc_object_t *p_this )
 if( p_dvdread == NULL )
 {
 msg_Err( p_demux, "DVDRead cannot open source: %s", psz_file );
-#ifdef __APPLE__
-vlc_dialog_display_error( p_demux, _("Problem accessing a system 
resource"),
-_("Potentially, macOS blocks access to your disc. "
-  "Please open \"System Preferences\" -> \"Security & Privacy\" "
-  "and allow VLC to access your external media in \"Files and 
Folders\" section."));
-#else
 vlc_dialog_display_error( p_demux, _("Playback failure"),
   _("DVDRead could not open the disc \"%s\"."), psz_file );
-#endif
 
 free( psz_file );
 return VLC_EGENERIC;

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] bluray: Fix potential buffer overflow when reading mount points

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Wed May  6 
20:35:22 2020 +0200| [2b697ae12898316af895a0a1e2285a70a49ea085] | committer: 
David Fuhrmann

bluray: Fix potential buffer overflow when reading mount points

Avoid overflow when more than 128 mount points exist on the system.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2b697ae12898316af895a0a1e2285a70a49ea085
---

 modules/access/bluray.c | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index d902fc5285..dfd471a02a 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -577,14 +577,18 @@ static void FindMountPoint(char **file)
 if (!stat (device, &st) && S_ISBLK (st.st_mode)) {
 int fs_count = getfsstat (NULL, 0, MNT_NOWAIT);
 if (fs_count > 0) {
-struct statfs mbuf[128];
-getfsstat (mbuf, fs_count * sizeof(mbuf[0]), MNT_NOWAIT);
+int bufSize = fs_count * sizeof (struct statfs);
+struct statfs* mbuf = malloc(bufSize);
+getfsstat (mbuf, bufSize, MNT_NOWAIT);
 for (int i = 0; i < fs_count; ++i)
 if (!strcmp (mbuf[i].f_mntfromname, device)) {
 free(device);
 *file = strdup(mbuf[i].f_mntonname);
+free(mbuf);
 return;
 }
+
+free(mbuf);
 }
 }
 #else

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] cdda: Add macOS permission check

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Wed May  6 
20:33:10 2020 +0200| [1ae5ef9b045f483d1bd0d5ecc3df3f8b4fff5f9f] | committer: 
David Fuhrmann

cdda: Add macOS permission check

Similar to dvdnav and dvdread.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1ae5ef9b045f483d1bd0d5ecc3df3f8b4fff5f9f
---

 modules/access/Makefile.am | 7 ---
 modules/access/cdda.c  | 7 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index 5fb23de555..9cd3098fc2 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -216,9 +216,10 @@ EXTRA_LTLIBRARIES += libvnc_plugin.la
 
 ### Optical media ###
 
-libcdda_plugin_la_SOURCES = access/cdda.c access/vcd/cdrom.c 
access/vcd/cdrom.h access/vcd/cdrom_internals.h \
-misc/webservices/json.c misc/webservices/json.h 
misc/webservices/json_helper.h \
-misc/webservices/musicbrainz.c 
misc/webservices/musicbrainz.h
+libcdda_plugin_la_SOURCES = access/cdda.c access/disc_helper.h 
access/vcd/cdrom.c access/vcd/cdrom.h \
+access/vcd/cdrom_internals.h 
misc/webservices/json.c misc/webservices/json.h \
+misc/webservices/json_helper.h 
misc/webservices/musicbrainz.c \
+misc/webservices/musicbrainz.h
 libcdda_plugin_la_CFLAGS = $(AM_CFLAGS) $(LIBCDDB_CFLAGS)
 libcdda_plugin_la_LIBADD = $(LIBCDDB_LIBS) $(LIBM)
 libcdda_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
diff --git a/modules/access/cdda.c b/modules/access/cdda.c
index 42d0e7c6ca..9260b833ed 100644
--- a/modules/access/cdda.c
+++ b/modules/access/cdda.c
@@ -56,9 +56,11 @@
 # include 
 #endif
 
+#include "disc_helper.h"
 #include "vcd/cdrom.h"  /* For CDDA_DATA_SIZE */
 #include "../misc/webservices/musicbrainz.h"
 
+
 #ifdef HAVE_LIBCDDB
  #include 
  #include 
@@ -110,6 +112,11 @@ static vcddev_t *DiscOpen(vlc_object_t *obj, const char 
*location,
 devpath[2] = '\0';
 #endif
 
+if (DiscProbeMacOSPermission(obj, devpath) != VLC_SUCCESS) {
+free(devpath);
+return NULL;
+}
+
 /* Open CDDA */
 vcddev_t *dev = ioctl_Open(obj, devpath);
 if (dev == NULL)

___
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

[vlc-commits] dvdnav: Improve user information about insufficient permissions

[David Fuhrmann]

vlc | branch: master | David Fuhrmann  | Mon May  4 
20:06:52 2020 +0200| [18e5f17fb8c19ff84fba41db110ac575dfbccf59] | committer: 
David Fuhrmann

dvdnav: Improve user information about insufficient permissions

The mentioned security setting is relevant for accessing
external media like RAW block devices (/dev/xxx), which is one of
the main use cases for this module (modern Macs do not have internal
optical drives anymore).

Probe for this case explicitly to inform the user how to get
access.

This is only relevant starting with macOS Catalina.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=18e5f17fb8c19ff84fba41db110ac575dfbccf59
---

 modules/access/Makefile.am   |  2 +-
 modules/access/disc_helper.h | 70 
 modules/access/dvdnav.c  | 12 
 po/POTFILES.in   |  1 +
 4 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/modules/access/Makefile.am b/modules/access/Makefile.am
index b73fda5f4c..b6b3af2266 100644
--- a/modules/access/Makefile.am
+++ b/modules/access/Makefile.am
@@ -242,7 +242,7 @@ endif
 EXTRA_LTLIBRARIES += libvcd_plugin.la
 access_LTLIBRARIES += $(LTLIBvcd)
 
-libdvdnav_plugin_la_SOURCES = access/dvdnav.c demux/mpeg/ps.h demux/mpeg/pes.h
+libdvdnav_plugin_la_SOURCES = access/disc_helper.h access/dvdnav.c 
demux/mpeg/ps.h demux/mpeg/pes.h
 libdvdnav_plugin_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS)
 libdvdnav_plugin_la_LIBADD = $(DVDNAV_LIBS)
 libdvdnav_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(accessdir)'
diff --git a/modules/access/disc_helper.h b/modules/access/disc_helper.h
new file mode 100644
index 00..8d5a4ef8b4
--- /dev/null
+++ b/modules/access/disc_helper.h
@@ -0,0 +1,70 @@
+/*
+ * disc_helper.h: disc helper functions
+ *
+ * Copyright (C) 2020 VLC authors and VideoLAN
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ */
+
+#include 
+#include 
+#include 
+
+#include 
+#include 
+
+
+inline static int DiscProbeMacOSPermission( vlc_object_t *p_this, const char 
*psz_file )
+{
+#ifdef __APPLE__
+/* Check is only relevant starting macOS Catalina */
+if( __builtin_available( macOS 10.15, * ) )
+{
+/* Continue. The check above cannot be negated. */
+}
+else
+{
+return VLC_SUCCESS;
+}
+
+msg_Dbg( p_this, "Checking access permission for path %s", psz_file );
+
+struct stat stat_buf;
+if( vlc_stat( psz_file, &stat_buf ) != 0 )
+return VLC_SUCCESS; // Continue with probing to be on the safe side
+
+if( !S_ISBLK( stat_buf.st_mode ) && !S_ISCHR( stat_buf.st_mode ) )
+return VLC_SUCCESS;
+
+/* Check that device access in fact fails with EPERM error */
+int retVal = access( psz_file, R_OK );
+if( retVal == -1 && errno == EPERM )
+{
+msg_Err( p_this, "Path %s cannot be opened due to unsufficient 
permissions", psz_file );
+vlc_dialog_display_error( p_this, _("Problem accessing a system 
resource"),
+_("Potentially, macOS blocks access to your disc. "
+  "Please open \"System Preferences\" -> \"Security & Privacy\" "
+  "and allow VLC to access your external media in \"Files and 
Folders\" section."));
+
+return VLC_EGENERIC;
+}
+
+return VLC_SUCCESS;
+#else
+VLC_UNUSED( p_this );
+VLC_UNUSED( psz_file );
+return VLC_SUCCESS;
+#endif
+}
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 0200871bdf..2b199f76c8 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -65,6 +65,8 @@ dvdnav_status_t dvdnav_jump_to_sector_by_time(dvdnav_t *, 
uint64_t, int32_t);
 #include "../demux/mpeg/ps.h"
 #include "../demux/timestamps_filter.h"
 
+#include "disc_helper.h"
+
 /*
  * Module descriptor
  **